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 bug on unsuccessful subcircuit loading

Browse Source 
git-svn-id: https://qucs.svn.sourceforge.net/svnroot/qucs/trunk@1642 b5b04e8c-4942-46c9-ab4f-83783d557d1c
This commit is contained in:
ela 2009-03-12 19:50:00 +00:00
parent 8c0e637135
commit 0db628d4ec
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
qucs/schematic_file.cpp
View File

@ -877,11 +877,13 @@ bool Schematic::throughAllComps(QTextStream *stream, int& countInit,
QString f = pc->getSubcircuitFile();
SubMap::Iterator it = FileList.find(f);
if(it != FileList.end()) {
i = 0;
// apply in/out signal types of subcircuit
for(Port *pp = pc->Ports.first(); pp; pp = pc->Ports.next(), i++) {
pp->Type = it.data().PortTypes[i];
pp->Connection->Type = pp->Type;
if (!it.data().PortTypes.isEmpty()) {
i = 0;
// apply in/out signal types of subcircuit
for(Port *pp = pc->Ports.first(); pp; pp = pc->Ports.next(), i++) {
pp->Type = it.data().PortTypes[i];
pp->Connection->Type = pp->Type;
}
}
continue; // insert each subcircuit just one time
}
@ -901,14 +903,16 @@ bool Schematic::throughAllComps(QTextStream *stream, int& countInit,
d->isAnalog = isAnalog;
d->creatingLib = creatingLib;
r = d->createSubNetlist(stream, countInit, Collect, ErrText, NumPorts);
i = 0;
// save in/out signal types of subcircuit
for(Port *pp = pc->Ports.first(); pp; pp = pc->Ports.next(), i++) {
pp->Type = d->PortTypes[i];
pp->Connection->Type = pp->Type;
if (r) {
i = 0;
// save in/out signal types of subcircuit
for(Port *pp = pc->Ports.first(); pp; pp = pc->Ports.next(), i++) {
pp->Type = d->PortTypes[i];
pp->Connection->Type = pp->Type;
}
sub.PortTypes = d->PortTypes;
FileList.replace(f, sub);
}
sub.PortTypes = d->PortTypes;
FileList.replace(f, sub);
delete d;
if(!r) return false;
continue;