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

*** empty log message ***

Browse Source
This commit is contained in:
margraf 2004-08-15 16:24:35 +00:00
parent 1e11e965cf
commit 5a06ac21cb
10 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qucs/ChangeLog
View File

@ -1,3 +1,7 @@
2004-08-13 Michael Margraf <michael.margraf@alumni.tu-berlin.de>
* fixed many little bugs
2004-08-09 Stefan Jahn <stefan@lkcc.org>
* qucs_de.ts: Updated german translation.

8
qucs/components/component.cpp
View File

@ -401,10 +401,12 @@ QString Component::NetList()
if(p2->Name != "Symbol")
if(p2->Name == "File") {
if(Model == "Sub") {
QFileInfo Info(QucsWorkDir, p2->Value);
QString Type = Info.filePath();;
QString Type = p2->Value;
QFileInfo Info(Type);
if(Info.extension() == "sch") Type = Type.left(Type.length()-4);
if(Type.at(0) <= '9') if(Type.at(0) >= '0') Type = '_' + Type;
Type.replace(QRegExp("\\W"), "_"); // none [a-zA-Z0-9] into "_"
s += " Type=\"_"+Type+"\""; // type for subcircuit
s += " Type=\""+Type+"\""; // type for subcircuit
continue;
}
QFileInfo info(p2->Value);

3
qucs/components/mosfet.cpp
View File

@ -219,7 +219,8 @@ void MOSFET::recreate()
}
// depletion or enhancement MOSFET ?
if(Props.next()->Value.stripWhiteSpace().at(0) == '-') {
if((Props.next()->Value.stripWhiteSpace().at(0) == '-') ==
(Props.first()->Value == "nfet")) {
pl3->x1 = -10; pl3->y1 = -8; pl3->x2 = -10; pl3->y2 = 8;
}
else {

3
qucs/components/mosfet_sub.cpp
View File

@ -222,7 +222,8 @@ void MOSFET_sub::recreate()
}
// depletion or enhancement MOSFET ?
if(Props.next()->Value.stripWhiteSpace().at(0) == '-') {
if((Props.next()->Value.stripWhiteSpace().at(0) == '-') ==
(Props.first()->Value == "nfet")) {
pl3->x1 = -10; pl3->y1 = -8; pl3->x2 = -10; pl3->y2 = 8;
}
else {

4
qucs/components/substrate.cpp
View File

@ -47,8 +47,8 @@ Substrate::Substrate()
Lines.append(new Line( 52,-22, 66, -8,QPen(QPen::darkBlue,1)));
Lines.append(new Line( 66,-30, 80,-16,QPen(QPen::darkBlue,1)));
x1 = -30; y1 =-40;
x2 = 80; y2 = 16;
x1 = -34; y1 =-44;
x2 = 84; y2 = 20;
tx = x1+4;
ty = y2+4;

10
qucs/diagrams/diagram.cpp
View File

@ -286,9 +286,13 @@ void Diagram::loadGraphData(const QString& defaultDataSet)
for(Graph *pg = Graphs.first(); pg != 0; pg = Graphs.next())
loadVarData(defaultDataSet); // load data, determine max/min values
if((ymin > ymax) || (xmin > xmax)) {
ymin = xmin = 0.0;
ymax = xmax = 1.0;
if(ymin > ymax) {
ymin = 0.0;
ymax = 1.0;
}
if(xmin > xmax) {
xmin = 0.0;
xmax = 1.0;
}
updateGraphData();

4
qucs/main.cpp
View File

@ -140,7 +140,7 @@ QString complexDeg(double real, double imag, int Precision)
QString Text;
if(fabs(imag) < 1e-250) Text = QString::number(real,'g',Precision);
else {
Text = QString::number(sqrt(real*real+imag*imag),'g',Precision) + " <";
Text = QString::number(sqrt(real*real+imag*imag),'g',Precision) + " / ";
Text += QString::number(180.0/M_PI*atan2(imag,real),'g',Precision) + '°';
}
return Text;
@ -152,7 +152,7 @@ QString complexRad (double real, double imag, int Precision)
if(fabs(imag) < 1e-250) Text = QString::number(real,'g',Precision);
else {
Text = QString::number(sqrt(real*real+imag*imag),'g',Precision);
Text += " <" + QString::number(atan2(imag,real),'g',Precision);
Text += " / " + QString::number(atan2(imag,real),'g',Precision) + "rad";
}
return Text;
}

9
qucs/qucsdoc.cpp
View File

@ -1139,7 +1139,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pc->isSelected ^= flag; return pc; }
if(pe_sel) {
pe_sel->isSelected = false;
// pc->isSelected = true;
return pc;
}
if(pe_1st == 0) pe_1st = pc; // give access to elements lying beneath
@ -1153,7 +1152,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pw->isSelected ^= flag; return pw; }
if(pe_sel) {
pe_sel->isSelected = false;
// pw->isSelected = true;
return pw;
}
if(pe_1st == 0) pe_1st = pw; // give access to elements lying beneath
@ -1164,7 +1162,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pl->isSelected ^= flag; return pl; }
if(pe_sel) {
pe_sel->isSelected = false;
// pl->isSelected = true;
return pl;
}
if(pe_1st == 0) pe_1st = pl; // give access to elements lying beneath
@ -1179,7 +1176,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pl->isSelected ^= flag; return pl; }
if(pe_sel) {
pe_sel->isSelected = false;
// pl->isSelected = true;
return pl;
}
if(pe_1st == 0) pe_1st = pl; // give access to elements lying beneath
@ -1195,7 +1191,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pm->isSelected ^= flag; return pm; }
if(pe_sel) {
pe_sel->isSelected = false;
// pm->isSelected = true;
return pm;
}
if(pe_1st == 0) pe_1st = pm; // give access to elements lying beneath
@ -1217,7 +1212,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pg->isSelected ^= flag; return pg; }
if(pe_sel) {
pe_sel->isSelected = false;
// pg->isSelected = true;
return pg;
}
if(pe_1st == 0) pe_1st = pg; // access to elements lying beneath
@ -1227,7 +1221,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pd->isSelected ^= flag; return pd; }
if(pe_sel) {
pe_sel->isSelected = false;
// pd->isSelected = true;
return pd;
}
if(pe_1st == 0) pe_1st = pd; // give access to elements lying beneath
@ -1248,7 +1241,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
if(flag) { pp->isSelected ^= flag; return pp; }
if(pe_sel) {
pe_sel->isSelected = false;
// pp->isSelected = true;
return pp;
}
if(pe_1st == 0) pe_1st = pp; // give access to elements lying beneath
@ -1256,7 +1248,6 @@ Element* QucsDoc::selectElement(int x, int y, bool flag)
}
}
// if(pe_1st) pe_1st->isSelected = true;
return pe_1st;
}

8
qucs/qucsfile.cpp
View File

@ -617,11 +617,12 @@ bool QucsFile::giveNodeNames(QTextStream *stream)
continue; // insert each subcircuit just one time
StringList.append(s);
QucsDoc *d = new QucsDoc(0, QucsWorkDir.filePath(s));
QucsDoc *d = new QucsDoc(0, QucsWorkDir.filePath(s));
if(!d->File.load()) { // load document if possible
delete d;
return false;
}
d->DocName = s;
d->File.createSubNetlist(stream);
delete d;
}
@ -706,8 +707,11 @@ bool QucsFile::createSubNetlist(QTextStream *stream)
}
QString Type = Doc->DocName;
QFileInfo Info(Type);
if(Info.extension() == "sch") Type = Type.left(Type.length()-4);
if(Type.at(0) <= '9') if(Type.at(0) >= '0') Type = '_' + Type;
Type.replace(QRegExp("\\W"), "_"); // replace all none [a-zA-Z0-9] with _
(*stream) << "\n.Def:_" << Type << " " << sl.join(" ") << "\n";
(*stream) << "\n.Def:" << Type << " " << sl.join(" ") << "\n";
QString s;

5
qucs/qucsview.cpp
View File

@ -956,7 +956,10 @@ void QucsView::MPressSelect(QMouseEvent *Event)
viewport()->repaint();
drawn = false;
if(Event->button() != Qt::LeftButton) return;
if(Event->button() != Qt::LeftButton) {
if(focusElement) focusElement->isSelected = true;
return;
}
MousePressAction = &QucsView::MouseDoNothing;
MouseDoubleClickAction = &QucsView::MouseDoNothing;