From 63d276ecd28c14136978ebaa3b4449f98fbe873d Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Mon, 25 Mar 2024 20:53:52 +0300 Subject: [PATCH 1/4] Fix AppImage build --- .github/workflows/appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 170cab78f..1ad935edc 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -26,7 +26,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 gperf dos2unix - 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 From 1592d0796628b273515868358d169990e066a03d Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Tue, 17 Sep 2024 20:26:33 +0300 Subject: [PATCH 2/4] Fix editing File type property --- qucs/components/componentdialog.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qucs/components/componentdialog.cpp b/qucs/components/componentdialog.cpp index 75c469609..41c70e1b1 100644 --- a/qucs/components/componentdialog.cpp +++ b/qucs/components/componentdialog.cpp @@ -1096,9 +1096,9 @@ void ComponentDialog::slotBrowseFile() s = file.fileName(); } edit->setText(s); + int row = prop->currentRow(); + prop->item(row,1)->setText(s); } - /* FIX - prop->currentItem()->setText(1, s); */ } // ------------------------------------------------------------------------- @@ -1525,8 +1525,12 @@ void ComponentDialog::fillPropsFromTable() QString disp = prop->item(row, 2)->text(); QString desc = prop->item(row, 3)->text(); bool display = (disp == tr("yes")); - auto pp = Comp->getProperty(name); - updateProperty(pp,value,display); + if (row < Comp->Props.count()) { + auto pp = Comp->Props[row]; + if (pp->Name == name) { + updateProperty(pp,value,display); + } + } } } From 3237373fba3fc087963dc804ba4401e7d18fe6ed Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Thu, 19 Sep 2024 19:00:57 +0300 Subject: [PATCH 3/4] Add model sweep pattern recognition --- qucs/components/param_sweep.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/qucs/components/param_sweep.cpp b/qucs/components/param_sweep.cpp index ee6142312..2a8f69a9d 100644 --- a/qucs/components/param_sweep.cpp +++ b/qucs/components/param_sweep.cpp @@ -151,11 +151,13 @@ QString Param_Sweep::getNgspiceBeforeSim(QString sim, int lvl) if (step_var == "temp" || step_var == "temper") temper_sweep = true; - if (temper_sweep) { + if (temper_sweep) { // Sweep temperature s += QString("option temp = $%1_act%2").arg(step_var).arg(nline_char); - } else if (compfound) { + } else if (compfound) { // Sweep device s += QString("alter %1 = $%2_act%3").arg(par).arg(step_var).arg(nline_char); - } else { + } else if (par.startsWith("@")) { // Sweep model + s += QString("altermod %1 = $%2_act%3").arg(par).arg(step_var).arg(nline_char); + } else { // Sweep .PARAM variable s += QString("alterparam %1 = $%2_act%3reset%3").arg(par).arg(step_var).arg(nline_char); } } From 4dd6f10534b58b1162ff663e3bf4f928f7bf5b15 Mon Sep 17 00:00:00 2001 From: Vadim Kuznetsov Date: Mon, 23 Sep 2024 20:37:53 +0300 Subject: [PATCH 4/4] Update NEWS.md and VERSION --- NEWS.md | 7 +++++++ VERSION | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 71442a89d..f51575900 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# Qucs-S 24.3.2 + +## Bugfixes + +* Fixed editing of File-type properties #948 +* Implemented @model[param] syntax recognition for Parameter sweep #948 + # Qucs-S 24.3.1 ## Packaging diff --git a/VERSION b/VERSION index e25b7148d..23b859016 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -24.3.1 +24.3.2