Changeset 3278 in Sophya for trunk/SophyaPI

Timestamp:

Jul 6, 2007, 4:30:54 PM (18 years ago)

Author:

ansari

Message:

correction de la fct PIGraphicAtt::ColIndexToColor(int colidx) - Reza 05/07/2007

Location:

trunk/SophyaPI/PI

Files:

• pigratt.cc (modified) (2 diffs)
• piversion.h (modified) (1 diff)

trunk/SophyaPI/PI/pigratt.cc

@@ -219 +219 @@
 static GrAttColMaps* GrAcmaps = NULL;
 
+#define GRA_NCOLMX 25
+static PIColors GrAcolTab[GRA_NCOLMX] = 
+  { PI_Black, PI_White, PI_Grey, PI_Red, PI_Blue, PI_Green,  
+    PI_Yellow, PI_Magenta, PI_Cyan, PI_Turquoise, PI_NavyBlue, PI_Orange, 
+    PI_SiennaRed, PI_Purple, PI_LimeGreen, PI_Gold, PI_Violet, PI_VioletRed, 
+    PI_BlueViolet, PI_DarkViolet, PI_SkyBlue, PI_RoyalBlue , PI_ForestGreen, 
+    PI_OrangeRed, PI_Brown };
 
 void PIGraphicAtt::InitGrAttStrings()
@@ -902 +909 @@
 {
   if (!gratt_init_done) InitGrAttStrings();
-  GrAttColors& GrAcol = *GrAcolors;
-  GrAttColors::const_iterator itc; 
-  PIColors cdcol = PI_NotDefColor;
-  if ((colidx < 0) || (colidx >= GrAcol.size()))  return cdcol;
-  int kc = 0;
-  for(itc = GrAcol.begin(); itc != GrAcol.end(); itc++) {
-    if (kc == colidx) { cdcol = (*itc).second; break; }
-    kc++;
-  }
-  return cdcol;
-}
+  if ((colidx < 0) || (colidx >= GRA_NCOLMX))  return PI_NotDefColor;
+  return GrAcolTab[colidx];
+}

trunk/SophyaPI/PI/piversion.h

@@ -2 +2 @@
 #define PIVERSION_H_SEEN
 
-#define PI_VERSIONNUMBER  4.01
+#define PI_VERSIONNUMBER  4.02
 
 #endif