Changeset 2380 in Sophya for trunk/SophyaPI

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

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (1 diff)
• pihisto2d.cc (modified) (3 diffs)
• pihisto2d.h (modified) (1 diff)
• pisiadw.cc (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -1128 +1128 @@
 usage += ">> ColorTables: defcmap  grey32  invgrey32  colrj32  colbr32 \n";
 usage += "                grey128  invgrey128  colrj128  colbr128 \n";
+usage += "                red32cm  green32cm  blue32cm  yellow32cm \n";
+usage += "                orange32cm cyan32cm violet32cm \n";
 usage += "                midas_pastel midas_heat midas_rainbow3 midas_bluered\n";
 usage += "                midas_bluewhite midas_redwhite \n";
-usage += "                rainbow16 \n";
+usage += "                multicol16 multicol64 \n";
 usage += "   revcmap : This flag reverses ColorMap indexing \n";
 usage += "--- For image displays:    \n";

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];

trunk/SophyaPI/PIext/pihisto2d.h

@@ -104 +104 @@
 
   PIOptMenu * mOPop[3];
-  PIMenu    * mCasc[2];
+  PIMenu    * mCasc[3];
   PIButton  * mBut[4];
   PILabel   * mLab[4];

trunk/SophyaPI/PIext/pisiadw.cc

@@ -82 +82 @@
 
 /* --Methode-- */
-void ObjMgrWind::Process(PIMessage msg, PIMsgHandler* /*sender*/, void* /*data*/)
-{
-
+void ObjMgrWind::Process(PIMessage msg, PIMsgHandler* sender, void* /*data*/)
+{
+
+if (sender == objlist)  return; // Changement de selection d'objet - on ne fait rien
   // PIMessage ssg = ModMsg(msg);
 msg = UserMsg(msg);