Changeset 1126 in Sophya for trunk/SophyaPI

Timestamp:

Aug 1, 2000, 1:26:12 PM (25 years ago)

Author:

ercodmgr

Message:

Adaptation aux modifs de tables de couleurs pour attributs graphique - Reza 1/8/2000

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• servnobjm.cc (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -702 +702 @@
 usage += "           ftrianglemarker<T>  starmarker<T>  fstarmarker<T> \n";
 usage += "   with <T> = 1 3 5 7 9 , Example fboxmarker5 , plusmarker9 ... \n";
-usage += ">> ColorTables: defcmap  grey32  greyinv32  colrj32  colbr32 \n";
-usage += "                grey128  greyinv128  colrj128  colbr128 \n";
+usage += ">> ColorTables: defcmap  grey32  invgrey32  colrj32  colbr32 \n";
+usage += "                grey128  invgrey128  colrj128  colbr128 \n";
+usage += "                midas_pastel midas_heat midas_rainbow3 midas_bluered\n";
+usage += "                midas_bluewhite midas_redwhite \n";
+usage += "                rainbow16 \n";
 usage += ">> ZoomFactors: defzoom zoomx1 zoomx2 zoomx3 zoomx4 zoomx5 \n";
 usage += "                               zoom/2 zoom/3 zoom/4 zoom/5 \n";

trunk/SophyaPI/PIext/servnobjm.cc

@@ -1562 +1562 @@
 gi.a1 = CMAP_OTHER;
 GrAcmap["defcmap"] = gi;
-gi.a1 = CMAP_GREY32;
-GrAcmap["grey32"] = gi;
-gi.a1 = CMAP_GREYINV32;
-GrAcmap["greyinv32"] = gi;
-gi.a1 = CMAP_COLRJ32;
-GrAcmap["colrj32"] = gi;
-gi.a1 = CMAP_COLBR32;
-GrAcmap["colbr32"] = gi;
-gi.a1 = CMAP_GREY128;
-GrAcmap["grey128"] = gi;
-gi.a1 = CMAP_GREYINV128;
-GrAcmap["greyinv128"] = gi;
-gi.a1 = CMAP_COLRJ128;
-GrAcmap["colrj128"] = gi;
-gi.a1 = CMAP_COLBR128;
-GrAcmap["colbr128"] = gi;
+for(int kcc=0; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) {
+  gi.a1 = PIColorMap::GetStandardColorMapId(kcc);
+  string colname = PIColorMap::GetStandardColorMapName(kcc);
+  for(int jll=0; jll<colname.length(); jll++)
+    colname[jll] = tolower(colname[jll]);
+  GrAcmap[colname] = gi;
+}
+
 
 // La valeur de zoom