*** empty log message ***

2025-03-28 21:13:26 +00:00 · 2004-05-26 19:47:55 +00:00 · 2004-05-26 19:47:55 +00:00 · 5e7d1d0e6e
commit 5e7d1d0e6e
parent c7f24e35bd
10 changed files with 60 additions and 40 deletions
--- a/2
+++ b/2
@ -21,6 +21,6 @@ Maintainer:
 	Michael Margraf <margraf@mwt.ee.tu-berlin.de>

 Authors: (see THANKS file for details)
-	Michael Margraf <margraf@mwt.ee.tu-berlin.de>
+	Michael Margraf <michael.margraf@alumni.tu-berlin.de>
 	Stefan Jahn <jahn@mwt.ee.tu-berlin.de>
 	Jens Flucke <jens.flucke@gmx.de>
--- a/qucs/ChangeLog
+++ b/qucs/ChangeLog
@ -1,3 +1,9 @@
+2004-05-26  Michael Margraf   <michael.margraf@alumni.tu-berlin.de>
+
+	* fixed bug in label handling when wire is split into two
+	wires
+	* fixed endless loop when diagram is too small for a grid
+
 2004-05-23  Michael Margraf   <michael.margraf@alumni.tu-berlin.de>

 	* improved detection of grounded wires and labeled wires
--- a/qucs/diagrams/rectdiagram.cpp
+++ b/qucs/diagrams/rectdiagram.cpp
@ -76,15 +76,18 @@ void RectDiagram::calcDiagram()

  if(fabs(xmax-xmin) < 1e-200) { xmax += fabs(xmax); xmin -= fabs(xmin); }
  if(fabs(ymax-ymin) < 1e-200) { ymax += fabs(ymax); ymin -= fabs(ymin); }
-  if(ymax == 0 && ymin == 0) { ymax = 1; ymin = -1; }
-  if(xmax == 0 && xmin == 0) { xmax = 1; xmin = -1; }
+  if(ymax == 0) if(ymin == 0) { ymax = 1; ymin = -1; }
+  if(xmax == 0) if(xmin == 0) { xmax = 1; xmin = -1; }
  xlow = xmin;  xup = xmax;
  ylow = ymin;  yup = ymax;

+  int z;
+  double numGrids, Base, Expo, GridStep, corr, zD, zDstep, GridNum;
  // ====  x grid  =======================================================
-  double numGrids = floor(double(x2)/60.0);   // minimal grid is 60 pixel
-  double Base = (xmax-xmin)/numGrids;
-  double Expo = floor(log10(Base));
+  numGrids = floor(double(x2)/60.0);   // minimal grid is 60 pixel
+  if(numGrids < 1.0) Base = xmax-xmin;
+  else Base = (xmax-xmin)/numGrids;
+  Expo = floor(log10(Base));
  Base = Base/pow(10.0,Expo);         // separate first significant digit
  if(Base < 3.5) {      // use only 1, 2 and 5, which ever is best fitted
    if(Base < 1.5) Base = 1.0;
@ -94,12 +97,12 @@ void RectDiagram::calcDiagram()
    if(Base < 7.5) Base = 5.0;
    else { Base = 1.0; Expo++; }
  }
-  double GridStep = Base * pow(10.0,Expo); // grid distance (real coordinates)
-  double corr = floor((xmax-xmin)/GridStep - numGrids);
+  GridStep = Base * pow(10.0,Expo); // grid distance (real coordinates)
+  corr = floor((xmax-xmin)/GridStep - numGrids);
  if(corr < 0.0) corr++;
  numGrids += corr;     // correct rounding faults

-  double zD = GridStep-fmod(xmax, GridStep);
+  zD = GridStep-fmod(xmax, GridStep);
  // expand grid to the right edge of diagram ?
  if(zD/GridStep < 0.2)  xup = xmax+zD;

@ -107,11 +110,11 @@ void RectDiagram::calcDiagram()
  if(zD/GridStep < 0.2) { xlow = xmin-zD;  zD = 0.0; }
  else zD = GridStep-zD;

-  double zDstep = GridStep/(xup-xlow)*double(x2);  // grid distance in pixel
-  double GridNum  = xlow + zD;
+  zDstep = GridStep/(xup-xlow)*double(x2);  // grid distance in pixel
+  GridNum  = xlow + zD;
  zD /= (xup-xlow)/double(x2);

-  int z = int(zD);
+  z = int(zD);
  while(z <= x2) {    // create all grid lines
    if(fabs(Expo) < 3.0)
      Texts.append(new Text(z-10, -17, QString::number(GridNum)));
@ -129,7 +132,8 @@ void RectDiagram::calcDiagram()

  // ====  y grid  =======================================================
  numGrids = floor(double(y2)/60.0);   // minimal grid is 60 pixel
-  Base = (ymax-ymin)/numGrids;
+  if(numGrids < 1.0) Base = ymax-ymin;
+  else Base = (ymax-ymin)/numGrids;
  Expo = floor(log10(Base));
  Base = Base/pow(10.0,Expo);        // separate first significant digit
  if(Base < 3.5) {            // use only 1, 2 and 5, which ever is best fitted
@ -185,7 +189,6 @@ void RectDiagram::calcDiagram()
  }
  x1 = maxWidth+14;

-
  // outer frame
  Lines.append(new Line(0,  y2, x2, y2, QPen(QPen::black,0)));
  Lines.append(new Line(x2, y2, x2,  0, QPen(QPen::black,0)));
--- a/qucs/qucs_de.ts
+++ b/qucs/qucs_de.ts
@ -3867,10 +3867,6 @@ Sets properties of the application</source>
        <source>Edit Qucs Properties</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Document Background Color:</source>
        <translation type="unfinished"></translation>
@ -3899,6 +3895,10 @@ Sets properties of the application</source>
        <source>Default Values</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Font (set after reload):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsView</name>
--- a/qucs/qucs_fr.ts
+++ b/qucs/qucs_fr.ts
@ -2678,10 +2678,6 @@ Sets properties of the application</source>
        <source>Edit Qucs Properties</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Document Background Color:</source>
        <translation type="unfinished"></translation>
@ -2706,6 +2702,10 @@ Sets properties of the application</source>
        <source>Default Values</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Font (set after reload):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsView</name>
--- a/qucs/qucs_it.ts
+++ b/qucs/qucs_it.ts
@ -2726,11 +2726,11 @@ Chiude il documento corrente</translation>
    </message>
    <message>
        <source>Settings</source>
-        <translation>Impostazioni</translation>
+        <translation type="obsolete">Impostazioni</translation>
    </message>
    <message>
        <source>Settings...</source>
-        <translation>Impostazioni...</translation>
+        <translation type="obsolete">Impostazioni...</translation>
    </message>
    <message>
        <source>Settings
@ -3574,10 +3574,6 @@ Sets properties of the application</source>
        <source>Edit Qucs Properties</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Document Background Color:</source>
        <translation type="unfinished"></translation>
@ -3606,6 +3602,10 @@ Sets properties of the application</source>
        <source>Default Values</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Font (set after reload):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsView</name>
--- a/qucs/qucs_pl.ts
+++ b/qucs/qucs_pl.ts
@ -2678,10 +2678,6 @@ Sets properties of the application</source>
        <source>Edit Qucs Properties</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Document Background Color:</source>
        <translation type="unfinished"></translation>
@ -2706,6 +2702,10 @@ Sets properties of the application</source>
        <source>Default Values</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Font (set after reload):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsView</name>
--- a/qucs/qucs_ro.ts
+++ b/qucs/qucs_ro.ts
@ -2678,10 +2678,6 @@ Sets properties of the application</source>
        <source>Edit Qucs Properties</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>Font:</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Document Background Color:</source>
        <translation type="unfinished"></translation>
@ -2706,6 +2702,10 @@ Sets properties of the application</source>
        <source>Default Values</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Font (set after reload):</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>QucsView</name>
--- a/qucs/qucsdoc.cpp
+++ b/qucs/qucsdoc.cpp
@ -258,6 +258,13 @@ Node* QucsDoc::insertNode(int x, int y, Element *e)
    pn->Connections.append(nw);
    nw->Port2->Connections.removeRef(pw);
    Wires.append(nw);
+
+    if(pw->Label)
+      if((pw->Label->cx > x) || (pw->Label->cy > y)) {
+	nw->Label = pw->Label;   // label goes to the new wire
+	pw->Label = 0;
+	nw->Label->pWire = nw;
+      }
    return pn;
  }

@ -1331,14 +1338,14 @@ int QucsDoc::selectElements(int x1, int y1, int x2, int y2, bool flag)
 }

 // ---------------------------------------------------
-// For moving elements: If the moving element is connected to a not moving element,
-// insert two wires. If the connected element is already a wire, use this wire.
-// Otherwise create new wire.
+// For moving elements: If the moving element is connected to a not
+// moving element, insert two wires. If the connected element is already
+// a wire, use this wire. Otherwise create new wire.
 void QucsDoc::NewMovingWires(QPtrList<Element> *p, Node *pn)
 {
  if(pn->Connections.count() < 1) return;   // return, if connected node is also moving
  Element *pe = pn->Connections.getFirst();
-  if(pe == (Element*)1) return;   // return, if it was already treated this way
+  if(pe == (Element*)1) return; // return, if it was already treated this way
  pn->Connections.prepend((Element*)1);  // to avoid doubling

  if(pn->Connections.count() == 2)    // 2, because of prepend (Element*)1
--- a/qucs/qucsview.cpp
+++ b/qucs/qucsview.cpp
@ -1305,18 +1305,22 @@ void QucsView::MReleaseResizeDiagram(QMouseEvent *Event)
  MAx3  = focusElement->cx;
  MAy3  = focusElement->cy;
  if(MAx2 < 0) {    // resize diagram
+    if(MAx2 > -10) MAx2 = -10;   // not smaller than 10 pixels
    focusElement->x2 = -MAx2;
    focusElement->cx = MAx1+MAx2;
  }
  else {
+    if(MAx2 < 10) MAx2 = 10;
    focusElement->x2 = MAx2;
    focusElement->cx = MAx1;
  }
  if(MAy2 < 0) {
+    if(MAy2 > -10) MAy2 = -10;
    focusElement->y2 = -MAy2;
    focusElement->cy = MAy1;
  }
  else {
+    if(MAy2 < 10) MAy2 = 10;
    focusElement->y2 = MAy2;
    focusElement->cy = MAy1+MAy2;
  }