Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/libkapa/src/KapaWindow.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libkapa/src/KapaWindow.c (modified) (11 diffs)

branches/simtest_nebulous_branches/Ohana/src/libkapa/src/KapaWindow.c

@@ -27 +27 @@
 }
 
+int KiiRelocate (int fd, int x, int y) {
+
+  KiiSendCommand (fd, 4, "MOVE");
+  KiiSendMessage (fd, "%d %d", x, y); 
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
 int KapaBox (int fd, Graphdata *graphdata) {
 
   KiiSendCommand (fd, 4, "DBOX");
-  KiiSendMessage (fd, "%12.6g %12.6g %12.6g %12.6g", 
-                    graphdata[0].xmin, graphdata[0].xmax, graphdata[0].ymin, graphdata[0].ymax);
-
-  KiiSendMessage (fd, "%lf %d", graphdata[0].lweight, graphdata[0].color);
-
-  KiiSendMessage (fd, "%s %s %s", graphdata[0].axis, graphdata[0].labels, graphdata[0].ticks);
+
+  KapaSendGraphData (fd, graphdata);
+
   KiiWaitAnswer (fd, "DONE");
   return (TRUE);
@@ -76 +81 @@
 }
 
+// XXX drop this function? : kapa is responsible for the graph initialization
 int KapaInitGraph (Graphdata *graphdata) {
 
@@ -95 +101 @@
   graphdata[0].flipeast = TRUE;
   graphdata[0].flipnorth = FALSE;
+
   strcpy (graphdata[0].axis, "2222");
   strcpy (graphdata[0].ticks, "2222");
   strcpy (graphdata[0].labels, "2222");
+
+  graphdata[0].ticktextPad = NAN;
+
+  graphdata[0].labelPadXm = NAN;
+  graphdata[0].labelPadXp = NAN;
+  graphdata[0].labelPadYm = NAN;
+  graphdata[0].labelPadYp = NAN;
+
+  graphdata[0].padXm = NAN;
+  graphdata[0].padXp = NAN;
+  graphdata[0].padYm = NAN;
+  graphdata[0].padYp = NAN;
 
   return (TRUE);
@@ -120 +139 @@
 }
 
-int KapaSetGraphData (int fd, Graphdata *data) {
-
-  /* tell kapa to look for the incoming image */
-  KiiSendCommand (fd, 4, "SSTY"); 
-  
+int KapaSendGraphData (int fd, Graphdata *data) {
+
   /* send kapa the plot details */
+  KiiSendMessage (fd, "%g %g %g %g", 
+                  data[0].xmin, data[0].xmax, 
+                  data[0].ymin, data[0].ymax);
+
   KiiSendMessage (fd, "%8d %d %d %d %d %d %f %f", 
                   data[0].style, 
@@ -132 +152 @@
                   data[0].lweight, data[0].size);
 
+  KiiSendMessage (fd, "%g %g %g %g %g", 
+                  data[0].ticktextPad,
+                  data[0].padXm, data[0].padXp, 
+                  data[0].padYm, data[0].padYp);
+
   KiiSendMessage (fd, "%g %g %g %g", 
-                  data[0].xmin, data[0].xmax, 
-                  data[0].ymin, data[0].ymax);
+                  data[0].labelPadXm, data[0].labelPadXp, 
+                  data[0].labelPadYm, data[0].labelPadYp);
 
   KiiSendMessage (fd, "%g %g %g %g", 
@@ -152 +177 @@
                   data[0].coords.cdelt2);
 
-  KiiWaitAnswer (fd, "DONE");
-  return (TRUE);
-}
-
-int KapaGetGraphData (int fd, Graphdata *data) {
-
-  /* tell kapa to look for the incoming image */
-  KiiSendCommand (fd, 4, "GSTY"); 
-  
+  KiiSendMessage (fd, "%s %s %s", data[0].axis, data[0].ticks, data[0].labels);
+
+  return (TRUE);
+}
+
+int KapaScanGraphData (int fd, Graphdata *data) {
+
   /* send kapa the plot details */
+  KiiScanMessage (fd, "%lf %lf %lf %lf", 
+                  &data[0].xmin, &data[0].xmax, 
+                  &data[0].ymin, &data[0].ymax);
+
   KiiScanMessage (fd, "%d %d %d %d %d %d %lf %lf", 
                   &data[0].style, 
@@ -168 +195 @@
                   &data[0].lweight, &data[0].size);
 
+  KiiScanMessage (fd, "%lf %lf %lf %lf %lf", 
+                  &data[0].ticktextPad, 
+                  &data[0].padXm, &data[0].padXp, 
+                  &data[0].padYm, &data[0].padYp);
+
   KiiScanMessage (fd, "%lf %lf %lf %lf", 
-                  &data[0].xmin, &data[0].xmax, 
-                  &data[0].ymin, &data[0].ymax);
+                  &data[0].labelPadXm, &data[0].labelPadXp, 
+                  &data[0].labelPadYm, &data[0].labelPadYp);
 
   KiiScanMessage (fd, "%f %f %f %f", 
@@ -188 +220 @@
                   &data[0].coords.cdelt2);
 
+  KiiScanMessage (fd, "%s %s %s", data[0].axis, data[0].ticks, data[0].labels);
+
   // XXX at some point, we need to add polynomials and 2-level mosaic
   // astrometry here.
 
   data[0].coords.Npolyterms = 0;
+
+  return (TRUE);
+}
+
+int KapaSetGraphData (int fd, Graphdata *data) {
+
+  /* tell kapa to look for the incoming image */
+  KiiSendCommand (fd, 4, "SSTY"); 
+  
+  KapaSendGraphData (fd, data);
+
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
+int KapaGetGraphData (int fd, Graphdata *data) {
+
+  /* tell kapa to look for the incoming image */
+  KiiSendCommand (fd, 4, "GSTY"); 
+  
+  KapaScanGraphData (fd, data);
 
   KiiWaitAnswer (fd, "DONE");
@@ -224 +279 @@
 int KapaPlotVector (int fd, int Npts, float *values, char *type) {
 
-  int Nbytes;
+  int Nbytes, Nwrite;
   int swap;
 
@@ -248 +303 @@
   KiiSendMessage (fd, "%s %d %d %d", type, Npts, Nbytes, swap); 
 
-  write (fd, values, Nbytes);
+  Nwrite = write (fd, values, Nbytes);
+  if (Nwrite != Nbytes) {
+    fprintf (stderr, "error sending data\n");
+    return FALSE;
+  }
   KiiWaitAnswer (fd, "DONE");
   return (TRUE);
@@ -300 +359 @@
 
   KiiSendCommand (fd, 4, "DSEC");
-  KiiSendMessage (fd, "%s %6.3f %6.3f %6.3f %6.3f", 
+  KiiSendMessage (fd, "%s %6.3f %6.3f %6.3f %6.3f %3d", 
                   section[0].name, 
                   section[0].x,
                   section[0].y,
                   section[0].dx,
-                  section[0].dy);
+                  section[0].dy,
+                  section[0].bg);
+  KiiWaitAnswer (fd, "DONE");
+  return (TRUE);
+}
+
+int KapaSectionBG (int fd, char *name, int bg) {
+
+  KiiSendCommand (fd, 4, "BSEC");
+  KiiSendMessage (fd, "%s %3d", name, bg);
   KiiWaitAnswer (fd, "DONE");
   return (TRUE);