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

2007-04-10 Stefan Jahn <stefan@lkcc.org>

Browse Source 
* textdoc.cpp (print): Also fixed print scale for text
        documents.

        * schematic.cpp (print): Fixed print scale for schematics.  It
        assumed a screen resolution of 72dpi.

        * mouseactions.cpp (rotateElements): Made rotation sticky while
        placing elements from the component tab as well as when pasting
        elements from the clipboard into the schematic.
This commit is contained in:
ela 2007-04-10 20:24:53 +00:00
parent c0cee05b65
commit 4f56c3c314
6 changed files with 119 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
qucs/ChangeLog
View File

@ -1,3 +1,15 @@
2007-04-10 Stefan Jahn <stefan@lkcc.org>
* textdoc.cpp (print): Also fixed print scale for text
documents.
* schematic.cpp (print): Fixed print scale for schematics. It
assumed a screen resolution of 72dpi.
* mouseactions.cpp (rotateElements): Made rotation sticky while
placing elements from the component tab as well as when pasting
elements from the clipboard into the schematic.
2007-04-05 Stefan Jahn <stefan@lkcc.org>
* schematic_file.cpp (throughAllNodes): Skip nodeset netlist

128
qucs/mouseactions.cpp
View File

@ -494,17 +494,8 @@ void MouseActions::MMovePaste(Schematic *Doc, QMouseEvent *Event)
MAx1 = DOC_X_POS(Event->pos().x());
MAy1 = DOC_Y_POS(Event->pos().y());
Doc->setOnGrid(MAx1, MAy1);
for(Element *pe=movingElements.first(); pe!=0; pe=movingElements.next()) {
if(pe->Type & isLabel) {
pe->cx += MAx1; pe->x1 += MAx1;
pe->cy += MAy1; pe->y1 += MAy1;
}
else
pe->setCenter(MAx1, MAy1, true);
pe->paintScheme(&painter);
}
moveElements(Doc,MAx1,MAy1);
paintElementsScheme(&painter);
drawn = true;
QucsMain->MouseMoveAction = &MouseActions::MMoveMoving2;
@ -1225,7 +1216,7 @@ void MouseActions::MPressElement(Schematic *Doc, QMouseEvent *Event, float, floa
setPainter(Doc, &painter);
int x1, y1, x2, y2;
int x1, y1, x2, y2, rot;
if(selElem->Type & isComponent) {
Component *Comp = (Component*)selElem;
switch(Event->button()) {
@ -1243,7 +1234,9 @@ void MouseActions::MPressElement(Schematic *Doc, QMouseEvent *Event, float, floa
drawn = false;
Doc->viewport()->update();
Doc->setChanged(true, true);
rot = Comp->rotated;
Comp = Comp->newOne(); // component is used, so create a new one
while(rot--) Comp->rotate(); // keep last rotation for single component
break;
case Qt::RightButton : // right mouse button rotates the component
@ -1625,10 +1618,71 @@ void MouseActions::MReleaseResizePainting(Schematic *Doc, QMouseEvent *Event)
Doc->setChanged(true, true);
}
// -----------------------------------------------------------
void MouseActions::paintElementsScheme(QPainter *p)
{
Element *pe;
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
pe->paintScheme(p);
}
// -----------------------------------------------------------
void MouseActions::moveElements(Schematic *Doc, int& x1, int& y1)
{
Element *pe;
Doc->setOnGrid(x1, y1);
for(pe=movingElements.first(); pe!=0; pe=movingElements.next()) {
if(pe->Type & isLabel) {
pe->cx += x1; pe->x1 += x1;
pe->cy += y1; pe->y1 += y1;
}
else
pe->setCenter(x1, y1, true);
}
}
// -----------------------------------------------------------
void MouseActions::rotateElements(Schematic *Doc, int& x1, int& y1)
{
int x2, y2;
Element *pe;
Doc->setOnGrid(x1, y1);
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
switch(pe->Type) {
case isComponent:
case isAnalogComponent:
case isDigitalComponent:
((Component*)pe)->rotate(); // rotate !before! rotating the center
x2 = x1 - pe->cx;
pe->setCenter(pe->cy - y1 + x1, x2 + y1);
break;
case isWire:
x2 = pe->x1;
pe->x1 = pe->y1 - y1 + x1;
pe->y1 = x1 - x2 + y1;
x2 = pe->x2;
pe->x2 = pe->y2 - y1 + x1;
pe->y2 = x1 - x2 + y1;
break;
case isPainting:
((Painting*)pe)->rotate(); // rotate !before! rotating the center
((Painting*)pe)->getCenter(x2, y2);
pe->setCenter(y2 - y1 + x1, x1 - x2 + y1);
break;
default:
x2 = x1 - pe->cx; // if diagram -> only rotate cx/cy
pe->setCenter(pe->cy - y1 + x1, x2 + y1);
break;
}
}
}
// -----------------------------------------------------------
void MouseActions::MReleasePaste(Schematic *Doc, QMouseEvent *Event)
{
int x1, y1, x2, y2;
int x1, y1, x2, y2, rot;
QFileInfo Info(Doc->DocName);
QPainter painter(Doc->viewport());
@ -1672,6 +1726,11 @@ void MouseActions::MReleasePaste(Schematic *Doc, QMouseEvent *Event)
}
pasteElements(Doc);
// keep rotation sticky for pasted elements
rot = movingRotated;
x1 = y1 = 0;
while(rot--) rotateElements(Doc,x1,y1);
QucsMain->MouseMoveAction = &MouseActions::MMovePaste;
QucsMain->MousePressAction = 0;
QucsMain->MouseReleaseAction = 0;
@ -1687,43 +1746,16 @@ void MouseActions::MReleasePaste(Schematic *Doc, QMouseEvent *Event)
setPainter(Doc, &painter);
if(drawn) // erase old scheme
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
pe->paintScheme(&painter);
paintElementsScheme(&painter);
drawn = true;
x1 = DOC_X_POS(Event->pos().x());
y1 = DOC_Y_POS(Event->pos().y());
Doc->setOnGrid(x1, y1);
for(pe = movingElements.first(); pe != 0; pe = movingElements.next()) {
switch(pe->Type) {
case isComponent:
case isAnalogComponent:
case isDigitalComponent:
((Component*)pe)->rotate(); // rotate !before! rotating the center
x2 = x1 - pe->cx;
pe->setCenter(pe->cy - y1 + x1, x2 + y1);
break;
case isWire:
x2 = pe->x1;
pe->x1 = pe->y1 - y1 + x1;
pe->y1 = x1 - x2 + y1;
x2 = pe->x2;
pe->x2 = pe->y2 - y1 + x1;
pe->y2 = x1 - x2 + y1;
break;
case isPainting:
((Painting*)pe)->rotate(); // rotate !before! rotating the center
((Painting*)pe)->getCenter(x2, y2);
pe->setCenter(y2 - y1 + x1, x1 - x2 + y1);
break;
default:
x2 = x1 - pe->cx; // if diagram -> only rotate cx/cy
pe->setCenter(pe->cy - y1 + x1, x2 + y1);
break;
}
pe->paintScheme(&painter);
}
x1 = DOC_X_POS(Event->pos().x());
y1 = DOC_Y_POS(Event->pos().y());
rotateElements(Doc,x1,y1);
paintElementsScheme(&painter);
// save rotation
movingRotated++;
movingRotated &= 3;
break;
default: ; // avoids compiler warnings

4
qucs/mouseactions.h
View File

@ -49,6 +49,7 @@ public:
int MAx1, MAy1,MAx2, MAy2, MAx3, MAy3; // cache for mouse movements
QPtrList<Element> movingElements;
int movingRotated;
// menu appearing by right mouse button click on component
QPopupMenu *ComponentMenu;
@ -108,6 +109,9 @@ public:
void MReleaseMoveText(Schematic*, QMouseEvent*);
void MReleaseZoomIn(Schematic*, QMouseEvent*);
void paintElementsScheme(QPainter*);
void rotateElements(Schematic*, int&, int&);
void moveElements(Schematic*, int&, int&);
void moveElements(QPtrList<Element>*, int, int);
void endElementMoving(Schematic*, QPtrList<Element>*);
void rightPressMenu(Schematic*, QMouseEvent*, float, float);

1
qucs/qucs_actions.cpp
View File

@ -270,6 +270,7 @@ void QucsApp::slotEditPaste(bool on)
view->drawn = false;
MouseMoveAction = &MouseActions::MMovePaste;
view->movingRotated = 0;
MousePressAction = 0;
MouseReleaseAction = 0;
MouseDoubleClickAction = 0;

25
qucs/schematic.cpp
View File

@ -467,17 +467,24 @@ void Schematic::contentsMouseDoubleClickEvent(QMouseEvent *Event)
// -----------------------------------------------------------
void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPage)
{
QPaintDeviceMetrics metrics(Painter->device());
QPaintDeviceMetrics pmetrics(Painter->device());
float printerDpiX = (float)pmetrics.logicalDpiX();
float printerDpiY = (float)pmetrics.logicalDpiY();
float printerW = (float)pmetrics.width();
float printerH = (float)pmetrics.height();
QPaintDeviceMetrics smetrics(QPainter(viewport()).device());
float screenDpiX = (float)smetrics.logicalDpiX();
float screenDpiY = (float)smetrics.logicalDpiY();
float PrintScale = 0.5;
sizeOfAll(UsedX1, UsedY1, UsedX2, UsedY2);
int marginX = 40 * metrics.logicalDpiX() / 72;
int marginY = 40 * metrics.logicalDpiY() / 72;
int marginX = (int)(40 * printerDpiX / screenDpiX);
int marginY = (int)(40 * printerDpiY / screenDpiY);
if(fitToPage) {
float ScaleX = float(metrics.width() - 2*marginX) /
float((UsedX2-UsedX1) * metrics.logicalDpiX()) * 72.0;
float ScaleY = float(metrics.height() - 2*marginY) /
float((UsedY2-UsedY1) * metrics.logicalDpiY()) * 72.0;
float ScaleX = float(printerW - 2*marginX) /
float((UsedX2-UsedX1) * printerDpiX) * screenDpiX;
float ScaleY = float(printerH - 2*marginY) /
float((UsedY2-UsedY1) * printerDpiY) * screenDpiY;
if(ScaleX > ScaleY)
PrintScale = ScaleY;
else
@ -495,7 +502,7 @@ void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPag
}
QFont oldFont = Painter->font();
p.init(Painter, PrintScale * float(metrics.logicalDpiX()) / 72.0,
p.init(Painter, PrintScale * printerDpiX / screenDpiX,
-StartX, -StartY, -marginX, -marginY, PrintScale);
if(!symbolMode)
@ -505,7 +512,7 @@ void Schematic::print(QPrinter*, QPainter *Painter, bool printAll, bool fitToPag
if(pc->isSelected || printAll) {
selected = pc->isSelected;
pc->isSelected = false;
pc->print(&p, 72.0 / float(metrics.logicalDpiX()));
pc->print(&p, screenDpiX / printerDpiX);
pc->isSelected = selected;
}

11
qucs/textdoc.cpp
View File

@ -176,13 +176,14 @@ void TextDoc::print(QPrinter *Printer, QPainter *Painter, bool printAll, bool)
sync(); // formatting whole text
QPaintDeviceMetrics metrics(Painter->device());
QPaintDeviceMetrics smetrics(QPainter(this).device());
QPaintDeviceMetrics pmetrics(Painter->device());
int margin = 54; // margin at each side (unit is point)
int marginX = margin * metrics.logicalDpiX() / 72;
int marginY = margin * metrics.logicalDpiY() / 72;
int marginX = margin * pmetrics.logicalDpiX() / smetrics.logicalDpiX();
int marginY = margin * pmetrics.logicalDpiY() / smetrics.logicalDpiY();
QRect printArea(
marginX, marginY, metrics.width() - 2*marginX,
metrics.height() - 2*marginY - Painter->fontMetrics().lineSpacing());
marginX, marginY, pmetrics.width() - 2*marginX,
pmetrics.height() - 2*marginY - Painter->fontMetrics().lineSpacing());
int linesPerPage = printArea.height() / Painter->fontMetrics().lineSpacing();