Changeset 39652 for trunk

Timestamp:

Aug 9, 2016, 12:32:32 PM (10 years ago)

Author:

eugene

Message:

init graphdata elements fLabelRange* and fMinor*

Location:

trunk/Ohana/src

Files:

• kapa2/src/Graphs.c (modified) (1 diff)
• libkapa/src/KapaWindow.c (modified) (2 diffs)

trunk/Ohana/src/kapa2/src/Graphs.c

@@ -26 +26 @@
     graph[0].axis[i].fMinor = 5.0;
   }    
-  graph[0].data.ticktextPad = NAN;
 
-  graph[0].data.labelPadXm = NAN;
-  graph[0].data.labelPadXp = NAN;
-  graph[0].data.labelPadYm = NAN;
-  graph[0].data.labelPadYp = NAN;
-
-  graph[0].data.padXm = NAN;
-  graph[0].data.padXp = NAN;
-  graph[0].data.padYm = NAN;
-  graph[0].data.padYp = NAN;
-
-  graph[0].data.fLabelRangeXm = 1.0;
-  graph[0].data.fLabelRangeXp = 1.0;
-  graph[0].data.fLabelRangeYm = 1.0;
-  graph[0].data.fLabelRangeYp = 1.0;
-
-  graph[0].data.fMinorXm = 5.0;
-  graph[0].data.fMinorXp = 5.0;
-  graph[0].data.fMinorYm = 5.0;
-  graph[0].data.fMinorYp = 5.0;
+  KapaInitGraph (&graph[0].data);
 
   for (i = 0; i < 8; i++) {
     strcpy (graph[0].label[i].text, "");
   }
-
-  graph[0].data.xmin = 0.0;
-  graph[0].data.xmax = 1.0;
-  graph[0].data.ymin = 0.0;
-  graph[0].data.ymax = 1.0;
-
-  graph[0].data.style   = 2;            // points
-  graph[0].data.ptype   = 2;            // + for points
-  graph[0].data.ltype   = 0;            // solid line
-  graph[0].data.etype   = 0;            // no error bars
-  graph[0].data.ebar    = 0;            // no cross bar
-  graph[0].data.color   = 0;            // black
-  graph[0].data.lweight = 0.5;          // line weight of 0.5
-  graph[0].data.size    = 1.0;          // point size of 1.0
-
-  graph[0].data.flipeast = TRUE;        // +East  = -X by default
-  graph[0].data.flipnorth = FALSE;      // +North = +Y by default
-
-  InitCoords (&graph[0].data.coords, "DEC--LIN");
-  strcpy (graph[0].data.axis, "2222");
-  strcpy (graph[0].data.ticks, "2222");
-  strcpy (graph[0].data.labels, "2222");
 
   graph[0].Nobjects = 0;

trunk/Ohana/src/libkapa/src/KapaWindow.c

@@ -93 +93 @@
   graphdata[0].xmin = graphdata[0].ymin = 0.0;
   graphdata[0].xmax = graphdata[0].ymax = 1.0;
-  graphdata[0].style = graphdata[0].ptype = 0;
+
+  graphdata[0].style = graphdata[0].ptype = 2;
   graphdata[0].ltype = graphdata[0].color = 0;
   graphdata[0].etype = graphdata[0].ebar = 0;
@@ -117 +118 @@
   graphdata[0].padYm = NAN;
   graphdata[0].padYp = NAN;
+
+  graphdata[0].fLabelRangeXm = 1.0;
+  graphdata[0].fLabelRangeXp = 1.0;
+  graphdata[0].fLabelRangeYm = 1.0;
+  graphdata[0].fLabelRangeYp = 1.0;
+
+  graphdata[0].fMinorXm = 5.0;
+  graphdata[0].fMinorXp = 5.0;
+  graphdata[0].fMinorYm = 5.0;
+  graphdata[0].fMinorYp = 5.0;
 
   return (TRUE);