Changeset 19828

Timestamp:

Oct 2, 2008, 8:18:07 AM (18 years ago)

Author:

eugene

Message:

update the KiiLoadPicture2D to match kapa 32bit upgrade

File:

• trunk/Ohana/src/libkapa/src/KiiPicture.c (modified) (4 diffs)

trunk/Ohana/src/libkapa/src/KiiPicture.c

@@ -37 +37 @@
   /* done with the conversion, now send kapa the converted picture */
   KiiSendMessage (fd, "%8d %8d", image[0].Nx, image[0].Ny);
-  KiiSendMessage (fd, "-32 1 0.0 1.0");
   KiiSendMessage (fd, "%f %f %s %s", data[0].zero, data[0].range, data[0].name, data[0].file);
   KiiSendMessage (fd, "%f %f %d ", min, max, size);
@@ -93 +92 @@
   /* done with the conversion, now send kapa the converted picture */
   KiiSendMessage (fd, "%8d %8d", image[0].Nx, image[0].Ny);
-  KiiSendMessage (fd, "8 1 0.0 1.0");
   KiiSendMessage (fd, "%f %f %s %s", data[0].zero, data[0].range, data[0].name, data[0].file);
   KiiSendMessage (fd, "%f %f %d ", min, max, size);
@@ -121 +119 @@
   KiiScanMessage (fd, "%d", &Ncolors);
 
-  ALLOCATE (outbuffer, char, Npix);
-  out = outbuffer;
-
-  /* need to invert the logic if range < 0 */
-
-  /* define color table, */
-  NNcolors = Ncolors - 1;
-  if (data[0].logflux) {
-    data[0].range = MAX (2, data[0].range);
-    a1 = Ncolors / log10 (data[0].range);
-    a2 = data[0].zero;
-    for (j = 0; j < image[0].Ny; j++) {
-      in = image[0].data2d[j];
-      for (i = 0; i < image[0].Nx; i++, in++, out++) {
-        *out = (char) MIN (a1 * log10 (MAX (*in - a2, 1.0)), NNcolors);
-      }
-    }
-  } else {
-    a1 = Ncolors / data[0].range;
-    a2 = Ncolors * data[0].zero / data[0].range;
-    for (j = 0; j < image[0].Ny; j++) {
-      in = image[0].data2d[j];
-      for (i = 0; i < image[0].Nx; i++, in++, out++) {
-        *out = (char) MIN (MAX (a1 * *in - a2, 0), NNcolors);
-      }
-    }
-  }
-  
   /* these are for a future upgrade */
   min = max = 0.0;
-  size = Npix*sizeof(char);
+  size = Npix*sizeof(float);
 
   /* done with the conversion, now send kapa the converted picture */
   KiiSendMessage (fd, "%8d %8d", image[0].Nx, image[0].Ny);
-  KiiSendMessage (fd, "8 1 0.0 1.0");
   KiiSendMessage (fd, "%f %f %s %s", data[0].zero, data[0].range, data[0].name, data[0].file);
   KiiSendMessage (fd, "%f %f %d ", min, max, size);
@@ -163 +132 @@
 
   /* send the image data */
-  write (fd, outbuffer, size);
-  free (outbuffer);
+
+  for (j = 0; j < image[0].Ny; j++) {
+      write (fd, image[0].data2d[j], image[0].Nx*sizeof(float));
+  }
 
   KiiWaitAnswer (fd, "DONE");