Changeset 27693

Timestamp:

Apr 14, 2010, 6:21:53 PM (16 years ago)

Author:

eugene

Message:

plotting cleanups

Location:

branches/eam_branches/Ohana.20100407/src

Files:

• kapa2/doc/mark.issues.txt (modified) (1 diff)
• kapa2/doc/notes.txt (added)
• kapa2/include/prototypes.h (modified) (1 diff)
• kapa2/include/structures.h (modified) (1 diff)
• kapa2/src/DrawFrame.c (modified) (5 diffs)
• kapa2/src/Graphs.c (modified) (2 diffs)
• kapa2/src/LoadFrame.c (modified) (3 diffs)
• kapa2/src/SetGraphData.c (modified) (2 diffs)
• kapa2/src/SetGraphSize.c (modified) (7 diffs)
• libkapa/include/kapa.h (modified) (1 diff)
• libkapa/src/KapaWindow.c (modified) (3 diffs)
• opihi/cmd.data/box.c (modified) (6 diffs)
• opihi/lib.data/open_graph.c (deleted)
• opihi/lib.data/open_image.c (deleted)

branches/eam_branches/Ohana.20100407/src/kapa2/doc/mark.issues.txt

@@ +1 @@
+
+
 -> The "plot" command needs to be fixed so that boundaries of contours do
 not cause it to draw excessive amounts of lines connecting unrelated

branches/eam_branches/Ohana.20100407/src/kapa2/include/prototypes.h

@@ -39 +39 @@
 void          DrawXErrors         PROTO((KapaGraphWidget *graph, Gobjects *objects));
 void          DrawYErrors         PROTO((KapaGraphWidget *graph, Gobjects *objects));
-void          DrawTick            PROTO((int fx, int fy, int dfx, int dfy, int P, double min, double max, double value, int IsLabel, int IsMajor, int naxis));
+void          DrawTick            PROTO((Axis *axis, int P, double value, int IsLabel, int IsMajor, int naxis));
 void          AxisTickScale       PROTO((Axis *axis, double *major, double *minor));
 

branches/eam_branches/Ohana.20100407/src/kapa2/include/structures.h

@@ -137 +137 @@
   double min, max;
   char isaxis, areticks, islabel, islog;
+  double pad, labelPad, ticktextPad;
   double fx, dfx, fy, dfy;  /* axis location on graphic */
   double lweight;

branches/eam_branches/Ohana.20100407/src/kapa2/src/DrawFrame.c

@@ -8 +8 @@
   
   int i, fx, fy, dfx, dfy, P, IsLabel, IsMajor;
-  double range, major, minor, first, next, lweight;
+  double range, major, minor, first, value, lweight;
 
   graphic = GetGraphic();
@@ -62 +62 @@
         first -= minor;
       }
-      for (next = first; ((range > 0) && (next <= graph[0].axis[i].max)) || ((range < 0) && (next >= graph[0].axis[i].max));) {
+      for (value = first; ((range > 0) && (value <= graph[0].axis[i].max)) || ((range < 0) && (value >= 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));
+        IsMajor |= (fabs((int)(value/major) - (value/major)) < 0.5*(minor/major));
+        IsMajor |= (fabs((int)((value + 0.5*minor)/major) - (value/major)) < 0.5*(minor/major));
+        IsMajor |= (fabs ((int)((value - 0.5*minor)/major) - (value/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);
+        DrawTick (&graph[0].axis[i], P, value, IsLabel, IsMajor, i);
         if (range > 0) 
-          next += minor;
+          value += minor;
         else 
-          next -= minor;
+          value -= minor;
       }
     }
@@ -78 +78 @@
 }
 
-void DrawTick (int fx, int fy, int dfx, int dfy, 
-               int P, double min, double max, 
-               double value, int IsLabel, int IsMajor, int naxis) {
+void DrawTick (Axis *axis, int P, double value, int IsLabel, int IsMajor, int naxis) {
   
   int x, y, dx, dy, pos, dir, fontsize;
-  double size, n;
+  double size, n, pad;
   char string[64], *fontname;
+
+  int fx  = axis->fx;
+  int fy  = axis->fy;
+  int dfx = axis->dfx;
+  int dfy = axis->dfy;
+
+  double min = axis->min;
+  double max = axis->max;
 
   if (IsMajor) { 
@@ -96 +102 @@
   y = fy + (value-min)*dfy/(max - min);
 
-  dir = +1;
-  if ((naxis == 0) || (naxis == 1)) dir *= -1;
+  dir = ((naxis == 0) || (naxis == 1)) ? -1 : +1;
   dx = dir*size*dfy*n;  
   dy = dir*size*dfx*n;
@@ -103 +108 @@
   DrawLine (x, y, dx, dy);
 
-# ifdef IN_AND_OUT_TICKS
-# define GAP 0.03
-# else
-# define GAP 0.01
-# endif
-
   if (IsLabel) {
     fontname = GetRotFont (&fontsize);
     pos = 0;
     
+    pad = isfinite(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 == 0) { dx = 0; dy = +pad; pos = 1; }
+    if (naxis == 2) { dx = 0; dy = -pad; 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; }
+    if (naxis == 1) { dy = 0; dx = -pad; pos = 3; }
+    if (naxis == 3) { dy = 0; dx = +pad; pos = 5; }
 
     x = fx + (value-min)*dfx/(max - min) + dx;

branches/eam_branches/Ohana.20100407/src/kapa2/src/Graphs.c

@@ -13 +13 @@
     graph[0].axis[i].min = 0.0;
     graph[0].axis[i].max = 1.0;
-    graph[0].axis[i].isaxis = FALSE;
-    graph[0].axis[i].areticks = FALSE;
-    graph[0].axis[i].islabel = FALSE;
+    graph[0].axis[i].isaxis = TRUE;
+    graph[0].axis[i].areticks = TRUE;
+    graph[0].axis[i].islabel = (i < 2);
     graph[0].axis[i].lweight = 0.0;
     graph[0].axis[i].color = 0;
+    graph[0].axis[i].ticktextPad = NAN;
+    graph[0].axis[i].labelPad = NAN;
+    graph[0].axis[i].pad = NAN;
   }    
   for (i = 0; i < 8; i++) {
@@ -80 +83 @@
     
   /* reset axes and labels */
-  for (i = 0; i < 4; i++) {
-    graph[0].axis[i].isaxis = FALSE;
-    graph[0].axis[i].islabel = FALSE;
-    graph[0].axis[i].areticks = FALSE;
-  }
+  // for (i = 0; i < 4; i++) {
+  //   graph[0].axis[i].isaxis = FALSE;
+  //   graph[0].axis[i].islabel = FALSE;
+  //   graph[0].axis[i].areticks = FALSE;
+  // }
   for (i = 0; i < 8; i++) {
     strcpy (graph[0].label[i].text, "");

branches/eam_branches/Ohana.20100407/src/kapa2/src/LoadFrame.c

@@ -5 +5 @@
   int i, color;
   char Axis[16], Labels[16], Ticks[16];
-  double lweight;
+  double lweight, ticktextPad, labelPad, padXm, padXp, padYm, padYp;
   Section *section;
   KapaGraphWidget *graph;
@@ -28 +28 @@
   color = MAX (0, MIN (15, color));
 
+  KiiScanMessage (sock, "%lf %lf %lf %lf %lf %lf", &ticktextPad, &labelPad, &padXm, &padXp, &padYm, &padYp);
+  graph[0].axis[0].pad = padXm;
+  graph[0].axis[1].pad = padYm;
+  graph[0].axis[2].pad = padXp;
+  graph[0].axis[3].pad = padYp;
+
   KiiScanMessage (sock, "%s %s %s", Axis, Labels, Ticks);
 
@@ -33 +39 @@
     graph[0].axis[i].lweight = lweight;
     graph[0].axis[i].color = color;
+
+    graph[0].axis[i].ticktextPad = ticktextPad;
+    graph[0].axis[i].labelPad = labelPad;
 
     switch (Axis[i]) {

branches/eam_branches/Ohana.20100407/src/kapa2/src/SetGraphData.c

@@ -28 +28 @@
                   &graph[0].data.lweight, 
                   &graph[0].data.size);
+
+  KiiScanMessage (sock, "%lf %lf %lf %lf %lf %lf", 
+                  &graph[0].data.ticktextPad, 
+                  &graph[0].data.labelPad, 
+                  &graph[0].data.padXm, 
+                  &graph[0].data.padXp, 
+                  &graph[0].data.padYm, 
+                  &graph[0].data.padYp);
 
   KiiScanMessage (sock, "%lf %lf %lf %lf", 
@@ -96 +104 @@
                   graph[0].data.lweight, graph[0].data.size);
 
+  KiiSendMessage (sock, "%g %g %g %g %g %g", 
+                  graph[0].data.ticktextPad, 
+                  graph[0].data.labelPad, 
+                  graph[0].data.padXm, 
+                  graph[0].data.padXp, 
+                  graph[0].data.padYm, 
+                  graph[0].data.padYp);
+
   KiiSendMessage (sock, "%g %g %g %g", 
                   graph[0].data.xmin, graph[0].data.xmax, 

branches/eam_branches/Ohana.20100407/src/kapa2/src/SetGraphSize.c

@@ -8 +8 @@
   int fontsize, bump, Nc;
   int textpad, textdY, WdY; 
-  double PADx, PADy, Dx, Dy;
-  double PXm, PXp, PYm, PYp;
+  double padXm, padXp, padYm, padYp;
+  double minPADx, maxPADx, minPADy, maxPADy;
+  double minPAD, maxPAD;
   double X0, Y0, dX, dY;
   char string[64], *fontname;
@@ -22 +23 @@
   fontname = GetRotFont (&fontsize);
 
-  PADx = MAX (graphic->dx / 20.0, fontsize);
-  PADy = MAX (graphic->dy / 20.0, fontsize);
-  Dx = graphic->dx - 2*PADx;
-  Dy = graphic->dy - 2*PADy;
+  minPADx = fontsize;
+  minPADy = fontsize;
+  maxPADx = 5*fontsize;
+  maxPADy = 5*fontsize;
 
-  /* each graph has a padding PXm, PXp, PYm, PYp */
-  PXm = (graph[0].axis[1].islabel) ? 4*fontsize : 0;
-  PXp = (graph[0].axis[3].islabel) ? 4*fontsize : 0;
-  PYm = (graph[0].axis[0].islabel) ? 4*fontsize : 0;
-  PYp = (graph[0].axis[2].islabel) ? 4*fontsize : 0;
- 
+  // padXm : padding below x-axis, padYp : padding to right of y-axis, etc
+  if (isnan(graph[0].axis[0].pad)) {
+      padXm = graph[0].axis[0].islabel ? maxPADx : minPADx;
+  } else {
+      padXm = graph[0].axis[0].pad * fontsize;
+  }
+  if (isnan(graph[0].axis[1].pad)) {
+      padYm = graph[0].axis[1].islabel ? maxPADx : minPADx;
+  } else {
+      padYm = graph[0].axis[1].pad * fontsize;
+  }
+  if (isnan(graph[0].axis[2].pad)) {
+      padXp = graph[0].axis[2].islabel ? maxPADx : minPADx;
+  } else {
+      padXp = graph[0].axis[2].pad * fontsize;
+  }
+  if (isnan(graph[0].axis[3].pad)) {
+      padYp = graph[0].axis[3].islabel ? maxPADx : minPADx;
+  } else {
+      padYp = graph[0].axis[3].pad * fontsize;
+  }
+
   /* basic size of the graph in Xwindow coordinates */
-  X0 = PADx + PXm + (Dx * section[0].x);
-  Y0 = PADy + PYm + (Dy * section[0].y);
-  dX = (Dx * section[0].dx) - PXp - PXm;
-  dY = (Dy * section[0].dy) - PYp - PYm;
+  X0 = graphic[0].dx * section[0].x + padYm;
+  Y0 = graphic[0].dy * section[0].y + padXm;
+  dX = graphic[0].dx * section[0].dx - padYm - padYp;
+  dY = graphic[0].dy * section[0].dy - padXm - padXp;
 
   // if we are tied to an image, make mods as needed
@@ -47 +64 @@
     switch (section->image->location) {
       case 1:
-        Y0 = graphic[0].dy * section[0].y + 2*PAD1 + WdY + 2; // tied to image in Y
+        Y0 = graphic[0].dy * section[0].y  + 2*PAD1 + WdY + 2; // tied to image in Y
         dY = graphic[0].dy * section[0].dy - 5*PAD1 - WdY - COLORPAD + 1;
         break;
       case 3:
-        dY = graphic[0].dy * section[0].dy - 5*PAD1 - WdY - COLORPAD - PADy - PYm;
+        dY = graphic[0].dy * section[0].dy - 5*PAD1 - WdY - COLORPAD - padYm - padYp;
         break;
       case 2:
@@ -58 +75 @@
         break;
       case 4:
-        dX = graphic[0].dx * section[0].dx - 3*PAD1 - ZOOM_X - PADx - PXm;
+        dX = graphic[0].dx * section[0].dx - 3*PAD1 - ZOOM_X - padXm - padXp;
         break;
     }
@@ -85 +102 @@
   graph[0].axis[3].dfy = -dY;
 
-  PADx = 0.8*fontsize + 2;
-  PADy = 3.0*fontsize + 4;
+  minPAD = 0.8*fontsize + 2;
+  maxPAD = 3.0*fontsize + 4;
 
   /* define locations of axis labels */
   graph[0].label[LABELX0].x = graph[0].axis[0].fx + 0.5*graph[0].axis[0].dfx;
-  bump = (graph[0].axis[0].islabel) ? PADy : PADx;
+  if (isnan(graph[0].axis[0].labelPad)) {
+      bump = (graph[0].axis[0].islabel) ? maxPAD : minPAD;
+  } else {
+      bump = graph[0].axis[0].labelPad * fontsize;
+  }
   graph[0].label[LABELX0].y = graph[0].axis[0].fy + bump;
 
   graph[0].label[LABELX1].x = graph[0].axis[2].fx + 0.5*graph[0].axis[2].dfx;
-  bump = (graph[0].axis[2].islabel) ? PADy : PADx;
+  if (isnan(graph[0].axis[2].labelPad)) {
+      bump = (graph[0].axis[2].islabel) ? maxPAD : minPAD;
+  } else {
+      bump = graph[0].axis[2].labelPad * fontsize;
+  }
   graph[0].label[LABELX1].y = graph[0].axis[2].fy - bump;
 
@@ -104 +129 @@
 
   graph[0].label[LABELY0].y = graph[0].axis[1].fy + 0.5*graph[0].axis[1].dfy;
-  bump = (graph[0].axis[1].islabel) ? (0.8*Nc*fontsize + 1) : PADx;
+  if (isnan(graph[0].axis[1].labelPad)) {
+      bump = (graph[0].axis[1].islabel) ? (0.8*Nc*fontsize + 1) : minPAD;
+  } else {
+      bump = graph[0].axis[1].labelPad * fontsize;
+  }
   graph[0].label[LABELY0].x = graph[0].axis[1].fx - bump;
 
@@ -113 +142 @@
 
   graph[0].label[LABELY1].y = graph[0].axis[3].fy + 0.5*graph[0].axis[3].dfy;
-  bump = (graph[0].axis[3].islabel) ? (0.8*Nc*fontsize + 1) : PADx;
+  if (isnan(graph[0].axis[3].labelPad)) {
+      bump = (graph[0].axis[3].islabel) ? (0.8*Nc*fontsize + 1) : minPAD;
+  } else {
+      bump = graph[0].axis[3].labelPad * fontsize;
+  }
   graph[0].label[LABELY1].x = graph[0].axis[3].fx + bump;
   
   /* these are wrong and have to be adjusted to sit in the corners */
 
-  graph[0].label[LABELUL].x = graph[0].axis[2].fx - PADx;
-  graph[0].label[LABELUL].y = graph[0].axis[2].fy - PADx;
-  graph[0].label[LABELUR].x = graph[0].axis[2].fx + graph[0].axis[2].dfx + PADx;
-  graph[0].label[LABELUR].y = graph[0].axis[2].fy - PADx;
-  graph[0].label[LABELLL].x = graph[0].axis[0].fx - PADx;
-  graph[0].label[LABELLL].y = graph[0].axis[0].fy + PADx;
-  graph[0].label[LABELLR].x = graph[0].axis[0].fx + graph[0].axis[0].dfx + PADx;
-  graph[0].label[LABELLR].y = graph[0].axis[0].fy + PADx;
-
+  graph[0].label[LABELUL].x = graph[0].axis[2].fx;
+  graph[0].label[LABELUL].y = graph[0].axis[2].fy - minPAD;
+  graph[0].label[LABELUR].x = graph[0].axis[2].fx + graph[0].axis[2].dfx;
+  graph[0].label[LABELUR].y = graph[0].axis[2].fy - minPAD;
+  graph[0].label[LABELLL].x = graph[0].axis[0].fx;
+  graph[0].label[LABELLL].y = graph[0].axis[0].fy + minPAD;
+  graph[0].label[LABELLR].x = graph[0].axis[0].fx + graph[0].axis[0].dfx;
+  graph[0].label[LABELLR].y = graph[0].axis[0].fy + minPAD;
 }

branches/eam_branches/Ohana.20100407/src/libkapa/include/kapa.h

@@ -79 +79 @@
   int style, ptype, ltype, etype, ebar, color;
   double lweight, size;
+  double ticktextPad, labelPad;
+  double padXm, padXp, padYm, padYp;
   Coords coords;
   int flipeast, flipnorth;

branches/eam_branches/Ohana.20100407/src/libkapa/src/KapaWindow.c

@@ -42 +42 @@
 
   KiiSendMessage (fd, "%lf %d", graphdata[0].lweight, graphdata[0].color);
+
+  KiiSendMessage (fd, "%lf %lf %lf %lf %lf %lf", graphdata[0].ticktextPad, graphdata[0].labelPad, graphdata[0].padXm, graphdata[0].padXp, graphdata[0].padYm, graphdata[0].padYp);
 
   KiiSendMessage (fd, "%s %s %s", graphdata[0].axis, graphdata[0].labels, graphdata[0].ticks);
@@ -140 +142 @@
                   data[0].lweight, data[0].size);
 
+  KiiSendMessage (fd, "%g %g %g %g %g %g", 
+                  data[0].ticktextPad, data[0].labelPad, 
+                  data[0].padXm, data[0].padXp, 
+                  data[0].padYm, data[0].padYp);
+
+
   KiiSendMessage (fd, "%g %g %g %g", 
                   data[0].xmin, data[0].xmax, 
@@ -175 +183 @@
                   &data[0].etype, &data[0].ebar, &data[0].color, 
                   &data[0].lweight, &data[0].size);
+
+  KiiScanMessage (fd, "%lf %lf %lf %lf %lf %lf", 
+                  &data[0].ticktextPad, &data[0].labelPad, 
+                  &data[0].padXm, &data[0].padXp, 
+                  &data[0].padYm, &data[0].padYp);
 
   KiiScanMessage (fd, "%lf %lf %lf %lf", 

branches/eam_branches/Ohana.20100407/src/opihi/cmd.data/box.c

@@ -25 +25 @@
   } 
 
-  graphmode.lweight = 1;
+  // graphmode.lweight = 1;
   if ((N = get_argument (argc, argv, "-lw"))) {
     remove_argument (N, &argc, argv);
@@ -32 +32 @@
   }
 
-  graphmode.color = KapaColorByName ("black");
+  // graphmode.color = KapaColorByName ("black");
   if ((N = get_argument (argc, argv, "-c"))) {
     remove_argument (N, &argc, argv);
@@ -40 +40 @@
   }
 
-  strcpy (graphmode.ticks, "2222");
+  // strcpy (graphmode.ticks, "2222");
   if ((N = get_argument (argc, argv, "-ticks"))) {
     remove_argument (N, &argc, argv);
@@ -51 +51 @@
   }
   
-  strcpy (graphmode.labels, "2222");
+  // strcpy (graphmode.labels, "2222");
   if ((N = get_argument (argc, argv, "-labels"))) {
     remove_argument (N, &argc, argv);
@@ -62 +62 @@
   }
 
-  strcpy (graphmode.axis, "2222");
+  // strcpy (graphmode.axis, "2222");
   if ((N = get_argument (argc, argv, "-axis"))) {
     remove_argument (N, &argc, argv);
@@ -71 +71 @@
       if ((graphmode.axis[i] != '0') && (graphmode.axis[i] != '1') && (graphmode.axis[i] != '2')) { goto usage; }
     }
+  }
+
+  if ((N = get_argument (argc, argv, "-tickpad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.ticktextPad = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  if ((N = get_argument (argc, argv, "-labelpad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.labelPad = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+
+  if ((N = get_argument (argc, argv, "-xpad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.padXm = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "+xpad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.padXp = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "-ypad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.padYm = atof(argv[N]);
+    remove_argument (N, &argc, argv);
+  }
+  if ((N = get_argument (argc, argv, "+ypad"))) {
+    remove_argument (N, &argc, argv);
+    graphmode.padYp = atof(argv[N]);
+    remove_argument (N, &argc, argv);
   }