Merge pull request #835 from ra3xdh/small_fixes

Small fixes
ra3xdh · Jul 11, 2024 · 45eda17 · 45eda17
2 parents 48e23d1 + f570c57
commit 45eda17
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 0 deletions.
diff --git a/library/symbols/diode.sym b/library/symbols/diode.sym
@@ -0,0 +1,12 @@
+<Qucs Schematic 24.2.1>
+<Symbol>
+  <Line 6 9 0 -18 #000080 2 1>
+  <Line -6 9 0 -18 #000080 2 1>
+  <Line 30 0 -24 0 #000080 2 1>
+  <Line -6 0 -24 0 #000080 2 1>
+  <Line 6 0 -12 -9 #000080 2 1>
+  <Line 6 0 -12 9 #000080 2 1>
+  <.ID -20 14 SUB>
+  <.PortSym -30 0 1 0 1>
+  <.PortSym 30 0 2 0 2>
+</Symbol>
diff --git a/library/symbols/varactor.sym b/library/symbols/varactor.sym
@@ -0,0 +1,13 @@
+<Qucs Schematic 24.2.1>
+<Symbol>
+  <.ID -20 24 SUB>
+  <Line 6 9 0 -18 #000080 2 1>
+  <Line -6 9 0 -18 #000080 2 1>
+  <Line 30 0 -20 0 #000080 2 1>
+  <Line -6 0 -24 0 #000080 2 1>
+  <Line 10 9 0 -18 #000080 2 1>
+  <Line 6 0 -12 -9 #000080 2 1>
+  <Line 6 0 -12 9 #000080 2 1>
+  <.PortSym -30 0 1 0 1>
+  <.PortSym 30 0 2 0 2>
+</Symbol>
diff --git a/library/symbols/zener.sym b/library/symbols/zener.sym
@@ -0,0 +1,13 @@
+<Qucs Schematic 24.2.1>
+<Symbol>
+  <.ID -20 24 SUB>
+  <Line 6 9 0 -18 #000080 2 1>
+  <Line -6 9 0 -18 #000080 2 1>
+  <Line 30 0 -24 0 #000080 2 1>
+  <Line -6 0 -24 0 #000080 2 1>
+  <Line 6 -9 -5 0 #000080 2 1>
+  <Line 6 0 -12 -9 #000080 2 1>
+  <Line 6 0 -12 9 #000080 2 1>
+  <.PortSym -30 0 1 0 1>
+  <.PortSym 30 0 2 0 2>
+</Symbol>
diff --git a/library/symbols/zener3.sym b/library/symbols/zener3.sym
@@ -0,0 +1,15 @@
+<Qucs Schematic 24.2.1>
+<Symbol>
+  <Line 6 9 0 -18 #000080 2 1>
+  <Line -6 9 0 -18 #000080 2 1>
+  <Line 30 0 -24 0 #000080 2 1>
+  <Line -6 0 -24 0 #000080 2 1>
+  <Line 6 -9 -5 0 #000080 2 1>
+  <Line 6 0 -12 -9 #000080 2 1>
+  <Line 6 0 -12 9 #000080 2 1>
+  <.PortSym -30 0 1 0 1>
+  <.PortSym 30 0 2 0 2>
+  <.PortSym 0 30 3 0 3>
+  <Line 0 30 0 -25 #000080 2 1>
+  <.ID 18 20 SUB>
+</Symbol>
diff --git a/qucs/dialogs/fillfromspicedialog.cpp b/qucs/dialogs/fillfromspicedialog.cpp
@@ -127,6 +127,13 @@ int fillFromSpiceDialog::parseModelcard()
         value += "M";
       }
 
+      if (value.size() >=2) {
+        // Ngspice doesn't accept numbers without leading zero
+        if (value.at(0) == '.' && value.at(1).isDigit()) {
+          value.insert(0,'0');
+        }
+      }
+
       if (chbNumNotation->isChecked()) {
         QString vv = convertNumNotation(value);
         if (!vv.isEmpty()) value = vv;

diff --git a/qucs/dialogs/simmessage.cpp b/qucs/dialogs/simmessage.cpp
@@ -607,6 +607,7 @@ void SimMessage::startSimulator()
   // append process PATH
   // insert Qucs bin dir, so ASCO can find qucsator
   env.insert("PATH", env.value("PATH") + sep + QucsSettings.BinDir );
+  env.insert("ASCO_SIM_PATH",QucsSettings.Qucsator);
   SimProcess.setProcessEnvironment(env);
 
   qDebug() << "Command :" << Program << Arguments.join(" ");