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

2006-08-30 Stefan Jahn <stefan@lkcc.org>

Browse Source 
* main.cpp (main): Using ASCODIR environment variable (if set)
      in order to locate the ASCO binary.  Otherwise it must be
      somewhere in the executable PATH.

      * dialogs/simmessage.cpp (startSimulator): Running ASCO
      appropriately and evaluating results.
This commit is contained in:
raimi 2006-08-31 13:22:11 +00:00
parent df2c0577b7
commit e72a52ebb1
10 changed files with 175 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NEWS
View File

@ -26,7 +26,7 @@ files.
Version 0.0.10
--------------
* optimization dialog for ASCO added, creating config files
* optimization dialog for ASCO added, preliminary support
* added an attenuator synthesis application
* many, many small bug fixes and improvements
* support for nine-valued VHDL logic

9
qucs/ChangeLog
View File

@ -1,3 +1,12 @@
2006-08-30 Stefan Jahn <stefan@lkcc.org>
* main.cpp (main): Using ASCODIR environment variable (if set)
in order to locate the ASCO binary. Otherwise it must be
somewhere in the executable PATH.
* dialogs/simmessage.cpp (startSimulator): Running ASCO
appropriately and evaluating results.
2006-08-29 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed bug printing text painting

6
qucs/components/ChangeLog
View File

@ -1,3 +1,9 @@
2006-08-30 Stefan Jahn <stefan@lkcc.org>
* opt_sim.cpp (loadASCOout): Evaluate output file of ASCO and
puts final values into initial values of the component.
(createASCOnetlist): Modifies netlist for use with ASCO.
2006-08-21 Stefan Jahn <stefan@lkcc.org>
* opt_sim.cpp (createASCOFiles): Moved this function here from

105
qucs/components/opt_sim.cpp
View File

@ -17,6 +17,10 @@
#include <qdir.h>
#include <qfile.h>
#include <qtextstream.h>
#include <qregexp.h>
#include <qstring.h>
#include <qstringlist.h>
#include "opt_sim.h"
#include "main.h"
@ -62,9 +66,12 @@ Element* Optimize_Sim::info(QString& Name, char* &BitmapFile, bool getNewOne)
QString Optimize_Sim::NetList()
{
QString s = "";
createASCOFiles();
s += "#\n";
s += "# ASCO configuration file(s) created\n";
if (createASCOFiles()) {
s += "# ASCO configuration file(s) created\n";
} else {
s += "# Failed to create ASCO configuration file(s)\n";
}
s += "#\n";
return s;
}
@ -72,10 +79,10 @@ QString Optimize_Sim::NetList()
extern QDir QucsHomeDir;
// -----------------------------------------------------------
void Optimize_Sim::createASCOFiles()
bool Optimize_Sim::createASCOFiles()
{
Property* pp;
QFile afile(QucsHomeDir.filePath("asco.cfg"));
QFile afile(QucsHomeDir.filePath("asco_netlist.cfg"));
if(afile.open(IO_WriteOnly)) {
QTextStream stream(&afile);
stream << "*\n";
@ -157,14 +164,14 @@ void Optimize_Sim::createASCOFiles()
stream << "#\n\n";
afile.close();
}
} else return false;
QDir ExtractDir(QucsHomeDir);
if(!ExtractDir.cd("extract")) {
if(!ExtractDir.mkdir("extract"))
return;
return false;
if(!ExtractDir.cd("extract"))
return;
return false;
}
for(pp = Props.at(2); pp != 0; pp = Props.next()) {
@ -183,6 +190,90 @@ void Optimize_Sim::createASCOFiles()
stream << "#\n\n";
efile.close();
}
else return false;
}
}
return true;
}
// -----------------------------------------------------------
bool Optimize_Sim::createASCOnetlist()
{
Property* pp;
QStringList vars;
for(pp = Props.at(2); pp != 0; pp = Props.next()) {
if(pp->Name == "Var") {
vars += pp->Value.section('|',0,0);
}
}
QFile infile(QucsHomeDir.filePath("netlist.txt"));
QFile outfile(QucsHomeDir.filePath("asco_netlist.txt"));
if(!infile.open(IO_ReadOnly)) return false;
if(!outfile.open(IO_WriteOnly)) return false;
QTextStream instream(&infile);
QTextStream outstream(&outfile);
QString Line;
while(!instream.atEnd()) {
Line = instream.readLine();
for(QStringList::Iterator it = vars.begin(); it != vars.end(); ++it ) {
QRegExp reg = QRegExp("=\"(" + *it + ")\"");
Line.replace(reg, "=\"#\\1#\"");
}
outstream << Line << "\n";
}
outfile.close();
infile.close();
return true;
}
// -----------------------------------------------------------
bool Optimize_Sim::loadASCOout()
{
bool changed = false;
Property* pp;
QStringList vars;
for(pp = Props.at(2); pp != 0; pp = Props.next()) {
if(pp->Name == "Var") {
vars += pp->Value.section('|',0,0);
}
}
QFile infile(QucsHomeDir.filePath("asco_out.log"));
if(!infile.open(IO_ReadOnly)) return false;
QTextStream instream(&infile);
QString Line;
while(!instream.atEnd()) Line = instream.readLine();
infile.close();
QStringList entries = QStringList::split(':',Line);
QStringList::Iterator it;
for(it = entries.begin(); it != entries.end(); ++it ) {
QString Name = *it;
Name = Name.stripWhiteSpace();
if(vars.contains(Name)) {
for(pp = Props.at(2); pp != 0; pp = Props.next()) {
if(pp->Name == "Var") {
QString val[6];
val[0] = pp->Value.section('|',0,0);
if(val[0]==Name) {
val[1] = pp->Value.section('|',1,1);
val[2] = pp->Value.section('|',2,2);
val[3] = pp->Value.section('|',3,3);
val[4] = pp->Value.section('|',4,4);
val[5] = pp->Value.section('|',5,5);
++it;
QString Value = *it;
Value = Value.stripWhiteSpace();
val[2] = Value;
pp->Value = val[0] + "|" + val[1] + "|" + val[2] + "|" +
val[3] + "|" + val[4] + "|" + val[5];
changed = true;
break;
}
}
}
}
}
return changed;
}

4
qucs/components/opt_sim.h
View File

@ -28,7 +28,9 @@ public:
Component* newOne();
static Element* info(QString&, char* &, bool getNewOne=false);
QString NetList();
void createASCOFiles();
bool createASCOFiles();
bool createASCOnetlist();
bool loadASCOout();
};
#endif

2
qucs/components/optimizedialog.cpp
View File

@ -275,7 +275,7 @@ OptimizeDialog::OptimizeDialog(Optimize_Sim *c_, Schematic *d_)
Component *pc;
for(pc=Doc->Components->first(); pc!=0; pc=Doc->Components->next())
if(pc != Comp)
if(pc->Model[0] == '.')
if(pc->Model[0] == '.' && pc->Model != ".Opt")
SimEdit->insertItem(pc->Name);
Property *pp;

46
qucs/dialogs/simmessage.cpp
View File

@ -34,6 +34,7 @@
#include "qucs.h"
#include "textdoc.h"
#include "schematic.h"
#include "components/opt_sim.h"
SimMessage::SimMessage(QWidget *w, QWidget *parent)
@ -292,6 +293,7 @@ void SimMessage::startSimulator()
#else
QString QucsDigi = "qucsdigi";
#endif
SimOpt = NULL;
if(DocWidget->inherits("QTextEdit")) {
// Take VHDL file in memory as it could contain unsaved changes.
@ -322,10 +324,17 @@ void SimMessage::startSimulator()
}
ProgText->insert(tr("done.\n")); // of "creating netlist...
if(SimPorts < 0)
CommandLine << QucsSettings.BinDir + "qucsator" << "-b" << "-g"
<< "-i" << QucsHomeDir.filePath("netlist.txt") << "-o" << DataSet;
else
if(SimPorts < 0) {
if((SimOpt = findOptimization((Schematic*)DocWidget))) {
((Optimize_Sim*)SimOpt)->createASCOnetlist();
CommandLine << QucsSettings.AscoDir + "asco" << "-qucs" <<
QucsHomeDir.filePath("asco_netlist.txt") << "-o" << "asco_out";
}
else {
CommandLine << QucsSettings.BinDir + "qucsator" << "-b" << "-g"
<< "-i" << QucsHomeDir.filePath("netlist.txt") << "-o" << DataSet;
}
} else {
#ifdef __MINGW32__
CommandLine << getShortPathName(QucsSettings.BinDir + QucsDigi)
<< "netlist.txt" << DataSet
@ -335,6 +344,7 @@ void SimMessage::startSimulator()
CommandLine << QucsSettings.BinDir + QucsDigi << "netlist.txt"
<< DataSet << SimTime << SimPath << QucsSettings.BinDir << "-c";
#endif
}
}
SimProcess.setArguments(CommandLine);
@ -356,6 +366,17 @@ void SimMessage::startSimulator()
}
}
// ------------------------------------------------------------------------
Component * SimMessage::findOptimization(Schematic *Doc) {
Component *pc;
for(pc=Doc->Components->first(); pc!=0; pc=Doc->Components->next())
if(pc->isActive)
if(pc->Model == ".Opt")
return pc;
return NULL;
}
// ------------------------------------------------------------------------
// Is called when the process sends an output to stdout.
void SimMessage::slotDisplayMsg()
@ -468,6 +489,23 @@ void SimMessage::FinishSimulation(int Status)
file.close();
}
if(Status == 0) {
if(SimOpt) { // save optimization data
QFile ifile(QucsHomeDir.filePath("asco_out.dat"));
QFile ofile(DataSet);
if(ifile.open(IO_ReadOnly)) {
if(ofile.open(IO_WriteOnly)) {
QByteArray data = ifile.readAll();
ofile.writeBlock(data);
ofile.close();
}
ifile.close();
}
if(((Optimize_Sim*)SimOpt)->loadASCOout())
((Schematic*)DocWidget)->setChanged(true,true);
}
}
emit SimulationEnded(Status, this);
}

5
qucs/dialogs/simmessage.h
View File

@ -28,6 +28,9 @@ class QVBoxLayout;
class QPushButton;
class QProgressBar;
class Component;
class Schematic;
// #define SPEEDUP_PROGRESSBAR
@ -68,6 +71,7 @@ private:
void FinishSimulation(int);
void nextSPICE();
void startSimulator();
Component * findOptimization(Schematic *);
public:
QWidget *DocWidget;
@ -82,6 +86,7 @@ public:
QProgressBar *SimProgress;
QString ProgressText;
Component *SimOpt;
int SimPorts;
bool makeSubcircuit, insertSim;
QStringList Collect;

9
qucs/main.cpp
View File

@ -461,6 +461,15 @@ int main(int argc, char *argv[])
if(!QucsSettings.VHDL_Attributes.isValid())
QucsSettings.VHDL_Attributes = Qt::darkCyan;
var = getenv ("ASCODIR");
if (var != NULL) {
QDir AscoDir = QDir (var);
QString AscoDirStr = AscoDir.canonicalPath ();
QucsSettings.AscoDir =
QDir::convertSeparators (AscoDirStr + "/bin/");
} else {
QucsSettings.AscoDir = "";
}
QApplication a(argc, argv);
a.setFont(QucsSettings.font);

1
qucs/main.h
View File

@ -53,6 +53,7 @@ struct tQucsSettings {
QString BitmapDir;
QString LangDir;
QString LibDir;
QString AscoDir;
// registered filename extensions with program to open the file
QStringList FileTypes;