Changeset 2380 in Sophya for trunk/SophyaPI/PIext/pihisto2d.cc

Timestamp:

May 15, 2003, 3:47:53 PM (22 years ago)

Author:

ansari

Message:

modifs suite ajout colormap MultiCol64 et corrections diverses - Reza 15/5/2003

File:

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

trunk/SophyaPI/PIext/pihisto2d.cc

@@ -735 +735 @@
 mOPop[2]->AppendItem("Black&White",7000);
 mCasc[0] = new PIMenu(mOPop[2]->Menu(),"PIStd-128Col");
-mCasc[1] = new PIMenu(mOPop[2]->Menu(),"MIDAS-CMap");
-int kcc,nsct1=5,nsct2=9,nsct3=PIColorMap::NumberStandardColorMaps()-1;
+mCasc[1] = new PIMenu(mOPop[2]->Menu(), "PIUniCol32");
+mCasc[2] = new PIMenu(mOPop[2]->Menu(),"MIDAS-CMap");
+int kcc,nsct1=5,nsct2=9,nsct3=17,nsct4=PIColorMap::NumberStandardColorMaps()-2;
 for(kcc=0; kcc<nsct1; kcc++) 
   mOPop[2]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(),7001+kcc);
@@ -745 +746 @@
   mCasc[1]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(),7001+kcc);
 mOPop[2]->AppendPDMenu(mCasc[1]);
-for(kcc=nsct3; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) 
+for(kcc=nsct3; kcc<nsct4; kcc++) 
+  mCasc[2]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(),7001+kcc);
+mOPop[2]->AppendPDMenu(mCasc[2]);
+for(kcc=nsct4; kcc<PIColorMap::NumberStandardColorMaps(); kcc++) 
   mOPop[2]->AppendItem(PIColorMap::GetStandardColorMapName(kcc).c_str(),7001+kcc);
 //mOPop[2]->SetValue(7000);
@@ -809 +813 @@
 int i;
 if(dbg) printf("H2WinArg::~H2WinArg %p\n",this);
-for(i=0;i<2;i++) delete mCasc[i];
+for(i=0;i<3;i++) delete mCasc[i];
 for(i=0;i<3;i++) delete mOPop[i];
 for(i=0;i<4;i++) delete mBut[i];