Changeset 2375 in Sophya

Timestamp:

Apr 25, 2003, 4:03:52 PM (22 years ago)

Author:

ansari

Message:

Correction bug ds les nouvelles tables - chgt de nom de tables - Reza 25/04/2003

Location:

trunk/SophyaPI/PI

Files:

• picmap.cc (modified) (2 diffs)
• picmapview.cc (modified) (1 diff)

trunk/SophyaPI/PI/picmap.cc

@@ -38 +38 @@
                       "Grey32","InvGrey32","ColRJ32","ColBR32","ColRV32", 
                       "Grey128","InvGrey128","ColRJ128","ColBR128",
-                      "Red32","Green32","Blue32","Yellow32",
+                      "Red32CM","Green32CM","Blue32CM","Yellow32CM",
                       "MIDAS_Pastel","MIDAS_Heat","MIDAS_Rainbow3", 
                       "MIDAS_BlueRed","MIDAS_BlueWhite","MIDAS_Stairs8",
@@ -457 +457 @@
         else if (mType == CMAP_BLUE32)  mycol.blue = vcol;
         else if (mType == CMAP_YELLOW32) mycol.green = mycol.red = vcol;
-        for(k=0; k<8; k++)     AllocColor(mycol, i*8+k);
-      }
-      for(i=6; i<20; i++) {
-        mycol.green = mycol.blue = 0;
-        mycol.red = 20000+(i-5)*2000;
         for(k=0; k<8; k++)     AllocColor(mycol, i*8+k);
       }

trunk/SophyaPI/PI/picmapview.cc

@@ -139 +139 @@
 
   if ( (cmap->Type() == CMAP_GREY32) || (cmap->Type() == CMAP_GREYINV32) ||
-       (cmap->Type() == CMAP_GREY128) || (cmap->Type() == CMAP_GREYINV128) )  g->SelForeground(PI_Red);
+       (cmap->Type() == CMAP_GREY128) || (cmap->Type() == CMAP_GREYINV128) || 
+       (cmap->Type() == CMAP_GREEN32) )  g->SelForeground(PI_Red);
   else g->SelForeground(PI_Green);