Changeset 15996

Timestamp:

Jan 4, 2008, 2:06:49 AM (18 years ago)

Author:

eugene

Message:

initial release of the histogram 3d color cube

Location:

branches/eam_branch_20071222/Ohana/src/kapa2

Files:

• Makefile (modified) (1 diff)
• include/constants.h (modified) (3 diffs)
• include/prototypes.h (modified) (2 diffs)
• include/structures.h (modified) (1 diff)
• src/ButtonFunctions.c (modified) (1 diff)
• src/ColorCube.c (added)
• src/ColorHistogram.c (added)
• src/SetColorScale.c (modified) (6 diffs)
• src/SetColormap.c (modified) (2 diffs)
• src/sort.c (added)
• test/input (modified) (1 diff)

branches/eam_branch_20071222/Ohana/src/kapa2/Makefile

@@ -78 +78 @@
 $(SRC)/PSimage.$(ARCH).o                  $(SRC)/PSPixmap.$(ARCH).o           \
 $(SRC)/PSOverlay.$(ARCH).o                $(SRC)/SetChannel.$(ARCH).o         \
-$(SRC)/SetColorScale.$(ARCH).o
+$(SRC)/SetColorScale.$(ARCH).o            $(SRC)/ColorCube.$(ARCH).o          \
+$(SRC)/ColorHistogram.$(ARCH).o           $(SRC)/sort.$(ARCH).o
 
 OBJ  =  $(KAPA)

branches/eam_branch_20071222/Ohana/src/kapa2/include/constants.h

@@ -12 +12 @@
 # define NCHANNELS 3
 # define NPIXELS_DYNAMIC 128
-# define NPIXELS_STATIC 1024
+
+// XXX for the moment, this is set to match the values in SetColorScale3D_CC
+# define NPIXELS_STATIC 3000
 
 # define PAD1  3
@@ -33 +35 @@
 typedef enum {
     KAPA_SCALE_1D,
-    KAPA_SCALE_3D
+    KAPA_SCALE_3D_RUFF,
+    KAPA_SCALE_3D_FULL
 } KapaColorScaleMode;
 
@@ -47 +50 @@
   LABELLR
 } KapaLabelMode;
+
+typedef enum {
+  KAPA_CHANNEL_RED,
+  KAPA_CHANNEL_GREEN,
+  KAPA_CHANNEL_BLUE,
+} KapaChannels;
+
+// use an enum to identify the 3 dimensions:
+typedef enum {
+  CC_X,
+  CC_Y,
+  CC_Z,
+} CCDimen;
 
 /* EVENT_MASK consists of:

branches/eam_branch_20071222/Ohana/src/kapa2/include/prototypes.h

@@ -142 +142 @@
 void          SetColorScale       PROTO((Graphic *graphic, KapaImageWidget *image));
 void          SetColorScale1D     PROTO((Graphic *graphic, KapaImageWidget *image));
-void          SetColorScale3D     PROTO((Graphic *graphic, KapaImageWidget *image));
+int           SetColorScale3D     PROTO((Graphic *graphic, KapaImageWidget *image));
 void          Remap               PROTO((Graphic *graphic, KapaImageWidget *image));
 void          Remap8              PROTO((Graphic *graphic, KapaImageWidget *image, Matrix *matrix));
@@ -223 +223 @@
 void InvertButton (Graphic *graphic, Button *button);
 void bDrawOverlay (KapaImageWidget *image, int N);
+
+/* color cube tools */
+CCNode *CCNodeAlloc ();
+CCNode *CCFindChild (CCNode *node, float x, float y, float z);
+int CCSplitNode (CCNode *node);
+int CCSplitNodeIterate (CCNode *node, int current, int max);
+void CCNodeFree (CCNode *node);
+CCNode *CCFindBottom (CCNode *top, float x, float y, float z);
+int CCNodeExtractCounts (CCNode *node, float **values, int *nvalues, int *NVALUES);
+int CCNodeDivideLimit (CCNode *node, float minValue);
+int CCNodeInitCounts (CCNode *node, float value);
+
+/* 3D color histogram */
+void ColorHistogram (KapaImageWidget *image, CCNode *cube);
+void CCNodeSetColorPixels (KapaImageWidget *image, CCNode *cube);
+int CCNodeSetColorMap (CCNode *node, XColor *cmap, int Npixels, int *current);
+
+int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image);
+
+void sort (float *value, int N);

branches/eam_branch_20071222/Ohana/src/kapa2/include/structures.h

@@ -66 +66 @@
 } TextBox;
 
+/*** 3C color cube histogram tree thingy ***/
+typedef struct CCNode {
+  // for the moment, this structure is specific to the color-histogram analysis.  if
+  // this were a void *pointer and we defined some additional apis, we could use this
+  // structure to track any 3D space
+  int count;    
+  int pixel;
+  char bottom;
+  float min[3]; // min value for each of the 3 dimensions for this node
+  float mid[3]; // mid-point for each of the 3 dimensions for this node
+  float max[3]; // max value for each of the 3 dimensions for this node
+  struct CCNode *sub[2][2][2];
+} CCNode;
+
 /**************** general structures ****************/
 typedef struct {

branches/eam_branch_20071222/Ohana/src/kapa2/src/ButtonFunctions.c

@@ -29 +29 @@
   char *name;
   name = HEAT;
-  SetColormap (name);
+  SetColormap ("ruffcolor");
   CreateColorbar (image, graphic);
   SetColorScale (graphic, image);

branches/eam_branch_20071222/Ohana/src/kapa2/src/SetColorScale.c

@@ -7 +7 @@
       SetColorScale1D (graphic, image);
       break;
-    case KAPA_SCALE_3D:
-      SetColorScale3D (graphic, image);
+    case KAPA_SCALE_3D_RUFF:
+      // fall-back on 1D colors (ie, if images are mis-matched)
+      if (!SetColorScale3D (graphic, image)) {
+        graphic[0].ColorScaleMode = KAPA_SCALE_1D;
+        SetColorScale1D (graphic, image);
+      }
+      break;
+    case KAPA_SCALE_3D_FULL:
+      // fall-back on 1D colors (ie, if images are mis-matched)
+      if (!SetColorScale3D_CC (graphic, image)) {
+        graphic[0].ColorScaleMode = KAPA_SCALE_1D;
+        SetColorScale1D (graphic, image);
+      }
       break;
     default:
@@ -60 +71 @@
 
 // in 3D we use channels 0,1,2 to choose the pixel from the cube
-void SetColorScale3D (Graphic *graphic, KapaImageWidget *image) {
+// XXX this uses a crude, uniform-spacing cube
+int SetColorScale3D (Graphic *graphic, KapaImageWidget *image) {
   int i, j, DX, DY, value, nPixels, rValue, gValue, bValue;
   float *rData, *bData, *gData;
@@ -67 +79 @@
   float redStart, blueStart, greenStart;
 
+  DX = image[0].channel[KAPA_CHANNEL_RED].matrix.Naxis[0];
+  DY = image[0].channel[KAPA_CHANNEL_RED].matrix.Naxis[1];
+
+  if (DX != image[0].channel[KAPA_CHANNEL_GREEN].matrix.Naxis[0]) return FALSE;
+  if (DY != image[0].channel[KAPA_CHANNEL_GREEN].matrix.Naxis[1]) return FALSE;
+  if (DX != image[0].channel[KAPA_CHANNEL_BLUE].matrix.Naxis[0]) return FALSE;
+  if (DY != image[0].channel[KAPA_CHANNEL_BLUE].matrix.Naxis[1]) return FALSE;
+
   // define the color transform parameters
   unsigned short maxRed = graphic[0].nRed - 1;
@@ -73 +93 @@
 
   // set start & slope for red (channel 0)
-  if (image[0].channel[0].range != 0.0) {
-    redSlope = graphic[0].nRed / image[0].channel[0].range;
-    redStart = graphic[0].nRed * image[0].channel[0].zero / image[0].channel[0].range;
+  if (image[0].channel[KAPA_CHANNEL_RED].range != 0.0) {
+    redSlope = graphic[0].nRed / image[0].channel[KAPA_CHANNEL_RED].range;
+    redStart = graphic[0].nRed * image[0].channel[KAPA_CHANNEL_RED].zero / image[0].channel[KAPA_CHANNEL_RED].range;
   } else {
     redSlope = 1.0;
-    redStart = image[0].channel[0].zero;
+    redStart = image[0].channel[KAPA_CHANNEL_RED].zero;
   }
   // set start & slope for blue (channel 0)
-  if (image[0].channel[1].range != 0.0) {
-    blueSlope = graphic[0].nBlue / image[0].channel[1].range;
-    blueStart = graphic[0].nBlue * image[0].channel[1].zero / image[0].channel[1].range;
+  if (image[0].channel[KAPA_CHANNEL_BLUE].range != 0.0) {
+    blueSlope = graphic[0].nBlue / image[0].channel[KAPA_CHANNEL_BLUE].range;
+    blueStart = graphic[0].nBlue * image[0].channel[KAPA_CHANNEL_BLUE].zero / image[0].channel[KAPA_CHANNEL_BLUE].range;
   } else {
     blueSlope = 1.0;
-    blueStart = image[0].channel[1].zero;
+    blueStart = image[0].channel[KAPA_CHANNEL_BLUE].zero;
   }
   // set start & slope for green (channel 0)
-  if (image[0].channel[2].range != 0.0) {
-    greenSlope = graphic[0].nGreen / image[0].channel[2].range;
-    greenStart = graphic[0].nGreen * image[0].channel[2].zero / image[0].channel[2].range;
+  if (image[0].channel[KAPA_CHANNEL_GREEN].range != 0.0) {
+    greenSlope = graphic[0].nGreen / image[0].channel[KAPA_CHANNEL_GREEN].range;
+    greenStart = graphic[0].nGreen * image[0].channel[KAPA_CHANNEL_GREEN].zero / image[0].channel[KAPA_CHANNEL_GREEN].range;
   } else {
     greenSlope = 1.0;
-    greenStart = image[0].channel[2].zero;
-  }
-
-  DX = image[0].channel[0].matrix.Naxis[0];
-  DY = image[0].channel[0].matrix.Naxis[1];
-  // check on equal size for channel[1] and channel[2]
+    greenStart = image[0].channel[KAPA_CHANNEL_GREEN].zero;
+  }
 
   nPixels = DX*DY;
@@ -108 +124 @@
 
   oData = image[0].pixmap;
-  rData = (float *) image[0].channel[0].matrix.buffer;
-  bData = (float *) image[0].channel[1].matrix.buffer;
-  gData = (float *) image[0].channel[2].matrix.buffer;
+  rData = (float *) image[0].channel[KAPA_CHANNEL_RED].matrix.buffer;
+  bData = (float *) image[0].channel[KAPA_CHANNEL_BLUE].matrix.buffer;
+  gData = (float *) image[0].channel[KAPA_CHANNEL_GREEN].matrix.buffer;
 
   // convert pixel data values to pixel index values (0 - Npixel)
@@ -128 +144 @@
     *oData = gValue + bValue * (maxGreen + 1) + rValue * (maxGreen + 1) * (maxBlue + 1);
   }
-}
+  return TRUE;
+}
+
+// in 3D we use channels 0,1,2 to choose the pixel from the cube
+int SetColorScale3D_CC (Graphic *graphic, KapaImageWidget *image) {
+
+  int i, DX, DY, Nvalues, NVALUES, Npixels, Nmin;
+  float *values, *colors;
+  CCNode *cube;
+
+  DX = image[0].channel[KAPA_CHANNEL_RED].matrix.Naxis[0];
+  DY = image[0].channel[KAPA_CHANNEL_RED].matrix.Naxis[1];
+  if (DX != image[0].channel[KAPA_CHANNEL_GREEN].matrix.Naxis[0]) return FALSE;
+  if (DY != image[0].channel[KAPA_CHANNEL_GREEN].matrix.Naxis[1]) return FALSE;
+  if (DX != image[0].channel[KAPA_CHANNEL_BLUE].matrix.Naxis[0]) return FALSE;
+  if (DY != image[0].channel[KAPA_CHANNEL_BLUE].matrix.Naxis[1]) return FALSE;
+
+  // create the top-level cube
+  cube = CCNodeAlloc();
+  cube->min[CC_X] = cube->min[CC_Y] = cube->min[CC_Z] = 0.0;
+  cube->max[CC_X] = cube->max[CC_Y] = cube->max[CC_Z] = 1.0;
+  cube->mid[CC_X] = cube->mid[CC_Y] = cube->mid[CC_Z] = 0.5;
+
+  // subdivide cube into first, uniform division (4x4x4)
+  CCSplitNodeIterate (cube, 0, 2);
+
+  // need to allocate at least 1184 pixels
+  // 64, 288, 512, 736, 960, 1184
+  for (i = 0; i < 8; i++) {
+    // generate histogram
+    ColorHistogram (image, cube);
+
+    // extract histogram values
+    values  = NULL;
+    Nvalues = 0;
+    NVALUES = 0;
+    CCNodeExtractCounts (cube, &values, &Nvalues, &NVALUES);
+  
+    // select top N cells
+    sort (values, Nvalues);
+
+    // split nodes with more than value[n]
+    Nmin = MAX (0, Nvalues - 50);
+    CCNodeDivideLimit (cube, values[Nmin]);
+    free (values);
+
+    CCNodeInitCounts (cube, 0.0);
+  }
+
+  // generate histogram
+  ColorHistogram (image, cube);
+  
+  // convert histogram 3D values to cmap colors
+  Npixels = 0;
+  CCNodeSetColorMap (cube, graphic[0].cmap, graphic[0].Npixels, &Npixels);
+
+  // store the colors
+  if (USE_XWINDOW) {
+    if (graphic[0].visualclass) {
+      XStoreColors(graphic[0].display, graphic[0].colormap, graphic[0].cmap, Npixels);
+    } else {
+      for (i = 0; i < Npixels; i++) {
+        if (XAllocColor (graphic[0].display, graphic[0].colormap, &graphic[0].cmap[i]) == 0) {
+          fprintf (stderr, "error on %d\n", i);
+        }
+      }
+    }
+  }
+  CCNodeSetColorPixels (image, cube);
+  return TRUE;
+}
+

branches/eam_branch_20071222/Ohana/src/kapa2/src/SetColormap.c

@@ -19 +19 @@
   graphic = GetGraphic();
 
+  // the "fullcolor" colormap is uniquely defined for each image;
+  // defer to the 'SetColorScale' step
+  if (!strcasecmp (name, "fullcolor")) {
+    graphic[0].ColorScaleMode = KAPA_SCALE_3D_FULL;
+    return TRUE;
+  }
+
   // very simple color model: evenly spaced cube 
-  if (!strcasecmp (name, "fullcolor")) {
+  if (!strcasecmp (name, "ruffcolor")) {
       graphic[0].nRed  = pow (graphic[0].Npixels, 0.333);
       graphic[0].nBlue = pow (graphic[0].Npixels, 0.333);
@@ -43 +50 @@
 
       // all other modes are 1D: set the flag:
-      graphic[0].ColorScaleMode = KAPA_SCALE_3D;
+      graphic[0].ColorScaleMode = KAPA_SCALE_3D_RUFF;
       goto store_colors;
   }

branches/eam_branch_20071222/Ohana/src/kapa2/test/input

@@ -23 +23 @@
   tv R 0 256
   tvchannel 1
+  tv G 0 256
+  tvchannel 2
   tv B 0 256
-  tvchannel 2
-  tv G 0 256
 end