Ci fixes (squashed)

Remove unneeded CMakeLists in bitmaps folder


Add qucs-s-spar-viewer.icns

This is required for the "build-mac-universal" and "build-mac-intel" jobs
Install libqt5charts5-dev dependency

I set up a fresh Lubuntu 24.04 on a VM and compiled the code from source using the instructions provided in the Qucs-S page. I found that to avoid the above error in the build, you need to install "libqt5charts5-dev" first. 

After that the compilation went fine. I'm not sure if it works with "libqt6charts6-dev". I'll check later.
Typo in CMakeLists


Remove unneeded include causing trouble in build appImage-Qt6

/home/runner/work/qucs_s/qucs_s/qucs-s-spar-viewer/main.cpp:28:10: fatal error: QDesktopWidget: No such file or directory
   28 | #include <QDesktopWidget>


Missing line in windows build


Patch provided by ra3xdh QtCharts


Update cmake.yml and deploy.yml

Added qt6-charts to Windows build and qt5charts to Qt5 build

.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
@@ -235,6 +238,7 @@ jobs:
         cache: true
         arch: 'clang_64'
         install-deps: 'true'
+        modules: 'qtcharts'
         
     - name: 'Install Dependencies'
       shell: bash
@@ -347,6 +351,7 @@ jobs:
           python:p 
           gperf:p
           github-cli:p
+          qt6-charts:p
 
     - name: Build project with CMake
       run: |
@@ -371,6 +376,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: |

qucs-s-spar-viewer/CMakeLists.txt

@@ -65,7 +65,7 @@ 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}spar_viewerf )
+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} )

qucs-s-spar-viewer/bitmaps/CMakeLists.txt

@@ -1,19 +0,0 @@
-
-SET(XPMS
-)
-
-# toolbar images
-SET(PNGS
-att_pi.png
-att_tee.png
-att_bridge.png
-)
-
-# application images
-SET(ICONS
-)
-
-INSTALL(FILES ${XPMS} DESTINATION share/qucs/bitmaps)
-INSTALL(FILES ${PNGS} DESTINATION share/qucs/bitmaps)
-INSTALL(FILES ${ICONS} DESTINATION share/qucs/bitmaps)
-

qucs-s-spar-viewer/main.cpp

@@ -25,7 +25,6 @@
 #include <QDir>
 #include <QFont>
 #include <QSettings>
-#include <QDesktopWidget>
 #include <QScreen>
 #include <QStyle>
 

qucs-s-spar-viewer/qucs-s-spar-viewer.cpp

@@ -560,7 +560,7 @@ void Qucs_S_SPAR_Viewer::addFiles(QStringList fileNames)
           //qDebug() << line;
 
            if (line.isEmpty()) continue;
-           if ((line.at(0).isNumber() == false) && (line.at(0) != "#")) {
+           if ((line.at(0).isNumber() == false) && (line.at(0) != '#')) {
                if (file_data["frequency"].size() == 0){
                    // There's still no data
                    continue;
@@ -572,7 +572,7 @@ void Qucs_S_SPAR_Viewer::addFiles(QStringList fileNames)
 
            }
            // Check for the option line
-           if (line.at(0) == "#"){
+           if (line.at(0) == '#'){
 
                QStringList info = line.split(" ");
                frequency_unit = info.at(1); // Specifies the unit of frequency.
@@ -1443,7 +1443,7 @@ void Qucs_S_SPAR_Viewer::updateTraces()
         QString data_file = trace_name_parts[0];
         QString trace_file = trace_name_parts[1];
 
-        if (trace_file.at(0) == "S"){
+        if (trace_file.at(0) == 'S'){
             trace_file = trace_file + QString("_dB");
         }
         if (trace_file == QString("|%1|").arg(QChar(0x0394))){
@@ -1643,7 +1643,7 @@ void Qucs_S_SPAR_Viewer::checkFreqSettingsLimits(QString filename, double& fmin,
 void Qucs_S_SPAR_Viewer::adjust_y_axis_to_trace(QString filename, QString tracename){
     qreal minX, maxX, minY, maxY;
 
-    if (tracename.at(0) == "S"){
+    if (tracename.at(0) == 'S'){
         tracename = tracename + QString("_dB");
     }
     if (tracename == QString("|%1|").arg(QChar(0x0394))){

qucs-s-spar-viewer/qucs-s-spar-viewer.h

@@ -13,7 +13,9 @@
 #include <QtGlobal>
 #include <complex>
 
+#if QT_VERSION < QT_VERSION_CHECK(6,0,0)
 using namespace QtCharts;
+#endif
 
 class QComboBox;
 class QTableWidget;