Changeset 15925 for branches/eam_branch_20071222/Ohana/src/kapa2/include/structures.h

Timestamp:

Dec 24, 2007, 5:47:04 PM (19 years ago)

Author:

eugene

Message:

lots of work to add in multiple channels, blinking, working to 3D colors

File:

• branches/eam_branch_20071222/Ohana/src/kapa2/include/structures.h (modified) (5 diffs)

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

@@ -2 +2 @@
 /**************** Graphic carries X info around ****************/
 typedef struct {
-  Display       *display;
-  int            screen;
+  Display       *display;     // X display pointer
+  int            screen;      // X screen number
   int            depth;
   Window         window;
   Visual        *visual;
-  int            visualclass;
-  int            Nbits;
+  int            visualclass; // is visual dynamic? (XXX change name?)
+  int            Nbits;       // pixel depth in bits (8, 16, 24, 32)
   GC             gc;
   XFontStruct   *font;
@@ -14 +14 @@
   int            x,  y;
   unsigned int   dx, dy;
-  XColor         cmap[1024];
+  XColor        *cmap;
   Colormap       colormap;
-  unsigned long  fore;
-  unsigned long  back;
-  unsigned long  *color;
-  unsigned long  pixels[1024];
-  unsigned long  overlay_color[NOVERLAYS];
-  int Npixels;
+  unsigned long *color;      // graph plotting colors
   int Ncolors;
+
+  unsigned long *pixels;     // image pixel colors
+  int Npixels;                // number of pixels
+
+  unsigned long  fore;        // basic foreground color 
+  unsigned long  back;        // basic background color
+
+  unsigned long  overlay_color[NOVERLAYS]; // image plotting colors 
 } Graphic;
 
@@ -125 +128 @@
 } KapaGraphWidget;
 
+typedef struct {
+  // data associated with this image element
+  Matrix   matrix;         /* data for picture */
+  double   zero, range;    /* zero, range for picture to cmap */
+  double   max, min;       /* zero, range for data to z-value */
+  double   start, slope;   /* zero, range for cmap to pixels */
+  Coords   coords;
+  char     file[1024];     /* name of file */
+  char     name[1024];     /* name of buffer */
+} KapaImageChannel;
+
 // a single image in the display window
 typedef struct {
@@ -139 +153 @@
   Button   grey_button;
   Button   rainbow_button;
-  Button    puns_button;
+  Button   heat_button;
   Button   overlay_button[NOVERLAYS];
 
@@ -149 +163 @@
   int      DecimalDegrees;
 
-  // data associated with this image element
+  double   X, Y;           /* image pixel at screen center */
+  int      expand;         /* zoomscale */
+  double   x, y, z;        /* last pointer coords */
+
   Overlay  overlay[NOVERLAYS];
   Overlay  tickmarks;
-  Matrix   matrix;         /* data for picture */
-  double   X, Y;           /* image pixel at screen center */
-  int      expand;         /* zoomscale */
-  double   zero, range;    /* zero, range for picture to cmap */
-  double   max, min;       /* zero, range for data to z-value */
-  double   start, slope;   /* zero, range for cmap to pixels */
-  double   x, y, z;        /* last pointer coords */
-  Coords   coords;
-  char     file[1024];     /* name of file */
-  char     name[1024];  /* name of buffer */
+
+  unsigned short   *pixmap;   // lookup table for image pixel value to pixel index
+  KapaImageChannel *image;
+  KapaImageChannel channel[NCHANNELS];
 } KapaImageWidget;