Changeset 143 in Sophya

Timestamp:

Sep 16, 1998, 3:49:07 PM (27 years ago)

Author:

ercodmgr

Message:

+ de couleurs possibles cmv 16/9/98

File:

• trunk/SophyaPI/PI/pihisto2d.cc (modified) (3 diffs)

trunk/SophyaPI/PI/pihisto2d.cc

@@ -531 +531 @@
 
 mOPop[2] = new PIOptMenu(this, "optmen-h2d-3", 100,25,10,70);
-mOPop[2]->AppendItem("B&W"      , 6301);
-mOPop[2]->AppendItem("Grey32"   , 6302);
-mOPop[2]->AppendItem("GreyInv32", 6303);
-mOPop[2]->AppendItem("RJ32"     , 6304);
-mOPop[2]->AppendItem("BR32"     , 6305);
-mOPop[2]->AppendItem("RV32"     , 6306);
-mOPop[2]->AppendItem("Arc16"    , 6307);
+mOPop[2]->AppendItem("B&W"       , 6301);
+mOPop[2]->AppendItem("Grey32"    , 6302);
+mOPop[2]->AppendItem("GreyInv32" , 6303);
+mOPop[2]->AppendItem("RJ32"      , 6304);
+mOPop[2]->AppendItem("BR32"      , 6305);
+mOPop[2]->AppendItem("RV32"      , 6306);
+mOPop[2]->AppendItem("Grey128"   , 6307);
+mOPop[2]->AppendItem("GreyInv128", 6308);
+mOPop[2]->AppendItem("RJ128"     , 6309);
+mOPop[2]->AppendItem("BR128"     , 6310);
+mOPop[2]->AppendItem("Arc16"     , 6311);
 sdum = "B&W"; mOPop[2]->SetValueStr(sdum);
 
@@ -603 +607 @@
 else if(mTypScal==1) { sdum="Log10";    mOPop[1]->SetValueStr(sdum);}
 
-if(!mFgCol)                      { sdum="B&W";       mOPop[2]->SetValueStr(sdum);}
+if(!mFgCol)                       { sdum="B&W";        mOPop[2]->SetValueStr(sdum);}
 else {
-  if(mCmap==CMAP_GREY32)         { sdum="Grey32";    mOPop[2]->SetValueStr(sdum);}
-  else if(mCmap==CMAP_GREYINV32) { sdum="GreyInv32"; mOPop[2]->SetValueStr(sdum);}
-  else if(mCmap==CMAP_COLRJ32)   { sdum="RJ32";      mOPop[2]->SetValueStr(sdum);}
-  else if(mCmap==CMAP_COLBR32)   { sdum="BR32";      mOPop[2]->SetValueStr(sdum);}
-  else if(mCmap==CMAP_COLRV32)   { sdum="RV32";      mOPop[2]->SetValueStr(sdum);}
-  else if(mCmap==CMAP_COL16)     { sdum="Arc16";     mOPop[2]->SetValueStr(sdum);}
+  if(mCmap==CMAP_GREY32)          { sdum="Grey32";     mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_GREYINV32)  { sdum="GreyInv32";  mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COLRJ32)    { sdum="RJ32";       mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COLBR32)    { sdum="BR32";       mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COLRV32)    { sdum="RV32";       mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_GREY128)    { sdum="Grey128";    mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_GREYINV128) { sdum="GreyInv128"; mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COLRJ128)   { sdum="RJ128";      mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COLBR128)   { sdum="BR128";      mOPop[2]->SetValueStr(sdum);}
+  else if(mCmap==CMAP_COL16)      { sdum="Arc16";      mOPop[2]->SetValueStr(sdum);}
 }
 
@@ -667 +675 @@
 else if (opt == 6305) { mFgCol = true;  mCmap = CMAP_COLBR32; }
 else if (opt == 6306) { mFgCol = true;  mCmap = CMAP_COLRV32; }
-else if (opt == 6307) { mFgCol = true;  mCmap = CMAP_COL16; }
+else if (opt == 6307) { mFgCol = true;  mCmap = CMAP_GREY128; }
+else if (opt == 6308) { mFgCol = true;  mCmap = CMAP_GREYINV128; }
+else if (opt == 6309) { mFgCol = true;  mCmap = CMAP_COLRJ128; }
+else if (opt == 6310) { mFgCol = true;  mCmap = CMAP_COLBR128; }
+else if (opt == 6311) { mFgCol = true;  mCmap = CMAP_COL16; }
 
 else if (opt == 6401) mFPoints = mPScal->GetValue()/100.;