Changeset 38706

Timestamp:

Sep 3, 2015, 6:25:56 AM (11 years ago)

Author:

eugene

Message:

clip the tickmarks if they are outside the window; only add labels up to the box limits

Location:

branches/eam_branches/ipp-20150625/Ohana/src/kapa2

Files:

• include/prototypes.h (modified) (1 diff)
• src/DrawFrame.c (modified) (5 diffs)
• src/PSFrame.c (modified) (1 diff)
• src/bDrawFrame.c (modified) (1 diff)

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/include/prototypes.h

@@ -40 +40 @@
 void          DrawYErrors         PROTO((KapaGraphWidget *graph, Gobjects *objects));
 void          DrawTick            PROTO((Graphic *graphic, Axis *axis, int P, TickMarkData *tick, int naxis));
-void          AxisTickScale       PROTO((Axis *axis, double *major, double *minor, int *nsignif));
+void          AxisTickScale       PROTO((Axis *axis, double *range, double *major, double *minor, int *nsignif));
 TickMarkData *CreateAxisTicks     PROTO((Axis *axis, int *nticks));
 int           PrintTick           PROTO((char *string, double value, double min, double max, int nsignif));

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src/DrawFrame.c

@@ -116 +116 @@
 
   if ((naxis == 0) || (naxis == 2)) {
-    x = MAX(x, fx);
-  }
-  //   y = MAX(y, fy);
-  // }
+    x = MIN(MAX(x, fx),fx+dfx);
+  }
+  if ((naxis == 1) || (naxis == 3)) {
+    y = MAX(MIN(y, fy),fy+dfy);
+  }
 
   dir = ((naxis == 0) || (naxis == 1)) ? -1 : +1;
@@ -154 +155 @@
 # define MIN_RANGE 1e-30
 
-void AxisTickScale (Axis *axis, double *major, double *minor, int *nsignif) {
-
-  double range, lrange, factor, mantis, fmantis, power;
-
-  range = axis[0].max - axis[0].min;
-  if (fabs(range) < MIN_RANGE) {
-    range = (range < 0) ? -MIN_RANGE : +MIN_RANGE;
-  }
-
-  lrange = log10(MAX(fabs(range), MIN_RANGE));
+void AxisTickScale (Axis *axis, double *range, double *major, double *minor, int *nsignif) {
+
+  double lrange, factor, mantis, fmantis, power;
+
+  *range = (axis[0].max - axis[0].min);
+  if (fabs(*range) < MIN_RANGE) {
+    *range = (*range < 0) ? -MIN_RANGE : +MIN_RANGE;
+  }
+
+  lrange = log10(MAX(fabs(*range), MIN_RANGE));
+  double truncRange = ((int) ((lrange + 0.005) * 1000)) / 1000.0;
+  lrange = truncRange;
+
   mantis = modf (lrange, &factor);
   if (mantis < 0.0) {
@@ -240 +244 @@
   if (isnan(axis->max) || isinf(axis->max)) return NULL;
   
-  range = axis->max - axis->min;
-
-  // not sure why I skip out here instead of using the MIN_RANGE value
-  if (fabs(range) < MIN_RANGE) return NULL;
-  
-  if (fabs(range) < MIN_RANGE) {
-    range = (range < 0) ? -MIN_RANGE : +MIN_RANGE;
-  }
-
   // length of the axis in pixels
   // int nPixels = hypot(axis->dfx, axis->dfy);
   // double dPixels = nPixels / range; // axis pixel-scale
 
-  AxisTickScale (axis, &major, &minor, &nsignif);
+  AxisTickScale (axis, &range, &major, &minor, &nsignif);
 
   // be a little generous 
@@ -260 +255 @@
 
   // value of the tick mark
-  ifirst = (axis->min < 0.0) ? (axis->min/minor - 0.05) : (axis->min/minor + 0.05);
+  if (axis->min > 0.0) {
+    double minValue = axis->min / minor;
+    if (minValue - (int)minValue < +0.1) {
+      ifirst = (int) minValue;
+    } else {
+      ifirst = (int) (minValue + 1);
+    }
+  } else {
+    double minValue = axis->min / minor;
+    if (minValue - (int)minValue > -0.1) {
+      ifirst = (int) minValue;
+    } else {
+      ifirst = (int) (minValue - 1);
+    }
+  }
+  // ifirst = (axis->min < 0.0) ? (axis->min/minor - 0.01) : (axis->min/minor + 0.01);
   first = minor*ifirst;
   
@@ -292 +302 @@
       value -= minor;
     
-    done |= (range > 0) && (value > axis->max);
-    done |= (range < 0) && (value < axis->max);
+    done |= (range > 0) && (value > axis->max + 0.1*minor);
+    done |= (range < 0) && (value < axis->max - 0.1*minor);
+    // fprintf (stderr, "%d : %f %f %f %f\n", done, range, value, axis->max, 0.1*minor);
   }
 

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src/PSFrame.c

@@ -81 +81 @@
   y = fy + (value-min)*dfy/(max - min);
 
+  if ((naxis == 0) || (naxis == 2)) {
+    x = MIN(MAX(x, fx),fx+dfx);
+  }
+  if ((naxis == 1) || (naxis == 3)) {
+    y = MIN(MAX(y, fy),fy+dfy);
+  }
+
   dir = ((naxis == 0) || (naxis == 1)) ? +1 : -1;
   dx = dir*size*dfy*n;  

branches/eam_branches/ipp-20150625/Ohana/src/kapa2/src/bDrawFrame.c

@@ -84 +84 @@
   y = fy + (value-min)*dfy/(max - min);
 
+  if ((naxis == 0) || (naxis == 2)) {
+    x = MIN(MAX(x, fx),fx+dfx);
+  }
+  if ((naxis == 1) || (naxis == 3)) {
+    y = MAX(MIN(y, fy),fy+dfy);
+  }
+
   dir = ((naxis == 0) || (naxis == 1)) ? -1 : +1;
   dx = dir*size*dfy*n;