Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for custom prefix to dataset variables #412

Merged
merged 2 commits into from
Jan 8, 2024
Merged

Add support for custom prefix to dataset variables #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce8ef3c
Add support for custom prefix to dataset variables. The prefix is
Dec 27, 2023
270df9a
Improve cistom_prefix handling.
Jan 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions qucs/extsimkernels/abstractspicekernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,8 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
bool hasParSweep = false;
bool hasDblParSweep = false;

QRegularExpression custom_prefix_rx("(?<=#).*?(?=#)");
QString custom_prefix = custom_prefix_rx.match(ngspice_output_filename).captured(0);
QRegularExpression four_rx(".*\\.four[0-9]+$");
QString full_outfile = workdir+QDir::separator()+ngspice_output_filename;
if (ngspice_output_filename.endsWith("HB.FD.prn")) {
Expand Down Expand Up @@ -1199,7 +1201,7 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset)
}
}
if (var_list.isEmpty()) continue; // nothing to convert
normalizeVarsNames(var_list);
normalizeVarsNames(var_list, custom_prefix);

QString indep = var_list.first();
//QList<double> sim_point;
Expand Down Expand Up @@ -1298,7 +1300,7 @@ void AbstractSpiceKernel::removeAllSimulatorOutputs()
* for harmonic balance variable and current probes variables are supported.
* \param var_list This list contains variable names that need normalization.
*/
void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list)
void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list, const QString &custom_prefix)
{
QString prefix="";
QString iprefix="";
Expand Down Expand Up @@ -1355,6 +1357,11 @@ void AbstractSpiceKernel::normalizeVarsNames(QStringList &var_list)
}
}

if ( !custom_prefix.isEmpty() ) {
for ( it = var_list.begin() ; it != var_list.end() ; ++it)
if ( !(*it).isEmpty() )
(*it).prepend(custom_prefix + ".");
}
}

/*!
Expand Down
2 changes: 1 addition & 1 deletion qucs/extsimkernels/abstractspicekernel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class AbstractSpiceKernel : public QObject
private:
enum outType {xyceSTD, spiceRaw, spiceRawSwp, xyceSTDswp, Unknown};

void normalizeVarsNames(QStringList &var_list);
void normalizeVarsNames(QStringList &var_list, const QString &custom_prefix);
int checkRawOutupt(QString ngspice_file, QStringList &values);
void extractBinSamples(QDataStream &dbl, QList< QList<double> > &sim_points,
int NumPoints, int NumVars, bool isComplex);
Expand Down
22 changes: 11 additions & 11 deletions qucs/extsimkernels/ngspice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,18 +100,18 @@ void Ngspice::createNetlist(QTextStream &stream, int ,
if(pc->isSimulation && pc->isActive == COMP_IS_ACTIVE) {
s = pc->getSpiceNetlist();
QString sim_typ = pc->Model;
if (sim_typ==".AC") simulations.append("ac");
if (sim_typ==".TR") simulations.append("tran");
if (sim_typ==".CUSTOMSIM") simulations.append("custom");
if (sim_typ==".DISTO") simulations.append("disto");
if (sim_typ==".NOISE") simulations.append("noise");
if (sim_typ==".PZ") simulations.append("pz");
if (sim_typ==".SENS") simulations.append("sens");
if (sim_typ==".SENS_AC") simulations.append("sens_ac");
if (sim_typ==".SP") simulations.append("sp");
if (sim_typ==".FFT") simulations.append("fft");
if (sim_typ==".AC") if(!simulations.contains("ac")) simulations.append("ac");
if (sim_typ==".TR") if(!simulations.contains("tran")) simulations.append("tran");
if (sim_typ==".CUSTOMSIM") if(!simulations.contains("custom")) simulations.append("custom");
if (sim_typ==".DISTO") if(!simulations.contains("disto")) simulations.append("disto");
if (sim_typ==".NOISE") if(!simulations.contains("noise")) simulations.append("noise");
if (sim_typ==".PZ") if(!simulations.contains("pz")) simulations.append("pz");
if (sim_typ==".SENS") if(!simulations.contains("sens")) simulations.append("sens");
if (sim_typ==".SENS_AC") if(!simulations.contains("sens_ac")) simulations.append("sens_ac");
if (sim_typ==".SP") if(!simulations.contains("sp")) simulations.append("sp");
if (sim_typ==".FFT") if(!simulations.contains("fft")) simulations.append("fft");
if ((sim_typ==".SW")&&
(pc->Props.at(0)->Value.startsWith("DC"))) simulations.append("dc");
(pc->Props.at(0)->Value.startsWith("DC"))) if(!simulations.contains("dc")) simulations.append("dc");
// stream<<s;
}
}
Expand Down