Changeset 14401 for trunk/Ohana/src/opihi/dvo/imextract.c

Timestamp:

Aug 4, 2007, 10:15:51 AM (19 years ago)

Author:

eugene

Message:

extensive updates to the avextract / mextract / skyregion system

File:

• trunk/Ohana/src/opihi/dvo/imextract.c (modified) (3 diffs)

trunk/Ohana/src/opihi/dvo/imextract.c

@@ -9 +9 @@
   double x, y, ra, dec, t, trange;
   time_t tzero, TimeReference;
+  SkyRegionSelection *selection;
 
   PhotCode *code;
-  Graphdata graphsky;
   Image *image;
   Vector *vec;
 
-  if (!GetGraphData (&graphsky, NULL, NULL)) return (FALSE);
   if (!InitPhotcodes ()) return (FALSE);
+
+  // parse skyregion options
+  if ((selection = SetRegionSelection (&argc, argv)) == NULL) {
+    gprint (GP_ERR, "invalid sky region selection\n");
+    return FALSE;
+  }
 
   /* check for time-based selection */
@@ -33 +38 @@
     remove_argument (N, &argc, argv);
     TimeSelect = TRUE;
-  }
-
-  /* check for region-based selection */
-  RegionSelect = FALSE;
-  if ((N = get_argument (argc, argv, "-region"))) {
-    remove_argument (N, &argc, argv);
-    RegionSelect = TRUE;
   }
 
@@ -104 +102 @@
 
   if ((image = LoadImages (&Nimage)) == NULL) return (FALSE);
-  image_subset (image, Nimage, &subset, &Nsubset, &graphsky, RegionSelect, tzero, trange, TimeSelect);
+  image_subset (image, Nimage, &subset, &Nsubset, selection, tzero, trange, TimeSelect);
   if ((mode == RA) || (mode == DEC)) BuildChipMatch (image, Nimage);