Changeset 3527 in Sophya for trunk/SophyaPI

Timestamp:

Oct 12, 2008, 6:57:14 PM (17 years ago)

Author:

ansari

Message:

Suite codage+debug RGB-Colormaps et affichage d'image en couleurs RGB, Reza 12/10/2008

Location:

trunk/SophyaPI/PI

Files:

• lut.cc (modified) (4 diffs)
• lut.h (modified) (1 diff)
• parradapter.cc (modified) (4 diffs)
• picmap.cc (modified) (1 diff)
• piimage.cc (modified) (2 diffs)
• piimgtools.cc (modified) (1 diff)

trunk/SophyaPI/PI/lut.cc

@@ -23 +23 @@
 if (bornes == NULL)  return;
 type = typ;  nLevel = nlev;
+int qqq = 1;
+quantum = 1;
+for(quantum=2; quantum<=42; quantum++) {
+  qqq = quantum*quantum*quantum;
+  if (qqq > NCol())  break;
+}
+quantum--;
+
 table = NULL;  
 tablenbin = 0;
@@ -47 +55 @@
 bornes = new double[nlev+1];
 nLevel = nlev;
+int qqq = 1;
+quantum = 1;
+for(quantum=2; quantum<=42; quantum++) {
+  qqq = quantum*quantum*quantum;
+  if (qqq > NCol())  break;
+}
+quantum--;
+// printf("*DBG*LUT* quantum= %d \n", (int)quantum);
 SetLut(min, max, Type());
 }
@@ -59 +75 @@
 type = typ;
 if (max <= min)  max = min+1.;
+mMin = min;  mMax = max;
+mMinI = (int)(min+0.1);  mMaxI = (int)(max+0.1);
 if (nLevel > 0)
   {
@@ -125 +143 @@
 {
   long lv = x+0.3;
-  double r = (lv%256);
+  int r = (lv%256);
   lv /= 256;
-  double g = (lv%256);
+  int g = (lv%256);
   lv /= 256;
-  double b = (lv%256);
-  int qqq = 1;
-  int quantum = 1;
-  for(quantum=2; quantum<=42; quantum++) {
-        qqq = quantum*quantum*quantum;
-        if (qqq > NCol())  break;
-  }
-  quantum--;
-  int ir = AppFast(r)*quantum/(NCol());
-  int ig = AppFast(g)*quantum/(NCol());
-  int ib = AppFast(b)*quantum/(NCol());
-  return ((unsigned short)((ib*quantum+ig)*quantum+ir));
+  int b = (lv%256);
+  return (unsigned short)((Contraste(b)*quantum+Contraste(g))*quantum+Contraste(r));
 }
 

trunk/SophyaPI/PI/lut.h

@@ -49 +49 @@
     return(table[k]); 
     } 
-          
+  inline int  Contraste(int ii)   /* for ApplyRGB */
+    {
+    if (ii >= mMaxI) return quantum-1;
+    if (ii <= mMinI) return 0;
+    else return ((ii-mMinI)*(quantum-1)/mMaxI);
+    }     
   int type;
   int nLevel;
+  int quantum;
   double * bornes;
+  double mMin, mMax;
+  int mMinI, mMaxI;
   int tablenbin;
   unsigned short * table;

trunk/SophyaPI/PI/parradapter.cc

@@ -562 +562 @@
   if (zm == 1)  {  // Pas de zoom  
     for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++) 
-        { *pp = (unsigned char) lut->ApplyFast( 
-                this->Value(j*sgnX+offX, i*sgnY+offY));  
-           pp++; }
+      for(i=ofx; i<ofx+npx; i++) {
+        *pp = lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));  pp++; 
+      }
     }
   else if (zm < -1) {       // Compression 
@@ -578 +577 @@
     for(j=ofy; j<ofy+npy; j++)
       for(i=ofx; i<ofx+npx; i++)  {
-        ucp = (unsigned char) lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));
+        ucp = lut->ApplyFast(this->Value(j*sgnX+offX, i*sgnY+offY));
         for(l=0; l<zm; l++)  {
           pp = pixc.ShortPointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);
@@ -589 +588 @@
   if (zm == 1)  {  // Pas de zoom  
     for(j=ofy; j<ofy+npy; j++)
-      for(i=ofx; i<ofx+npx; i++) 
-        { *pp = (unsigned char) lut->ApplyFast( 
-                this->Value(i*sgnX+offX, j*sgnY+offY));  
-           pp++; }
+      for(i=ofx; i<ofx+npx; i++) {
+        *pp = lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));  pp++; 
+      }
     }
   else if (zm < -1) {       // Compression 
@@ -605 +603 @@
     for(j=ofy; j<ofy+npy; j++)
       for(i=ofx; i<ofx+npx; i++)  {
-        ucp = (unsigned char) lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));
+        ucp = lut->ApplyFast(this->Value(i*sgnX+offX, j*sgnY+offY));
         for(l=0; l<zm; l++)  {
           pp = pixc.ShortPointer()+((j-ofy)*zm+l)*nppx+((i-ofx)*zm);

trunk/SophyaPI/PI/picmap.cc

@@ -597 +597 @@
       int drgb = 65535/(nlev-1);
       i = 0;
-      for(int kb=0; kb<8; kb++) {
+      for(int kb=0; kb<nlev; kb++) {
         mycol.blue = (unsigned short)(kb*drgb);
-        for(int jg=0; jg<8; jg++) { 
+        for(int jg=0; jg<nlev; jg++) { 
           mycol.green = (unsigned short)(jg*drgb);
-          for(int ir=0; ir<8; ir++) {
+          for(int ir=0; ir<nlev; ir++) {
             mycol.red = (unsigned short)(ir*drgb);
             AllocColor(mycol, i);   i++;

trunk/SophyaPI/PI/piimage.cc

@@ -625 +625 @@
       double min = Lut()->Min();
       double max = Lut()->Max();
-      size_t q = opts.find(',');
-      if (q < opts.length()-1)
-        sscanf(opts.substr(q+1).c_str(),"%lg,%lg",&min, &max);
       int typlut=kLutType_Lin;      ;
       if (opts.substr(4,3) == "lin")  typlut=kLutType_Lin;
@@ -633 +630 @@
       else if (opts.substr(4,4) == "sqrt")  typlut=kLutType_Sqrt;
       else if (opts.substr(4,6) == "square")  typlut=kLutType_Square;
-      else if (opts.substr(4,6) == "rgb")  typlut=kLutType_RGB;
+      else if (opts.substr(4,3) == "rgb")  { 
+        typlut=kLutType_RGB;
+        min = 0;  max = 255;
+      } 
+      size_t q = opts.find(',');
+      if (q < opts.length()-1)
+        sscanf(opts.substr(q+1).c_str(),"%lg,%lg",&min, &max);
+
       SetLut(AutoLut_No, min, max, typlut, 0, false);
       continue;

trunk/SophyaPI/PI/piimgtools.cc

@@ -448 +448 @@
     if ((lauto < 0) || (lauto > 12))  lauto = 12;
     typ = mOpt[0]->GetValue() - 1100;
-    if ( (typ < 0) || (typ > 3) )  typ = 0;
+    if ( (typ < 0) || (typ > 4) )  typ = 0;
     (PIImage::CurrentPIImage())->SetLut(alts[lauto], min, max, typlut[typ], nsas[lauto]);
     if (msg == 2500) {