Changeset 42489

Timestamp:

Aug 12, 2023, 10:23:09 AM (3 years ago)

Author:

eugene

Message:

install colormaps in defined location, make them discoverable

Location:

branches/eam_branches/ipp-20230313/Ohana/src/kapa2

Files:

• Makefile (modified) (2 diffs)
• colormaps (moved) (moved from branches/eam_branches/ipp-20230313/Ohana/src/kapa2/cmaps )
• include/constants.h (modified) (1 diff)
• include/prototypes.h (modified) (1 diff)
• src/FindColormap.c.in (modified) (6 diffs)
• src/SetColormap.c (modified) (3 diffs)

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/Makefile

@@ -10 +10 @@
 SRC     =       $(HOME)/src
 INC     =       $(HOME)/include
+DATA    =       $(DESTDATA)/kapa
 include ../../Makefile.Common
 
@@ -110 +111 @@
 OBJ  =  $(KAPA) $(PDF) $(BDRAW) $(PSFILES)
 
+cmaps: 
+        @echo "installing colormaps for kapa"
+        @if [ ! -d $(DATA)/colormaps ]; then mkdir -p $(DATA)/colormaps; fi
+        @if [   -d $(HOME)/colormaps ]; then rm -f $(HOME)/colormaps/*~; fi
+        @if [   -d $(HOME)/colormaps ]; then rm -f $(HOME)/colormaps/#*; fi
+        @if [   -d $(HOME)/colormaps ]; then for i in `find $(HOME)/colormaps -name CVS -prune -o -type f -print`; do cp -f $$i $(DATA)/colormaps; done; fi
+
 # dependancy rules for include files ########################
 $(OBJ): $(INC)/Ximage.h \

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/include/constants.h

@@ -55 +55 @@
 
 typedef enum {
+  KAPA_CM_NONE,
   KAPA_CM_RAW,
   KAPA_CM_CSV,

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/include/prototypes.h

@@ -331 +331 @@
 int CheckFileAccess (char *name);
 char *FindColormap (char *name);
-
-
+char *ParseColormapModeFromEnum (KapaColorMapMode mode);
+void ListColormap (void);

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src/FindColormap.c.in

@@ -1 +1 @@
 # include "Ximage.h"
+# include <glob.h>
 
 // look for the colormap files in the local directory first, then
 // in the directory given by @DATADIR@
 // XXX : probably need to check the input name length
+
+// XXX it would help to be able to list the existing colormaps
+// XXX it would help to be able to recognize the colormap format
+// or better yet have kapa recognize the type from the file
 
 char *ParseColormapName (char *name, KapaColorMapMode *mode) {
@@ -19 +24 @@
 
   return (strcreate (&name[5]));
+}
+
+static char *KAPA_CM_NAME_NONE   = "none";
+static char *KAPA_CM_NAME_STATIC = "static";
+static char *KAPA_CM_NAME_RAW    = "raw";
+static char *KAPA_CM_NAME_LGCY   = "lgcy";
+static char *KAPA_CM_NAME_CETF   = "cetf";
+static char *KAPA_CM_NAME_CETR   = "cetr";
+static char *KAPA_CM_NAME_CSVF   = "csvf";
+
+char *ParseColormapModeFromEnum (KapaColorMapMode mode) {
+
+  if (mode == KAPA_CM_NONE)    { return KAPA_CM_NAME_NONE; }
+  if (mode == KAPA_CM_STATIC)  { return KAPA_CM_NAME_STATIC; }
+  if (mode == KAPA_CM_RAW)     { return KAPA_CM_NAME_RAW;    }
+  if (mode == KAPA_CM_LEGACY)  { return KAPA_CM_NAME_LGCY;   }
+  if (mode == KAPA_CM_CET)     { return KAPA_CM_NAME_CETF;   }
+  if (mode == KAPA_CM_CET_REV) { return KAPA_CM_NAME_CETR;   }
+  if (mode == KAPA_CM_CSV)     { return KAPA_CM_NAME_CSVF;   }
+  return NULL;
+}
+
+int CheckColormapFileFormat (char *filename) {
+  
+  // is the name one of the static colormaps?
+  int isStatic = FALSE;
+  isStatic = isStatic || !strcasecmp (filename, "fullcolor");
+  isStatic = isStatic || !strcasecmp (filename, "ruffcolor");
+  isStatic = isStatic || !strcasecmp (filename, "grayscale");
+  isStatic = isStatic || !strcasecmp (filename, "greyscale");
+  isStatic = isStatic || !strcasecmp (filename, "-grayscale");
+  isStatic = isStatic || !strcasecmp (filename, "-greyscale");
+  isStatic = isStatic || !strcasecmp (filename, "Heat");
+  isStatic = isStatic || !strcasecmp (filename, "Rainbow");
+  isStatic = isStatic || !strcasecmp (filename, "anuenue");
+  if (isStatic) return KAPA_CM_STATIC;
+
+  // open the file
+  
+  FILE *f = fopen (filename, "r");
+  if (!f) {
+    fprintf (stderr, "failed to open colormap file %s\n", filename);
+    return FALSE;
+  }
+
+  char line[1024];
+
+  // read until we get a line which is not blank or commented out
+  while (scan_line_maxlen (f, line, 1024) != EOF) {
+
+    // scan past leading whitespace
+    char *p = line;
+    while ((*p != 0) && OHANA_WHITESPACE(*p)) { p++; }
+    if (*p == 0) { continue; }
+
+    // skip any lines with comment character:
+    if (*p == '#') { continue; }
+
+    float fracIndex, fracRed, fracBlue, fracGreen;
+
+    // we have a line to test:
+    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);
+
+    // the scanf does not require the comma, can 
+    if (Nscan1 == 4) { return KAPA_CM_CSV; }
+    if (Nscan2 == 3) { return KAPA_CM_CET; } // could also be CET_REV
+    if (Nscan3 == 4) { return KAPA_CM_RAW; } // could also be LEGACY
+
+    fclose (f);
+    return KAPA_CM_NONE;
+  }
+  fclose (f);
+  return KAPA_CM_NONE;
 }
 
@@ -51 +131 @@
 char *FindColormap (char *name) {
 
-  static char *datadir = "@DATADIR@";
+  static char *datadir = "@DATADIR@/colormaps";
 
   char *filename;
@@ -58 +138 @@
   // make a copy of the file name if it is found locally
   if (CheckFileAccess (name)) {
+    fprintf (stderr, "found local: %s\n", name);
     return (strcreate (name));
   }
@@ -68 +149 @@
   // make a copy of the file name if it is found locally
   if (CheckFileAccess (filename)) {
+    fprintf (stderr, "found installed: %s\n", filename);
     return (strcreate (filename));
   }
@@ -74 +156 @@
 }
 
+// returns the name of an existing file
+void ListColormaps (void) {
+
+  static char *datadir = "@DATADIR@/colormaps";
+  char dataglob[1024];
+
+  sprintf (dataglob, "%s/*.cm", datadir);
+
+  glob_t globList;
+
+  // parse the filename as a glob
+  globList.gl_offs = 0;
+  glob (dataglob, 0, NULL, &globList);
+
+  int Nfile = globList.gl_pathc;
+  for (int i = 0; i < Nfile; i++) {
+    int format = CheckColormapFileFormat (globList.gl_pathv[i]);
+    fprintf (stderr, "%s : %s\n", globList.gl_pathv[i], ParseColormapModeFromEnum (format));
+  }
+}
+

branches/eam_branches/ipp-20230313/Ohana/src/kapa2/src/SetColormap.c

@@ -21 +21 @@
   float scale, blueRef, redRef, greenRef;
   Graphic *graphic;
+
+  if (!strcasecmp(inName, "list")) {
+    ListColormaps ();
+    return TRUE;
+  }
 
   graphic = GetGraphic();
@@ -232 +237 @@
       return FALSE;
   }
-
+  
   FILE *f = fopen (truename, "r");
   if (!f) {
@@ -252 +257 @@
   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;