Changeset 40929 for branches/eam_branches/ohana.20190329

Timestamp:

Oct 8, 2019, 9:20:32 PM (7 years ago)

Author:

eugene

Message:

use polyfill to plot images scaled by exptime (to be expanded)

Location:

branches/eam_branches/ohana.20190329/src/opihi

Files:

• dvo/Makefile (modified) (1 diff)
• dvo/cimages.c (added)
• dvo/images.c (modified) (4 diffs)
• dvo/init.c (modified) (2 diffs)
• lib.data/style_args.c (modified) (1 diff)

branches/eam_branches/ohana.20190329/src/opihi/dvo/Makefile

@@ -67 +67 @@
 $(SRC)/gstar.$(ARCH).o                  \
 $(SRC)/hosts.$(ARCH).o          \
+$(SRC)/cimages.$(ARCH).o                \
 $(SRC)/images.$(ARCH).o         \
 $(SRC)/imbox.$(ARCH).o                  \

branches/eam_branches/ohana.20190329/src/opihi/dvo/images.c

@@ -12 +12 @@
 
   off_t i, Nimage, Nmosaic;
-  int j, status, InPic, leftside, *plist, TimeSelect, ByName;
+  int j, status, InPic, leftside, TimeSelect, ByName;
+  // int *plist, n, npts; -- what is/was plist?
   int WITH_MOSAIC, SOLO_MOSAIC;
   time_t tzero, tend;
-  int N, NPTS, n, npts, Npts, kapa, *foundMosaic;
+  int n, N, NPTS, Npts, kapa, *foundMosaic;
   Vector Xvec, Yvec;
   double r[8], d[8], x[8], y[8], Rmin, Rmax, Rmid, trange, Radius;
@@ -148 +149 @@
   int TrianglePts  = wordhash ("TRI-");
 
-  npts = NPTS = 200;
+  // npts = 200
+  NPTS = 200;
   SetVector (&Xvec, OPIHI_FLT, NPTS);
   SetVector (&Yvec, OPIHI_FLT, NPTS);
@@ -154 +156 @@
   Image *mosaic = NULL;
 
-  ALLOCATE (plist, int, NPTS);
-  n = N = 0;
+  /******** stage 1 : find the images to plot *********/
+
+  // ALLOCATE (plist, int, NPTS);
+  n = 0; // tracks number of images
+  N = 0; // tracks number of vertices
   for (i = 0; i < Nimage; i++) {
     if (ByName && strncmp (image[i].name, name, strlen(name))) continue;
@@ -335 +340 @@
     if (!InPic) continue;
 
-    plist[n] = i;
-    n++;
-    if (n > npts - 1) {
-      npts += 200;
-      REALLOCATE (plist, int, npts);
-    }
-    N+=2*Npts;
+    // plist[n] = i;
+    // n++;
+    // if (n > npts - 1) {
+    //   npts += 200;
+    //   REALLOCATE (plist, int, npts);
+    // }
+    n ++;
+    N += 2*Npts;
     if (N + 16 >= NPTS) {  /* need to leave room for 8 point image */
       NPTS += 400;

branches/eam_branches/ohana.20190329/src/opihi/dvo/init.c

@@ -14 +14 @@
 int catdir_define   PROTO((int, char **));
 int ccd             PROTO((int, char **));
+int cimages         PROTO((int, char **));
 int cmatch          PROTO((int, char **));
 int cmd             PROTO((int, char **));
@@ -80 +81 @@
   {1, "catdir",      catdir_define,"re-define CATDIR"},
 //  {1, "ccd",         ccd,          "plot color-color diagram"},
+  {1, "cimages",     cimages,      "fill image boxes with a color"},
   {1, "cmatch",      cmatch,       "match two catalogs"},
 //  {1, "cmd",         cmd,          "plot cmd of stars in current region"},

branches/eam_branches/ohana.20190329/src/opihi/lib.data/style_args.c

@@ -72 +72 @@
   }
 
+  if ((graphmode[0].style == KAPA_PLOT_POLYGON) || (graphmode[0].style == KAPA_PLOT_POLYFILL)) {
+    if ((N = get_argument (*argc, argv, "-npoint"))) {
+      remove_argument (N, argc, argv);
+      graphmode[0].ptype = atoi (argv[N]);
+      remove_argument (N, argc, argv);
+    } else {
+      gprint (GP_ERR, "polygon & polyfill styles require number of points argument: -npoint N\n");
+      return FALSE;
+    }
+  }
   return (TRUE);
 }