Changeset 16011 for trunk/Ohana/src/kapa2/src/CreateZoom32.c

Timestamp:

Jan 6, 2008, 1:41:58 PM (19 years ago)

Author:

eugene

Message:

updates from eam_branch_20071222 : new 3D color map and multiple channels

File:

• trunk/Ohana/src/kapa2/src/CreateZoom32.c (modified) (11 diffs)

trunk/Ohana/src/kapa2/src/CreateZoom32.c

@@ -1 +1 @@
 # include "Ximage.h"
 # define FRAC(a) ((a) - (int)(a))
-
-static float slope = 1.0;
-static float start = 0.0;
-static int MaxValue = 255;
-
-// XXX inline this if needed
-static int PixelLookup(float value) {
-  int out;
-  out = MIN (MAX (slope * value - start, 0), MaxValue);
-  return (out);
-}
 
 void CreateZoom32 (KapaImageWidget *image, Graphic *graphic, double x, double y) {
@@ -22 +11 @@
   int expand_in, expand_out;
   unsigned int *out_pix, *out_pix2;
-  float *imdata, *in_pix, *in_pix2;
-  unsigned long pixel[256], pixvalue;
+  unsigned short *in_pix, *in_pix2;
+  unsigned long *pixel, pixvalue;
   unsigned long back;
 
-  if (image[0].matrix.size == 0) {  /* create a test pattern */
+  if (image[0].image[0].matrix.size == 0) {  /* create a test pattern */
     REALLOCATE (image[0].zoom.data, char, 4*image[0].zoom.dx*image[0].zoom.dy);
     image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
@@ -33 +22 @@
   }
 
-  for (i = 0; i < 256; i++) { /* set up pixel array */
+  ALLOCATE (pixel, unsigned long, graphic[0].Npixels);
+
+  // local array for pixel values
+  for (i = 0; i < graphic[0].Npixels; i++) { 
     pixel[i] = graphic[0].cmap[i].pixel;
   }
   back = graphic[0].back;
-
-  // define the color transform parameters
-  MaxValue = graphic[0].Npixels - 1;
-  if (image[0].range != 0.0) {
-    slope = graphic[0].Npixels / image[0].range;
-    start = graphic[0].Npixels * image[0].zero / image[0].range;
-  } else {
-    slope = 1.0;
-    start = image[0].zero;
-  }
 
   zoomscale = MAX (5, image[0].expand + 5);
@@ -55 +37 @@
   dx = image[0].zoom.dx;
   dy = image[0].zoom.dy;
-  DX = image[0].matrix.Naxis[0];
-  DY = image[0].matrix.Naxis[1];
+  DX = image[0].image[0].matrix.Naxis[0];
+  DY = image[0].image[0].matrix.Naxis[1];
+  
+  /* Rx,Ry are the screen coordinates of the first image pixel */
   Rx = x - expand*(int)(0.5*(dx + 1)) + 1;
   Ry = y - expand*(int)(0.5*(dy + 1)) + 1;
@@ -64 +48 @@
   i_end   = MAX (MIN ((DX-Rx) / expand, dx - expand_out + 1), 0);
   j_end   = MAX (MIN ((DY-Ry) / expand, dy - expand_out + 1), 0);
+
   dropback = expand_out - (i_end - i_start) % expand_out;
   if ((i_end - i_start) % expand_out == 0) dropback = 0;
 
   out_pix = (unsigned int *) image[0].zoom.data;
-  imdata  = (float *) image[0].matrix.buffer;
-  in_pix  = &imdata[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];
+  in_pix  = &image[0].pixmap[DX*(int)MAX(Ry,0) + (int)MAX(Rx,0)];
 
   /********** below we do the mapping from buffer pixels (in) to picture pixels (out) **********/
@@ -78 +62 @@
     return;
   } 
-  
+ 
 
   /**** fill in bottom area ****/
   for (j = 0; j < dx*j_start; j++, out_pix++) {
-    out_pix[0] = back;
+    *out_pix = back;
   }
 
@@ -88 +72 @@
 
     /**** fill in area to the left of the picture ****/
-    for (jj = 0; jj < expand_out; jj++) { 
+    for (jj = 0; (i_start > 0) && (jj < expand_out); jj++) { 
       out_pix2 = out_pix + jj*dx;
       for (i = 0; i < i_start; i++, out_pix2++) {
-        out_pix[0] = back;
+        *out_pix2 = back;
       }
     }
@@ -100 +84 @@
     if (expand_out == 1) {
       for (i = i_start; i < i_end; i++, in_pix2+= expand_in, out_pix++) {
-        pixelN = PixelLookup(*in_pix2);
-        out_pix[0] = pixel[pixelN];
+        *out_pix = pixel[*in_pix2];
       }
-    }
-    else {
+    } else {
       for (i = i_start; i < i_end; i+= expand_out, in_pix2++, out_pix+= expand_out) { 
-        pixelN   = PixelLookup(*in_pix2);
-        pixvalue = pixel[pixelN];
+        pixvalue = pixel[*in_pix2];
         out_pix2 = out_pix;
         for (jj = 0; jj < expand_out; jj++, out_pix2+=(dx-expand_out)) {
           for (ii = 0; ii < expand_out; ii++, out_pix2++) {
-            out_pix2[0] = pixvalue; 
+            *out_pix2 = pixvalue; 
           }
         }
@@ -117 +98 @@
     }
     out_pix -= dropback;
-
     
     /**** fill in area to the right of the picture ****/
@@ -123 +103 @@
       out_pix2 = out_pix + jj*dx;
       for (i = i_end; i < dx; i++, out_pix2++) {
-        out_pix2[0] = back;
+        *out_pix2 = back;
       }
     }
@@ -134 +114 @@
   /**** fill in top area ****/
   for (j = 0; (j < dx*(dy - j_end)) && (out_pix - (unsigned int *)image[0].zoom.data < dx*dy); j++, out_pix++) { 
-    out_pix[0] = back;
+    *out_pix = back;
   }
 
-  out_pix = (unsigned int *)image[0].zoom.data;
   image[0].zoom.pix = XCreateImage (graphic[0].display, graphic[0].visual, graphic[0].depth, ZPixmap, 0, 
                                         image[0].zoom.data, image[0].zoom.dx, image[0].zoom.dy, 32, 0);
   
+  free (pixel);
 }