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

new selectionRect look and feel

Browse Source
This commit is contained in:
Krasilnikov Sergey 2023-06-02 21:17:24 +03:00
parent 2f8062a76e
commit f0162087ab
5 changed files with 106 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
qucs/mouseactions.cpp
View File

@ -291,7 +291,7 @@ void MouseActions::MMoveElement(Schematic *Doc, QMouseEvent *Event)
setPainter(Doc);
if(selElem->Type == isPainting) {
Doc->PostPaintEvent (_NotRop, 0,0,0,0);
Doc->PostPaintEvent (_NotRop, 0, 0, 0, 0);
x -= Doc->contentsX();
y -= Doc->contentsY();
((Painting*)selElem)->MouseMoving(Doc, x, y, gx, gy,
@ -403,19 +403,17 @@ void MouseActions::MMoveWire1(Schematic *Doc, QMouseEvent *Event)
* @param Doc
* @param Event
*/
void MouseActions::MMoveSelect(Schematic *Doc, QMouseEvent *Event)
{
//qDebug() << "MMoveSelect " << "select area";
MAx2 = DOC_X_POS(Event->pos().x()) - MAx1;
MAy2 = DOC_Y_POS(Event->pos().y()) - MAy1;
if(isMoveEqual) { // x and y size must be equal ?
if(abs(MAx2) > abs(MAy2)) {
if(MAx2<0) MAx2 = -abs(MAy2); else MAx2 = abs(MAy2);
void MouseActions::MMoveSelect(Schematic *Doc, QMouseEvent *Event) {
//qDebug() << "MMoveSelect " << "select area";
MAx2 = DOC_X_POS(Event->pos().x()) - MAx1;
MAy2 = DOC_Y_POS(Event->pos().y()) - MAy1;
if (isMoveEqual) { // x and y size must be equal ?
if (abs(MAx2) > abs(MAy2)) {
if (MAx2 < 0) MAx2 = -abs(MAy2); else MAx2 = abs(MAy2);
} else { if (MAy2 < 0) MAy2 = -abs(MAx2); else MAy2 = abs(MAx2); }
}
else { if(MAy2<0) MAy2 = -abs(MAx2); else MAy2 = abs(MAx2); }
}
Doc->PostPaintEvent (_Rect, MAx1, MAy1, MAx2, MAy2);
Doc->PostPaintEvent(_SelectionRect, MAx1, MAy1, MAx2, MAy2);
}
// -----------------------------------------------------------
@ -675,7 +673,7 @@ void MouseActions::MMoveActivate(Schematic *Doc, QMouseEvent *Event)
MAx3 = DOC_X_POS(Event->pos().x());
MAy3 = DOC_Y_POS(Event->pos().y());
Doc->PostPaintEvent (_Rect, MAx3, MAy3-9, 14, 10);
Doc->PostPaintEvent (_Rect, MAx3, MAy3 - 9, 14, 10);
Doc->PostPaintEvent (_Line, MAx3, MAy3-9, MAx3+13, MAy3);
Doc->PostPaintEvent (_Line, MAx3, MAy3, MAx3+13, MAy3-9);
}
@ -1358,7 +1356,7 @@ void MouseActions::MPressElement(Schematic *Doc, QMouseEvent *Event, float, floa
void MouseActions::MPressWire1(Schematic *Doc, QMouseEvent*, float fX, float fY)
{
//Doc->PostPaintEvent (_DotLine);
//Doc->PostPaintEvent (_NotRop);
//Doc->PostPaintEvent (PPENotRop);
//if(drawn) {
#if 0 //ALYS - it draws some garbage, not deleted because of possible questions
Doc->PostPaintEvent (_Line, 0, MAy3, MAx2, MAy3); // erase old mouse cross
@ -1588,12 +1586,11 @@ void MouseActions::MReleaseSelect2(Schematic *Doc, QMouseEvent *Event)
{
if(Event->button() != Qt::LeftButton) return;
bool Ctrl;
if(Event->modifiers().testFlag(Qt::ControlModifier)) Ctrl = true;
else Ctrl = false;
bool IsCtrl = Event->modifiers().testFlag(Qt::ControlModifier);
bool IsShift = Event->modifiers().testFlag(Qt::ShiftModifier);
// selects all elements within the rectangle
Doc->selectElements(MAx1, MAy1, MAx1+MAx2, MAy1+MAy2, Ctrl);
Doc->selectElements(MAx1, MAy1, MAx1+MAx2, MAy1+MAy2, IsCtrl, !IsShift);
Doc->releaseKeyboard(); // allow keyboard inputs again
QucsMain->MouseMoveAction = 0;
@ -1601,6 +1598,7 @@ void MouseActions::MReleaseSelect2(Schematic *Doc, QMouseEvent *Event)
QucsMain->MouseReleaseAction = &MouseActions::MReleaseSelect;
QucsMain->MouseDoubleClickAction = &MouseActions::MDoubleClickSelect;
Doc->highlightWireLabels ();
Doc->PostedPaintEvents.clear();
Doc->viewport()->update();
drawn = false;
}
@ -1695,7 +1693,7 @@ void MouseActions::MReleaseResizePainting(Schematic *Doc, QMouseEvent *Event)
{
if(Event->button() != Qt::LeftButton) return;
QucsMain->MouseMoveAction = 0;
QucsMain->MouseMoveAction = nullptr;
QucsMain->MousePressAction = &MouseActions::MPressSelect;
QucsMain->MouseReleaseAction = &MouseActions::MReleaseSelect;
QucsMain->MouseDoubleClickAction = &MouseActions::MDoubleClickSelect;
@ -1710,7 +1708,7 @@ void MouseActions::MReleaseResizePainting(Schematic *Doc, QMouseEvent *Event)
void MouseActions::paintElementsScheme(Schematic *p)
{
Element *pe;
for(pe = movingElements.first(); pe != 0; pe = movingElements.next())
for(pe = movingElements.first(); pe != nullptr; pe = movingElements.next())
pe->paintScheme(p);
}

2
qucs/qucs_actions.cpp
View File

@ -641,7 +641,7 @@ void QucsApp::slotSelectAll()
((TextDoc*)Doc)->selectAll();
}
else {
((Schematic*)Doc)->selectElements(INT_MIN, INT_MIN, INT_MAX, INT_MAX, true);
((Schematic*)Doc)->selectElements(INT_MIN, INT_MIN, INT_MAX, INT_MAX, true, false);
((Schematic*)Doc)->viewport()->update();
view->drawn = false;
}

12
qucs/schematic.cpp
View File

@ -458,11 +458,10 @@ void Schematic::drawContents(QPainter *p, int, int, int, int)
* Paint actions can only be called from within the paint event, so they
* are put into a QList (PostedPaintEvents) and processed here
*/
for(int i=0;i<PostedPaintEvents.size();i++)
for(auto p : PostedPaintEvents)
{
PostedPaintEvent p = PostedPaintEvents[i];
// QPainter painter2(viewport()); for if(p.PaintOnViewport)
QPen pen(Qt::black);
Painter.Painter->setPen(Qt::black);
switch(p.pe)
{
@ -472,6 +471,13 @@ void Schematic::drawContents(QPainter *p, int, int, int, int)
case _Rect:
Painter.drawRect(p.x1, p.y1, p.x2, p.y2);
break;
case _SelectionRect:
pen.setStyle(Qt::DashLine);
pen.setColor(QColor(50, 50, 50, 100));
Painter.Painter->setPen(pen);
Painter.fillRect(p.x1, p.y1, p.x2, p.y2, QColor(200,220,240,100));
Painter.drawRect(p.x1, p.y1, p.x2, p.y2);
break;
case _Line:
Painter.drawLine(p.x1, p.y1, p.x2, p.y2);
break;

6
qucs/schematic.h
View File

@ -61,7 +61,7 @@ struct DigSignal {
QString Type; // type of signal
};
typedef QMap<QString, DigSignal> DigMap;
typedef enum {_NotRop, _Rect, _Line, _Ellipse, _Arc, _DotLine, _Translate, _Scale}PE;
typedef enum {_NotRop, _Rect, _SelectionRect, _Line, _Ellipse, _Arc, _DotLine, _Translate, _Scale} PE;
typedef struct {PE pe; int x1; int y1;int x2;int y2;int a; int b; bool PaintOnViewport;}PostedPaintEvent;
// subcircuit, vhdl, etc. file structure
@ -226,8 +226,8 @@ public:
void markerUpDown(bool, Q3PtrList<Element>*);
Element* selectElement(float, float, bool, int *index=0);
void deselectElements(Element*);
int selectElements(int, int, int, int, bool) const;
void deselectElements(Element*) const;
int selectElements(int, int, int, int, bool, bool) const;
void selectMarkers() const;
void newMovingWires(Q3PtrList<Element>*, Node*, int) const;
int copySelectedElements(Q3PtrList<Element>*);

155
qucs/schematic_element.cpp
View File

@ -1435,7 +1435,7 @@ void Schematic::highlightWireLabels ()
// ---------------------------------------------------
// Deselects all elements except 'e'.
void Schematic::deselectElements(Element *e)
void Schematic::deselectElements(Element *e) const
{
// test all components
for(Component *pc = Components->first(); pc != 0; pc = Components->next())
@ -1476,131 +1476,126 @@ void Schematic::deselectElements(Element *e)
// ---------------------------------------------------
// Selects elements that lie within the rectangle x1/y1, x2/y2.
int Schematic::selectElements(int x1, int y1, int x2, int y2, bool flag) const
{
int z=0; // counts selected elements
int cx1, cy1, cx2, cy2;
int Schematic::selectElements(int x1, int y1, int x2, int y2, bool append, bool entirely) const {
int z = 0; // counts selected elements
int cx1, cy1, cx2, cy2;
// exchange rectangle coordinates to obtain x1 < x2 and y1 < y2
cx1 = (x1 < x2) ? x1 : x2;
cx2 = (x1 > x2) ? x1 : x2;
cx2 = (x1 >= x2) ? x1 : x2;
cy1 = (y1 < y2) ? y1 : y2;
cy2 = (y1 > y2) ? y1 : y2;
cy2 = (y1 >= y2) ? y1 : y2;
x1 = cx1;
x2 = cx2;
y1 = cy1;
y2 = cy2;
QRect selectionRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
// test all components
for(Component *pc = Components->first(); pc != nullptr; pc = Components->next())
{
for (Component *pc = Components->first(); pc != nullptr; pc = Components->next()) {
pc->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
{
pc->isSelected = true;
z++;
continue;
}
if(pc->isSelected &= flag) z++;
QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pc->isSelected = true;
z++;
continue;
}
if (pc->isSelected &= append) z++;
}
Wire *pw;
for (pw = Wires->first(); pw != nullptr; pw = Wires->next()) // test all wires
{
if (pw->x1 >= x1)
if (pw->x2 <= x2)
if (pw->y1 >= y1)
if (pw->y2 <= y2) {
pw->isSelected = true;
z++;
continue;
}
if (pw->isSelected &= flag) z++;
QRect componentRect(pw->x1, pw->y1, pw->x2 - pw->x1, pw->y2 - pw->y1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pw->isSelected = true;
z++;
continue;
}
if (pw->isSelected &= append) z++;
}
// test all wire labels *********************************
WireLabel *pl=nullptr;
for(pw = Wires->first(); pw != nullptr; pw = Wires->next())
{
if(pw->Label)
{
WireLabel *pl = nullptr;
for (pw = Wires->first(); pw != nullptr; pw = Wires->next()) {
if (pw->Label) {
pl = pw->Label;
if(pl->x1 >= x1) if((pl->x1+pl->x2) <= x2)
if(pl->y1 >= y1) if((pl->y1+pl->y2) <= y2)
{
pl->isSelected = true;
z++;
continue;
}
if(pl->isSelected &= flag) z++;
QRect componentRect(pl->x1, pl->y1, pl->x2 - pl->x1, pl->y2 - pl->y1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pl->isSelected = true;
z++;
continue;
}
if (pl->isSelected &= append) z++;
}
}
// test all node labels *************************************
for(Node *pn = Nodes->first(); pn != 0; pn = Nodes->next())
{
for (Node *pn = Nodes->first(); pn != nullptr; pn = Nodes->next()) {
pl = pn->Label;
if(pl)
{
if(pl->x1 >= x1) if((pl->x1+pl->x2) <= x2)
if((pl->y1-pl->y2) >= y1) if(pl->y1 <= y2)
{
pl->isSelected = true;
z++;
continue;
}
if(pl->isSelected &= flag) z++;
if (pl) {
QRect componentRect(pl->x1, pl->y1, pl->x2 - pl->x1, pl->y2 - pl->y1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pl->isSelected = true;
z++;
continue;
}
if (pl->isSelected &= append) z++;
}
}
// test all diagrams *******************************************
for(Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next())
{
for (Diagram *pd = Diagrams->first(); pd != 0; pd = Diagrams->next()) {
// test graphs of diagram
for (Graph *pg : pd->Graphs)
{
if(pg->isSelected &= flag) z++;
for (Graph *pg: pd->Graphs) {
if (pg->isSelected &= append) z++;
// test markers of graph
for (Marker *pm : pg->Markers)
{
for (Marker *pm: pg->Markers) {
pm->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
{
pm->isSelected = true;
z++;
continue;
}
if(pm->isSelected &= flag) z++;
QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pm->isSelected = true;
z++;
continue;
}
if (pm->isSelected &= append) z++;
}
}
// test diagram itself
pd->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
{
pd->isSelected = true;
z++;
continue;
}
if(pd->isSelected &= flag) z++;
QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pd->isSelected = true;
z++;
continue;
}
if (pd->isSelected &= append) z++;
}
// test all paintings *******************************************
for(Painting *pp = Paintings->first(); pp != 0; pp = Paintings->next())
{
for (Painting *pp = Paintings->first(); pp != 0; pp = Paintings->next()) {
pp->Bounding(cx1, cy1, cx2, cy2);
if(cx1 >= x1) if(cx2 <= x2) if(cy1 >= y1) if(cy2 <= y2)
{
pp->isSelected = true;
z++;
continue;
}
if(pp->isSelected &= flag) z++;
QRect componentRect(cx1, cy1, cx2 - cx1, cy2 - cy1);
if ((entirely && selectionRect.contains(componentRect)) ||
(!entirely && selectionRect.intersects(componentRect))) {
pp->isSelected = true;
z++;
continue;
}
if (pp->isSelected &= append) z++;
}
return z;