Changeset 40571

Timestamp:

Dec 5, 2018, 9:54:03 AM (8 years ago)

Author:

eugene

Message:

avextract mag:flags returns measure flags if mag is not a primary photcode

Location:

trunk/Ohana/src/libdvo

Files:

• include/get_graphdata.h (modified) (1 diff)
• src/dbExtractAverages.c (modified) (1 diff)

trunk/Ohana/src/libdvo/include/get_graphdata.h

@@ -7 +7 @@
   double xmin, xmax, ymin, ymax;
   int style, ptype, ltype, etype, ebar, color;
-  double lweight, size;
+  double lweight, size, alpha;
   double ticktextPad;
   double labelPadXm, labelPadYm, labelPadXp, labelPadYp;

trunk/Ohana/src/libdvo/src/dbExtractAverages.c

@@ -403 +403 @@
         case MAG_OPTION_FLAGS: {
           int Nsec = GetPhotcodeNsec (field->photcode->code);
-          if (Nsec == -1) break;
+          if (Nsec == -1) {
+            for (n = 0; measure && n < average->Nmeasure; n++) {
+              if (field->photcode->code != measure[n].photcode) continue;
+              value.Int = measure[n].photFlags; 
+              break;
+            }
+            break;
+          }
           value.Int = secfilt[Nsec].flags;
           break;