Merge pull request #1165 from ThomasZecha/dev/tze/featureExportCdlNet…

…list New feature CDL netlist export
ra3xdh · Jan 7, 2025 · ac24a25 · ac24a25
2 parents b955037 + efb112d
commit ac24a25
Show file tree

Hide file tree

Showing 270 changed files with 1,493 additions and 770 deletions.
diff --git a/qucs/components/ac_sim.cpp b/qucs/components/ac_sim.cpp
@@ -79,7 +79,7 @@ void AC_Sim::recreate(Schematic*)
   }
 }
 
-QString AC_Sim::spice_netlist(bool isXyce)
+QString AC_Sim::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
     QString s = SpiceModel + " ";
     QString unit;
@@ -100,7 +100,7 @@ QString AC_Sim::spice_netlist(bool isXyce)
     QString fstart = spicecompat::normalize_value(Props.at(1)->Value); // Start freq.
     QString fstop = spicecompat::normalize_value(Props.at(2)->Value); // Stop freq.
     s += QStringLiteral("%1 %2 \n").arg(fstart).arg(fstop);
-    if (!isXyce) s.remove(0,1);
+    if (dialect != spicecompat::SPICEXyce) s.remove(0,1);
     return s.toLower();
 
 }
diff --git a/qucs/components/ac_sim.h b/qucs/components/ac_sim.h
@@ -28,7 +28,7 @@ class AC_Sim : public qucs::component::SimulationComponent  {
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
   void recreate(Schematic*);
-  QString spice_netlist(bool isXyce=false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
 };
 
 #endif
diff --git a/qucs/components/ampere_ac.cpp b/qucs/components/ampere_ac.cpp
@@ -78,8 +78,10 @@ Element* Ampere_ac::info(QString& Name, char* &BitmapFile, bool getNewOne)
 }
 
 
-QString Ampere_ac::spice_netlist(bool)
+QString Ampere_ac::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
+    Q_UNUSED(dialect);
+
     QString s = spicecompat::check_refdes(Name,SpiceModel);
 
     QString plus = spicecompat::normalize_node_name(Ports.at(1)->Connection->Name);

diff --git a/qucs/components/ampere_ac.h b/qucs/components/ampere_ac.h
@@ -28,7 +28,7 @@ class Ampere_ac : public Component  {
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
 };
 
 #endif
diff --git a/qucs/components/ampere_dc.cpp b/qucs/components/ampere_dc.cpp
@@ -47,7 +47,7 @@ Ampere_dc::Ampere_dc()
   SpiceModel = "I";
 
   Props.append(new Property("I", "1 mA", true,
-		QObject::tr("current in Ampere")));
+    QObject::tr("current in Ampere")));
 
   rotate();  // fix historical flaw
 }
@@ -56,8 +56,10 @@ Ampere_dc::~Ampere_dc()
 {
 }
 
-QString Ampere_dc::spice_netlist(bool)
+QString Ampere_dc::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
+    Q_UNUSED(dialect);
+
     QString s = spicecompat::check_refdes(Name,SpiceModel);
 
     QString plus = Ports.at(1)->Connection->Name;
@@ -68,6 +70,12 @@ QString Ampere_dc::spice_netlist(bool)
             .arg(spicecompat::normalize_value(Props.at(0)->Value));
     return s;
 }
+
+QString Ampere_dc::cdl_netlist()
+{
+    return spice_netlist(spicecompat::CDL);
+}
+
 Component* Ampere_dc::newOne()
 {
   return new Ampere_dc();

diff --git a/qucs/components/ampere_dc.h b/qucs/components/ampere_dc.h
@@ -27,7 +27,8 @@ class Ampere_dc : public Component  {
   ~Ampere_dc();
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
-   QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
+  virtual QString cdl_netlist();
 };
 
 #endif
diff --git a/qucs/components/biast.cpp b/qucs/components/biast.cpp
@@ -80,9 +80,10 @@ Element* BiasT::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString BiasT::spice_netlist(bool isXyce)
+QString BiasT::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
-    Q_UNUSED(isXyce);
+    Q_UNUSED(dialect);
+
     QString s;
     QString L = spicecompat::normalize_value(getProperty("L")->Value);
     QString C = spicecompat::normalize_value(getProperty("C")->Value);

diff --git a/qucs/components/biast.h b/qucs/components/biast.h
@@ -28,7 +28,7 @@ class BiasT : public Component  {
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
 };
 
 #endif
diff --git a/qucs/components/bjt.cpp b/qucs/components/bjt.cpp
@@ -42,7 +42,7 @@ Component* BJT::newOne()
   return p;
 }
 
-QString BJT::spice_netlist(bool)
+QString BJT::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     QList<int> pin_seq;
@@ -60,17 +60,28 @@ QString BJT::spice_netlist(bool)
 
     QString par_str = form_spice_param_list(spice_incompat,spice_tr);
 
-    if (getProperty("UseGlobTemp")->Value == "yes") {
-      s += QStringLiteral(" QMOD_%1 AREA=%2\n").arg(Name).arg(getProperty("Area")->Value);
+    const bool isDialectCDL(dialect == spicecompat::CDL);
+
+    if (getProperty("UseGlobTemp")->Value == "yes" || isDialectCDL) {
+        s += QStringLiteral(" QMOD_%1 %2=%3\n").arg(Name).arg(isDialectCDL ? "$EA" : "AREA").arg(getProperty("Area")->Value);
     } else {
-      s += QStringLiteral(" QMOD_%1 AREA=%2 TEMP=%3\n").arg(Name).arg(getProperty("Area")->Value)
-      .arg(getProperty("Temp")->Value);
+        s += QStringLiteral(" QMOD_%1 AREA=%2 TEMP=%3\n").arg(Name).arg(getProperty("Area")->Value)
+            .arg(getProperty("Temp")->Value);
+    }
+
+    if (!isDialectCDL)
+    {
+        s += QStringLiteral(".MODEL QMOD_%1 %2 (%3)\n").arg(Name).arg(getProperty("Type")->Value).arg(par_str);
     }
-    s += QStringLiteral(".MODEL QMOD_%1 %2 (%3)\n").arg(Name).arg(getProperty("Type")->Value).arg(par_str);
 
     return s;
 }
 
+QString BJT::cdl_netlist()
+{
+    return spice_netlist(spicecompat::CDL);
+}
+
 // -------------------------------------------------------
 Element* BJT::info(QString& Name, char* &BitmapFile, bool getNewOne)
 {

diff --git a/qucs/components/bjt.h b/qucs/components/bjt.h
@@ -32,7 +32,8 @@ class BJT : public Basic_BJT  {
 protected:
   void createSymbol();
   QString netlist();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
+  virtual QString cdl_netlist();
 };
 
 #endif
diff --git a/qucs/components/bjtsub.cpp b/qucs/components/bjtsub.cpp
@@ -201,7 +201,7 @@ void BJTsub::createSymbol()
   x2 =  30; y2 =  30;
 }
 
-QString BJTsub::spice_netlist(bool)
+QString BJTsub::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
     QList<int> pin_seq;
@@ -219,14 +219,24 @@ QString BJTsub::spice_netlist(bool)
 
     QString par_str = form_spice_param_list(spice_incompat,spice_tr);
 
-    if (getProperty("UseGlobTemp")->Value == "yes") {
-      s += QStringLiteral(" QMOD_%1 AREA=%2\n").arg(Name).arg(getProperty("Area")->Value);
+    const bool isDialectCDL(dialect == spicecompat::CDL);
+
+    if (getProperty("UseGlobTemp")->Value == "yes" || isDialectCDL) {
+        s += QStringLiteral(" QMOD_%1 %2=%3\n").arg(Name).arg(isDialectCDL ? "$EA" : "AREA").arg(getProperty("Area")->Value);
     } else {
-      s += QStringLiteral(" QMOD_%1 AREA=%2 TEMP=%3\n").arg(Name).arg(getProperty("Area")->Value)
-      .arg(getProperty("Temp")->Value);
+        s += QStringLiteral(" QMOD_%1 AREA=%2 TEMP=%3\n").arg(Name).arg(getProperty("Area")->Value)
+            .arg(getProperty("Temp")->Value);
     }
 
-    s += QStringLiteral(".MODEL QMOD_%1 %2 (%3)\n").arg(Name).arg(getProperty("Type")->Value).arg(par_str);
+    if (!isDialectCDL)
+    {
+        s += QStringLiteral(".MODEL QMOD_%1 %2 (%3)\n").arg(Name).arg(getProperty("Type")->Value).arg(par_str);
+    }
 
     return s;
 }
+
+QString BJTsub::cdl_netlist()
+{
+    return spice_netlist(spicecompat::CDL);
+}
diff --git a/qucs/components/bjtsub.h b/qucs/components/bjtsub.h
@@ -36,7 +36,8 @@ class BJTsub : public Basic_BJT  {
   static Element* info_pnp(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
+  virtual QString cdl_netlist();
   void createSymbol();
 };
 

diff --git a/qucs/components/capacitor.cpp b/qucs/components/capacitor.cpp
@@ -25,11 +25,11 @@ Capacitor::Capacitor()
   Description = QObject::tr("capacitor");
 
   Props.append(new Property("C", "1 nF", true,
-		QObject::tr("capacitance in Farad")));
+    QObject::tr("capacitance in Farad")));
   Props.append(new Property("V", "", false,
-		QObject::tr("initial voltage for transient simulation")));
+    QObject::tr("initial voltage for transient simulation")));
   Props.append(new Property("Symbol", "neutral", false,
-	QObject::tr("schematic symbol")+" [neutral, polar]"));
+  QObject::tr("schematic symbol")+" [neutral, polar]"));
 
   createSymbol();
   tx = x1+4;
@@ -53,7 +53,7 @@ Element* Capacitor::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString Capacitor::spice_netlist(bool)
+QString Capacitor::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
     QString s = spicecompat::check_refdes(Name,SpiceModel);
 
@@ -64,24 +64,29 @@ QString Capacitor::spice_netlist(bool)
     s += " "+spicecompat::normalize_value(Props.at(0)->Value) + " ";
     QString val = Props.at(1)->Value; // add inial voltage if presents
     val = val.remove(' ').toUpper();
-    if (!val.isEmpty()) {
+    if (!val.isEmpty() && dialect != spicecompat::CDL) {
         s += " IC=" + val;
     }
 
     return s+'\n';
 }
 
+QString Capacitor::cdl_netlist()
+{
+    return spice_netlist(spicecompat::CDL);
+}
+
 QString Capacitor::va_code()
 {
     QString val = vacompat::normalize_value(Props.at(0)->Value);
     QString plus =  Ports.at(0)->Connection->Name;
-    QString minus = Ports.at(1)->Connection->Name; 
+    QString minus = Ports.at(1)->Connection->Name;
     QString s = "";
     QString Vpm = vacompat::normalize_voltage(plus,minus);
     if (Vpm.startsWith("(-")) Vpm.remove(1,1); // Make capacitor unipolar, remove starting minus
-    QString Ipm = vacompat::normalize_current(plus,minus,true); 
+    QString Ipm = vacompat::normalize_current(plus,minus,true);
     s  += QStringLiteral("%1  <+ ddt( %2 *  %3  );\n").arg(Ipm).arg(Vpm).arg(val);
-            
+
     return s;
 }
 

diff --git a/qucs/components/capacitor.h b/qucs/components/capacitor.h
@@ -30,7 +30,8 @@ class Capacitor : public MultiViewComponent  {
 
 protected:
   void createSymbol();
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
+  virtual QString cdl_netlist();
   QString va_code();
 };
 

diff --git a/qucs/components/capq.cpp b/qucs/components/capq.cpp
@@ -91,9 +91,10 @@ Element* CapQ::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString CapQ::spice_netlist(bool isXyce)
+QString CapQ::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
-    Q_UNUSED(isXyce);
+    Q_UNUSED(dialect);
+
     QString s;
     QString pin1 = Ports.at(0)->Connection->Name;
     pin1 = spicecompat::normalize_node_name(pin1);
@@ -124,3 +125,4 @@ QString CapQ::spice_netlist(bool isXyce)
 
     return s;
 }
+
diff --git a/qucs/components/capq.h b/qucs/components/capq.h
@@ -34,7 +34,7 @@ class CapQ : public Component  {
   static Element* info(QString&, char* &, bool getNewOne=false);
 
 protected:
-  QString spice_netlist(bool isXyce);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
 };
 
 #endif
diff --git a/qucs/components/cccs.cpp b/qucs/components/cccs.cpp
@@ -82,27 +82,29 @@ Element* CCCS::info(QString& Name, char* &BitmapFile, bool getNewOne)
 }
 
 QString CCCS::va_code()
-{  
-    
-    QString Gain = vacompat::normalize_value(Props.at(0)->Value); 
-	QString P1 = Ports.at(0)->Connection->Name;
+{
+
+    QString Gain = vacompat::normalize_value(Props.at(0)->Value);
+    QString P1 = Ports.at(0)->Connection->Name;
     QString P4 = Ports.at(1)->Connection->Name;
     QString P3 = Ports.at(2)->Connection->Name;
     QString P2 = Ports.at(3)->Connection->Name;
     QString s = "";
-    
+
     QString Vpm = vacompat::normalize_voltage(P1,P2);
-    QString Ipm = vacompat::normalize_current(P1,P2,true);  
+    QString Ipm = vacompat::normalize_current(P1,P2,true);
     s += QStringLiteral(" %1  <+  %2 * 1e3;\n").arg(Ipm).arg(Vpm);
     QString Vpm2 = vacompat::normalize_voltage(P4,P3);
-    QString Ipm2 = vacompat::normalize_current(P4,P3,true); 
+    QString Ipm2 = vacompat::normalize_current(P4,P3,true);
     s += QStringLiteral("%1  <+   %2 * 1e-9;\n").arg(Ipm2).arg(Vpm2);
     s += QStringLiteral("%1  <+   %2 * 1e3 * %3 ;\n").arg(Ipm2).arg(Vpm).arg(Gain);
-    
+
     return s;
 }
-QString CCCS::spice_netlist(bool)
+QString CCCS::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */)
 {
+    Q_UNUSED(dialect);
+
     QString s = spicecompat::check_refdes(Name,SpiceModel); // spice CCCS consists two sources: output source
                         // and zero value controlling source
     QString val = spicecompat::normalize_value(Props.at(0)->Value);

diff --git a/qucs/components/cccs.h b/qucs/components/cccs.h
@@ -28,7 +28,7 @@ class CCCS : public Component  {
   Component* newOne();
   static Element* info(QString&, char* &, bool getNewOne=false);
 protected:
-  QString spice_netlist(bool isXyce = false);
+  QString spice_netlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
   QString va_code();
 };