Introduce optional netlisting to console

-Replaced Component::getProbeVariable(bool isXyce) with Component::getProbeVariable(spicecompat::SpiceDialect dialect) Signed-off-by: ThomasZecha <zecha@ihp-microelectronics.com>
ra3xdh · Jan 19, 2025 · e27883f · e27883f
1 parent 63d6d07
commit e27883f
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/qucs/components/component.cpp b/qucs/components/component.cpp
@@ -840,7 +840,7 @@ QStringList Component::getExtraVariables() {
     return QStringList();
 }
 
-QString Component::getProbeVariable(bool) {
+QString Component::getProbeVariable(spicecompat::SpiceDialect) {
     return QString();
 }
 

diff --git a/qucs/components/component.h b/qucs/components/component.h
@@ -47,7 +47,7 @@ class Component : public Element {
   virtual QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
   virtual QString getEquations(QString sim, QStringList &dep_vars);
   virtual QStringList getExtraVariables();
-  virtual QString getProbeVariable(bool isXyce = false);
+  virtual QString getProbeVariable(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault);
   virtual QString getSpiceModel();
   virtual QString getSpiceLibrary() { return QString(); }
   virtual QStringList getSpiceLibraryFiles() { return QStringList(); }

diff --git a/qucs/components/iprobe.cpp b/qucs/components/iprobe.cpp
@@ -90,13 +90,13 @@ QString iProbe::spice_netlist(spicecompat::SpiceDialect dialect /* = spicecompat
 
 /*!
  * \brief iProbe::getProbeVariable Get current probe variable
- * \param isXyce True if Xyce simulator
+ * \param dialect Spice dialect used
  * \return Current probe variable in Ngspice or Xyce notation
  */
-QString iProbe::getProbeVariable(bool isXyce)
+QString iProbe::getProbeVariable(spicecompat::SpiceDialect dialect)
 {
     QString s;
-    if (isXyce) {
+    if (dialect == spicecompat::SPICEXyce) {
         s = QStringLiteral("I(V%1)").arg(Name);
     } else {
         s = QStringLiteral("V%1#branch").arg(Name);

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

diff --git a/qucs/components/vprobe.cpp b/qucs/components/vprobe.cpp
@@ -73,7 +73,7 @@ Element* vProbe::info(QString& Name, char* &BitmapFile, bool getNewOne)
   return 0;
 }
 
-QString vProbe::getProbeVariable(bool)
+QString vProbe::getProbeVariable(spicecompat::SpiceDialect)
 {
     return Name;
 }

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

diff --git a/qucs/extsimkernels/xyce.cpp b/qucs/extsimkernels/xyce.cpp
@@ -117,7 +117,7 @@ void Xyce::createNetlist(
     }
     for(Component *pc = a_schematic->a_DocComps.first(); pc != 0; pc = a_schematic->a_DocComps.next()) {
         if (pc->isProbe) {
-            QString var_pr = pc->getProbeVariable(true);
+            QString var_pr = pc->getProbeVariable(spicecompat::SPICEXyce);
             if (!vars.contains(var_pr)) {
                 vars.append(var_pr);
             }