IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Apr 11, 2005, 10:37:51 AM (21 years ago)
Author:
eugene
Message:

moved kapa/kii communications to use SendGraphCommand functions

Location:
trunk/Ohana/src/opihi/cmd.data
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.data/center.c

    r2843 r3693  
    2828  }
    2929
    30   write (Ximage, "CENT", 4); /* tell Ximage to look for the incoming image */
    31 
    32   sprintf (buffer, "%8.3f %8.3f %8d ", x, y, zoom);
    33   sprintf (buffer2, "NBYTES %8d ", strlen (buffer));
    34   write (Ximage, buffer2, 16);
    35   write (Ximage, buffer, strlen (buffer));
    36  
     30  SendGraphCommand (Ximage, 4, "CENT");
     31  SendGraphMessage (Ximage, "%8.3f %8.3f %8d ", x, y, zoom);
    3732  return (TRUE);
    38 
    3933}

  • trunk/Ohana/src/opihi/cmd.data/erase.c

    r2843 r3693  
    3131    if (!(strcmp (argv[i], "all"))) {
    3232      for (n = 0; n < 4; n++) {
    33         write (Ximage, "ERAS", 4); /* force Ximage to look for the incoming image */
    34         sprintf (buffer, "OVERLAY %7d ", n);
    35         write (Ximage, buffer, 16);
     33        SendGraphCommand (Ximage, 4, "ERAS");
     34        SendGraphCommand (Ximage, 16, "OVERLAY %7d ", n);
    3635      }
    3736      return (TRUE);
    … …  
    4443    if (!(strcmp (argv[i], "tick"))) n = 4;
    4544   
    46     write (Ximage, "ERAS", 4); /* force Ximage to look for the incoming image */
    47     sprintf (buffer, "OVERLAY %7d ", n);
    48     write (Ximage, buffer, 16);
     45    SendGraphCommand (Ximage, 4, "ERAS");
     46    SendGraphCommand (Ximage, 16, "OVERLAY %7d ", n);
    4947  }
    50 
    5148  return (TRUE);
    52  
    5349}

  • trunk/Ohana/src/opihi/cmd.data/jpeg.c

    r2843 r3693  
    5151  }
    5252
    53   strcpy (buffer, type);
    54   write (Source, buffer, 4);
    55   sprintf (buffer, "LEN: %11d", strlen(filename));
    56   write (Source, buffer, 16);
     53  SendGraphCommand (Source, 4, type);
     54  SendGraphCommand (Source, 16, "LEN: %11d", strlen(filename));
    5755  write (Source, filename, strlen(filename));
    5856  read (Source, buffer, 4);

  • trunk/Ohana/src/opihi/cmd.data/load.c

    r2843 r3693  
    5555  Nline = 0;
    5656
    57   write (Ximage, "LOAD", 4); /* force Ximage to look for the incoming image */
    58   sprintf (line, "OVER %9d ", n);
    59   write (Ximage, line, 16);
     57  SendGraphCommand (Ximage, 4, "LOAD");
     58  SendGraphCommand (Ximage, 16, "OVER %9d ", n);
    6059 
    6160  for (n = 0; scan_line (f, line) != EOF;) {
    … …  
    123122    Nline ++;
    124123    if (Nline == 512) {
    125       sprintf (line, "NLINES  %7d ", Nline);
    126       write (Ximage, line, 16);
     124      SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline);
    127125      write (Ximage, buffer, Nline*128);
    128126      bzero (buffer, 65536);
    … …  
    131129  }
    132130
    133   sprintf (line, "NLINES  %7d ", Nline);
    134   write (Ximage, line, 16);
     131  SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline);
    135132  write (Ximage, buffer, Nline*128);
    136   sprintf (line, "DONE ");
    137   write (Ximage, line, 16);
     133  SendGraphCommand (Ximage, 16, "DONE");
    138134
    139135  free (buffer);

  • trunk/Ohana/src/opihi/cmd.data/point.c

    r2843 r3693  
    4444  }
    4545
    46   ALLOCATE (line, char, 1024);     /* space to read the file */
    47 
    4846  ra = atof(argv[3]);
    4947  dec = atof(argv[4]);
    … …  
    7068  }
    7169
    72   write (Ximage, "LOAD", 4); /* force Ximage to look for the incoming image */
    73   sprintf (line, "OVERLAY %6d ", n);
    74   write (Ximage, line, 16);
    75   sprintf (line, "NLINES %7d ", 1);
    76   write (Ximage, line, 16);
    77   sprintf (line, "%15s %20.10f %20.10f %20.10f %20.10f ", argv[2], x, y, dx, dy);
    78   write (Ximage, line, 128);
    79   sprintf (line, "DONE ");
    80   write (Ximage, line, 16);
    81 
    82   free (line);
    83 
     70  SendGraphCommand (Ximage, 4, "LOAD");
     71  SendGraphCommand (Ximage, 16, "OVERLAY %6d ", n);
     72  SendGraphCommand (Ximage, 16, "NLINES %7d ", 1);
     73  SendGraphCommand (Ximage, 128, "%15s %20.10f %20.10f %20.10f %20.10f ", argv[2], x, y, dx, dy);
     74  SendGraphCommand (Ximage, 16, "DONE");
    8475  return (TRUE);
    85 
    8676}
    8777

  • trunk/Ohana/src/opihi/cmd.data/ps.c

    r3692 r3693  
    6060  if (!RawImage && !NoScale) SendGraphCommand (Source, 4, "PSIT");
    6161
    62   /* I need to fix kapa and kii to read NBYTES, etc like other messages
    63   SendGraphMessage (Source, "%s", filename); */
    64 
    65   sprintf (buffer, "LEN: %11d", strlen(filename));
    66   write (Source, buffer, 16);
     62  /* I need to fix kapa and kii to read NBYTES, etc like other messages */
     63  SendGraphCommand (Source, 16, "LEN: %11d", strlen(filename));
    6764  write (Source, filename, strlen(filename));
    6865  read (Source, buffer, 4);

  • trunk/Ohana/src/opihi/cmd.data/save.c

    r2843 r3693  
    2727  }
    2828
    29   if (!SelectOverlay (argv[1], &n))
    30     return (FALSE);
    31 
    32   sprintf (buffer, "FILE: %d %s", n, argv[2]);
    33   sprintf (buffer2, "NBYTES: %8d", strlen(buffer));
     29  if (!SelectOverlay (argv[1], &n)) return (FALSE);
    3430 
    3531  if (ISCEL)
    36     write (Ximage, "CSVE", 4); /* force Ximage to look for the incoming image */
     32    SendGraphCommand (Ximage, 4, "CSVE");
    3733  else
    38     write (Ximage, "SAVE", 4); /* force Ximage to look for the incoming image */
    39   write (Ximage, buffer2, 16);
    40   write (Ximage, buffer, strlen(buffer));
    41  
     34    SendGraphCommand (Ximage, 4, "SAVE");
     35
     36  SendGraphMessage (Ximage, "FILE: %d %s", n, argv[2]);
    4237  return (TRUE);
    43 
    4438}

  • trunk/Ohana/src/opihi/cmd.data/tv.c

    r3692 r3693  
    8888  root = filerootname (buf[0].file);
    8989  SendGraphMessage (Ximage, "%s %s %s ", coords.ctype, root, buf[0].name);
    90 
    9190  write (Ximage, outbuffer, size);
    9291  free (outbuffer);

  • trunk/Ohana/src/opihi/cmd.data/tvcontour.c

    r2843 r3693  
    4545Nline ++; \
    4646if (Nline == 512) { \
    47   sprintf (line, "NLINES  %7d ", Nline); \
    48   write (Ximage, line, 16); \
     47  SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline); \
    4948  write (Ximage, buffer, Nline*128); \
    5049  bzero (buffer, 65536); \
    … …  
    5756Nline ++; \
    5857if (Nline == 512) { \
    59   sprintf (line, "NLINES  %7d ", Nline); \
    60   write (Ximage, line, 16); \
     58  SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline); \
    6159  write (Ximage, buffer, Nline*128); \
    6260  bzero (buffer, 65536); \
    … …  
    123121  }
    124122
    125   write (Ximage, "LOAD", 4); /* force Ximage to look for the incoming image */
    126   sprintf (line, "OVERLAY %7d ", n);
    127   write (Ximage, line, 16);
     123  SendGraphCommand (Ximage, 4, "LOAD"); /* force Ximage to look for the incoming image */
     124  SendGraphCommand (Ximage, 16, "OVERLAY %7d ", n);
    128125  ALLOCATE (buffer, char, 65536);  /* space for 512 lines of 128 bytes */
    129126  bzero (buffer, 65536);
    … …  
    282279 
    283280  if (Nline > 0) {
    284     sprintf (line, "NLINES  %7d ", Nline);
    285     write (Ximage, line, 16);
     281    SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline);
    286282    write (Ximage, buffer, Nline*128);
    287283  }
    288284
    289285  free (buffer);
    290   sprintf (line, "DONE ");
    291   write (Ximage, line, 16);
    292   if (Npix != 1) {
    293     free (matrix);
    294   }
     286  SendGraphCommand (Ximage, 16, "DONE");
     287
     288  if (Npix != 1) free (matrix);
    295289  fprintf (stderr, "\n");
    296290  return (TRUE);

  • trunk/Ohana/src/opihi/cmd.data/tvgrid.c

    r2843 r3693  
    5151 
    5252  /* tell KII to expect overlay data */
    53   write (Ximage, "LOAD", 4);
    54   sprintf (buffer, "OVERLAY: %7d", ncolor);
    55   write (Ximage, buffer, 16);
     53  SendGraphCommand (Ximage, 4, "LOAD");
     54  SendGraphCommand (Ximage, 16, "OVERLAY: %7d", ncolor);
    5655 
    5756  dDEC = fabs(dec1 - dec0);
    … …  
    8483  NY = buf[0].header.Naxis[1];
    8584
    86     /* find starting position
    87     RD_to_XY (&x0, &y0, MIN(ra0, ra1), dec + 0.1*dDEC, &coords);
    88     sprintf (label, format, dec);
    89     sprintf (buffer, "%15s %20.10f %20.10f %20.10f %20.10f ", "TEXT", x0, y0, (double)(strlen(label) + 1), 0.0);
    90     write (Ximage, buffer, 128);
    91     write (Ximage, label, strlen(label) + 1); */
    92 
    9385  dRA = MAX (fabs(ra1 - ra0) / 100.0, 0.1);
    9486  connect = FALSE;
    … …  
    9789      RD_to_XY (&x1, &y1, ra, dec, &coords);
    9890      if ((x1 >= 0) && (x1 < NX) && (y1 >= 0) && (y1 < NY)) {
    99         if (connect) {
    100           sprintf (buffer, "%15s %20.10f %20.10f %20.10f %20.10f ", "LINE", x0, y0, (x1 - x0), (y1 - y0));
    101           write (Ximage, buffer, 128);
    102         }
     91        if (connect) SendGraphCommand (Ximage, 128, "%15s %20.10f %20.10f %20.10f %20.10f ", "LINE", x0, y0, (x1 - x0), (y1 - y0));
    10392        x0 = x1;
    10493        y0 = y1;
    10594        connect = TRUE;
    106       }
    107       else {
     95      } else {
    10896        connect = FALSE;
    10997      }
    … …  
    143131      RD_to_XY (&x1, &y1, ra, dec, &coords);
    144132      if ((x1 >= 0) && (x1 < NX) && (y1 >= 0) && (y1 < NY)) {
    145         if (connect) {
    146           sprintf (buffer, "%15s %20.10f %20.10f %20.10f %20.10f ", "LINE", x0, y0, (x1 - x0), (y1 - y0));
    147           write (Ximage, buffer, 128);
    148         }
     133        if (connect) SendGraphCommand (Ximage, 128, "%15s %20.10f %20.10f %20.10f %20.10f ", "LINE", x0, y0, (x1 - x0), (y1 - y0));
    149134        x0 = x1;
    150135        y0 = y1;
    151136        connect = TRUE;
    152       }
    153       else {
     137      } else {
    154138        connect = FALSE;
    155139      }
    … …  
    176160  */
    177161
    178   sprintf (buffer, "DONE");
    179   write (Ximage, buffer, 128);
     162  SendGraphCommand (Ximage, 128, "DONE");
    180163  return (TRUE);
    181164}
    182 
    183 
    184  
    185165
    186166/*

  • trunk/Ohana/src/opihi/cmd.data/vcontour.c

    r2598 r3693  
    4545Nline ++; \
    4646if (Nline == 512) { \
    47   sprintf (line, "NLINES  %7d \0", Nline); \
    48   write (Ximage, line, 16); \
     47  SendGraphCommand (Ximage, 16, "NLINES  %7d \0", Nline); \
    4948  write (Ximage, buffer, Nline*128); \
    5049  bzero (buffer, 65536); \
    … …  
    5756Nline ++; \
    5857if (Nline == 512) { \
    59   sprintf (line, "NLINES  %7d \0", Nline); \
    60   write (Ximage, line, 16); \
     58  SendGraphCommand (Ximage, 16, "NLINES  %7d \0", Nline); \
    6159  write (Ximage, buffer, Nline*128); \
    6260  bzero (buffer, 65536); \
    … …  
    263261 
    264262  if (Nline > 0) {
    265     sprintf (line, "NLINES  %7d \0", Nline);
    266     write (Ximage, line, 16);
     263    SendGraphCommand (Ximage, 16, "NLINES  %7d \0", Nline);
    267264    write (Ximage, buffer, Nline*128);
    268265  }
    269266
    270267  free (buffer);
    271   sprintf (line, "DONE \0");
    272   write (Ximage, line, 16);
    273   if (Npix != 1) {
    274     free (matrix);
    275   }
     268  SendGraphCommand (Ximage, 16, "DONE");
     269  if (Npix != 1) free (matrix);
    276270  fprintf (stderr, "\n");
    277271}

  • trunk/Ohana/src/opihi/cmd.data/vload.c

    r2843 r3693  
    66  int Ximage, Nimage;
    77  double dx, dy;
    8   char *buffer, *line;
     8  char *buffer;
    99  Vector *vecx, *vecy;
    1010 
    … …  
    3333  ALLOCATE (buffer, char, 65536);  /* space for 512 lines of 128 bytes */
    3434  bzero (buffer, 65536);
    35   ALLOCATE (line, char, 1024);     /* space to read the file */
    3635  Nline = 0;
    3736
    38   write (Ximage, "LOAD", 4); /* force Ximage to look for the incoming image */
    39   sprintf (line, "OVER %9d ", n);
    40   write (Ximage, line, 16);
    41  
     37  SendGraphCommand (Ximage, 4, "LOAD");
     38  SendGraphCommand (Ximage, 16, "OVER %9d ", n);
     39
    4240  dx = dy = 1.0;
    43 
    4441  for (i = 0; i < vecx[0].Nelements; i++) {
    4542    snprintf (&buffer[Nline*128], 128, "%15s %20.10f %20.10f %20.10f %20.10f ", "BOX",
    … …  
    4744    Nline ++;
    4845    if (Nline == 512) {
    49       sprintf (line, "NLINES  %7d ", Nline);
    50       write (Ximage, line, 16);
     46      SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline);
    5147      write (Ximage, buffer, Nline*128);
    5248      bzero (buffer, 65536);
    … …  
    5551  }
    5652
    57   sprintf (line, "NLINES  %7d ", Nline);
    58   write (Ximage, line, 16);
     53  SendGraphCommand (Ximage, 16, "NLINES  %7d ", Nline);
    5954  write (Ximage, buffer, Nline*128);
    60   sprintf (line, "DONE ");
    61   write (Ximage, line, 16);
     55  SendGraphCommand (Ximage, 16, "DONE");
    6256
    6357  free (buffer);
    64   free (line);
    6558  fprintf (stderr, "loaded %d objects\n", n);
    6659
Note: See TracChangeset for help on using the changeset viewer.