Changeset 27713

Timestamp:

Apr 20, 2010, 10:10:43 AM (16 years ago)

Author:

eugene

Message:

plotting improvements

Location:

branches/eam_branches/Ohana.20100407/src

Files:

• kapa2/doc/mark.issues.txt (modified) (1 diff)
• kapa2/src/Graphs.c (modified) (1 diff)
• kapa2/src/SetGraphData.c (modified) (2 diffs)
• libkapa/src/IOfuncs.c (modified) (1 diff)
• opihi/cmd.data/box.c (modified) (3 diffs)

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

@@ -1 +1 @@
 
+
+* need consistency of graph defaults : axis, tick, labels should come from kapa
+* clear should erase current plot
 
 -> The "plot" command needs to be fixed so that boundaries of contours do

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

@@ -22 +22 @@
     graph[0].axis[i].pad = NAN;
   }    
+  graph[0].data.ticktextPad = NAN;
+  graph[0].data.labelPad = NAN;
+  graph[0].data.padXm = NAN;
+  graph[0].data.padXp = NAN;
+  graph[0].data.padYm = NAN;
+  graph[0].data.padYp = NAN;
+
   for (i = 0; i < 8; i++) {
     strcpy (graph[0].label[i].text, "");

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

@@ -14 +14 @@
   if (section->graph == NULL) {
     section->graph = InitGraph ();
+    fprintf (stderr, "pad: %f %f %f\n", section->graph->axis[0].pad, section->graph->axis[0].labelPad, section->graph->axis[0].ticktextPad);
     SetSectionSizes (section);
+    fprintf (stderr, "pad: %f %f %f\n", section->graph->axis[0].pad, section->graph->axis[0].labelPad, section->graph->axis[0].ticktextPad);
   }
   graph = section->graph;
+  fprintf (stderr, "pad: %f %f %f\n", section->graph->axis[0].pad, section->graph->axis[0].labelPad, section->graph->axis[0].ticktextPad);
   
   // get graph data from client 
@@ -36 +39 @@
                   &graph[0].data.padYm, 
                   &graph[0].data.padYp);
+
+  for (i = 0; i < 4; i++) {
+    graph[0].axis[i].ticktextPad = graph[0].data.ticktextPad;
+    graph[0].axis[i].labelPad = graph[0].data.labelPad;
+  }    
+  graph[0].axis[0].pad = graph[0].data.padXm;
+  graph[0].axis[1].pad = graph[0].data.padYm;
+  graph[0].axis[2].pad = graph[0].data.padXp;
+  graph[0].axis[3].pad = graph[0].data.padYp;
 
   KiiScanMessage (sock, "%lf %lf %lf %lf", 

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

@@ -1 +1 @@
 # include <kapa_internal.h>
-# define DEBUG 0
+# define DEBUG 1
 
 /** these function expect to operate with a BLOCKing socket **/

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

@@ -40 +40 @@
   }
 
-  // strcpy (graphmode.ticks, "2222");
+  // XXX need to get the current values from kapa
+  strcpy (graphmode.ticks, "2222");
   if ((N = get_argument (argc, argv, "-ticks"))) {
     remove_argument (N, &argc, argv);
@@ -51 +52 @@
   }
   
-  // strcpy (graphmode.labels, "2222");
+  strcpy (graphmode.labels, "2222");
   if ((N = get_argument (argc, argv, "-labels"))) {
     remove_argument (N, &argc, argv);
@@ -62 +63 @@
   }
 
-  // strcpy (graphmode.axis, "2222");
+  strcpy (graphmode.axis, "2222");
   if ((N = get_argument (argc, argv, "-axis"))) {
     remove_argument (N, &argc, argv);