diff --git a/qucs/components/component.cpp b/qucs/components/component.cpp index 856f9f1f2..8aa2e01b8 100644 --- 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 index 67a15b071..a15d08e96 100644 --- 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 index 17b9864ee..1a3d8c84a 100644 --- 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 index 4ea421472..3d5fe326e 100644 --- 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 index 7068f9a66..b3333cc53 100644 --- 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 index 147762774..7be7d24e4 100644 --- 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 index 36a416801..4bf78ba4a 100644 --- 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); }