Merge pull request #955 from ra3xdh/release/24.3.2

Release/24.3.2

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

VERSION

@@ -1 +1 @@
-24.3.1
+24.3.2

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);
+      }
+    }
   }
 }
 

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);
         }
     }