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

cleanup Component::save and ::load #383

Merged
merged 7 commits into from
Oct 6, 2017
Merged

cleanup Component::save and ::load #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
248837f
Component::save cleanup
felix-salfelder Sep 26, 2015
f14e475
Component::load cleanup
felix-salfelder Sep 27, 2015
d41ed81
Merge branch 'develop' into schematic_cleanup
felix-salfelder Feb 18, 2016
d8b71bf
Merge branch 'release-0.0.19' into schematic_cleanup
felix-salfelder Jul 24, 2016
3a994f6
properly handle buttons for equation in componentdialog
felix-salfelder Jul 24, 2016
41b74f5
Merge branch 'release-0.0.19' into schematic_cleanup
felix-salfelder Nov 4, 2016
02c95fc
Merge remote-tracking branch 'origin/develop' into schematic_cleanup
felix-salfelder Feb 1, 2017
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
205 changes: 130 additions & 75 deletions qucs/qucs/components/component.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#include <stdlib.h>
#include <cmath>

#include "componentdialog.h"
#include "components.h"
#include "node.h"
#include "main.h"
Expand Down Expand Up @@ -702,7 +703,10 @@ QString Component::get_VHDL_Code(int NumPorts)
}

// -------------------------------------------------------
QString Component::save()
// save a component
// FIXME: part of corresponding SchematicSerializer implementation
// BUG: c must be const (cannot because of QT3)
void Schematic::saveComponent(QTextStream& s, Component /*const*/ * c) const
{
#if XML
QDomDocument doc;
Expand All @@ -723,93 +727,125 @@ QString Component::save()
}
qDebug (doc.toString());
#endif
QString s = "<" + Model;

if(Name.isEmpty()) s += " * ";
else s += " "+Name+" ";
// s << " "; ??
s << "<" << c->Model;

s << " ";
if(c->Name.isEmpty()){
s << "*";
}else{
s << c->Name;
}
s << " ";

int i=0;
if(!showName)
if(!c->showName){
i = 4;
i |= isActive;
s += QString::number(i);
s += " "+QString::number(cx)+" "+QString::number(cy);
s += " "+QString::number(tx)+" "+QString::number(ty);
if(mirroredX) s += " 1";
else s += " 0";
s += " "+QString::number(rotated);
}
i |= c->isActive;
s << QString::number(i);
s << " "+QString::number(c->cx)+" "+QString::number(c->cy);
s << " "+QString::number(c->tx)+" "+QString::number(c->ty);
s << " ";
if(c->mirroredX){
s << "1";
}else{
s << "0";
}
s << " " << QString::number(c->rotated);

// write all properties
for(Property *p1 = Props.first(); p1 != 0; p1 = Props.next()) {
if(p1->Description.isEmpty())
s += " \""+p1->Name+"="+p1->Value+"\""; // e.g. for equations
else s += " \""+p1->Value+"\"";
if(p1->display) s += " 1";
else s += " 0";
// FIXME: ask component for properties, not for dictionary
for(Property *p1 = c->Props.first(); p1 != 0; p1 = c->Props.next()) {
if(p1->Description.isEmpty()){
s << " \""+p1->Name+"="+p1->Value+"\""; // e.g. for equations
}else{
s << " \""+p1->Value+"\"";
}
s << " ";
if(p1->display){
s << "1";
}else{
s << "0";
}
}

return s+">";
s << ">";
}

// -------------------------------------------------------
bool Component::load(const QString& _s)
// FIXME: must be Component* SchematicParser::loadComponent(Stream&, Component*);
Component* Schematic::loadComponent(const QString& _s, Component* c) const
{
bool ok;
int ttx, tty, tmp;
QString s = _s;

if(s.at(0) != '<') return false;
if(s.at(s.length()-1) != '>') return false;
if(s.at(0) != '<'){
return NULL;
}else if(s.at(s.length()-1) != '>'){
return NULL;
}
s = s.mid(1, s.length()-2); // cut off start and end character

QString n;
Name = s.section(' ',1,1); // Name
if(Name == "*") Name = "";
c->Name = s.section(' ',1,1); // Name
if(c->Name == "*"){
c->Name = "";
}

n = s.section(' ',2,2); // isActive
tmp = n.toInt(&ok);
if(!ok) return false;
isActive = tmp & 3;
if(!ok){
return NULL;
}
c->isActive = tmp & 3;

if(tmp & 4)
showName = false;
c->showName = false;
else
showName = true;
c->showName = true;

n = s.section(' ',3,3); // cx
cx = n.toInt(&ok);
if(!ok) return false;
c->cx = n.toInt(&ok);
if(!ok) return NULL;

n = s.section(' ',4,4); // cy
cy = n.toInt(&ok);
if(!ok) return false;
c->cy = n.toInt(&ok);
if(!ok) return NULL;

n = s.section(' ',5,5); // tx
ttx = n.toInt(&ok);
if(!ok) return false;
if(!ok) return NULL;

n = s.section(' ',6,6); // ty
tty = n.toInt(&ok);
if(!ok) return false;
if(!ok) return NULL;

if(Model.at(0) != '.') { // is simulation component (dc, ac, ...) ?
if(c->Model.at(0) != '.') { // is simulation component (dc, ac, ...) ?

n = s.section(' ',7,7); // mirroredX
if(n.toInt(&ok) == 1) mirrorX();
if(!ok) return false;
if(n.toInt(&ok) == 1){
c->mirrorX();
}
if(!ok) return NULL;

n = s.section(' ',8,8); // rotated
tmp = n.toInt(&ok);
if(!ok) return false;
if(rotated > tmp) // neccessary because of historical flaw in ...
if(!ok) return NULL;
if(c->rotated > tmp) // neccessary because of historical flaw in ...
tmp += 4; // ... components like "volt_dc"
for(int z=rotated; z<tmp; z++) rotate();

for(int z=c->rotated; z<tmp; z++){
c->rotate();
}
}

tx = ttx; ty = tty; // restore text position (was changed by rotate/mirror)
c->tx = ttx;
c->ty = tty; // restore text position (was changed by rotate/mirror)

QString Model = c->Model; // BUG: don't use names

unsigned int z=0, counts = s.count('"');
// FIXME. use c->paramCount()
if(Model == "Sub")
tmp = 2; // first property (File) already exists
else if(Model == "Lib")
Expand All @@ -824,68 +860,71 @@ bool Component::load(const QString& _s)
tmp = 5; // number of properties for the default MUTX (2 inductors)
else tmp = counts + 1; // "+1" because "counts" could be zero

/// BUG FIXME. dont use Component parameter dictionary.
for(; tmp<=(int)counts/2; tmp++)
Props.append(new Property("p", "", true, " "));
c->Props.append(new Property("p", "", true, " "));

// load all properties
Property *p1;
for(p1 = Props.first(); p1 != 0; p1 = Props.next()) {
for(p1 = c->Props.first(); p1 != 0; p1 = c->Props.next()) {
z++;
n = s.section('"',z,z); // property value
z++;
//qDebug() << "LOAD: " << p1->Description;

// not all properties have to be mentioned (backward compatible)
if(z > counts) {
if(p1->Description.isEmpty())
Props.remove(); // remove if allocated in vain
if(p1->Description.isEmpty()){
c->Props.remove(); // remove if allocated in vain
}

if(Model == "Diode") {
if(Model == "Diode") { // BUG: don't use names
if(counts < 56) { // backward compatible
counts >>= 1;
p1 = Props.at(counts-1);
for(; p1 != 0; p1 = Props.current()) {
if(counts-- < 19)
p1 = c->Props.at(counts-1);
for(; p1 != 0; p1 = c->Props.current()) {
if(counts-- < 19){
break;
}

n = Props.prev()->Value;
n = c->Props.prev()->Value;
p1->Value = n;
}

p1 = Props.at(17);
p1->Value = Props.at(11)->Value;
Props.current()->Value = "0";
p1 = c->Props.at(17);
p1->Value = c->Props.at(11)->Value;
c->Props.current()->Value = "0";
}
}
else if(Model == "AND" || Model == "NAND" || Model == "NOR" ||
Model == "OR" || Model == "XNOR"|| Model == "XOR") {
if(counts < 10) { // backward compatible
counts >>= 1;
p1 = Props.at(counts);
for(; p1 != 0; p1 = Props.current()) {
p1 = c->Props.at(counts);
for(; p1 != 0; p1 = c->Props.current()) {
if(counts-- < 4)
break;
n = Props.prev()->Value;
n = c->Props.prev()->Value;
p1->Value = n;
}
Props.current()->Value = "10";
c->Props.current()->Value = "10";
}
}
else if(Model == "Buf" || Model == "Inv") {
if(counts < 8) { // backward compatible
counts >>= 1;
p1 = Props.at(counts);
for(; p1 != 0; p1 = Props.current()) {
p1 = c->Props.at(counts);
for(; p1 != 0; p1 = c->Props.current()) {
if(counts-- < 3)
break;
n = Props.prev()->Value;
n = c->Props.prev()->Value;
p1->Value = n;
}
Props.current()->Value = "10";
c->Props.current()->Value = "10";
}
}

return true;
return c;
}

// for equations
Expand All @@ -894,25 +933,27 @@ bool Component::load(const QString& _s)
p1->Name = n.section('=',0,0);
n = n.section('=',1);
// allocate memory for a new property (e.g. for equations)
if(Props.count() < (counts>>1)) {
Props.insert(z >> 1, new Property("y", "1", true));
Props.prev();
if(c->Props.count() < (counts>>1)) {
c->Props.insert(z >> 1, new Property("y", "1", true));
c->Props.prev();
}
}
if(z == 6) if(counts == 6) // backward compatible
if(Model == "R") {
Props.getLast()->Value = n;
return true;
c->Props.getLast()->Value = n;
return c;
}
p1->Value = n;

n = s.section('"',z,z); // display
p1->display = (n.at(1) == '1');
}

return true;
return c;
}

// -------------------------------------------------------

// *******************************************************************
// *** The following functions are used to load the schematic symbol
// *** from file. (e.g. subcircuit, library component)
Expand Down Expand Up @@ -1540,11 +1581,14 @@ void GateComponent::createSymbol()
// ***********************************************************************
// ******** ********
// ******** The following function does not belong to any class. ********
// ******** It creates a component by getting the identification ********
// ******** It creates a symbol by getting the identification ********
// ******** string used in the schematic file and for copy/paste. ********
// ******** ********
// ***********************************************************************

// FIXME:
// must be Component* SomeParserClass::getComponent(QString& Line)
// better: Component* SomeParserClass::getComponent(SomeDataStream& s)
Component* getComponentFromName(QString& Line, Schematic* p)
{
Component *c = 0;
Expand All @@ -1565,9 +1609,11 @@ Component* getComponentFromName(QString& Line, Schematic* p)
else if (cstr.left (6) == "SPfile" && cstr != "SPfile") {
// backward compatible
c = new SParamFile ();
c->Props.getLast()->Value = cstr.mid (6); }
else
c->Props.getLast()->Value = cstr.mid (6);
}else{
// FIXME: fetch proto from dictionary.
c = Module::getComponent (cstr);
}

if(!c) {
/// \todo enable user to load partial schematic, skip unknown components
Expand Down Expand Up @@ -1596,7 +1642,8 @@ Component* getComponentFromName(QString& Line, Schematic* p)

}

if(!c->load(Line)) {
// BUG: don't use schematic.
if(!p->loadComponent(Line, c)) {
QMessageBox::critical(0, QObject::tr("Error"),
QObject::tr("Format Error:\nWrong 'component' line format!"));
delete c;
Expand All @@ -1611,3 +1658,11 @@ Component* getComponentFromName(QString& Line, Schematic* p)
c->tx = x; c->ty = y;
return c;
}

// do something with Dialog Buttons
void Component::dialgButtStuff(ComponentDialog& d)const
{
d.disableButtons();
}

// vim:ts=8:sw=2:noet
5 changes: 3 additions & 2 deletions qucs/qucs/components/component.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class Schematic;
class ViewPainter;
class QString;
class QPen;

class ComponentDialog;

class Component : public Element {
public:
Expand All @@ -51,7 +51,6 @@ class Component : public Element {
void rotate();
void mirrorX(); // mirror about X axis
void mirrorY(); // mirror about Y axis
QString save();
bool load(const QString&);

// to hold track of the component appearance for saving and copying
Expand All @@ -62,6 +61,8 @@ class Component : public Element {
// set the pointer scematic associated with the component
virtual void setSchematic (Schematic* p) { containingSchematic = p; }
virtual Schematic* getSchematic () {return containingSchematic; }
// do somehting with buttons. can sb think of a more descriptive name?
virtual void dialgButtStuff(ComponentDialog&)const;

QList<Line *> Lines;
QList<struct Arc *> Arcs;
Expand Down
Loading