diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index b6854d2c..3ea112a2 100644 --- a/.github/workflows/cmake.yml +++ b/.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 diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index d60b5443..9e45a41b 100644 --- a/.github/workflows/deploy.yml +++ b/.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: | diff --git a/qucs-s-spar-viewer/CMakeLists.txt b/qucs-s-spar-viewer/CMakeLists.txt index 311dbbc0..7c421deb 100644 --- a/qucs-s-spar-viewer/CMakeLists.txt +++ b/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} ) diff --git a/qucs-s-spar-viewer/bitmaps/CMakeLists.txt b/qucs-s-spar-viewer/bitmaps/CMakeLists.txt deleted file mode 100644 index a0b4c05a..00000000 --- a/qucs-s-spar-viewer/bitmaps/CMakeLists.txt +++ /dev/null @@ -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) - diff --git a/qucs-s-spar-viewer/main.cpp b/qucs-s-spar-viewer/main.cpp index 4097c086..52badc64 100644 --- a/qucs-s-spar-viewer/main.cpp +++ b/qucs-s-spar-viewer/main.cpp @@ -25,7 +25,6 @@ #include #include #include -#include #include #include diff --git a/qucs-s-spar-viewer/qucs-s-spar-viewer.cpp b/qucs-s-spar-viewer/qucs-s-spar-viewer.cpp index 75b6dacd..7bd844ed 100644 --- a/qucs-s-spar-viewer/qucs-s-spar-viewer.cpp +++ b/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))){ diff --git a/qucs-s-spar-viewer/qucs-s-spar-viewer.h b/qucs-s-spar-viewer/qucs-s-spar-viewer.h index ebfb67f7..9694a83b 100644 --- a/qucs-s-spar-viewer/qucs-s-spar-viewer.h +++ b/qucs-s-spar-viewer/qucs-s-spar-viewer.h @@ -13,7 +13,9 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(6,0,0) using namespace QtCharts; +#endif class QComboBox; class QTableWidget; diff --git a/qucs/bitmaps/qucs-s-spar-viewer.icns b/qucs/bitmaps/qucs-s-spar-viewer.icns new file mode 100644 index 00000000..9b05d832 Binary files /dev/null and b/qucs/bitmaps/qucs-s-spar-viewer.icns differ