SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash on SWP and empty datasets

Browse Source
This commit is contained in:
Vadim Kuznetzov 2016-07-10 16:38:54 +03:00
parent a4a622eecd
commit 42d8a81428
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qucs/extsimkernels/abstractspicekernel.cpp
View File

@ -909,21 +909,16 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset, bool xy
QString sim,indep;
QStringList indep_vars;
QString swp_var,swp_var2;
QStringList swp_var_val,swp_var2_val;
swp_var.clear();
swp_var2.clear();
swp_var_val.clear();
swp_var2_val.clear();
QList< QList<double> > sim_points;
QStringList var_list;
bool isComplex = false;
bool hasParSweep = false;
bool hasDblParSweep = false;
QString ngspice_output_filename;
foreach(ngspice_output_filename,output_files) { // For every simulation convert results to Qucs dataset
QList< QList<double> > sim_points;
QStringList var_list;
QString swp_var,swp_var2;
QStringList swp_var_val,swp_var2_val;
bool isComplex = false;
bool hasParSweep = false;
bool hasDblParSweep = false;
QString full_outfile = workdir+QDir::separator()+ngspice_output_filename;
if (ngspice_output_filename.endsWith("HB.FD.prn")) {
parseHBOutput(full_outfile,sim_points,var_list);
@ -1004,6 +999,8 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset, bool xy
if (hasParSweep) {
int indep_cnt;
if (swp_var_val.isEmpty()) continue;
if (hasDblParSweep&&swp_var2_val.isEmpty()) continue;
if (hasDblParSweep) indep_cnt = sim_points.count()/(swp_var_val.count()*swp_var2_val.count());
else indep_cnt = sim_points.count()/swp_var_val.count();
if (!indep.isEmpty()) {
@ -1057,7 +1054,6 @@ void AbstractSpiceKernel::convertToQucsData(const QString &qucs_dataset, bool xy
if (indep.isEmpty()) ds_stream<<"</indep>\n";
else ds_stream<<"</dep>\n";
}
hasParSweep = false;
}
QFile dataset(qucs_dataset);