Merge pull request #397 from ra3xdh/203-rotate-symbol-bug

Rewrite rotation of paintings
ra3xdh · Dec 11, 2023 · 28fe600 · 28fe600
2 parents bc69b2c + 3b31674
commit 28fe600
Show file tree

Hide file tree

Showing 19 changed files with 3,718 additions and 3,410 deletions.
diff --git a/qucs/mouseactions.cpp b/qucs/mouseactions.cpp
diff --git a/qucs/paintings/arrow.cpp b/qucs/paintings/arrow.cpp
@@ -439,22 +439,33 @@ void Arrow::Bounding(int& _x1, int& _y1, int& _x2, int& _y2)
 
 // --------------------------------------------------------------------------
 // Rotates around the center.
-void Arrow::rotate()
+void Arrow::rotate(int xc, int yc)
 {
-  cx += (x2>>1) - (y2>>1);
-  cy += (x2>>1) + (y2>>1);
-
-  int tmp = x2;
-  x2  =  y2;
-  y2  = -tmp;
-
-  tmp =  xp1;
-  xp1 =  yp1;
-  yp1 = -tmp;
-
-  tmp =  xp2;
-  xp2 =  yp2;
-  yp2 = -tmp;
+    int xr1 = cx - xc;
+    int yr1 = cy - yc;
+    int xr2 = cx + x2 - xc;
+    int yr2 = cy + y2 - yc;
+
+    int tmp = xr2;
+    xr2  =  yr2;
+    yr2  = -tmp;
+
+    tmp = xr1;
+    xr1  =  yr1;
+    yr1  = -tmp;
+
+    cx = xr1 + xc;
+    cy = yr1 + yc;
+    x2 = xr2 - xr1;
+    y2 = yr2 - yr1;
+
+    tmp = xp1;
+    xp1 = yp1;
+    yp1 = -tmp;
+
+    tmp = xp2;
+    xp2 = yp2;
+    yp2 = -tmp;
 }
 
 // --------------------------------------------------------------------------

diff --git a/qucs/paintings/arrow.h b/qucs/paintings/arrow.h
@@ -46,7 +46,7 @@ class Arrow : public Painting  {
   bool resizeTouched(float, float, float);
   void MouseResizeMoving(int, int, Schematic*);
 
-  void rotate();
+  void rotate(int, int);
   void mirrorX();
   void mirrorY();
   bool Dialog();

diff --git a/qucs/paintings/ellipse.cpp b/qucs/paintings/ellipse.cpp
@@ -341,13 +341,25 @@ bool qucs::Ellipse::getSelected(float fX, float fY, float w)
 
 // --------------------------------------------------------------------------
 // Rotates around the center.
-void qucs::Ellipse::rotate()
+void qucs::Ellipse::rotate(int xc, int yc)
 {
-  cy += (y2-x2) >> 1;
-  cx += (x2-y2) >> 1;
-  int tmp = x2;
-  x2 = y2;
-  y2 = tmp;
+    int xr1 = cx - xc;
+    int yr1 = cy - yc;
+    int xr2 = cx + x2 - xc;
+    int yr2 = cy + y2 - yc;
+
+    int tmp = xr2;
+    xr2  =  yr2;
+    yr2  = -tmp;
+
+    tmp = xr1;
+    xr1  =  yr1;
+    yr1  = -tmp;
+
+    cx = xr1 + xc;
+    cy = yr1 + yc;
+    x2 = xr2 - xr1;
+    y2 = yr2 - yr1;
 }
 
 // --------------------------------------------------------------------------

diff --git a/qucs/paintings/ellipse.h b/qucs/paintings/ellipse.h
@@ -47,7 +47,7 @@ class Ellipse : public Painting  {
   bool resizeTouched(float, float, float);
   void MouseResizeMoving(int, int, Schematic*);
 
-  void rotate();
+  void rotate(int, int);
   void mirrorX();
   void mirrorY();
   bool Dialog();

diff --git a/qucs/paintings/ellipsearc.cpp b/qucs/paintings/ellipsearc.cpp
@@ -345,16 +345,29 @@ bool EllipseArc::getSelected(float fX, float fY, float w)
 
 // --------------------------------------------------------------------------
 // Rotates around the center.
-void EllipseArc::rotate()
+// Rotates around the center.
+void EllipseArc::rotate(int xc, int yc)
 {
-  cy += (y2-x2) >> 1;
-  cx += (x2-y2) >> 1;
-  int tmp = x2;
-  x2 = y2;
-  y2 = tmp;
-
-  Angle += 16*90;
-  if(Angle >= 16*360)  Angle -= 16*360;
+    int xr1 = cx - xc;
+    int yr1 = cy - yc;
+    int xr2 = cx + x2 - xc;
+    int yr2 = cy + y2 - yc;
+
+    int tmp = xr2;
+    xr2  =  yr2;
+    yr2  = -tmp;
+
+    tmp = xr1;
+    xr1  =  yr1;
+    yr1  = -tmp;
+
+    cx = xr1 + xc;
+    cy = yr1 + yc;
+    x2 = xr2 - xr1;
+    y2 = yr2 - yr1;
+
+    Angle += 16*90;
+    if(Angle >= 16*360)  Angle -= 16*360;
 }
 
 // --------------------------------------------------------------------------

diff --git a/qucs/paintings/ellipsearc.h b/qucs/paintings/ellipsearc.h
@@ -45,7 +45,7 @@ class EllipseArc : public Painting  {
   bool resizeTouched(float, float, float);
   void MouseResizeMoving(int, int, Schematic*);
 
-  void rotate();
+  void rotate(int, int);
   void mirrorX();
   void mirrorY();
   bool Dialog();

diff --git a/qucs/paintings/graphicline.cpp b/qucs/paintings/graphicline.cpp
@@ -291,14 +291,25 @@ void GraphicLine::Bounding(int& _x1, int& _y1, int& _x2, int& _y2)
 
 // --------------------------------------------------------------------------
 // Rotates around the center.
-void GraphicLine::rotate()
+void GraphicLine::rotate(int xc, int yc)
 {
-  cx += (x2>>1) - (y2>>1);
-  cy += (x2>>1) + (y2>>1);
-
-  int tmp = x2;
-  x2  =  y2;
-  y2  = -tmp;
+    int xr1 = cx - xc;
+    int yr1 = cy - yc;
+    int xr2 = cx + x2 - xc;
+    int yr2 = cy + y2 - yc;
+
+    int tmp = xr2;
+    xr2  =  yr2;
+    yr2  = -tmp;
+
+    tmp = xr1;
+    xr1  =  yr1;
+    yr1  = -tmp;
+
+    cx = xr1 + xc;
+    cy = yr1 + yc;
+    x2 = xr2 - xr1;
+    y2 = yr2 - yr1;
 }
 
 // --------------------------------------------------------------------------

diff --git a/qucs/paintings/graphicline.h b/qucs/paintings/graphicline.h
@@ -47,7 +47,7 @@ class GraphicLine : public Painting  {
   bool resizeTouched(float, float, float);
   void MouseResizeMoving(int, int, Schematic*);
 
-  void rotate();
+  void rotate(int, int);
   void mirrorX();
   void mirrorY();
   bool Dialog();