S-parameter viewer

.github/workflows/cmake.yml

@@ -28,7 +28,7 @@ jobs:
     - name: InstallQt5
       run: |
           sudo apt-get update
-          sudo apt-get install -y qtbase5-dev qttools5-dev qtscript5-dev libqt5svg5-dev flex bison
+          sudo apt-get install -y qtbase5-dev qttools5-dev qtscript5-dev libqt5svg5-dev flex bison libqt5charts5-dev
     - name: Configure CMake
       # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
       # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type

.github/workflows/deploy.yml

@@ -64,6 +64,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libglx-dev libgl1-mesa-dev flex bison gperf dos2unix flex bison gperf dos2unix
           sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 100 --slave /usr/bin/g++ g++ /usr/bin/g++-12
+          sudo apt install libqt5charts5-dev
 
     - name: 'Install Qt6'
       uses: jurplel/install-qt-action@v4
@@ -74,6 +75,7 @@ jobs:
         cache: true
         arch: 'linux_gcc_64'
         install-deps: 'true'
+        modules: 'qtcharts'
 
     - name: 'Configure CMake'
       run: |
@@ -146,6 +148,7 @@ jobs:
         cache: true
         arch: 'clang_64'
         install-deps: 'true'
+        modules: 'qtcharts'
 
     - name: 'Install Dependencies'
       shell: bash
@@ -179,6 +182,7 @@ jobs:
         cp -pR ./build/qucs-attenuator/qucs-sattenuator.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-filter/qucs-sfilter.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-powercombining/qucs-spowercombining.app ${{env.QUCS_MACOS_BIN}}
+        cp -pR ./build/qucs-s-spar-viewer/qucs-sspar-viewer.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-transcalc/qucs-strans.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucsator_rf/src/qucsator_rf ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucsator_rf/src/converter/qucsconv_rf ${{env.QUCS_MACOS_BIN}}
@@ -191,6 +195,7 @@ jobs:
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-sattenuator.app
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-sfilter.app
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-spowercombining.app
+        macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-sspar-viewer.app
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-strans.app
         strip ${{env.QUCS_MACOS_BIN}}/qucsator_rf
         strip ${{env.QUCS_MACOS_BIN}}/qucsconv_rf 
@@ -235,6 +240,7 @@ jobs:
         cache: true
         arch: 'clang_64'
         install-deps: 'true'
+        modules: 'qtcharts'
 
     - name: 'Install Dependencies'
       shell: bash
@@ -268,6 +274,7 @@ jobs:
         cp -pR ./build/qucs-attenuator/qucs-sattenuator.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-filter/qucs-sfilter.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-powercombining/qucs-spowercombining.app ${{env.QUCS_MACOS_BIN}}
+        cp -pR ./build/qucs-s-spar-viewer/qucs-sspar-viewer.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucs-transcalc/qucs-strans.app ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucsator_rf/src/qucsator_rf ${{env.QUCS_MACOS_BIN}}
         cp -pR ./build/qucsator_rf/src/converter/qucsconv_rf ${{env.QUCS_MACOS_BIN}}
@@ -281,6 +288,7 @@ jobs:
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-sfilter.app
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-spowercombining.app
         macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-strans.app
+        macdeployqt ${{env.QUCS_MACOS_BIN}}/qucs-sspar-viewer.app
         strip ${{env.QUCS_MACOS_BIN}}/qucsator_rf
         strip ${{env.QUCS_MACOS_BIN}}/qucsconv_rf
         codesign --force --deep --sign - ./build/qucs/qucs-s.app
@@ -347,6 +355,7 @@ jobs:
           python:p 
           gperf:p
           github-cli:p
+          qt6-charts:p
 
     - name: Build project with CMake
       run: |
@@ -371,6 +380,7 @@ jobs:
         windeployqt-qt6.exe build/qucs-suite/bin/qucs-sfilter.exe  --no-translations 
         windeployqt-qt6.exe build/qucs-suite/bin/qucs-spowercombining.exe  --no-translations 
         windeployqt-qt6.exe build/qucs-suite/bin/qucs-strans.exe  --no-translations
+        windeployqt-qt6.exe build/qucs-suite/bin/qucs-sspar-viewer.exe  --no-translations
 
     - name: Copy non-Qt DLLs to bin directory
       run: |

.gitignore

@@ -57,3 +57,5 @@ __pycache__
 .vscode/settings.json
 .vscode/tasks.json
 /cmake-build-debug/
+
+build-qucs-s-spar-viewer-Desktop-Debug/

CMakeLists.txt

@@ -66,6 +66,7 @@ add_subdirectory( qucs-filter )
 add_subdirectory( library )
 add_subdirectory( qucs-transcalc )
 add_subdirectory( qucs-powercombining )
+add_subdirectory( qucs-s-spar-viewer )
 #add_subdirectory( examples )
 if(EXISTS ${CMAKE_SOURCE_DIR}/qucsator_rf/CMakeLists.txt)
     add_subdirectory(qucsator_rf)

qucs-s-spar-viewer/CMakeLists.txt

@@ -0,0 +1,168 @@
+PROJECT(qucs-s-spar-viewer CXX C)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+cmake_policy(VERSION 3.10)
+
+SET(QUCS_NAME "qucs-s")
+
+# use top VERSION file
+file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)
+message(STATUS "Configuring ${PROJECT_NAME} (GUI): VERSION ${QUCS_VERSION}")
+
+set(PROJECT_VERSION "${QUCS_VERSION}")
+
+set(PROJECT_VENDOR "Qucs-S team. This program is licensed under the GNU GPL")
+set(PROJECT_COPYRIGHT_YEAR "2024")
+set(PROJECT_DOMAIN_FIRST "qucs")
+set(PROJECT_DOMAIN_SECOND "org")
+
+
+add_compile_definitions(HAVE_CONFIG_H)
+SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+# configure the header config.h
+CONFIGURE_FILE (
+    "${PROJECT_SOURCE_DIR}/../config.h.cmake"
+    "${PROJECT_BINARY_DIR}/config.h"
+)
+
+INCLUDE_DIRECTORIES("${PROJECT_BINARY_DIR}")
+
+if(WITH_QT6)
+    set(QT_VERSION_MAJOR 6)
+else()
+    set(QT_VERSION_MAJOR 5)
+endif()
+find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Core Gui Widgets Charts)
+include_directories(
+      ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DIRS}
+      ${Qt${QT_VERSION_MAJOR}Gui_INCLUDE_DIRS}
+      ${Qt${QT_VERSION_MAJOR}Widgets_INCLUDE_DIRS}
+      )
+
+
+IF(QT_VERSION_MAJOR EQUAL 6)
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ELSE()
+set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ENDIF()
+
+if (MSVC)
+  add_compile_options(/Zc:__cplusplus /permissive- /MP /Zc:preprocessor)
+else()
+  # additional warnings
+  add_compile_options(-Wall -Wextra)
+endif()
+ADD_DEFINITIONS(${QT_DEFINITIONS})
+
+#ADD_SUBDIRECTORY( bitmaps ) -> added as resources
+
+SET( spar_viewer_sources main.cpp qucs-s-spar-viewer.cpp)
+
+SET( spar_viewer_moc_headers qucs-s-spar-viewer.h)
+
+SET(RESOURCES qucs-s-spar-viewer.qrc)
+
+if(QT_VERSION_MAJOR EQUAL 6)
+QT6_WRAP_CPP( spar_viewer_moc_sources ${spar_viewer_moc_headers} )
+QT6_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
+else()
+QT5_WRAP_CPP( spar_viewer_moc_sources ${spar_viewer_moc_headers} )
+QT5_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
+endif()
+
+IF(APPLE)
+  # set information on Info.plist file
+	SET(MACOSX_BUNDLE_INFO_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_BUNDLE_VERSION "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_NAME} ${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}")
+  SET(MACOSX_BUNDLE_COPYRIGHT "${PROJECT_COPYRIGHT_YEAR} ${PROJECT_VENDOR}")
+  SET(MACOSX_BUNDLE_GUI_IDENTIFIER "${PROJECT_DOMAIN_SECOND}.${PROJECT_DOMAIN_FIRST}")
+  SET(MACOSX_BUNDLE_BUNDLE_NAME "${PROJECT_NAME}")
+  SET(MACOSX_BUNDLE_ICON_FILE qucs-s-spar-viewer.icns)
+
+  # set where in the bundle to put the icns file
+  SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/../qucs/bitmaps/qucs-s-spar-viewer.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+  # include the icns file in the target
+  SET(spar_viewer_sources ${spar_viewer_sources} ${CMAKE_CURRENT_SOURCE_DIR}/../qucs/bitmaps/qucs-s-spar-viewer.icns)
+
+ENDIF(APPLE)
+
+ADD_EXECUTABLE( ${QUCS_NAME}spar-viewer MACOSX_BUNDLE WIN32
+  ${spar_viewer_sources}
+  ${spar_viewer_moc_sources}
+  ${RESOURCES_SRCS} )
+
+TARGET_LINK_LIBRARIES( ${QUCS_NAME}spar-viewer Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Charts )
+SET_TARGET_PROPERTIES(${QUCS_NAME}spar-viewer PROPERTIES POSITION_INDEPENDENT_CODE TRUE)
+#INSTALL (TARGETS ${QUCS_NAME}spar-viewer DESTINATION bin)
+#
+# Prepare the installation
+#
+SET(plugin_dest_dir bin)
+SET(qtconf_dest_dir bin)
+SET(APPS "${CMAKE_INSTALL_PREFIX}/bin/${QUCS_NAME}spar-viewer")
+IF(APPLE)
+  SET(plugin_dest_dir ${QUCS_NAME}spar-viewer.app/Contents/MacOS)
+  SET(qtconf_dest_dir ${QUCS_NAME}spar-viewer.app/Contents/Resources)
+  SET(APPS "${CMAKE_INSTALL_PREFIX}/bin/${QUCS_NAME}spar-viewer.app")
+ENDIF(APPLE)
+
+IF(WIN32)
+  SET(APPS "${CMAKE_INSTALL_PREFIX}/bin/${QUCS_NAME}spar-viewer.exe")
+ENDIF(WIN32)
+
+#
+# Install the Qucs application, on Apple, the bundle is
+# installed as on other platforms it'll go into the bin directory.
+#
+INSTALL(TARGETS ${QUCS_NAME}spar-viewer
+    BUNDLE DESTINATION bin COMPONENT Runtime
+    RUNTIME DESTINATION bin COMPONENT Runtime
+    )
+
+
+#
+# Install needed Qt plugins by copying directories from the qt installation
+# One can cull what gets copied by using 'REGEX "..." EXCLUDE'
+#
+IF(APPLE AND QT_PLUGINS_DIR)
+  INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION bin/${plugin_dest_dir}/plugins COMPONENT Runtime)
+ENDIF()
+#
+# install a qt.conf file
+# this inserts some cmake code into the install script to write the file
+#
+IF(APPLE)
+INSTALL(CODE "
+    file(WRITE \"\${CMAKE_INSTALL_PREFIX}/bin/${qtconf_dest_dir}/qt.conf\" \"\")
+    " COMPONENT Runtime)
+ENDIF()
+
+#--------------------------------------------------------------------------------
+# Use BundleUtilities to get all other dependencies for the application to work.
+# It takes a bundle or executable along with possible plugins and inspects it
+# for dependencies.  If they are not system dependencies, they are copied.
+
+# directories to look for dependencies
+IF(APPLE)
+  SET(DIRS ${QT_LIBRARY_DIRS})
+ENDIF()
+
+# Now the work of copying dependencies into the bundle/package
+# The quotes are escaped and variables to use at install time have their $ escaped
+# An alternative is the do a configure_file() on a script and use install(SCRIPT  ...).
+# Note that the image plugins depend on QtSvg and QtXml, and it got those copied
+# over.
+IF(APPLE)
+INSTALL(CODE "
+    file(GLOB_RECURSE QTPLUGINS
+      \"\${CMAKE_INSTALL_PREFIX}/bin/${plugin_dest_dir}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+    include(BundleUtilities)
+    fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
+    " COMPONENT Runtime)
+ENDIF()
+
+