Changeset 42821 for trunk/Ohana/src/kapa2/src

Timestamp:

May 8, 2025, 4:29:52 PM (12 months ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20230313

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/kapa2/src (modified) (1 prop)
• src/kapa2/src/FindColormap.c.in (copied) (copied from branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src/FindColormap.c.in )
• src/kapa2/src/SetColormap.c (modified) (3 diffs)

trunk/Ohana/src/kapa2/src/SetColormap.c

@@ -21 +21 @@
   float scale, blueRef, redRef, greenRef;
   Graphic *graphic;
+
+  if (inName && !strcasecmp(inName, "list")) {
+    ListColormaps ();
+    return TRUE;
+  }
 
   graphic = GetGraphic();
@@ -214 +219 @@
 
   /* anuenue */
-  if (!strncmp (graphic->colormapName, "file:", 5) || 
-      !strncmp (graphic->colormapName, "lgcy:", 5) || 
-      !strncmp (graphic->colormapName, "cetf:", 5) || 
-      !strncmp (graphic->colormapName, "cetr:", 5) || 
-      !strncmp (graphic->colormapName, "csvf:", 5)) {
-
-    FILE *f = fopen (&graphic->colormapName[5], "r");
-    if (!f) {
-      fprintf (stderr, "failed to open colormap file %s\n", &graphic->colormapName[5]);
+  KapaColorMapMode mode = KAPA_CM_STATIC;
+
+  // we should already have handled the static colormaps by this point
+  char *basename = ParseColormapName (graphic->colormapName, &mode);
+  if (mode == KAPA_CM_STATIC) {
+    fprintf (stderr, "unknown static colormap name %s\n", graphic->colormapName);
+    free (basename);
+    return FALSE;
+  }    
+
+  // look in local directory and installation directory
+  char *truename = FindColormap (basename);
+  FREE (basename);
+
+  if (!truename) {
+      fprintf (stderr, "cannot find colormap file %s\n", &graphic->colormapName[5]);
       return FALSE;
-    }
-    char line[1024];
-
-    int lastIndex = 0;
-    float lastRed = 0.0;
-    float lastBlue = 0.0;
-    float lastGreen = 0.0;
-
-    int isCSV = !strncmp (graphic->colormapName, "csvf:", 5);
-    int isCET = !strncmp (graphic->colormapName, "cetf:", 5);
-    int isCETRev = !strncmp (graphic->colormapName, "cetr:", 5);
-    int isLegacy = !strncmp (graphic->colormapName, "lgcy:", 5);
-
-    float fracIndex, fracRed, fracBlue, fracGreen;
-
-    if (isCET || isCETRev) fracIndex = 0.0;
-
-    while (scan_line_maxlen (f, line, 1024) != EOF) {
-      // file contains f R G B : f = 0.0 - 1.0, R,G,B = 0.0 - 1.0
-
-      int Nscan;
-      if (isCSV) {
-        Nscan = sscanf (line, "%f,%f,%f,%f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
-        if (Nscan != 4) continue;
-      }
-      if (isCET || isCETRev) {
-        Nscan = sscanf (line, "%f,%f,%f", &fracRed, &fracGreen, &fracBlue);
-        fracIndex += 1.0 / 256.0;
-        if (Nscan != 3) continue;
-      }
-      if (isLegacy) {
-        Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracBlue, &fracGreen);
-        if (Nscan != 4) continue;
-      }
-      if (!isCSV && !isLegacy && !isCET && !isCETRev) {
-        Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
-        if (Nscan != 4) continue;
-      }
-
-      int nextIndex = fracIndex * MaxValue;
-      if (nextIndex <= lastIndex) {
-        lastRed = fracRed;
-        lastBlue = fracBlue;
-        lastGreen = fracGreen;
-        continue;
-      }
-      float dRdI = (fracRed   - lastRed)   / (float) (nextIndex - lastIndex);
-      float dBdI = (fracBlue  - lastBlue)  / (float) (nextIndex - lastIndex);
-      float dGdI = (fracGreen - lastGreen) / (float) (nextIndex - lastIndex);
-      for (i = lastIndex; i < nextIndex; i++) {
-        float redValue   = 0xffff * (dRdI * (i - lastIndex) + lastRed);
-        float blueValue  = 0xffff * (dBdI * (i - lastIndex) + lastBlue);
-        float greenValue = 0xffff * (dGdI * (i - lastIndex) + lastGreen);
-        SETVALUE (graphic[0].cmap[i].red,   redValue,   0, 0xffff);
-        SETVALUE (graphic[0].cmap[i].blue,  blueValue,  0, 0xffff);
-        SETVALUE (graphic[0].cmap[i].green, greenValue, 0, 0xffff);
-      }
+  }
+  
+  FILE *f = fopen (truename, "r");
+  if (!f) {
+    fprintf (stderr, "failed to open colormap file %s\n", truename);
+    FREE (truename);
+    return FALSE;
+  }
+  FREE (truename);
+
+  char line[1024];
+  
+  int lastIndex = 0;
+  float lastRed = 0.0;
+  float lastBlue = 0.0;
+  float lastGreen = 0.0;
+  
+  float fracIndex, fracRed, fracBlue, fracGreen;
+
+  if (mode == KAPA_CM_CET || mode == KAPA_CM_CET_REV) fracIndex = 0.0;
+
+  int checkFormat = TRUE;
+
+  while (scan_line_maxlen (f, line, 1024) != EOF) {
+    // file contains f R G B : f = 0.0 - 1.0, R,G,B = 0.0 - 1.0
+    // skip any lines with comment character:
+
+    char *p = line;
+    while ((*p != 0) && OHANA_WHITESPACE(*p)) { p++; }
+    if (*p == 0) { continue; }
+    if (*p == '#') { continue; }
+
+    // attempt to confirm the format (and warn if it does not seem to match)
+    if (checkFormat) {
+      int Nscan1 = sscanf (line, "%f,%f,%f,%f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
+      int Nscan2 = sscanf (line, "%f,%f,%f", &fracRed, &fracGreen, &fracBlue);
+      int Nscan3 = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracBlue, &fracGreen);
+
+      if (Nscan1 == 4) {
+        if (mode != KAPA_CM_CSV) { fprintf (stderr, "warning: %s appears to be format csvf: not %s\n line: %s\n", graphic->colormapName, ParseColormapModeFromEnum(mode), line); }
+      }
+      if (Nscan2 == 3) {
+        if ((mode != KAPA_CM_CET) && (mode != KAPA_CM_CET_REV)) { fprintf (stderr, "warning: %s appears to be format cetf: or cetf: not %s\n line: %s\n", graphic->colormapName, ParseColormapModeFromEnum(mode), line); }
+      }
+      if (Nscan3 == 4) {
+        if (mode != KAPA_CM_RAW) { fprintf (stderr, "warning: %s appears to be format file: not %s\n line: %s\n", graphic->colormapName, ParseColormapModeFromEnum(mode), line); }
+      }
+      checkFormat = FALSE;
+    }
+
+    int Nscan;
+    if (mode == KAPA_CM_CSV) {
+      Nscan = sscanf (line, "%f,%f,%f,%f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
+      if (Nscan != 4) continue;
+    }
+    if ((mode == KAPA_CM_CET || mode == KAPA_CM_CET_REV)) {
+      Nscan = sscanf (line, "%f,%f,%f", &fracRed, &fracGreen, &fracBlue);
+      fracIndex += 1.0 / 256.0;
+      if (Nscan != 3) continue;
+    }
+    if (mode == KAPA_CM_LEGACY) {
+      Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracBlue, &fracGreen);
+      if (Nscan != 4) continue;
+    }
+    if (mode == KAPA_CM_RAW) {
+      Nscan = sscanf (line, "%f %f %f %f", &fracIndex, &fracRed, &fracGreen, &fracBlue);
+      if (Nscan != 4) continue;
+    }
+    
+    int nextIndex = fracIndex * MaxValue;
+    if (nextIndex <= lastIndex) {
       lastRed = fracRed;
       lastBlue = fracBlue;
       lastGreen = fracGreen;
-      lastIndex = nextIndex;
-    }
-    fclose (f);
-
-    if ((int) (MaxValue*fracIndex) < MaxValue) {
-      float dRdI = (1.0 - lastRed)   / (float) (MaxValue - lastIndex);
-      float dBdI = (1.0 - lastBlue)  / (float) (MaxValue - lastIndex);
-      float dGdI = (1.0 - lastGreen) / (float) (MaxValue - lastIndex);
-      for (i = lastIndex; i < MaxValue; i++) {
-        float redValue   = 0xffff * (dRdI * (i - lastIndex) + lastRed);
-        float blueValue  = 0xffff * (dBdI * (i - lastIndex) + lastBlue);
-        float greenValue = 0xffff * (dGdI * (i - lastIndex) + lastGreen);
-        SETVALUE (graphic[0].cmap[i].red,   redValue,   0, 0xffff);
-        SETVALUE (graphic[0].cmap[i].blue,  blueValue,  0, 0xffff);
-        SETVALUE (graphic[0].cmap[i].green, greenValue, 0, 0xffff);
-      }
-    }
-
-    // reverse the color sequence:
-    if (isCETRev) {
-      for (i = 0; i < MaxValue / 2; i++) {  
-        unsigned short tmp;
-        // fprintf (stderr, "swap: %d %d\n", graphic[0].cmap[i].red, graphic[0].cmap[MaxValue - 1 - i].red);
-        tmp = graphic[0].cmap[i].red;   graphic[0].cmap[i].red   = graphic[0].cmap[MaxValue - 1 - i].red;   graphic[0].cmap[MaxValue - 1 - i].red   = tmp;
-        tmp = graphic[0].cmap[i].blue;  graphic[0].cmap[i].blue  = graphic[0].cmap[MaxValue - 1 - i].blue;  graphic[0].cmap[MaxValue - 1 - i].blue  = tmp;
-        tmp = graphic[0].cmap[i].green; graphic[0].cmap[i].green = graphic[0].cmap[MaxValue - 1 - i].green; graphic[0].cmap[MaxValue - 1 - i].green = tmp;
-      }
-    }
-
-    goto store_colors;
-  }
-
-  return (FALSE);
+      continue;
+    }
+    float dRdI = (fracRed   - lastRed)   / (float) (nextIndex - lastIndex);
+    float dBdI = (fracBlue  - lastBlue)  / (float) (nextIndex - lastIndex);
+    float dGdI = (fracGreen - lastGreen) / (float) (nextIndex - lastIndex);
+    for (i = lastIndex; i < nextIndex; i++) {
+      float redValue   = 0xffff * (dRdI * (i - lastIndex) + lastRed);
+      float blueValue  = 0xffff * (dBdI * (i - lastIndex) + lastBlue);
+      float greenValue = 0xffff * (dGdI * (i - lastIndex) + lastGreen);
+      SETVALUE (graphic[0].cmap[i].red,   redValue,   0, 0xffff);
+      SETVALUE (graphic[0].cmap[i].blue,  blueValue,  0, 0xffff);
+      SETVALUE (graphic[0].cmap[i].green, greenValue, 0, 0xffff);
+    }
+    lastRed = fracRed;
+    lastBlue = fracBlue;
+    lastGreen = fracGreen;
+    lastIndex = nextIndex;
+  }
+  fclose (f);
+
+  if ((int) (MaxValue*fracIndex) < MaxValue) {
+    float dRdI = (1.0 - lastRed)   / (float) (MaxValue - lastIndex);
+    float dBdI = (1.0 - lastBlue)  / (float) (MaxValue - lastIndex);
+    float dGdI = (1.0 - lastGreen) / (float) (MaxValue - lastIndex);
+    for (i = lastIndex; i < MaxValue; i++) {
+      float redValue   = 0xffff * (dRdI * (i - lastIndex) + lastRed);
+      float blueValue  = 0xffff * (dBdI * (i - lastIndex) + lastBlue);
+      float greenValue = 0xffff * (dGdI * (i - lastIndex) + lastGreen);
+      SETVALUE (graphic[0].cmap[i].red,   redValue,   0, 0xffff);
+      SETVALUE (graphic[0].cmap[i].blue,  blueValue,  0, 0xffff);
+      SETVALUE (graphic[0].cmap[i].green, greenValue, 0, 0xffff);
+    }
+  }
+
+  // reverse the color sequence:
+  if (mode == KAPA_CM_CET_REV) {
+    for (i = 0; i < MaxValue / 2; i++) {  
+      unsigned short tmp;
+      // fprintf (stderr, "swap: %d %d\n", graphic[0].cmap[i].red, graphic[0].cmap[MaxValue - 1 - i].red);
+      tmp = graphic[0].cmap[i].red;   graphic[0].cmap[i].red   = graphic[0].cmap[MaxValue - 1 - i].red;   graphic[0].cmap[MaxValue - 1 - i].red   = tmp;
+      tmp = graphic[0].cmap[i].blue;  graphic[0].cmap[i].blue  = graphic[0].cmap[MaxValue - 1 - i].blue;  graphic[0].cmap[MaxValue - 1 - i].blue  = tmp;
+      tmp = graphic[0].cmap[i].green; graphic[0].cmap[i].green = graphic[0].cmap[MaxValue - 1 - i].green; graphic[0].cmap[MaxValue - 1 - i].green = tmp;
+    }
+  }
 
  store_colors:
@@ -333 +370 @@
   return (TRUE);
 }
-