Changeset 200 in Sophya for trunk/SophyaPI

Timestamp:

Feb 25, 1999, 2:37:21 PM (27 years ago)

Author:

ercodmgr

Message:

dessin grille + ticks axes correctement geres rz+cmv 25/2/99

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (4 diffs)
• pidrawer.h (modified) (2 diffs)

trunk/SophyaPI/PI/pidrawer.cc

@@ -226 +226 @@
 }
 
+static void BestTicks(float rmin,float rmax,int nticks,float& majt)
+{
+double d = rmax - rmin;
+double ld = log10(d);
+double fld = floor(fabs(ld));
+double del,del0;
+double fac[4] = {2.,5.,10.,20.};
+if(ld>=0.) { fld -= 1.; del0 = del = pow(10.,fld); }
+else { fld += 2.; del0 = del = pow(10., -fld); }
+int k=0;
+while( d/del > (double) nticks && k<4 ) { del = fac[k]*del0; k++; }
+majt = del;
+}
 
 void
 PIDrawer::CalcTicks()
 {
-        float xExt = xMax-xMin;
-        int lx = (int) ceil(log10(xExt)-0.1);
-        xExt = (float)pow(10.0,lx);
-        xMajTickStep = xExt/10;
-        xMinTickStep = xMajTickStep/10;
-    xFirstMajTick = int(xMin / xMajTickStep) * xMajTickStep;
-    if (xFirstMajTick < xMin) xFirstMajTick += xMajTickStep;
-    xFirstMinTick = int(xMin / xMinTickStep) * xMinTickStep;
-    if (xFirstMinTick < xMin) xFirstMinTick += xMinTickStep;
-    
-    
-        float yExt = yMax-yMin;
-        int ly = (int) ceil(log10(yExt)-0.1);
-        yExt = (float)pow(10.0,ly);
-        yMajTickStep = yExt/10;
-        yMinTickStep = yMajTickStep/10;
-    yFirstMajTick = int(yMin / yMajTickStep) * yMajTickStep;
-    if (yFirstMajTick < yMin) yFirstMajTick += yMajTickStep;
-    yFirstMinTick = int(yMin / yMinTickStep) * yMinTickStep;
-    if (yFirstMinTick < yMin) yFirstMinTick += yMinTickStep;
-    
-    yMajTickLen = (xMax-xMin)/100;
-    yMinTickLen = (xMax-xMin)/250;
-    xMajTickLen = (yMax-yMin)/100;
-    xMinTickLen = (yMax-yMin)/250;
-
-}
-
-
+  BestTicks(xMin,xMax,7,xMajTickStep);
+  xMinTickStep = xMajTickStep/10;
+  xFirstMajTick = int(xMin / xMajTickStep) * xMajTickStep;
+  if (xFirstMajTick < xMin) xFirstMajTick += xMajTickStep;
+  xFirstMinTick = int(xMin / xMinTickStep) * xMinTickStep;
+  if (xFirstMinTick < xMin) xFirstMinTick += xMinTickStep;
+
+  BestTicks(yMin,yMax,12,yMajTickStep);
+  yMinTickStep = yMajTickStep/10;
+  yFirstMajTick = int(yMin / yMajTickStep) * yMajTickStep;
+  if (yFirstMajTick < yMin) yFirstMajTick += yMajTickStep;
+  yFirstMinTick = int(yMin / yMinTickStep) * yMinTickStep;
+  if (yFirstMinTick < yMin) yFirstMinTick += yMinTickStep;
+
+  yMajTickLen = (xMax-xMin)/100;
+  yMinTickLen = (xMax-xMin)/250;
+  xMajTickLen = (yMax-yMin)/100;
+  xMinTickLen = (yMax-yMin)/250;
+}
 
 void
@@ -280 +283 @@
   else g->SelLine(mLAtt);
   unsigned int flags = axesFlags;
+
   if (flags & kStdAxes) {
-  
+
     // Les axes
     
@@ -335 +339 @@
     float extYMinTickLen = flags&kExtTicks ? yMinTickLen : 0;
     float intYMinTickLen = flags&kIntTicks ? yMinTickLen : 0;
+
+    // La grille en pointilles
+
+    if (flags & kGridOn) DrawGrid(g);
 
     // Les ticks majeurs
@@ -440 +448 @@
       g->DrawString(x+xOffset, y, label);
   }
+}
+
+void
+PIDrawer::DrawGrid(PIGraphicUC* g)
+{
+  PILineAtt savlineatt = g->GetLineAtt();
+  g->SelLine(PI_ThinDashedLine);
+
+  for (float x=xFirstMajTick; x<=xMax; x += xMajTickStep)
+    g->DrawLine(x, yMin, x, yMax);
+
+  for (float y=yFirstMajTick; y<=yMax; y += yMajTickStep)
+    g->DrawLine(xMin, y, xMax, y);
+
+  g->SelLine(savlineatt);
 }
 

trunk/SophyaPI/PI/pidrawer.h

@@ -23 +23 @@
   kMinTicks    = 0x0080,
   kLabels      = 0x1000,
+  kGridOn      = 0x2000,
   kAxesDflt    = kStdAxes | kTicks | kLabels,       // Axes trace par defaut
   kAxesNone    = 0                                  // Pas de trace d axe  
@@ -82 +83 @@
   void DrawHLabels(PIGraphicUC* g, float y, float xBeg, float xStep, int just=0);
   void DrawVLabels(PIGraphicUC* g, float x, float yBeg, float yStep, int just=0);
+  void DrawGrid(PIGraphicUC* g);