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 issues #319 and #320

Browse Source 
Fix for #319:
1. Implemented second column replacement in ComponentDialog::slotButtUp()
and ComponentDialog::slotButtDown() in componentdialog.cpp

Fix for #320:
1. Added schematic frame printing in ImageWriter. Adapted bouning box
calculation for schematics with frames.
2. Refactored getSchWidthAndHeightMethod() --- moved to ImageWriter
This commit is contained in:
Vadim Kuznetzov 2015-07-23 16:15:38 +03:00
parent dce642f12d
commit f93bb0df26
5 changed files with 35 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
qucs/components/componentdialog.cpp
View File

@ -1218,6 +1218,11 @@ void ComponentDialog::slotButtUp()
QTableWidgetItem *target = prop->takeItem(curRow-1,0);
prop->setItem(curRow-1, 0, source);
prop->setItem(curRow, 0, target);
source = prop->takeItem(curRow ,1);
target = prop->takeItem(curRow-1,1);
prop->setItem(curRow-1, 1, source);
prop->setItem(curRow, 1, target);
// select moved row
prop->selectRow(curRow-1);
@ -1241,6 +1246,10 @@ void ComponentDialog::slotButtDown()
QTableWidgetItem *target = prop->takeItem(curRow+1,0);
prop->setItem(curRow+1, 0, source);
prop->setItem(curRow, 0, target);
source = prop->takeItem(curRow,1);
target = prop->takeItem(curRow+1,1);
prop->setItem(curRow+1, 1, source);
prop->setItem(curRow, 1, target);
// select moved row
prop->selectRow(curRow+1);

21
qucs/imagewriter.cpp
View File

@ -44,8 +44,7 @@ ImageWriter::noGuiPrint(QWidget *doc, QString printFile, QString color)
const int bourder = 30;
int w,h,wsel,hsel,
xmin, ymin, xmin_sel, ymin_sel;
sch->getSchWidthAndHeight(w, h, xmin, ymin);
getSchWidthAndHeight(sch, w,h,xmin,ymin);
sch->getSelAreaWidthAndHeight(wsel, hsel, xmin_sel, ymin_sel);
w += bourder;
h += bourder;
@ -135,7 +134,7 @@ int ImageWriter::print(QWidget *doc)
xmin, ymin, xmin_sel, ymin_sel;
int status = -1;
sch->getSchWidthAndHeight(w, h, xmin, ymin);
getSchWidthAndHeight(sch, w, h, xmin, ymin);
sch->getSelAreaWidthAndHeight(wsel, hsel, xmin_sel, ymin_sel);
w += border;
h += border;
@ -277,3 +276,19 @@ int ImageWriter::print(QWidget *doc)
delete dlg;
return status;
}
void ImageWriter::getSchWidthAndHeight(Schematic *sch, int &w, int &h, int &xmin, int &ymin)
{
xmin = sch->UsedX1;
ymin = sch->UsedY1;
w = abs(sch->UsedX2 - xmin);
h = abs(sch->UsedY2 - ymin);
int f_w, f_h;
if (sch->sizeOfFrame(f_w,f_h)) {
xmin = 0;
ymin = 0;
w = f_w;
h = f_h;
}
}

2
qucs/imagewriter.h
View File

@ -41,6 +41,8 @@ public:
private:
bool onlyDiagram;
QString lastExportFilename;
void getSchWidthAndHeight(Schematic *sch, int &w, int &h, int &xmin, int &ymin);
};
#endif

71
qucs/schematic.cpp
View File

@ -636,6 +636,11 @@ void Schematic::paintSchToViewpainter(ViewPainter *p, bool printAll, bool toImag
{
bool selected;
if (printAll) {
int x2,y2;
if (sizeOfFrame(x2,y2)) paintFrame(p);
}
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
if(pc->isSelected || printAll) {
selected = pc->isSelected;
@ -2175,72 +2180,6 @@ void Schematic::contentsDragMoveEvent(QDragMoveEvent *Event)
Event->accept();
}
void Schematic::getSchWidthAndHeight(int &w, int &h, int& xmin_, int& ymin_)
{
int xmin= INT_MAX,
ymin= INT_MAX,
xmax= INT_MIN,
ymax= INT_MIN;
for(Component *pc = Components->first(); pc != 0; pc = Components->next()) {
int x1,y1,x2,y2,d1,d2,d3,d4;
pc->entireBounds(x1,y1,x2,y2,this->textCorr());
d1 = std::min(x1,x2);
if (d1<xmin) xmin = d1;
d2 = std::max(x2,x1);
if (d2>xmax) xmax = d2;
d3 = std::min(y1,y2);
if (d3<ymin) ymin = d3;
d4 = std::max(y2,y1);
if (d4>ymax) ymax = d4;
}
for(Wire *pw = Wires->first(); pw != 0; pw = Wires->next()) {
int xc,yc;
pw->getCenter(xc,yc);
if (xc<xmin) xmin = xc;
if (xc>xmax) xmax = xc;
if (yc<ymin) ymin = yc;
if (yc>ymax) ymax = yc;
}
for(Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next()) {
int x1,y1,x2,y2,d1,d2,d3,d4;
pd->Bounding(x1,y1,x2,y2);
d1 = std::min(x1,x2);
if (d1<xmin) xmin = d1;
d2 = std::max(x2,x1);
if (d2>xmax) xmax = d2;
d3 = std::min(y1,y2);
if (d3<ymin) ymin = d3;
d4 = std::max(y2,y1);
if (d4>ymax) ymax = d4;
}
for(Painting *pp = Paintings->first(); pp != 0; pp = Paintings->next()) {
int x1,y1,x2,y2,d1,d2,d3,d4;
pp->Bounding(x1,y1,x2,y2);
d1 = std::min(x1,x2);
if (d1<xmin) xmin = d1;
d2 = std::max(x2,x1);
if (d2>xmax) xmax = d2;
d3 = std::min(y1,y2);
if (d3<ymin) ymin = d3;
d4 = std::max(y2,y1);
if (d4>ymax) ymax = d4;
}
w = abs(xmax - xmin);
h = abs(ymax - ymin);
xmin_ = xmin;
ymin_ = ymin;
}
void Schematic::getSelAreaWidthAndHeight(int &wsel, int &hsel, int& xmin_sel_, int& ymin_sel_)
{
int xmin= INT_MAX,

3
qucs/schematic.h
View File

@ -91,6 +91,7 @@ public:
void PostPaintEvent(PE pe, int x1=0, int y1=0, int x2=0, int y2=0, int a=0, int b=0,bool PaintOnViewport=false);
float textCorr();
bool sizeOfFrame(int&, int&);
void sizeOfAll(int&, int&, int&, int&);
bool rotateElements();
bool mirrorXComponents();
@ -165,7 +166,6 @@ signals:
void signalFileChanged(bool);
protected:
bool sizeOfFrame(int&, int&);
void paintFrame(ViewPainter*);
// overloaded function to get actions of user
@ -251,7 +251,6 @@ public:
Painting* selectedPainting(float, float);
void copyPaintings(int&, int&, int&, int&, QList<Element *> *);
void getSchWidthAndHeight(int& w, int& h, int& xmin_, int& ymin_); // calculates schematic
void getSelAreaWidthAndHeight(int &wsel, int& hsel, int& xmin_sel_, int& ymin_sel_); // and selected area width and height in pixels
private: