IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
May 22, 2007, 12:23:09 PM (19 years ago)
Author:
eugene
Message:

upgrading to kapa 2.0 API, upgrades to dvo user interface

Location:
trunk/Ohana/src/opihi/cmd.astro
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.astro/cgrid.c

    r7917 r13479  
    1414  double x, y;
    1515  Vector Xvec, Yvec;
    16   int NorthPole, SouthPole, N, OnPic, LOnPic, status, NELEMENTS, First;
     16  int kapa, NorthPole, SouthPole, N, OnPic, LOnPic, status, NELEMENTS, First;
    1717  Graphdata graphmode;
    1818
    19   if (!style_args (&graphmode, &argc, argv, 0)) return FALSE;
     19  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
    2020
    2121  if (argc != 1) {
    … …  
    2323    return (FALSE);
    2424  }
    25   SetGraph (graphmode);
    2625
    2726  /* are we plotting one of the poles? */
    … …  
    392391  graphmode.ptype = 100; /* connect a pair */
    393392  graphmode.etype = 0;
    394   PrepPlotting (N, &graphmode);
    395   PlotVector (N, Xvec.elements);
    396   PlotVector (N, Yvec.elements);
     393  PlotVectorPair (kapa, N, Xvec.elements, Yvec.elements, &graphmode);
    397394
    398395  free (Xvec.elements);

  • trunk/Ohana/src/opihi/cmd.astro/cplot.c

    r7917 r13479  
    33int cplot (int argc, char **argv) {
    44 
    5   int i, Npts, status;
     5  int i, kapa, Npts, status;
    66  float *x, *y, *r, *d, Rmin, Rmax;
    77  Vector Xvec, Yvec, *xvec, *yvec;
    88  Graphdata graphmode;
    99
    10   if (!style_args (&graphmode, &argc, argv, 0)) return FALSE;
     10  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
    1111
    1212  if (argc != 3) {
    … …  
    1414    return (FALSE);
    1515  }
    16   SetGraph (graphmode);
    1716
    1817  Rmin = graphmode.coords.crval1 - 182.0;
    … …  
    6766
    6867  graphmode.etype = 0;
    69   PrepPlotting (Npts, &graphmode);
    70   PlotVector (Npts, Xvec.elements);
    71   PlotVector (Npts, Yvec.elements);
     68  PlotVectorPair (kapa, Npts, Xvec.elements, Yvec.elements, &graphmode);
    7269 
    7370  free (Xvec.elements);

  • trunk/Ohana/src/opihi/cmd.astro/czplot.c

    r7917 r13479  
    33int czplot (int argc, char **argv) {
    44 
    5   int i, Npts;
     5  int i, kapa, Npts;
    66  double min, range, Rmin, Rmax;
    77  float *in, *out, *r, *d, *x, *y;
    … …  
    99  Graphdata graphmode;
    1010
    11   if (!style_args (&graphmode, &argc, argv, 0)) return FALSE;
     11  if (!style_args (&graphmode, &argc, argv, &kapa)) return FALSE;
    1212
    1313  if (argc != 6) {
    … …  
    1515    return (FALSE);
    1616  }
    17   SetGraph (graphmode);
    1817
    1918  min = atof(argv[4]);
    … …  
    5958  graphmode.etype = 0;
    6059  Npts = Xvec.Nelements;
    61   PrepPlotting (Npts, &graphmode);
    62 
    63   PlotVector (Npts, Xvec.elements);
    64   PlotVector (Npts, Yvec.elements);
    65   PlotVector (Npts, Zvec.elements);
     60  PlotVectorTriplet (kapa, Npts, Xvec.elements, Yvec.elements, Zvec.elements, &graphmode);
    6661
    6762  free (Xvec.elements);

  • trunk/Ohana/src/opihi/cmd.astro/gauss.c

    r7917 r13479  
    55  char key[20];
    66  int i, N, Npix, Nborder, Nspot;
    7   double X, Y, Z, max;
    8   int Ximage, Nimage;
     7  double X, Y, Z, ZP, RA, DEC, max;
     8  int kapa;
     9  char *name;
    910  Buffer *buf;
     11  KapaImageData data;
    1012
    11   Nimage = -1;
     13  name = NULL;
    1214  if ((N = get_argument (argc, argv, "-n"))) {
    1315    remove_argument (N, &argc, argv);
    14     Nimage = atof (argv[N]);
     16    name = strcreate (argv[N]);
    1517    remove_argument (N, &argc, argv);
    1618  }
    17   if (!GetImage (&Ximage, &Nimage)) return (FALSE);
     19  if (!GetImageData (&data, &kapa, name)) return (FALSE);
     20  FREE (name);
    1821
    1922  Nborder = 3;
    … …  
    3740  }
    3841 
    39   if (Ximage < 1) {
     42  if (kapa < 1) {
    4043    gprint (GP_ERR, "no active TV\n");
    4144    return (FALSE);
    … …  
    4851  }
    4952
    50   if ((buf = SelectBuffer (GetImageName(), OLDBUFFER, TRUE)) == NULL) return (FALSE);
     53  if ((buf = SelectBuffer (data.name, OLDBUFFER, TRUE)) == NULL) return (FALSE);
    5154
    52   KiiCursorOn (Ximage);
     55  KiiCursorOn (kapa);
    5356
    5457  for (i = 0; (i < Nspot) || (Nspot == 0); i++) {
    55     KiiCursorRead (Ximage, &X, &Y, key);
     58    KiiCursorRead (kapa, &X, &Y, &ZP, &RA, &DEC, key);
    5659    if (!strcasecmp (key, "Q")) break;
    5760    Z = get_aperture_stats (&buf[0].matrix, (int)(X+0.5), (int)(Y+0.5), Npix, Nborder, max);
    5861  }
    59   KiiCursorOff (Ximage);
     62  KiiCursorOff (kapa);
    6063  return (TRUE);
    6164}

  • trunk/Ohana/src/opihi/cmd.astro/objload.c

    r7917 r13479  
    77  int i, N, Objtype, type, Nline, status;
    88  FILE *f;
    9   char *buffer, *line;
    10   int Ximage, Nimage, Noverlay, NOVERLAY;
     9  char *buffer, *line, *name;
     10  int kapa, Noverlay, NOVERLAY;
    1111  KiiOverlay *overlay;
    1212 
    13   Nimage = -1;
     13  name = NULL;
    1414  if ((N = get_argument (argc, argv, "-n"))) {
    1515    remove_argument (N, &argc, argv);
    16     Nimage = atof (argv[N]);
     16    name = strcreate (argv[N]);
    1717    remove_argument (N, &argc, argv);
    1818  }
    19   if (!GetImage (&Ximage, &Nimage)) return (FALSE);
     19  if (!GetImage (NULL, &kapa, name)) return (FALSE);
     20  FREE (name);
    2021
    2122  Objtype = 0;
    … …  
    6364  free (buffer);
    6465
    65   KiiLoadOverlay (Ximage, overlay, Noverlay, argv[1]);
     66  KiiLoadOverlay (kapa, overlay, Noverlay, argv[1]);
    6667
    6768  free (overlay);

  • trunk/Ohana/src/opihi/cmd.astro/outline.c

    r7917 r13479  
    145145    /* code to draw dots on Ximage */
    146146    {
    147       int Nimage, Ximage;
     147      int kapa;
    148148      float xp, yp, x, y;
    149149      float dx, dy, theta, t, dt;
    … …  
    151151      KiiOverlay *overlay;
    152152     
    153       Nimage = -1;
    154       if (!GetImage (&Ximage, &Nimage)) return (FALSE);
     153      if (!GetImage (NULL, &kapa, NULL)) return (FALSE);
    155154     
    156155      Noverlay = 0;
    … …  
    179178        CHECK_REALLOCATE (overlay, KiiOverlay, NOVERLAY, Noverlay, 1000);
    180179      }
    181       KiiLoadOverlay (Ximage, overlay, Noverlay, "red");
     180      KiiLoadOverlay (kapa, overlay, Noverlay, "red");
    182181      free (overlay);
    183182    }

  • trunk/Ohana/src/opihi/cmd.astro/outline2.c

    r7917 r13479  
    303303int plot_outline () {
    304304 
    305   int Nimage, Ximage;
     305  int kapa;
    306306  float xp, yp, x, y;
    307307  float dx, dy, theta, t, dt;
    … …  
    309309  KiiOverlay *overlay;
    310310 
    311   Nimage = -1;
    312   if (!GetImage (&Ximage, &Nimage)) return (FALSE);
     311  if (!GetImage (NULL, &kapa, NULL)) return (FALSE);
    313312 
    314313  Noverlay = 0;
    … …  
    337336    CHECK_REALLOCATE (overlay, KiiOverlay, NOVERLAY, Noverlay, 1000);
    338337  }
    339   KiiLoadOverlay (Ximage, overlay, Noverlay, "red");
     338  KiiLoadOverlay (kapa, overlay, Noverlay, "red");
    340339  free (overlay);
    341340  return (TRUE);

  • trunk/Ohana/src/opihi/cmd.astro/region.c

    r10928 r13479  
    55  char string[256];
    66  double Ra, Dec, Radius;
    7   double dx, dy;
    8   int N, Ngraph, Xgraph;
     7  float dx, dy;
     8  int N, kapa;
     9  char *name;
    910  Graphdata graphmode;
    1011
    11   Ngraph = 0;
    12   if (!GetGraph (&graphmode, &Xgraph, &Ngraph)) return (FALSE);
     12  name = NULL;
     13  if ((N = get_argument (argc, argv, "-n"))) {
     14    remove_argument (N, &argc, argv);
     15    name = strcreate (argv[N]);
     16    remove_argument (N, &argc, argv);
     17  }
     18  if (!GetGraph (&graphmode, &kapa, name)) return (FALSE);
     19  FREE (name);
    1320
    1421  if ((N = get_argument (argc, argv, "-ew"))) {
    … …  
    6067 
    6168  /* ask kapa for coordinate limits, so get the right aspect ratio */
    62   KiiSendCommand (Xgraph, 4, "LIMS");
    63   KiiScanMessage (Xgraph, "%lf %lf", &dx, &dy);
     69  KapaGetLimits (kapa, &dx, &dy);
    6470  dx = fabs (dx);
    6571  dy = fabs (dy);
    … …  
    101107  graphmode.coords.cdelt1 = graphmode.coords.cdelt2 = 1.0;
    102108
    103   KapaClear (Xgraph, TRUE);
    104   KapaSetLimits (Xgraph, &graphmode);
     109  KapaClearSections (kapa);
     110  KapaSetLimits (kapa, &graphmode);
    105111
    106112  /* drop this? */
    107113  sprintf (string, "%8.4f %8.4f (%f)", Ra, Dec, Radius);
    108   KapaSendLabel (Xgraph, string, 2);
     114  KapaSendLabel (kapa, string, 2);
    109115
    110   SetGraph (graphmode);
     116  // XXX is this the right thing to be doing?
     117  SetGraph (&graphmode);
    111118  return (TRUE);
    112119}
Note: See TracChangeset for help on using the changeset viewer.