diff --git a/qucs/components/component.cpp b/qucs/components/component.cpp index 603dc6a3..8aa2e01b 100644 --- a/qucs/components/component.cpp +++ b/qucs/components/component.cpp @@ -828,7 +828,7 @@ QString Component::getVerilogACode() { } } -QString Component::getExpression(bool, bool) { +QString Component::getExpression(spicecompat::SpiceDialect) { return QString(); } @@ -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 092d860a..a15d08e9 100644 --- a/qucs/components/component.h +++ b/qucs/components/component.h @@ -44,10 +44,10 @@ public: QString getNetlist(); QString getSpiceNetlist(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); QString getVerilogACode(); - virtual QString getExpression(bool isXyce = false, bool isCdl = false); + 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/equation.cpp b/qucs/components/equation.cpp index 25bd4daf..05299c61 100644 --- a/qucs/components/equation.cpp +++ b/qucs/components/equation.cpp @@ -119,14 +119,11 @@ QString Equation::getVAExpressions() /*! * \brief Equation::getExpression Extract equations that don't contain simulation variables * (voltages/cureents) in .PARAM section of spice netlist - * \param isXyce True if Xyce is used. - * \param isCdl True if CDL is used. + * \param dialect Which spice-dialect is used. * \return .PARAM section of spice netlist as a single string. */ -QString Equation::getExpression(bool isXyce, bool isCdl /* = false */) +QString Equation::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - Q_UNUSED(isCdl); - if (isActive != COMP_IS_ACTIVE) return QString(); QStringList ng_vars,ngsims; @@ -145,9 +142,9 @@ QString Equation::getExpression(bool isXyce, bool isCdl /* = false */) QStringList tokens; QString eqn = Props.at(i)->Value; spicecompat::splitEqn(eqn,tokens); - spicecompat::convert_functions(tokens,isXyce); + spicecompat::convert_functions(tokens, dialect == spicecompat::SPICEXyce); eqn = tokens.join(""); - if (isXyce) { + if (dialect == spicecompat::SPICEXyce) { eqn.replace("^","**"); if (!(fp_pattern.match(eqn).hasMatch()|| diff --git a/qucs/components/equation.h b/qucs/components/equation.h index e8ff266d..ebbd485f 100644 --- a/qucs/components/equation.h +++ b/qucs/components/equation.h @@ -28,7 +28,7 @@ public: ~Equation(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); QString getEquations(QString sim, QStringList &dep_vars); QString getVAvariables(); QString getVAExpressions(); diff --git a/qucs/components/iprobe.cpp b/qucs/components/iprobe.cpp index 17b9864e..1a3d8c84 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 5ebfd45f..3d5fe326 100644 --- a/qucs/components/iprobe.h +++ b/qucs/components/iprobe.h @@ -27,8 +27,8 @@ public: ~iProbe(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool, bool) { return "";} - QString getProbeVariable(bool isXyce = false); + QString getExpression(spicecompat::SpiceDialect) { return "";} + 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 7068f9a6..b3333cc5 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 14776277..7be7d24e 100644 --- a/qucs/components/vprobe.h +++ b/qucs/components/vprobe.h @@ -27,7 +27,7 @@ public: ~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/CdlNetlistWriter.cpp b/qucs/extsimkernels/CdlNetlistWriter.cpp index 3fe8d12d..b3cdc4bb 100644 --- a/qucs/extsimkernels/CdlNetlistWriter.cpp +++ b/qucs/extsimkernels/CdlNetlistWriter.cpp @@ -149,7 +149,7 @@ void CdlNetlistWriter::startNetlist() { if (pc->isEquation) { - s = pc->getExpression(false, true); + s = pc->getExpression(spicecompat::CDL); a_netlistStream << s; } } diff --git a/qucs/extsimkernels/externsimdialog.cpp b/qucs/extsimkernels/externsimdialog.cpp index 17c78553..3a3d195c 100644 --- a/qucs/extsimkernels/externsimdialog.cpp +++ b/qucs/extsimkernels/externsimdialog.cpp @@ -25,7 +25,7 @@ #include "main.h" #include "qucs.h" -ExternSimDialog::ExternSimDialog(Schematic *sch, bool netlist_mode) : +ExternSimDialog::ExternSimDialog(Schematic* sch, bool netlist2Console, bool netlist_mode) : QDialog(sch), a_schematic(sch), a_buttonStopSim(new QPushButton(tr("Stop"),this)), @@ -37,7 +37,8 @@ ExternSimDialog::ExternSimDialog(Schematic *sch, bool netlist_mode) : a_ngspice(new Ngspice(sch,this)), a_xyce(new Xyce(sch,this)), a_wasSimulated(true), - a_hasError(false) + a_hasError(false), + a_netlist2Console(netlist2Console) { const QString workdir(QucsSettings.S4Qworkdir); @@ -296,27 +297,40 @@ void ExternSimDialog::slotStop() void ExternSimDialog::slotSaveNetlist() { QFileInfo inf(a_schematic->getDocName()); - QString filename = QFileDialog::getSaveFileName(this,tr("Save netlist"),inf.path()+QDir::separator()+"netlist.cir", - "All files (*)"); - if (filename.isEmpty()) return; + QString filename; - switch (QucsSettings.DefaultSimulator) { + if (!a_netlist2Console) + { + filename = QFileDialog::getSaveFileName( + this, + tr("Save netlist"), + inf.path() + QDir::separator() + "netlist.cir", + "All files (*)"); + if (filename.isEmpty()) + { + return; + } + } + + switch (QucsSettings.DefaultSimulator) + { case spicecompat::simNgspice: - case spicecompat::simSpiceOpus: { - a_ngspice->SaveNetlist(filename); - } + case spicecompat::simSpiceOpus: + a_ngspice->SaveNetlist(filename, a_netlist2Console); break; - case spicecompat::simXyce: { - a_xyce->SaveNetlist(filename); - } + case spicecompat::simXyce: + a_xyce->SaveNetlist(filename, a_netlist2Console); break; default: break; } - if (!QFile::exists(filename)) { - QMessageBox::critical(0, QObject::tr("Save netlist"), - QObject::tr("Disk write error!"), QMessageBox::Ok); + if (!a_netlist2Console && !QFile::exists(filename)) + { + QMessageBox::critical( + nullptr, + QObject::tr("Save netlist"), + QObject::tr("Disk write error!"), QMessageBox::Ok); } } diff --git a/qucs/extsimkernels/externsimdialog.h b/qucs/extsimkernels/externsimdialog.h index 5541b4fe..acbbccd3 100644 --- a/qucs/extsimkernels/externsimdialog.h +++ b/qucs/extsimkernels/externsimdialog.h @@ -30,7 +30,7 @@ class ExternSimDialog : public QDialog Q_OBJECT private: - Schematic *a_schematic; + Schematic* a_schematic; QPushButton *a_buttonStopSim; QPushButton *a_buttonSaveNetlist; @@ -46,10 +46,13 @@ private: bool a_wasSimulated; bool a_hasError; + bool a_netlist2Console; public: - explicit ExternSimDialog(Schematic *sch, - bool netlist_mode = false); + explicit ExternSimDialog( + Schematic* sch, + bool netlist2Console, + bool netlist_mode = false); ~ExternSimDialog(); bool wasSimulated() const { return a_wasSimulated; } diff --git a/qucs/extsimkernels/ngspice.cpp b/qucs/extsimkernels/ngspice.cpp index 6169e4bf..e704c6c7 100644 --- a/qucs/extsimkernels/ngspice.cpp +++ b/qucs/extsimkernels/ngspice.cpp @@ -33,6 +33,10 @@ #include "config.h" #endif +#include + +#include + /*! \file ngspice.cpp \brief Implementation of the Ngspice class @@ -43,7 +47,7 @@ * \param schematic Schematic that need to be simulated with Ngspice. * \param parent Parent object */ -Ngspice::Ngspice(Schematic *schematic, QObject *parent) : +Ngspice::Ngspice(Schematic* schematic, QObject *parent) : AbstractSpiceKernel(schematic, parent), a_spinit_name() { @@ -67,8 +71,11 @@ Ngspice::Ngspice(Schematic *schematic, QObject *parent) : * \param[out] vars The list of output variables and node names. * \param[out] outputs The list of spice output raw text files. */ -void Ngspice::createNetlist(QTextStream &stream, int , - QStringList &simulations, QStringList &vars, QStringList &outputs) +void Ngspice::createNetlist( + QTextStream& stream, + QStringList& simulations, + QStringList& vars, + QStringList& outputs) { Q_UNUSED(simulations); @@ -464,7 +471,7 @@ void Ngspice::slotSimulate() QString netfile = "spice4qucs.cir"; QString tmp_path = QDir::toNativeSeparators(a_workdir+QDir::separator()+netfile); - SaveNetlist(tmp_path); + SaveNetlist(tmp_path, false); removeAllSimulatorOutputs(); @@ -583,24 +590,43 @@ void Ngspice::slotProcessOutput() * \brief Ngspice::SaveNetlist Create netlist and save it to file without execution * of simulator. * \param[in] filename Absolute path to netlist + * \param[in] netlist2Console Whether netlist to console instead to file */ -void Ngspice::SaveNetlist(QString filename) +void Ngspice::SaveNetlist(QString filename, bool netlist2Console) { - int num=0; a_sims.clear(); a_vars.clear(); - QFile spice_file(filename); - if (spice_file.open(QFile::WriteOnly)) { - QTextStream stream(&spice_file); - createNetlist(stream,num,a_sims,a_vars,a_output_files); - spice_file.close(); + QScopedPointer netlistString; + QScopedPointer netlistStream; + QScopedPointer netlistFile; + + if (netlist2Console) + { + netlistString.reset(new QString); + netlistStream.reset(new QTextStream(netlistString.get())); } else { - QString msg=QStringLiteral("Tried to save netlist \nin %1\n(could not open for writing!)").arg(filename); - QString final_msg=QStringLiteral("%1\n This could be an error in the QSettings settings file\n(usually in ~/.config/qucs/qucs_s.conf)\nThe value for S4Q_workdir (default:/spice4qucs) needs to be writeable!\nFor a Simulation Simulation will raise error! (most likely S4Q_workdir does not exists)").arg(msg); - QMessageBox::critical(nullptr,tr("Problem with SaveNetlist"),final_msg,QMessageBox::Ok); + netlistFile.reset(new QFile(filename)); + if (netlistFile->open(QFile::WriteOnly)) + { + netlistStream.reset(new QTextStream(netlistFile.get())); + } + else + { + QString msg = QStringLiteral("Tried to save netlist \nin %1\n(could not open for writing!)").arg(filename); + QString final_msg = QStringLiteral("%1\n This could be an error in the QSettings settings file\n(usually in ~/.config/qucs/qucs_s.conf)\nThe value for S4Q_workdir (default:/spice4qucs) needs to be writeable!\nFor a Simulation Simulation will raise error! (most likely S4Q_workdir does not exists)").arg(msg); + QMessageBox::critical(nullptr,tr("Problem with SaveNetlist"), final_msg, QMessageBox::Ok); + return; + } + } + + createNetlist(*netlistStream, a_sims, a_vars, a_output_files); + + if (netlist2Console) + { + std::cout << netlistString->toUtf8().constData() << std::endl; } } diff --git a/qucs/extsimkernels/ngspice.h b/qucs/extsimkernels/ngspice.h index a63f5b2e..a2a4bedc 100644 --- a/qucs/extsimkernels/ngspice.h +++ b/qucs/extsimkernels/ngspice.h @@ -41,7 +41,7 @@ private: QString a_spinit_name; bool checkNodeNames(QStringList &incompat); - static QString collectSpiceinit(Schematic *sch); + static QString collectSpiceinit(Schematic* sch); bool findMathFuncInc(QString &mathf_inc); QString getParentSWPscript(Component *pc_swp, QString sim, bool before, bool &hasDblSWP); QString getParentSWPCntVar(Component *pc_swp, QString sim); @@ -49,14 +49,17 @@ private: void createSpiceinit(const QString &initial_spiceinit); public: - explicit Ngspice(Schematic *schematic, QObject *parent = 0); - void SaveNetlist(QString filename); + explicit Ngspice(Schematic* schematic, QObject *parent = 0); + void SaveNetlist(QString filename, bool netlist2Console); void setSimulatorCmd(QString cmd); void setSimulatorParameters(QString parameters); protected: - void createNetlist(QTextStream &stream, int NumPorts, QStringList &simulations, - QStringList &vars, QStringList &outputs); + void createNetlist( + QTextStream& stream, + QStringList& simulations, + QStringList& vars, + QStringList& outputs); public slots: void slotSimulate(); diff --git a/qucs/extsimkernels/xyce.cpp b/qucs/extsimkernels/xyce.cpp index 743e63d4..4bf78ba4 100644 --- a/qucs/extsimkernels/xyce.cpp +++ b/qucs/extsimkernels/xyce.cpp @@ -25,6 +25,10 @@ #include "config.h" #endif +#include + +#include + /*! \file xyce.cpp \brief Implementation of the Xyce class @@ -35,7 +39,7 @@ * \param schematic Schematic that need to be simulated with Ngspice. * \param parent Parent object */ -Xyce::Xyce(Schematic *schematic, QObject *parent) : +Xyce::Xyce(Schematic* schematic, QObject *parent) : AbstractSpiceKernel(schematic, parent), a_Noisesim(false), a_simulationsQueue(), @@ -79,8 +83,11 @@ void Xyce::determineUsedSimulations(QStringList *sim_lst) * \param[out] vars The list of output variables and node names. * \param[out] outputs The list of spice output raw text files. */ -void Xyce::createNetlist(QTextStream &stream, int , QStringList &simulations, - QStringList &vars, QStringList &outputs) +void Xyce::createNetlist( + QTextStream& stream, + QStringList& simulations, + QStringList& vars, + QStringList& outputs) { QString s; bool hasParSweep = false; @@ -110,7 +117,7 @@ void Xyce::createNetlist(QTextStream &stream, int , QStringList &simulations, } 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); } @@ -312,7 +319,6 @@ void Xyce::slotSimulate() return; } - int num=0; a_netlistQueue.clear(); a_output_files.clear(); @@ -332,7 +338,7 @@ void Xyce::slotSimulate() QFile spice_file(tmp_path); if (spice_file.open(QFile::WriteOnly)) { QTextStream stream(&spice_file); - createNetlist(stream,num,sim_lst,a_vars,a_output_files); + createNetlist(stream,sim_lst,a_vars,a_output_files); spice_file.close(); } } @@ -347,16 +353,36 @@ void Xyce::slotSimulate() * \brief Xyce::SaveNetlist Save netlist into specified file without * execution of simulator. * \param[in] filename The name of file in which netlist is saved + * \param[in] netlist2Console Whether netlist to console instead to file */ -void Xyce::SaveNetlist(QString filename) +void Xyce::SaveNetlist(QString filename, bool netlist2Console) { determineUsedSimulations(); - int num = 0; - QFile spice_file(filename); - if (spice_file.open(QFile::WriteOnly)) { - QTextStream stream(&spice_file); - createNetlist(stream,num,a_simulationsQueue,a_vars,a_output_files); - spice_file.close(); + + QScopedPointer netlistString; + QScopedPointer netlistStream; + QScopedPointer netlistFile; + + if (netlist2Console) + { + netlistString.reset(new QString); + netlistStream.reset(new QTextStream(netlistString.get())); + } + else + { + netlistFile.reset(new QFile(filename)); + + if (netlistFile->open(QFile::WriteOnly)) + { + netlistStream.reset(new QTextStream(netlistFile.get())); + } + } + + createNetlist(*netlistStream, a_simulationsQueue, a_vars, a_output_files); + + if (netlist2Console) + { + std::cout << netlistString->toUtf8().constData() << std::endl; } } diff --git a/qucs/extsimkernels/xyce.h b/qucs/extsimkernels/xyce.h index 1917fb7f..e0e8afba 100644 --- a/qucs/extsimkernels/xyce.h +++ b/qucs/extsimkernels/xyce.h @@ -46,15 +46,19 @@ private: public: void determineUsedSimulations(QStringList *sim_lst = NULL); - explicit Xyce(Schematic *schematic, QObject *parent = 0); + explicit Xyce(Schematic* schematic, QObject *parent = 0); - void SaveNetlist(QString filename); + void SaveNetlist(QString filename, bool netlist2Console); void setParallel(bool par); bool waitEndOfSimulation(); protected: - void createNetlist(QTextStream &stream, int NumPorts, QStringList &simulations, - QStringList &vars, QStringList &outputs); + void createNetlist( + QTextStream& stream, + QStringList& simulations, + QStringList& vars, + QStringList& outputs); + protected slots: void slotFinished(); void slotProcessOutput(); diff --git a/qucs/main.cpp b/qucs/main.cpp index 2b83043e..bdb30143 100644 --- a/qucs/main.cpp +++ b/qucs/main.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -36,6 +37,9 @@ #include #include #include +#include +#include +#include #include "qucs.h" #include "main.h" @@ -50,6 +54,7 @@ #include "extsimkernels/ngspice.h" #include "extsimkernels/xyce.h" +#include "extsimkernels/CdlNetlistWriter.h" #if defined(_WIN32) ||defined(__MINGW32__) #include //for OutputDebugString @@ -268,202 +273,315 @@ void qucsMessageOutput(QtMsgType type, const QMessageLogContext &context, const fflush(stderr); } -Schematic *openSchematic(QString schematic) +Schematic* openSchematic(const QString& schematicFileName) { - qDebug() << "*** try to load schematic :" << schematic; + qDebug() << "*** try to load schematic :" << schematicFileName; - QFile file(schematic); // save simulator messages - if(file.open(QIODevice::ReadOnly)) { - file.close(); - } - else { - fprintf(stderr, "Error: Could not load schematic %s\n", schematic.toLatin1().data()); - return NULL; - } - - // populate Modules list - //Module::registerModules (); - - // new schematic from file - Schematic *sch = new Schematic(0, schematic); - - // load schematic file if possible - if(!sch->loadDocument()) { - fprintf(stderr, "Error: Could not load schematic %s\n", schematic.toLatin1().data()); - delete sch; - return NULL; - } - return sch; -} - -int doNetlist(QString schematic, QString netlist) -{ - QucsSettings.DefaultSimulator = spicecompat::simQucsator; - Module::registerModules(); - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; - } - - qDebug() << "*** try to write netlist :" << netlist; - - QStringList Collect; - - QPlainTextEdit *ErrText = new QPlainTextEdit(); //dummy - QFile NetlistFile; - QTextStream Stream; - - Collect.clear(); // clear list for NodeSets, SPICE components etc. - - NetlistFile.setFileName(netlist); - if(!NetlistFile.open(QIODevice::WriteOnly)) { - fprintf(stderr, "Error: Could not load netlist %s\n", netlist.toLatin1().data()); - return -1; - } - - Stream.setDevice(&NetlistFile); - int SimPorts = sch->prepareNetlist(Stream, Collect, ErrText); - - if(SimPorts < -5) { - NetlistFile.close(); - QByteArray ba = netlist.toLatin1(); - fprintf(stderr, "Error: Could not prepare netlist %s\n", ba.data()); - /// \todo better handling for error/warnings - qCritical() << ErrText->toPlainText(); - return 1; - } - - // output NodeSets, SPICE simulations etc. - for(QStringList::Iterator it = Collect.begin(); - it != Collect.end(); ++it) { - // don't put library includes into netlist... - if ((*it).right(4) != ".lst" && - (*it).right(5) != ".vhdl" && - (*it).right(4) != ".vhd" && - (*it).right(2) != ".v") { - Stream << *it << '\n'; + QFile file(schematicFileName); // save simulator messages + if (file.open(QIODevice::ReadOnly)) + { + file.close(); + } + else + { + fprintf(stderr, "Error: Could not load schematic %s\n", schematicFileName.toLatin1().data()); + return nullptr; } - } - Stream << '\n'; + // populate Modules list + //Module::registerModules (); - QString SimTime = sch->createNetlist(Stream, SimPorts); - delete(sch); + // new schematic from file + Schematic *schematic = new Schematic(nullptr, schematicFileName); - NetlistFile.close(); + // load schematic file if possible + if (!schematic->loadDocument()) + { + fprintf(stderr, "Error: Could not load schematic %s\n", schematicFileName.toLatin1().data()); + delete schematic; + return nullptr; + } - return 0; + return schematic; } -int runNgspice(QString schematic, QString dataset) +int doNetlist(QString schematicFileName, QString netlistFileName, bool netlist2Console) +{ + QucsSettings.DefaultSimulator = spicecompat::simQucsator; + Module::registerModules(); + + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return 1; + } + + if (!netlist2Console) + { + qDebug() << "*** try to write netlist :" << netlistFileName; + } + + QScopedPointer netlistFile; + QScopedPointer netlistStream; + QScopedPointer netlistString; + + if (!netlist2Console) + { + netlistFile.reset(new QFile(netlistFileName)); + if (!netlistFile->open(QIODevice::WriteOnly)) + { + fprintf(stderr, "Error: Could not load netlist %s\n", netlistFileName.toLatin1().data()); + return -1; + } + + netlistStream.reset(new QTextStream(netlistFile.get())); + } + else + { + netlistString.reset(new QString); + netlistStream.reset(new QTextStream(netlistString.get())); + } + + QPlainTextEdit errText; // dummy + QStringList Collect; // clear list for NodeSets, SPICE components etc. + int SimPorts = schematic->prepareNetlist(*netlistStream, Collect, &errText); + + if (SimPorts < -5) + { + QByteArray ba = netlistFileName.toLatin1(); + fprintf(stderr, "Error: Could not prepare netlist %s\n", ba.data()); + /// \todo better handling for error/warnings + qCritical() << errText.toPlainText(); + return 1; + } + + // output NodeSets, SPICE simulations etc. + for (QStringList::Iterator it = Collect.begin(); it != Collect.end(); ++it) + { + // don't put library includes into netlist... + if ((*it).right(4) != ".lst" && + (*it).right(5) != ".vhdl" && + (*it).right(4) != ".vhd" && + (*it).right(2) != ".v") + { + *netlistStream << *it << '\n'; + } + } + + *netlistStream << '\n'; + + schematic->createNetlist(*netlistStream, SimPorts); + + if (netlist2Console) + { + std::cout << std::endl << netlistString->toLatin1().constData() << std::endl; + } + + return 0; +} + +int runNgspice(QString schematicFileName, QString dataset) { QucsSettings.DefaultSimulator = spicecompat::simNgspice; Module::registerModules(); - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; + + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return 1; } - Ngspice *ngspice = new Ngspice(sch); + QScopedPointer ngspice(new Ngspice(schematic.get())); ngspice->slotSimulate(); bool ok = ngspice->waitEndOfSimulation(); - if (!ok) { + if (!ok) + { fprintf(stderr, "Ngspice timed out or start error!\n"); - delete ngspice; return -1; - } else { + } + else + { ngspice->convertToQucsData(dataset); } - delete ngspice; return 0; } -int runXyce(QString schematic, QString dataset) +int runXyce(QString schematicFileName, QString dataset) { QucsSettings.DefaultSimulator = spicecompat::simXyce; Module::registerModules(); - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; + + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return 1; } - Xyce *xyce = new Xyce(sch); + QScopedPointer xyce(new Xyce(schematic.get())); xyce->slotSimulate(); bool ok = xyce->waitEndOfSimulation(); - if (!ok) { + if (!ok) + { fprintf(stderr, "Xyce timed out or start error!\n"); - delete xyce; return -1; - } else { + } + else + { xyce->convertToQucsData(dataset); } - delete xyce; return 0; } -int doNgspiceNetlist(QString schematic, QString netlist) +int doNgspiceNetlist(QString schematicFileName, QString netlistFileName, bool netlist2Console) { QucsSettings.DefaultSimulator = spicecompat::simNgspice; Module::registerModules(); - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; - } - Ngspice *ngspice = new Ngspice(sch); - ngspice->SaveNetlist(netlist); - delete ngspice; - if (!QFile::exists(netlist)) return -1; - else return 0; + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return 1; + } + + QScopedPointer ngspice(new Ngspice(schematic.get())); + ngspice->SaveNetlist(netlistFileName, netlist2Console); + + if (!netlist2Console && !QFile::exists(netlistFileName)) + { + return -1; + } + + return 0; } -int doXyceNetlist(QString schematic, QString netlist) +int doCdlNetlist(QString schematicFileName, QString netlistFileName, bool netlist2Console) +{ + QucsSettings.DefaultSimulator = spicecompat::simNgspice; + Module::registerModules(); + + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return -1; + } + + QScopedPointer netlistStream; + QScopedPointer netlistString; + QScopedPointer cdlFile; + + if (netlist2Console) + { + netlistString.reset(new QString()); + netlistStream.reset(new QTextStream(netlistString.get())); + } + else + { + cdlFile.reset(new QFile(netlistFileName)); + + if (cdlFile->open(QFile::WriteOnly)) + { + netlistStream.reset(new QTextStream(cdlFile.get())); + } + else + { + QString msg = QStringLiteral( + "Tried to save netlist \nto %1\n(could not open for writing!)") + .arg(netlistFileName); + QString finalMsg = QStringLiteral( + "%1\n This could be an error in the QSettings settings file\n" + "(usually in ~/.config/qucs/qucs_s.conf)\n" + "The value for S4Q_workdir (default:/spice4qucs) needs to be writeable!") + .arg(msg); + QMessageBox::critical(nullptr, QStringLiteral("Problem with SaveNetlist"), finalMsg, QMessageBox::Ok); + + return -1; + } + } + + CdlNetlistWriter cdlWriter(*netlistStream, schematic.get()); + if (!cdlWriter.write()) + { + QMessageBox::critical( + nullptr, + QStringLiteral("Save CDL netlist"), + QStringLiteral("Save CDL netlist failed!"), + QMessageBox::Ok); + return -1; + } + + if (netlist2Console) + { + std::cout << std::endl << netlistString->toUtf8().constData() << std::endl; + } + else + { + if (!QFile::exists(netlistFileName)) + { + return -1; + } + } + + return 0; +} + +int doXyceNetlist(QString schematicFileName, QString netlistFileName, bool netlist2Console) { QucsSettings.DefaultSimulator = spicecompat::simXyce; Module::registerModules(); - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; - } - Xyce *xyce = new Xyce(sch); - xyce->SaveNetlist(netlist); - delete xyce; + QScopedPointer schematic(openSchematic(schematicFileName)); - if (!QFile::exists(netlist)) return -1; - else return 0; + if (!schematic) + { + return 1; + } + + QScopedPointer xyce(new Xyce(schematic.get())); + xyce->SaveNetlist(netlistFileName, netlist2Console); + + if (!netlist2Console && !QFile::exists(netlistFileName)) + { + return -1; + } + + return 0; } -int doPrint(QString schematic, QString printFile, +int doPrint(QString schematicFileName, QString printFile, QString page, int dpi, QString color, QString orientation) { - QucsSettings.DefaultSimulator = spicecompat::simQucsator; - Schematic *sch = openSchematic(schematic); - if (sch == NULL) { - return 1; - } + QucsSettings.DefaultSimulator = spicecompat::simQucsator; - sch->a_Nodes = &(sch->a_DocNodes); - sch->a_Wires = &(sch->a_DocWires); - sch->a_Diagrams = &(sch->a_DocDiags); - sch->a_Paintings = &(sch->a_DocPaints); - sch->a_Components = &(sch->a_DocComps); - sch->reloadGraphs(); + QScopedPointer schematic(openSchematic(schematicFileName)); + if (!schematic) + { + return 1; + } - qDebug() << "*** try to print file :" << printFile; + schematic->a_Nodes = &(schematic->a_DocNodes); + schematic->a_Wires = &(schematic->a_DocWires); + schematic->a_Diagrams = &(schematic->a_DocDiags); + schematic->a_Paintings = &(schematic->a_DocPaints); + schematic->a_Components = &(schematic->a_DocComps); + schematic->reloadGraphs(); - // determine filetype - if (printFile.endsWith(".pdf")) { - //initial printer - PrinterWriter *Printer = new PrinterWriter(); - Printer->setFitToPage(true); - Printer->noGuiPrint(sch, printFile, page, dpi, color, orientation); - } else { - ImageWriter *Printer = new ImageWriter(""); - Printer->noGuiPrint(sch, printFile, color); - } - return 0; + qDebug() << "*** try to print file :" << printFile; + + // determine filetype + if (printFile.endsWith(".pdf")) { + //initial printer + PrinterWriter *Printer = new PrinterWriter(); + Printer->setFitToPage(true); + Printer->noGuiPrint(schematic.get(), printFile, page, dpi, color, orientation); + } + else + { + ImageWriter *Printer = new ImageWriter(""); + Printer->noGuiPrint(schematic.get(), printFile, color); + } + + return 0; } /*! @@ -750,305 +868,370 @@ void createListComponentEntry(){ // ######################################################################### int main(int argc, char *argv[]) { - qInstallMessageHandler(qucsMessageOutput); - // set the Qucs version string - QucsVersion = VersionTriplet(PACKAGE_VERSION); + qInstallMessageHandler(qucsMessageOutput); + // set the Qucs version string + QucsVersion = VersionTriplet(PACKAGE_VERSION); - // apply default settings - //QucsSettings.font = QFont("Helvetica", 12); - QucsSettings.largeFontSize = 16.0; - QucsSettings.maxUndo = 20; - QucsSettings.NodeWiring = 0; + // apply default settings + //QucsSettings.font = QFont("Helvetica", 12); + QucsSettings.largeFontSize = 16.0; + QucsSettings.maxUndo = 20; + QucsSettings.NodeWiring = 0; - // initially center the application - QApplication a(argc, argv); - //QDesktopWidget *d = a.desktop(); - QucsSettings.font = QApplication::font(); - QucsSettings.appFont = QApplication::font(); - QucsSettings.textFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); - QucsSettings.font.setPointSize(12); + // initially center the application + QApplication app(argc, argv); + //QDesktopWidget *d = app.desktop(); + QucsSettings.font = QApplication::font(); + QucsSettings.appFont = QApplication::font(); + QucsSettings.textFont = QFontDatabase::systemFont(QFontDatabase::FixedFont); + QucsSettings.font.setPointSize(12); - // default - QString QucsWorkdirPath = QDir::homePath()+QDir::toNativeSeparators ("/QucsWorkspace"); - QucsSettings.qucsWorkspaceDir.setPath(QucsWorkdirPath); - QucsSettings.QucsWorkDir.setPath(QucsSettings.qucsWorkspaceDir.canonicalPath()); + // default + QString QucsWorkdirPath = QDir::homePath()+QDir::toNativeSeparators ("/QucsWorkspace"); + QucsSettings.qucsWorkspaceDir.setPath(QucsWorkdirPath); + QucsSettings.QucsWorkDir.setPath(QucsSettings.qucsWorkspaceDir.canonicalPath()); - // load existing settings (if any) - loadSettings(); + // load existing settings (if any) + loadSettings(); - /* restore saved style */ - QString savedStyle = _settings::Get().item("AppStyle"); - QStyle* style = QStyleFactory::create(savedStyle); - if (style) { - QApplication::setStyle(style); - } - /* restore saved style */ + /* restore saved style */ + QString savedStyle = _settings::Get().item("AppStyle"); + QStyle* style = QStyleFactory::create(savedStyle); + if (style) { + QApplication::setStyle(style); + } + /* restore saved style */ - QDir().mkpath(QucsSettings.qucsWorkspaceDir.absolutePath()); - QDir().mkpath(QucsSettings.tempFilesDir.absolutePath()); + QDir().mkpath(QucsSettings.qucsWorkspaceDir.absolutePath()); + QDir().mkpath(QucsSettings.tempFilesDir.absolutePath()); - // continue to set up overrides or default settings (some are saved on exit) + // continue to set up overrides or default settings (some are saved on exit) - // check for relocation env variable - QDir QucsDir; - QString QucsApplicationPath = QCoreApplication::applicationDirPath(); + // check for relocation env variable + QDir QucsDir; + QString QucsApplicationPath = QCoreApplication::applicationDirPath(); #ifdef __APPLE__ - QucsDir = QDir(QucsApplicationPath.section("/bin",0,0)); + QucsDir = QDir(QucsApplicationPath.section("/bin",0,0)); #else - QucsDir = QDir(QucsApplicationPath); - QucsDir.cdUp(); + QucsDir = QDir(QucsApplicationPath); + QucsDir.cdUp(); #endif - QucsSettings.BinDir = QucsApplicationPath.contains("bin") ? - (QucsApplicationPath + QDir::separator()) : QucsDir.absoluteFilePath("bin/"); - QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/"; + QucsSettings.BinDir = QucsApplicationPath.contains("bin") ? + (QucsApplicationPath + QDir::separator()) : QucsDir.absoluteFilePath("bin/"); + QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/"; - QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/"; - QucsSettings.OctaveDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/octave/"; - QucsSettings.ExamplesDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/examples/"; - QucsSettings.DocDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/docs/"; - QucsSettings.Editor = "qucs"; + QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/"; + QucsSettings.OctaveDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/octave/"; + QucsSettings.ExamplesDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/examples/"; + QucsSettings.DocDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/docs/"; + QucsSettings.Editor = "qucs"; - /// \todo Make the setting up of all executables below more consistent - char *var = NULL; // Don't use QUCSDIR with Qucs-S - var = getenv("QUCSATOR"); - if(var != NULL) { - QucsSettings.QucsatorVar = QString(var); - } - else { - QucsSettings.QucsatorVar = ""; - } - - var = getenv("QUCSCONV"); - if(var != NULL) { - QucsSettings.Qucsconv = QString(var); - } - - - var = getenv("ADMSXMLBINDIR"); - if(var != NULL) { - QucsSettings.AdmsXmlBinDir.setPath(QString(var)); - } - else { - // default admsXml bindir same as Qucs - QString admsExec; -#if defined(_WIN32) || defined(__MINGW32__) - admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml.exe"); -#else - admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml"); -#endif - QFile adms(admsExec); - if(adms.exists()) - QucsSettings.AdmsXmlBinDir.setPath(QucsSettings.BinDir); - } - - var = getenv("ASCOBINDIR"); - if(var != NULL) { - QucsSettings.AscoBinDir.setPath(QString(var)); - } - else { - // default ASCO bindir same as Qucs - QString ascoExec; -#if defined(_WIN32) || defined(__MINGW32__) - ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco.exe"); -#else - ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco"); -#endif - QFile asco(ascoExec); - if(asco.exists()) - QucsSettings.AscoBinDir.setPath(QucsSettings.BinDir); - } - - - var = getenv("QUCS_OCTAVE"); - if (var != NULL) { - QucsSettings.QucsOctave = QString(var); - } else { - QucsSettings.QucsOctave.clear(); - } - - if(!QucsSettings.BGColor.isValid()) - QucsSettings.BGColor.setRgb(255, 250, 225); - - // syntax highlighting - if(!QucsSettings.Comment.isValid()) - QucsSettings.Comment = Qt::gray; - if(!QucsSettings.String.isValid()) - QucsSettings.String = Qt::red; - if(!QucsSettings.Integer.isValid()) - QucsSettings.Integer = Qt::blue; - if(!QucsSettings.Real.isValid()) - QucsSettings.Real = Qt::darkMagenta; - if(!QucsSettings.Character.isValid()) - QucsSettings.Character = Qt::magenta; - if(!QucsSettings.Type.isValid()) - QucsSettings.Type = Qt::darkRed; - if(!QucsSettings.Attribute.isValid()) - QucsSettings.Attribute = Qt::darkCyan; - if(!QucsSettings.Directive.isValid()) - QucsSettings.Directive = Qt::darkCyan; - if(!QucsSettings.Task.isValid()) - QucsSettings.Task = Qt::darkRed; - - QucsSettings.sysDefaultFont = QApplication::font(); - QApplication::setFont(QucsSettings.appFont); - - QTranslator tor( 0 ); - QString lang = QucsSettings.Language; - if(lang.isEmpty()) { - QLocale loc; - lang = loc.name(); -// lang = QTextCodec::locale(); - } - static_cast(tor.load( QStringLiteral("qucs_") + lang, QucsSettings.LangDir)); - QApplication::installTranslator( &tor ); - - // This seems to be necessary on a few system to make strtod() - // work properly !???! - setlocale (LC_NUMERIC, "C"); - - QString inputfile; - QString outputfile; - - bool netlist_flag = false; - bool print_flag = false; - bool ngspice_flag = false; - bool xyce_flag = false; - bool run_flag = false; - QString page = "A4"; - int dpi = 96; - QString color = "RGB"; - QString orientation = "portraid"; - - // simple command line parser - for (int i = 1; i < argc; ++i) { - if (!strcmp(argv[i], "-h") || !strcmp(argv[i], "--help")) { - fprintf(stdout, - "Usage: %s [-hv] \n" - " qucs -n -i FILENAME -o FILENAME\n" - " qucs -p -i FILENAME -o FILENAME.[pdf|png|svg|eps] \n\n" - " -h, --help display this help and exit\n" - " -v, --version display version information and exit\n" - " -n, --netlist convert Qucs schematic into netlist\n" - " -p, --print print Qucs schematic to file (eps needs inkscape)\n" - " --page [A4|A3|B4|B5] set print page size (default A4)\n" - " --dpi NUMBER set dpi value (default 96)\n" - " --color [RGB|RGB] set color mode (default RGB)\n" - " --orin [portraid|landscape] set orientation (default portraid)\n" - " -i FILENAME use file as input schematic\n" - " -o FILENAME use file as output netlist\n" - " --ngspice create Ngspice netlist\n" - " --xyce Xyce netlist\n" - " --run execute Ngspice/Xyce immediately\n" - " -icons create component icons under ./bitmaps_generated\n" - " -doc dump data for documentation:\n" - " * file with of categories: categories.txt\n" - " * one directory per category (e.g. ./lumped components/)\n" - " - CSV file with component data ([comp#]_data.csv)\n" - " - CSV file with component properties. ([comp#]_props.csv)\n" - " -list-entries list component entry formats for schematic and netlist\n" - , argv[0]); - return 0; - } - else if (!strcmp(argv[i], "-v") || !strcmp(argv[i], "--version")) { -#ifdef GIT - fprintf(stdout, "qucs s" PACKAGE_VERSION " (" GIT ")" "\n"); -#else - fprintf(stdout, "Qucs " PACKAGE_VERSION "\n"); -#endif - return 0; - } - else if (!strcmp(argv[i], "-n") || !strcmp(argv[i], "--netlist")) { - netlist_flag = true; - } - else if (!strcmp(argv[i], "-p") || !strcmp(argv[i], "--print")) { - print_flag = true; - } - else if (!strcmp(argv[i], "--page")) { - page = argv[++i]; - } - else if (!strcmp(argv[i], "--dpi")) { - dpi = QString(argv[++i]).toInt(); - } - else if (!strcmp(argv[i], "--color")) { - color = argv[++i]; - } - else if (!strcmp(argv[i], "--orin")) { - orientation = argv[++i]; - } - else if (!strcmp(argv[i], "-i")) { - inputfile = argv[++i]; - } - else if (!strcmp(argv[i], "-o")) { - outputfile = argv[++i]; - } - else if (!strcmp(argv[i], "--ngspice")) { - ngspice_flag = true; - } - else if (!strcmp(argv[i], "--xyce")) { - xyce_flag = true; - } - else if (!strcmp(argv[i], "--run")) { - run_flag = true; - } - else if(!strcmp(argv[i], "-icons")) { - createIcons(); - return 0; - } - else if(!strcmp(argv[i], "-doc")) { - createDocData(); - return 0; - } - else if(!strcmp(argv[i], "-list-entries")) { - createListComponentEntry(); - return 0; + /// \todo Make the setting up of all executables below more consistent + char *var = NULL; // Don't use QUCSDIR with Qucs-S + var = getenv("QUCSATOR"); + if (var != NULL) { + QucsSettings.QucsatorVar = QString(var); } else { - fprintf(stderr, "Error: Unknown option: %s\n", argv[i]); - return -1; + QucsSettings.QucsatorVar = ""; } - } - // check operation and its required arguments - if (netlist_flag and print_flag) { - fprintf(stderr, "Error: --print and --netlist cannot be used together\n"); - return -1; - } else if (((ngspice_flag||xyce_flag) && print_flag)|| - (run_flag && print_flag)) - { - fprintf(stderr, "Error: --print and Ngspice/Xyce cannot be used together\n"); - return -1; - } else if (netlist_flag or print_flag) { - if (inputfile.isEmpty()) { - fprintf(stderr, "Error: Expected input file.\n"); - return -1; + var = getenv("QUCSCONV"); + if (var != NULL) { + QucsSettings.Qucsconv = QString(var); } - if (outputfile.isEmpty()) { - fprintf(stderr, "Error: Expected output file.\n"); - return -1; + + var = getenv("ADMSXMLBINDIR"); + if (var != NULL) { + QucsSettings.AdmsXmlBinDir.setPath(QString(var)); } - // create netlist from schematic - if (netlist_flag) { - if (!run_flag) { - if (ngspice_flag) return doNgspiceNetlist(inputfile, outputfile); - else if (xyce_flag) return doXyceNetlist(inputfile, outputfile); - else return doNetlist(inputfile, outputfile); - } else { - if (ngspice_flag) return runNgspice(inputfile, outputfile); - else if (xyce_flag) return runXyce(inputfile, outputfile); - else return 1; + else { + // default admsXml bindir same as Qucs + QString admsExec; +#if defined(_WIN32) || defined(__MINGW32__) + admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml.exe"); +#else + admsExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"admsXml"); +#endif + QFile adms(admsExec); + if (adms.exists()) + { + QucsSettings.AdmsXmlBinDir.setPath(QucsSettings.BinDir); } - } else if (print_flag) { - return doPrint(inputfile, outputfile, - page, dpi, color, orientation); } - } - QucsMain = new QucsApp(); - //1a.setMainWidget(QucsMain); + var = getenv("ASCOBINDIR"); + if (var != NULL) { + QucsSettings.AscoBinDir.setPath(QString(var)); + } + else { + // default ASCO bindir same as Qucs + QString ascoExec; +#if defined(_WIN32) || defined(__MINGW32__) + ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco.exe"); +#else + ascoExec = QDir::toNativeSeparators(QucsSettings.BinDir+"/"+"asco"); +#endif + QFile asco(ascoExec); + if (asco.exists()) + { + QucsSettings.AscoBinDir.setPath(QucsSettings.BinDir); + } + } - QucsMain->show(); - int result = a.exec(); - //saveApplSettings(QucsMain); - return result; + var = getenv("QUCS_OCTAVE"); + if (var != NULL) { + QucsSettings.QucsOctave = QString(var); + } else { + QucsSettings.QucsOctave.clear(); + } + + if(!QucsSettings.BGColor.isValid()) + QucsSettings.BGColor.setRgb(255, 250, 225); + + // syntax highlighting + if(!QucsSettings.Comment.isValid()) + QucsSettings.Comment = Qt::gray; + if(!QucsSettings.String.isValid()) + QucsSettings.String = Qt::red; + if(!QucsSettings.Integer.isValid()) + QucsSettings.Integer = Qt::blue; + if(!QucsSettings.Real.isValid()) + QucsSettings.Real = Qt::darkMagenta; + if(!QucsSettings.Character.isValid()) + QucsSettings.Character = Qt::magenta; + if(!QucsSettings.Type.isValid()) + QucsSettings.Type = Qt::darkRed; + if(!QucsSettings.Attribute.isValid()) + QucsSettings.Attribute = Qt::darkCyan; + if(!QucsSettings.Directive.isValid()) + QucsSettings.Directive = Qt::darkCyan; + if(!QucsSettings.Task.isValid()) + QucsSettings.Task = Qt::darkRed; + + QucsSettings.sysDefaultFont = QApplication::font(); + QApplication::setFont(QucsSettings.appFont); + + QTranslator tor(nullptr); + QString lang = QucsSettings.Language; + if (lang.isEmpty()) { + QLocale loc; + lang = loc.name(); +// lang = QTextCodec::locale(); + } + static_cast(tor.load( QStringLiteral("qucs_") + lang, QucsSettings.LangDir)); + QApplication::installTranslator( &tor ); + + // This seems to be necessary on a few system to make strtod() + // work properly !???! + setlocale (LC_NUMERIC, "C"); + +#ifdef GIT + const QString applicationVersion(QString::fromUtf8("qucs s%1 (%2)").arg(PACKAGE_VERSION).arg(GIT)); +#else + const QString applicationVersion(QString::fromUtf8("Qucs %1").arg(PACKAGE_VERSION)); +#endif + + QCoreApplication::setApplicationVersion(applicationVersion); + QStringList cmdArgs; + for (int i = 0; i < argc; ++i) + { + cmdArgs << argv[i]; + } + + QCommandLineParser parser; + parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); + parser.addVersionOption(); + + parser.addOptions({ + {{"h", "help"}, QCoreApplication::translate("main", "display this help and exit")}, + {{"n", "netlist"}, QCoreApplication::translate("main", "convert Qucs schematic into netlist")}, + {{"p", "print"}, QCoreApplication::translate("main", "print Qucs schematic to file (eps needs inkscape)")}, + {"page", QCoreApplication::translate("main", "set print page size (default A4)"), "A4|A3|B4|B5", "A4"}, + {"dpi", QCoreApplication::translate("main", "set dpi value (default 96)"), "NUMBER", "96"}, + {"color", QCoreApplication::translate("main", "set color mode (default RGB)"), "RGB|BW", "RGB"}, + {"orin", QCoreApplication::translate("main", "set orientation (default portraid)"), "portraid|landscape", "portraid"}, + {"i", QCoreApplication::translate("main", "use file as input schematic"), "FILENAME"}, + {"o", QCoreApplication::translate("main", "use file as output netlist"), "FILENAME"}, + {"ngspice", QCoreApplication::translate("main", "create Ngspice netlist")}, + {"cdl", QCoreApplication::translate("main", "create CDL netlist")}, + {"xyce", QCoreApplication::translate("main", "Xyce netlist")}, + {"run", QCoreApplication::translate("main", "execute Ngspice/Xyce immediately")}, + {"icons", QCoreApplication::translate("main", "create component icons under ./bitmaps_generated")}, + {"doc", QCoreApplication::translate( + "main", + "dump data for documentation:\n" + "* file with of categories: categories.txt\n" + "* one directory per category (e.g. ./lumped\n" + " components/)\n" + " - CSV file with component data\n" + " ([comp#]_data.csv)\n" + " - CSV file with component properties.\n" + " ([comp#]_props.csv)" + ) + }, + {"list-entries", QCoreApplication::translate("main", "list component entry formats for schematic and netlist")}, + {{"c", "netlist2Console"}, QCoreApplication::translate("main", "write netlist to console")}, + }); + + parser.process(cmdArgs); + + if (parser.isSet("help")) + { + // some modification of the Qt-generated usage text + + QString helpText = parser.helpText(); + helpText.insert( + helpText.indexOf('\n', 0)+1, + QString::fromUtf8( + " qucs -n -i FILENAME -o FILENAME\n" + " qucs -p -i FILENAME -o FILENAME.[pdf|png|svg|eps]\n")); + + QRegularExpression optIndent(QString::fromUtf8("--page|--dpi|--color|--orin|--ngspice|--xyce|--run|--cdl")); + int idx; + int from = 0; + while ((idx = helpText.indexOf(optIndent, from)) != -1) + { + helpText.insert(idx, " "); + from = idx +3; + } + + std::cout << helpText.toUtf8().constData(); + exit(0); + } + + const bool netlist_flag(parser.isSet("netlist")); + const bool print_flag(parser.isSet("print")); + const QString page(parser.value("page")); + const int dpi(parser.value("dpi").toInt()); + const QString color(parser.value("color")); + const QString orientation(parser.value("orin")); + const QString inputfile(parser.value("i")); + const QString outputfile(parser.value("o")); + const bool ngspice_flag(parser.isSet("ngspice")); + const bool cdl_flag(parser.isSet("cdl")); + const bool xyce_flag(parser.isSet("xyce")); + const bool run_flag(parser.isSet("run")); + const bool netlist2Console(parser.isSet("netlist2Console")); + +#if 0 + std::cout << "Current cli values:" << std::endl; + std::cout << "netlist_flag: " << netlist_flag << std::endl; + std::cout << "print_flag: " << print_flag << std::endl; + std::cout << "page: " << page.toUtf8().constData() << std::endl; + std::cout << "dpi: " << dpi << std::endl; + std::cout << "color: " << color.toUtf8().constData() << std::endl; + std::cout << "orientation: " << orientation.toUtf8().constData() << std::endl; + std::cout << "inputfile: " << inputfile.toUtf8().constData() << std::endl; + std::cout << "outputfile: " << outputfile.toUtf8().constData() << std::endl; + std::cout << "ngspice_flag: " << ngspice_flag << std::endl; + std::cout << "cdl_flag: " << cdl_flag << std::endl; + std::cout << "xyce_flag: " << xyce_flag << std::endl; + std::cout << "run_flag: " << run_flag << std::endl; + std::cout << "netlist2Console: " << netlist2Console << std::endl; + std::cout << "icons: " << parser.isSet("icons") << std::endl; + std::cout << "doc: " << parser.isSet("doc") << std::endl; + std::cout << "list-entries: " << parser.isSet("list-entries") << std::endl; + + exit(0); +#endif + + if (parser.isSet("icons")) + { + createIcons(); + return 0; + } + + if (parser.isSet("doc")) + { + createDocData(); + return 0; + } + + if (parser.isSet("list-entries")) + { + createListComponentEntry(); + return 0; + } + + // check operation and its required arguments + if (netlist_flag and print_flag) + { + fprintf(stderr, "Error: --print and --netlist cannot be used together\n"); + return -1; + } + else if (cdl_flag and run_flag) + { + fprintf(stderr, "Error: --cdl and --run cannot be used together\n"); + return -1; + } + else if (((ngspice_flag || xyce_flag || cdl_flag) && print_flag) || (run_flag && print_flag)) + { + fprintf(stderr, "Error: --print and Ngspice/CDL/Xyce cannot be used together\n"); + return -1; + } + else if (netlist_flag or print_flag) + { + if (inputfile.isEmpty()) + { + fprintf(stderr, "Error: Expected input file.\n"); + return -1; + } + if (!netlist2Console && outputfile.isEmpty()) + { + fprintf(stderr, "Error: Expected output file.\n"); + return -1; + } + // create netlist from schematic + if (netlist_flag) + { + if (!run_flag) + { + if (ngspice_flag) + { + return doNgspiceNetlist(inputfile, outputfile, netlist2Console); + } + else if (cdl_flag) + { + return doCdlNetlist(inputfile, outputfile, netlist2Console); + } + else if (xyce_flag) + { + return doXyceNetlist(inputfile, outputfile, netlist2Console); + } + else + { + return doNetlist(inputfile, outputfile, netlist2Console); + } + } + else + { + if (ngspice_flag) + { + return runNgspice(inputfile, outputfile); + } + else if (xyce_flag) + { + return runXyce(inputfile, outputfile); + } + else + { + return 1; + } + } + } + else if (print_flag) + { + return doPrint(inputfile, outputfile, page, dpi, color, orientation); + } + } + + QucsMain = new QucsApp(netlist2Console); + //1a.setMainWidget(QucsMain); + + QucsMain->show(); + int result = app.exec(); + //saveApplSettings(QucsMain); + return result; } diff --git a/qucs/qucs.cpp b/qucs/qucs.cpp index 23289803..c9041496 100644 --- a/qucs/qucs.cpp +++ b/qucs/qucs.cpp @@ -88,9 +88,9 @@ //#include "extsimkernels/codemodelgen.h" #include "symbolwidget.h" -QucsApp::QucsApp() +QucsApp::QucsApp(bool netlist2Console) : + a_netlist2Console(netlist2Console) { - windowTitle = misc::getWindowTitle(); setWindowTitle(windowTitle); @@ -575,11 +575,11 @@ void QucsApp::initView() messageDock = new MessageDock(this); // initial projects directory model - m_homeDirModel = new QucsFileSystemModel(this); - m_proxyModel = new QucsSortFilterProxyModel(); - //m_proxyModel->setDynamicSortFilter(true); + a_homeDirModel = new QucsFileSystemModel(this); + a_proxyModel = new QucsSortFilterProxyModel(); + //a_proxyModel->setDynamicSortFilter(true); // show all directories (project and non-project) - m_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); + a_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); // ............................................ QString path = QucsSettings.qucsWorkspaceDir.absolutePath(); @@ -1386,21 +1386,21 @@ void QucsApp::readProjects() if (path == homepath) { // in Qucs Home, disallow further up in the dirs tree - m_homeDirModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs); + a_homeDirModel->setFilter(QDir::NoDotAndDotDot | QDir::AllDirs); } else { - m_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); + a_homeDirModel->setFilter(QDir::NoDot | QDir::AllDirs); } // set the root path - QModelIndex rootModelIndex = m_homeDirModel->setRootPath(path); + QModelIndex rootModelIndex = a_homeDirModel->setRootPath(path); // assign the model to the proxy and the proxy to the view - m_proxyModel->setSourceModel(m_homeDirModel); - m_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); + a_proxyModel->setSourceModel(a_homeDirModel); + a_proxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); // sort by first column (file name, only column show in the QListView) - m_proxyModel->sort(0); - Projects->setModel(m_proxyModel); + a_proxyModel->sort(0); + Projects->setModel(a_proxyModel); // fix the listview on the root path of the model - Projects->setRootIndex(m_proxyModel->mapFromSource(rootModelIndex)); + Projects->setRootIndex(a_proxyModel->mapFromSource(rootModelIndex)); } // ---------------------------------------------------------- @@ -2410,7 +2410,7 @@ void QucsApp::slotTune(bool checked) return; } - Schematic *d = dynamic_cast(w); + Schematic* d(dynamic_cast(w)); assert(d); bool found = false; @@ -3463,57 +3463,83 @@ void QucsApp::slotSimSettings() void QucsApp::slotSimulateWithSpice() { - if (!isTextDocument(DocumentTab->currentWidget())) { - Schematic *sch = (Schematic*)DocumentTab->currentWidget(); - if (TuningMode) { - QFileInfo Info(sch->getDocName()); + if (!isTextDocument(DocumentTab->currentWidget())) + { + Schematic* schematic(dynamic_cast(DocumentTab->currentWidget())); + if (TuningMode) + { + QFileInfo Info(schematic->getDocName()); QString ext = Info.suffix(); - if (ext == "dpl") { - QucsDoc *Doc = (QucsDoc *)sch; - sch = (Schematic *) getSchematicWidget(Doc); - if (sch == nullptr) return; + if (ext == "dpl") + { + QucsDoc *doc(dynamic_cast(schematic)); + Q_ASSERT(doc != nullptr); + schematic = dynamic_cast(getSchematicWidget(doc)); + if (schematic == nullptr) + { + return; + } } } - if (sch->getDocName().isEmpty()) { - auto biasState = sch->getShowBias(); - QMessageBox::warning(this,tr("Simulate schematic"), + if (schematic->getDocName().isEmpty()) + { + auto biasState = schematic->getShowBias(); + QMessageBox::warning( + this, + tr("Simulate schematic"), tr("Schematic not saved! Simulation of unsaved schematic " - "not possible. Save schematic first!")); + "not possible. Save schematic first!")); slotFileSaveAs(); - sch->setShowBias(biasState); + schematic->setShowBias(biasState); } - ExternSimDialog *SimDlg = new ExternSimDialog(sch); - connect(SimDlg,SIGNAL(simulated(ExternSimDialog*)), - this,SLOT(slotAfterSpiceSimulation(ExternSimDialog*))); - connect(SimDlg,SIGNAL(warnings()),this,SLOT(slotShowWarnings())); - connect(SimDlg,SIGNAL(success()),this,SLOT(slotResetWarnings())); - if (TuningMode || sch->getShowBias() == 0) SimDlg->slotStart(); - else SimDlg->exec(); - /*disconnect(SimDlg,SIGNAL(simulated()),this,SLOT(slotAfterSpiceSimulation())); - disconnect(SimDlg,SIGNAL(warnings()),this,SLOT(slotShowWarnings())); - disconnect(SimDlg,SIGNAL(success()),this,SLOT(slotResetWarnings()));*/ - /*if (SimDlg->wasSimulated && sch->getSimOpenDpl()) - if (sch->getShowBias() < 1) slotChangePage(sch->getDocName(),sch->getDataDisplay()); + ExternSimDialog *SimDlg = new ExternSimDialog(schematic, false); + connect(SimDlg, SIGNAL(simulated(ExternSimDialog*)), this, SLOT(slotAfterSpiceSimulation(ExternSimDialog*))); + connect(SimDlg, SIGNAL(warnings()), this, SLOT(slotShowWarnings())); + connect(SimDlg, SIGNAL(success()), this, SLOT(slotResetWarnings())); + + if (TuningMode || schematic->getShowBias() == 0) + { + SimDlg->slotStart(); + } + else + { + SimDlg->exec(); + } + /*disconnect(SimDlg, SIGNAL(simulated()), this, SLOT(slotAfterSpiceSimulation())); + disconnect(SimDlg, SIGNAL(warnings()), this, SLOT(slotShowWarnings())); + disconnect(SimDlg, SIGNAL(success()), this, SLOT(slotResetWarnings()));*/ + /*if (SimDlg->wasSimulated && schematic->getSimOpenDpl()) + if (schematic->getShowBias() < 1) slotChangePage(schematic->getDocName(), schematic->getDataDisplay()); delete SimDlg;*/ - } else { - QMessageBox::warning(this,tr("Simulate schematic"), - tr("Simulation of text document is not possible!")); + } + else + { + QMessageBox::warning( + this, + tr("Simulate schematic"), + tr("Simulation of text document is not possible!")); } } void QucsApp::slotSaveNetlist() { - if (QucsSettings.DefaultSimulator == spicecompat::simQucsator) { - QMessageBox::information(this,tr("Save netlist"), - tr("This action is supported only for SPICE simulators!")); + if (QucsSettings.DefaultSimulator == spicecompat::simQucsator) + { + QMessageBox::information( + this, + tr("Save netlist"), + tr("This action is supported only for SPICE simulators!")); return; } - if (!isTextDocument(DocumentTab->currentWidget())) { - Schematic *sch = (Schematic*)DocumentTab->currentWidget(); - ExternSimDialog *SimDlg = new ExternSimDialog(sch, true); - SimDlg->slotSaveNetlist(); - delete SimDlg; + + if (!isTextDocument(DocumentTab->currentWidget())) + { + Schematic* schematic(dynamic_cast(DocumentTab->currentWidget())); + Q_ASSERT(schematic != nullptr); + + ExternSimDialog simDlg(schematic, a_netlist2Console, true); + simDlg.slotSaveNetlist(); } } @@ -3524,53 +3550,55 @@ void QucsApp::slotSaveCdlNetlist() Schematic* schematic = dynamic_cast(DocumentTab->currentWidget()); Q_ASSERT(schematic != nullptr); -#ifdef NETLIST_CDL_TO_CONSOLE // for fast testing purposes - QString netlistString; + if (a_netlist2Console) { - QTextStream netlistStream(&netlistString); - CdlNetlistWriter cdlWriter(netlistStream, schematic); - if (!cdlWriter.write()) + QString netlistString; { - QMessageBox::critical( - this, - tr("Save CDL netlist"), - tr("Save CDL netlist failed!"), - QMessageBox::Ok); + QTextStream netlistStream(&netlistString); + CdlNetlistWriter cdlWriter(netlistStream, schematic); + if (!cdlWriter.write()) + { + QMessageBox::critical( + this, + tr("Save CDL netlist"), + tr("Save CDL netlist failed!"), + QMessageBox::Ok); + } + printf("\nCDL netlist:\n%s\n", netlistString.toUtf8().constData()); + Content->refresh(); } - printf("\nCDL netlist:\n%s\n", netlistString.toUtf8().constData()); - Content->refresh(); } -#else - QFileInfo inf(schematic->getDocName()); - QString filename = QFileDialog::getSaveFileName( - this, - tr("Save CDL netlist"), - inf.path() + QDir::separator() + "netlist.cdl", - "CDL netlist (*.cdl)"); - - if (filename.isEmpty()) + else { - return; - } + QFileInfo inf(schematic->getDocName()); + QString filename = QFileDialog::getSaveFileName( + this, + tr("Save CDL netlist"), + inf.path() + QDir::separator() + "netlist.cdl", + "CDL netlist (*.cdl)"); - QFile netlistFile(filename); - if (netlistFile.open(QIODevice::WriteOnly)) - { - QTextStream netlistStream(&netlistFile); - CdlNetlistWriter cdlWriter(netlistStream, schematic); - if (!cdlWriter.write()) + if (filename.isEmpty()) { - QMessageBox::critical( - this, - tr("Save CDL netlist"), - tr("Save CDL netlist failed!"), - QMessageBox::Ok); + return; } - netlistFile.close(); - Content->refresh(); - } -#endif + QFile netlistFile(filename); + if (netlistFile.open(QIODevice::WriteOnly)) + { + QTextStream netlistStream(&netlistFile); + CdlNetlistWriter cdlWriter(netlistStream, schematic); + if (!cdlWriter.write()) + { + QMessageBox::critical( + this, + tr("Save CDL netlist"), + tr("Save CDL netlist failed!"), + QMessageBox::Ok); + } + netlistFile.close(); + Content->refresh(); + } + } } } diff --git a/qucs/qucs.h b/qucs/qucs.h index 7e9f7319..f144dfeb 100644 --- a/qucs/qucs.h +++ b/qucs/qucs.h @@ -88,7 +88,7 @@ protected: class QucsApp : public QMainWindow { Q_OBJECT public: - QucsApp(); + QucsApp(bool netlist2Console); ~QucsApp(); bool closeAllFiles(); bool gotoPage(const QString&); // to load a document @@ -251,10 +251,10 @@ private: // ********** Properties ************************************************ QStack HierarchyHistory; // keeps track of "go into subcircuit" QString QucsFileFilter; - QFileSystemModel *m_homeDirModel; - QucsSortFilterProxyModel *m_proxyModel; - QFileSystemModel *m_projModel; + QFileSystemModel *a_homeDirModel; + QucsSortFilterProxyModel *a_proxyModel; int ccCurIdx; // CompChooser current index (used during search) + bool a_netlist2Console; // ********** Methods *************************************************** void initView(); diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp index d90e638c..161894dd 100644 --- a/qucs/qucs_init.cpp +++ b/qucs/qucs_init.cpp @@ -574,12 +574,12 @@ void QucsApp::initActions() save_netlist = new QAction(tr("Save netlist"), this); save_netlist->setStatusTip(tr("Save netlist")); - save_netlist->setWhatsThis(tr("Save netlist to file")); + save_netlist->setWhatsThis(tr(QString::fromUtf8("Save netlist to %1").arg(a_netlist2Console ? "console" : "file").toLatin1().constData())); connect(save_netlist, SIGNAL(triggered()), SLOT(slotSaveNetlist())); saveCdlNetlist = new QAction(tr("Save CDL netlist"), this); saveCdlNetlist->setStatusTip(tr("Save CDL netlist")); - saveCdlNetlist->setWhatsThis(tr("Save CDL netlist to file")); + saveCdlNetlist->setWhatsThis(tr(QString::fromUtf8("Save CDL netlist to %1").arg(a_netlist2Console ? "console" : "file").toLatin1().constData())); connect(saveCdlNetlist, SIGNAL(triggered()), SLOT(slotSaveCdlNetlist())); setMarker = new QAction(QIcon((":/bitmaps/svg/marker.svg")), tr("Set Marker on Graph"), this); diff --git a/qucs/spicecomponents/incl_script.cpp b/qucs/spicecomponents/incl_script.cpp index 54f79dad..55083123 100644 --- a/qucs/spicecomponents/incl_script.cpp +++ b/qucs/spicecomponents/incl_script.cpp @@ -77,9 +77,9 @@ Element* InclScript::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString InclScript::getExpression(bool, bool isCdl /* = false */) +QString InclScript::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - if (isActive != COMP_IS_ACTIVE || isCdl) + if (isActive != COMP_IS_ACTIVE || dialect == spicecompat::CDL) return QString(); return Props.at(0)->Value+"\n"; } diff --git a/qucs/spicecomponents/incl_script.h b/qucs/spicecomponents/incl_script.h index 51d9466a..449bb95d 100644 --- a/qucs/spicecomponents/incl_script.h +++ b/qucs/spicecomponents/incl_script.h @@ -27,7 +27,7 @@ public: ~InclScript(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_csparameter.cpp b/qucs/spicecomponents/sp_csparameter.cpp index 47a31820..6039b33e 100644 --- a/qucs/spicecomponents/sp_csparameter.cpp +++ b/qucs/spicecomponents/sp_csparameter.cpp @@ -69,8 +69,10 @@ Element* SpiceCSParam::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceCSParam::getExpression(bool) +QString SpiceCSParam::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { + Q_UNUSED(dialect); + if (isActive != COMP_IS_ACTIVE) return QString(); QString s; diff --git a/qucs/spicecomponents/sp_csparameter.h b/qucs/spicecomponents/sp_csparameter.h index ef7697cc..3140537e 100644 --- a/qucs/spicecomponents/sp_csparameter.h +++ b/qucs/spicecomponents/sp_csparameter.h @@ -29,7 +29,7 @@ public: Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); static void splitEqn(QString &eqn, QStringList &tokens); - QString getExpression(bool isXyce = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString netlist() { return QString(); } diff --git a/qucs/spicecomponents/sp_func.cpp b/qucs/spicecomponents/sp_func.cpp index 2fdb764d..5ba51a9d 100644 --- a/qucs/spicecomponents/sp_func.cpp +++ b/qucs/spicecomponents/sp_func.cpp @@ -70,9 +70,9 @@ Element* SpiceFunc::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceFunc::getExpression(bool, bool isCdl /* = false */) +QString SpiceFunc::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - if (isActive != COMP_IS_ACTIVE || isCdl) return QString(); + if (isActive != COMP_IS_ACTIVE || dialect == spicecompat::CDL) return QString(); QString s; s.clear(); diff --git a/qucs/spicecomponents/sp_func.h b/qucs/spicecomponents/sp_func.h index b4b3a5b1..7cb9c61e 100644 --- a/qucs/spicecomponents/sp_func.h +++ b/qucs/spicecomponents/sp_func.h @@ -28,7 +28,7 @@ public: ~SpiceFunc(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_globalpar.cpp b/qucs/spicecomponents/sp_globalpar.cpp index efaadb88..cd2b9ccf 100644 --- a/qucs/spicecomponents/sp_globalpar.cpp +++ b/qucs/spicecomponents/sp_globalpar.cpp @@ -70,14 +70,15 @@ Element* SpiceGlobalParam::info(QString& Name, char* &BitmapFile, bool getNewOne } -QString SpiceGlobalParam::getExpression(bool, bool isCdl /* = false */) +QString SpiceGlobalParam::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { if (isActive != COMP_IS_ACTIVE) return QString(); QString s; s.clear(); for (Property *pp : Props) { - s += QStringLiteral(".%1PARAM %2 = %3\n").arg(isCdl ? "" : "GLOBAL_").arg(pp->Name).arg(pp->Value); + s += QStringLiteral(".%1PARAM %2 = %3\n") + .arg(dialect == spicecompat::CDL ? "" : "GLOBAL_").arg(pp->Name).arg(pp->Value); } return s; } diff --git a/qucs/spicecomponents/sp_globalpar.h b/qucs/spicecomponents/sp_globalpar.h index f0e71c61..a53326b7 100644 --- a/qucs/spicecomponents/sp_globalpar.h +++ b/qucs/spicecomponents/sp_globalpar.h @@ -29,7 +29,7 @@ public: Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); static void splitEqn(QString &eqn, QStringList &tokens); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_ic.cpp b/qucs/spicecomponents/sp_ic.cpp index 7b28e43a..e5341196 100644 --- a/qucs/spicecomponents/sp_ic.cpp +++ b/qucs/spicecomponents/sp_ic.cpp @@ -69,9 +69,9 @@ Element* SpiceIC::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceIC::getExpression(bool, bool isCdl /* = false */) +QString SpiceIC::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - if (isActive != COMP_IS_ACTIVE || isCdl) return QString(); + if (isActive != COMP_IS_ACTIVE || dialect == spicecompat::CDL) return QString(); QString s; s.clear(); diff --git a/qucs/spicecomponents/sp_ic.h b/qucs/spicecomponents/sp_ic.h index 82db5a21..708553a2 100644 --- a/qucs/spicecomponents/sp_ic.h +++ b/qucs/spicecomponents/sp_ic.h @@ -28,7 +28,7 @@ public: ~SpiceIC(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_nodeset.cpp b/qucs/spicecomponents/sp_nodeset.cpp index 35da1101..0511a1a8 100644 --- a/qucs/spicecomponents/sp_nodeset.cpp +++ b/qucs/spicecomponents/sp_nodeset.cpp @@ -69,9 +69,9 @@ Element* SpiceNodeset::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceNodeset::getExpression(bool, bool isCdl /* = false */) +QString SpiceNodeset::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - if (isActive != COMP_IS_ACTIVE || isCdl) return QString(); + if (isActive != COMP_IS_ACTIVE || dialect == spicecompat::CDL) return QString(); QString s; s.clear(); diff --git a/qucs/spicecomponents/sp_nodeset.h b/qucs/spicecomponents/sp_nodeset.h index aafa0b7f..995484d8 100644 --- a/qucs/spicecomponents/sp_nodeset.h +++ b/qucs/spicecomponents/sp_nodeset.h @@ -28,7 +28,7 @@ public: ~SpiceNodeset(); Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_options.cpp b/qucs/spicecomponents/sp_options.cpp index 53371feb..5fb3a9d6 100644 --- a/qucs/spicecomponents/sp_options.cpp +++ b/qucs/spicecomponents/sp_options.cpp @@ -71,13 +71,13 @@ Element* SpiceOptions::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceOptions::getExpression(bool isXyce, bool isCdl /* = false */) +QString SpiceOptions::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { - if (isActive != COMP_IS_ACTIVE || isCdl) return QString(); + if (isActive != COMP_IS_ACTIVE || dialect == spicecompat::CDL) return QString(); QString s; s.clear(); - if (isXyce) { + if (dialect == spicecompat::SPICEXyce) { s += QStringLiteral(".OPTIONS %1 ").arg(Props.at(0)->Value); for (int i=1;iName).arg(Props.at(i)->Value); diff --git a/qucs/spicecomponents/sp_options.h b/qucs/spicecomponents/sp_options.h index 6bccdd28..7b5f2445 100644 --- a/qucs/spicecomponents/sp_options.h +++ b/qucs/spicecomponents/sp_options.h @@ -29,7 +29,7 @@ public: Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); static void splitEqn(QString &eqn, QStringList &tokens); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); } diff --git a/qucs/spicecomponents/sp_parameter.cpp b/qucs/spicecomponents/sp_parameter.cpp index 5c290f7e..23f878d6 100644 --- a/qucs/spicecomponents/sp_parameter.cpp +++ b/qucs/spicecomponents/sp_parameter.cpp @@ -69,14 +69,14 @@ Element* SpiceParam::info(QString& Name, char* &BitmapFile, bool getNewOne) return 0; } -QString SpiceParam::getExpression(bool, bool isCdl /* = false */) +QString SpiceParam::getExpression(spicecompat::SpiceDialect dialect /* = spicecompat::SPICEDefault */) { if (isActive != COMP_IS_ACTIVE) return QString(); QString s; s.clear(); for (Property *pp : Props) { - if (isCdl) + if (dialect == spicecompat::CDL) { s += QStringLiteral(".PARAM %1=%2\n").arg(pp->Name).arg(pp->Value); } diff --git a/qucs/spicecomponents/sp_parameter.h b/qucs/spicecomponents/sp_parameter.h index a3fba349..2bcf2ccc 100644 --- a/qucs/spicecomponents/sp_parameter.h +++ b/qucs/spicecomponents/sp_parameter.h @@ -29,7 +29,7 @@ public: Component* newOne(); static Element* info(QString&, char* &, bool getNewOne=false); static void splitEqn(QString &eqn, QStringList &tokens); - QString getExpression(bool isXyce, bool isCdl = false); + QString getExpression(spicecompat::SpiceDialect dialect = spicecompat::SPICEDefault); protected: QString vhdlCode(int) { return QString(); }