Changeset 2516 in Sophya for trunk/SophyaPI/PI/piaxes.cc

Timestamp:

Mar 17, 2004, 7:04:25 PM (22 years ago)

Author:

cmv

Message:

GetDistanceToPoint et preparation des axes centres avec x0,y0

quelconques cmv 17/03/04

File:

• trunk/SophyaPI/PI/piaxes.cc (modified) (5 diffs)

trunk/SophyaPI/PI/piaxes.cc

@@ -111 +111 @@
 
     // Les axes
+    double x0axes = (xMin+xMax)/2.;
+    double y0axes = (yMin+yMax)/2.;
+    // POUR REZA: ici si on a demande de forcer les axes en x0,y0
+    // alors on le fait ici: il faut faire a peu pres ca:
+    // > if(getaxescenter()) getaxescenter(x0axes,y0axes);
+    if(x0axes<xMin || x0axes>xMax) x0axes = (xMin+xMax)/2.;
+    if(y0axes<yMin || y0axes>yMax) y0axes = (yMin+yMax)/2.;
     
-    g->DrawLine(xMin, (yMin+yMax)/2., xMax, (yMin+yMax)/2.);
-    g->DrawLine((xMin+xMax)/2., yMin, (xMin+xMax)/2., yMax);
+    g->DrawLine(xMin, y0axes, xMax, y0axes);
+    g->DrawLine(x0axes, yMin, x0axes, yMax);
     //    PIArrowMarker amk = g->GetArrowMarker();
     //    if (amk == PI_NotDefArrowMarker) 
@@ -120 +127 @@
     //    g->SelArrowMarker(5, g->GetArrowMarker());
     double xm2 = g->DeltaUCX(xMax, yMajTickLen*2.);
-    g->DrawArrowMarker(xMax, (yMin+yMax)/2., xm2, (yMin+yMax)/2., true);
+    g->DrawArrowMarker(xMax, y0axes, xm2, y0axes, true);
     double ym2 = g->DeltaUCY(yMax, xMajTickLen*2.);
-    g->DrawArrowMarker((xMin+xMax)/2., yMax, (xMin+xMax)/2., ym2, true);
+    g->DrawArrowMarker(x0axes, yMax, x0axes, ym2, true);
     // La grille en pointilles
 
@@ -130 +137 @@
   
     if (flags & kMajTicks) {
-        DrawHTicks(g, (yMin+yMax)/2., xMajTickLen, xMajTickLen, xMajTicks);
-        DrawVTicks(g, (xMin+xMax)/2., yMajTickLen, yMajTickLen, yMajTicks);
+        DrawHTicks(g, y0axes, xMajTickLen, xMajTickLen, xMajTicks);
+        DrawVTicks(g, x0axes, yMajTickLen, yMajTickLen, yMajTicks);
     }
     
@@ -137 +144 @@
   
     if (flags & kMinTicks) {
-        DrawHTicks(g, (yMin+yMax)/2., xMinTickLen, xMinTickLen, xMinTicks);
-        DrawVTicks(g, (xMin+xMax)/2., yMinTickLen, yMinTickLen, yMinTicks);
+        DrawHTicks(g, y0axes, xMinTickLen, xMinTickLen, xMinTicks);
+        DrawVTicks(g, x0axes, yMinTickLen, yMinTickLen, yMinTicks);
     }
     
@@ -146 +153 @@
       double declab = 2*xMajTickLen;
       if (!aYdir)
-        DrawHLabels(g, (yMin+yMax)/2.-declab, xMajTicks, PI_VerticalTop);
+        DrawHLabels(g, y0axes-declab, xMajTicks, PI_VerticalTop);
       else 
-        DrawHLabels(g, (yMin+yMax)/2.+declab, xMajTicks, PI_VerticalTop);
+        DrawHLabels(g, y0axes+declab, xMajTicks, PI_VerticalTop);
 
       declab = 2.*yMajTickLen;
       if (!aXdir)
-        DrawVLabels(g, (xMin+xMax)/2.-declab, yMajTicks, PI_HorizontalRight);
+        DrawVLabels(g, x0axes-declab, yMajTicks, PI_HorizontalRight);
       else 
-        DrawVLabels(g, (xMin+xMax)/2.+declab, yMajTicks, PI_HorizontalRight);
+        DrawVLabels(g, x0axes+declab, yMajTicks, PI_HorizontalRight);
     }