Changeset 28003 for branches/pap/Ohana/src/kapa2/src/DrawFrame.c

Timestamp:

May 18, 2010, 12:49:05 PM (16 years ago)

Author:

eugene

Message:

merging changes from trunk into branches/pap

Location:

branches/pap

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/kapa2/src/DrawFrame.c (modified) (4 diffs)

branches/pap/Ohana/src/kapa2/src/DrawFrame.c

@@ -1 +1 @@
 # include "Ximage.h"
-# define MIN_RANGE 1e-10
+
 # define DrawLine(X,Y,DX,DY) (XDrawLine (graphic->display, graphic->window, graphic->gc, (int)(X), (int)(Y), (int)(X+DX), (int)(Y+DY)))
   
-static Graphic *graphic;
-
-void DrawFrame (KapaGraphWidget *graph) {
-  
-  int i, fx, fy, dfx, dfy, P, IsLabel, IsMajor;
-  double range, major, minor, first, next, lweight;
+int DrawFrame (KapaGraphWidget *graph) {
+  
+  int i, j, Nticks, P;
+  double fx, fy, dfx, dfy, lweight;
+  Graphic *graphic;
+  TickMarkData *ticks;
+  int color;
 
   graphic = GetGraphic();
 
-  /* each axis is drawn independently, but ticks and labels are placed according to
-     perpendicular distance. */
+  /* each axis is drawn independently, but ticks and labels are placed according to perpendicular distance. */
   for (i = 0; i < 4; i++) {
-    fx = graph[0].axis[i].fx;
-    fy = graph[0].axis[i].fy;
+    fx  = graph[0].axis[i].fx;
+    fy  = graph[0].axis[i].fy;
     dfx = graph[0].axis[i].dfx;
     dfy = graph[0].axis[i].dfy;
-    P = hypot ((double)graph[0].axis[(i+1)%2].dfx, (double)graph[0].axis[(i+1)%2].dfy);
+    P = hypot (graph[0].axis[(i+1)%2].dfx, graph[0].axis[(i+1)%2].dfy);
 
     lweight = MAX (0, MIN (10, graph[0].axis[i].lweight));
+    color = MAX (0, MIN (15, graph[0].axis[i].color));
+
     XSetLineAttributes (graphic->display, graphic->gc, lweight, LineSolid, CapNotLast, JoinMiter);
-    
-    graph[0].axis[i].color = MAX (0, MIN (15, graph[0].axis[i].color));
-
-    XSetForeground (graphic->display, graphic->gc, graphic->color[graph[0].axis[i].color]);
-    DrawRotTextInit (graphic->display, graphic->window, graphic->gc, graphic->color[graph[0].axis[i].color], graphic->back);
-
-    // fprintf (stderr, "axis: %d, color: %d, %ld, weight: %f\n", i, graph[0].axis[i].color, graphic->color[graph[0].axis[i].color], lweight);
+    XSetForeground (graphic->display, graphic->gc, graphic->color[color]);
+    DrawRotTextInit (graphic->display, graphic->window, graphic->gc, graphic->color[color], graphic->back);
 
     if (graph[0].axis[i].isaxis) {
       DrawLine (fx, fy, dfx, dfy);
-      // fprintf (stderr, "%d : %d %d - %d %d\n", i, fx, fy, dfx, dfy);
-      // if (i == 0) {
-      //        int j;
-      //        for (j = fx; j < fx + dfx; j+= 10) {
-      //          DrawLine (j, fy-10, 0, 20);
-      //        }
-      // }
     }
     
     if (graph[0].axis[i].areticks) {
-      if (isnan(graph[0].axis[i].min) || isinf(graph[0].axis[i].min)) continue;
-      if (isnan(graph[0].axis[i].max) || isinf(graph[0].axis[i].max)) continue;
-
-      range = graph[0].axis[i].max - graph[0].axis[i].min;
-      if (fabs(range) < MIN_RANGE) continue;
-
-      if (fabs(range) < MIN_RANGE) {
-        range = (range < 0) ? -MIN_RANGE : +MIN_RANGE;
+      ticks = CreateAxisTicks (&graph[0].axis[i], &Nticks);
+      for (j = 0; j < Nticks; j++) {
+        DrawTick (graphic, &graph[0].axis[i], P, &ticks[j], i);
       }
-
-      AxisTickScale (&graph[0].axis[i], &major, &minor);
-
-      first = minor*((int)(graph[0].axis[i].min/minor));
-      if ((range > 0) && (first < graph[0].axis[i].min)) {
-        first += minor;
-      }
-      if ((range < 0) && (first > graph[0].axis[i].min)) {
-        first -= minor;
-      }
-      for (next = first; ((range > 0) && (next <= graph[0].axis[i].max)) || ((range < 0) && (next >= graph[0].axis[i].max));) {
-        IsMajor = FALSE;
-        IsMajor |= (fabs((int)(next/major) - (next/major)) < 0.5*(minor/major));
-        IsMajor |= (fabs((int)((next + 0.5*minor)/major) - (next/major)) < 0.5*(minor/major));
-        IsMajor |= (fabs ((int)((next - 0.5*minor)/major) - (next/major)) < 0.5*(minor/major));
-        IsLabel = (IsMajor && graph[0].axis[i].islabel);
-        DrawTick (fx, fy, dfx, dfy, P, graph[0].axis[i].min, graph[0].axis[i].max, next, IsLabel, IsMajor, i);
-        if (range > 0) 
-          next += minor;
-        else 
-          next -= minor;
-      }
+      FREE (ticks);
     }
   }
-}
-
-void DrawTick (int fx, int fy, int dfx, int dfy, 
-               int P, double min, double max, 
-               double value, int IsLabel, int IsMajor, int naxis) {
-  
-  int x, y, dx, dy, pos, dir, fontsize;
-  double size, n;
+  return (TRUE);
+}
+
+void DrawTick (Graphic *graphic, Axis *axis, int P, TickMarkData *tick, int naxis) {
+  
+  double x, y, dx, dy;
+  int pos, dir, fontsize;
+  double size, n, pad;
   char string[64], *fontname;
 
-  if (IsMajor) { 
+  double fx  = axis->fx;
+  double fy  = axis->fy;
+  double dfx = axis->dfx;
+  double dfy = axis->dfy;
+
+  double min = axis->min;
+  double max = axis->max;
+
+  double value = tick->value;
+
+  pos = size = 0;
+
+  if (tick->IsMajor) { 
     size = MAX (0.02, 7.0 / P); 
   } else {
@@ -92 +68 @@
   }
   
-  n = P / sqrt ((double)(dfx*dfx + dfy*dfy));
+  n = P / hypot(dfx, dfy);
   x = fx + (value-min)*dfx/(max - min);
   y = fy + (value-min)*dfy/(max - min);
 
-  dir = +1;
-  if ((naxis == 0) || (naxis == 1)) dir *= -1;
+  if ((naxis == 0) || (naxis == 2)) {
+    x = MAX(x, fx);
+  }
+  //   y = MAX(y, fy);
+  // }
+
+  dir = ((naxis == 0) || (naxis == 1)) ? -1 : +1;
   dx = dir*size*dfy*n;  
   dy = dir*size*dfx*n;
@@ -103 +84 @@
   DrawLine (x, y, dx, dy);
 
-# ifdef IN_AND_OUT_TICKS
-# define GAP 0.03
-# else
-# define GAP 0.01
-# endif
-
-  if (IsLabel) {
+  if (tick->IsLabel) {
+    int xt, yt;
+
     fontname = GetRotFont (&fontsize);
-    pos = 0;
+    
+    pad = !isnan(axis->ticktextPad) ? axis->ticktextPad*fontsize : fontsize + 4.0;
+    // pad = !isnan(axis->ticktextPad) ? axis->ticktextPad*fontsize : 0.8*fontsize + 1.0;
     
     /* temporarily assume rectilinear axes */
-    if (naxis == 0) { dx = 0; dy = -dir*(0.8*fontsize + 1); pos = 1; }
-    if (naxis == 2) { dx = 0; dy = -dir*(0.8*fontsize + 1); pos = 7; }
-
-    if (naxis == 1) { dy = 0; dx = -(0.8*fontsize + 1); pos = 3; }
-    if (naxis == 3) { dy = 0; dx = +(0.8*fontsize + 1); pos = 5; }
-
-    x = fx + (value-min)*dfx/(max - min) + dx;
-    y = fy + (value-min)*dfy/(max - min) + dy;
+    if (naxis == 0) { dx = 0; dy = +1.0*pad; pos = 7; }
+    if (naxis == 2) { dx = 0; dy = -1.0*pad; pos = 1; }
+
+    if (naxis == 1) { dy = 0; dx = -0.5*pad; pos = 3; }
+    if (naxis == 3) { dy = 0; dx = +0.5*pad; pos = 5; }
+
+    xt = fx + (value-min)*dfx/(max - min) + dx;
+    yt = fy + (value-min)*dfy/(max - min) + dy;
     if (fabs(value/(max-min)) < 0.001) { value = 0.0; }
     sprintf (string, "%4g", value);
-    DrawRotText (x, y, string, pos, 0.0);
-  }
-  
-}
-
+    DrawRotText (xt, yt, string, pos, 0.0);
+  }
+}
+
+# define MIN_RANGE 1e-10
 
 void AxisTickScale (Axis *axis, double *major, double *minor) {
@@ -192 +171 @@
   }
 }
+
+TickMarkData *CreateAxisTicks (Axis *axis, int *nticks) {
+
+  TickMarkData *ticks;
+  double range, major, minor, first, value, dPixels, overshoot;
+  int i, NTICKS, nPixels, done, ifirst;
+
+  *nticks = 0;
+
+  if (isnan(axis->min) || isinf(axis->min)) return NULL;
+  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
+  nPixels = hypot(axis->dfx, axis->dfy);
+  dPixels = nPixels / range; // axis pixel-scale
+
+  AxisTickScale (axis, &major, &minor);
+
+  // be a little generous 
+  NTICKS = (int)(fabs(range / minor)) + 2;
+  ALLOCATE (ticks, TickMarkData, NTICKS);
+
+  // value of the tick mark
+  ifirst = (axis->min < 0.0) ? (axis->min/minor - 0.05) : (axis->min/minor + 0.05);
+  first = minor*ifirst;
+  
+  // allow undershoot by 1 pixel
+  overshoot = (axis->min - first) * dPixels;
+  // if (overshoot > 0.5) {
+  //   if (range > 0) {
+  //     first += minor;
+  //   } else {
+  //     first -= minor;
+  //   }
+  // }
+
+  // loop to find the ticks
+  done = FALSE;
+  value = first; 
+  for (i = 0; !done && (i < NTICKS); i++) {
+    ticks[i].IsMajor = FALSE;
+    ticks[i].IsMajor |= (fabs((int)(value/major) - (value/major)) < 0.5*(minor/major));
+    ticks[i].IsMajor |= (fabs((int)((value + 0.5*minor)/major) - (value/major)) < 0.5*(minor/major));
+    ticks[i].IsMajor |= (fabs((int)((value - 0.5*minor)/major) - (value/major)) < 0.5*(minor/major));
+    ticks[i].IsLabel = (ticks[i].IsMajor && axis->islabel);
+    ticks[i].value = value;
+    if (range > 0) 
+      value += minor;
+    else 
+      value -= minor;
+    
+    done |= (range > 0) && (value > axis->max);
+    done |= (range < 0) && (value < axis->max);
+  }
+
+  *nticks = i;
+  return (ticks);
+}