Changeset 5850 for trunk/Ohana/src/opihi/lib.data/open_graph.c

Timestamp:

Dec 27, 2005, 3:21:40 PM (20 years ago)

Author:

eugene

Message:

substantial work to move kii/kapa call into libkapa

File:

• trunk/Ohana/src/opihi/lib.data/open_graph.c (modified) (6 diffs)

trunk/Ohana/src/opihi/lib.data/open_graph.c

@@ -2 +2 @@
 # define DEBUG 0
 
-/** this list must match the one in kapa/include/structures.h, and equiv */
-# define NGRAPHCOLORS 23
-static char GRAPHCOLORS[NGRAPHCOLORS][2][15] = {
-  {"black",    "0.00 0.00 0.00"},
-  {"white",    "1.00 1.00 1.00"},
-  {"red",      "1.00 0.00 0.00"}, 
-  {"pink",     "1.00 0.75 0.80"}, 
-  {"orange",   "1.00 0.65 0.00"}, 
-  {"yellow",   "1.00 1.00 0.00"}, 
-  {"wheat",    "0.96 0.87 0.70"}, 
-  {"gold",     "1.00 0.84 0.00"}, 
-  {"green",    "0.00 1.00 0.00"}, 
-  {"darkgreen","0.00 0.40 0.00"}, 
-  {"blue",     "0.00 0.00 1.00"}, 
-  {"skyblue",  "0.53 0.81 0.92"}, 
-  {"indigo",   "0.56 0.16 0.87"}, 
-  {"violet",   "1.00 0.00 0.00"},
-  {"grey10",   "0.10 0.10 0.10"},
-  {"grey20",   "0.20 0.20 0.20"},
-  {"grey30",   "0.30 0.30 0.30"},
-  {"grey40",   "0.40 0.40 0.40"},
-  {"grey50",   "0.50 0.50 0.50"},
-  {"grey60",   "0.60 0.60 0.60"},
-  {"grey70",   "0.70 0.70 0.70"},
-  {"grey80",   "0.80 0.80 0.80"},
-  {"grey90",   "0.90 0.90 0.90"}};
-
-  /* we have space for several kapa windows */
+/* we have space for several kapa windows */
 # define NXGRAPH 5
 
@@ -50 +23 @@
   
   for (i = 0; i < NXGRAPH; i++) {
-    if (Xgraph[i] > 0) {
-      SendGraphCommand (Xgraph[i], 4, "QUIT");
-    }
+    KiiClose (Xgraph[i]);
   }
 }
@@ -81 +52 @@
     graphdata[i].flipeast = TRUE;
     graphdata[i].flipnorth = FALSE;
+    strcpy (graphdata[i].axis, "2222");
+    strcpy (graphdata[i].ticks, "2222");
+    strcpy (graphdata[i].labels, "2222");
   }
 }
@@ -94 +68 @@
 int open_graph (int N) {
 
-  int InitSocket, status, addreslen, Ntry, fd;
-  char temp[128], socket_name[64], *kapa_exec;
-  struct sockaddr_un Address;
+  int fd;
+  char *kapa_exec;
   
   kapa_exec = get_variable ("KAPA");
@@ -104 +77 @@
   }
 
-  sprintf (socket_name, "/tmp/Kapa.XXXXXX");
-  if ((fd = mkstemp (socket_name)) == -1) {
+  fd = KiiOpen (kapa_exec, NULL);
+
+  if (fd < 0) {
     fprintf (stderr, "error starting kapa\n");
     return (FALSE);
-  }
-  close (fd);
-  unlink (socket_name);
+  } 
 
-  strcpy (Address.sun_path, socket_name); 
-  Address.sun_family = AF_UNIX; 
-  InitSocket = socket (AF_UNIX, SOCK_STREAM, 0); 
-  status = bind (InitSocket, (struct sockaddr *) &Address, sizeof (Address));
-  status = listen (InitSocket, 1);
-  
-  sprintf (temp, "%s %s &", kapa_exec, socket_name);
-  free (kapa_exec);
-
-# if DEBUG
-  fprintf (stderr, "start kapa, press return: %s\n", temp);
-  fscanf (stdin, "%d", &i);
-# else  
-  system (temp);
-# endif
-  
-  addreslen =  sizeof (Address);
-  fcntl (InitSocket, F_SETFL, O_NONBLOCK); 
-
-# define NTRY 200
-  Ntry = 0;
-  while (Ntry < NTRY) {
-    Xgraph[N] = accept (InitSocket, (struct sockaddr *)&Address, &addreslen);
-    if (Xgraph[N] == -1) {
-      if (errno == EAGAIN) {
-        usleep (10000);
-        Ntry ++;
-      } else { 
-        Ntry = NTRY;
-      }
-    } else {
-      Ntry = NTRY;
-    }
-  }
-  if (Xgraph[N] < 0) {
-    fprintf (stderr, "error starting kapa\n");
-    return (FALSE);
-  } else {
-    fcntl (Xgraph[N], F_SETFL, !O_NONBLOCK); 
-    return (TRUE);
-  }
-  
+  Xgraph[N] = fd;
+  return (TRUE);
 }
 
@@ -226 +158 @@
   graphdata[Active] = data;
 }
-
-int GetColor (char *name) {
-
-  int i;
-  
-  for (i = 0; i < NGRAPHCOLORS; i++) {
-    if (!strcmp (name, GRAPHCOLORS[i][0])) {
-      return (i);
-    }   
-  }
-  fprintf (stderr, "color may be one of:\n");
-  for (i = 0; i < NGRAPHCOLORS; i++) {
-    fprintf (stderr, "  %s\n", GRAPHCOLORS[i][0]);
-  }
-  return (-1);
-}       
-
-int SendLabel (char *string, int Xgraph, int mode) {
-
-  SendGraphCommand (Xgraph, 4, "LABL");
-  SendGraphCommand (Xgraph, 16, "%6d %6d", strlen (string), mode);
-  write (Xgraph, string, strlen (string));
-  return (TRUE);
-}
-
-/* send a message of arbitrary size, sending the size first */
-int SendGraphMessage (int device, char *format, ...) {
-
-  int Nbyte, status;
-  char tmp;
-  va_list argp;  
-
-  va_start (argp, format);
-  Nbyte = vsnprintf (&tmp, 0, format, argp);
-  va_end (argp);
-
-  if (!Nbyte) return (FALSE);
-
-  va_start (argp, format);
-  SendGraphCommand (device, 16, "NBYTES: %6d", Nbyte);
-  status = SendGraphCommandV (device, Nbyte, format, argp);
-  va_end (argp);
-  return (status);
-}
-
-int SendGraphCommand (int device, int length, char *format, ...) {
-
-  int status;
-  va_list argp;  
-
-  va_start (argp, format);
-  status = SendGraphCommandV (device, length, format, argp);
-  va_end (argp);
-  return (status);
-}
-  
-int SendGraphCommandV (int device, int length, char *format, va_list argp) {
-
-  char *string;
-
-  /* I allocated and zero 1 extra byte */
-  ALLOCATE (string, char, length + 1);
-  memset (string, 0, length + 1);
-  vsnprintf (string, length + 1, format, argp);
-
-  /* fprintf (stderr, "msg: %s\n", string); */
-  write (device, string, length);
-  free (string);
-  return (TRUE);
-}