Changeset 1971 in Sophya for trunk/SophyaPI/PIext/nobjmgr.cc

Timestamp:

Apr 30, 2002, 2:34:41 PM (23 years ago)

Author:

ansari

Message:

1/ Basculement de decodage des options de display aux methodes
PIDrawer/PIWdg::DecodeOptionString()
2/ Possibilite de Show/Hide de la partie Zoom/ColorMap/Stat du MainWindow

Reza 30/4/2002

File:

• trunk/SophyaPI/PIext/nobjmgr.cc (modified) (19 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -1135 +1135 @@
 
 int wrsid = 0;
-bool fgsr = true;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 
 string n1,r1;
@@ -1143 +1141 @@
 if (dr) { 
   PIDrawer3D * dr3 = dynamic_cast<PIDrawer3D *>(dr);
-  if(dr3)  wrsid = myImgApp->Disp3DDrawer(dr3, n1, opt);
-  else wrsid = myImgApp->DispScDrawer( dr, n1, opt); 
-  }
-else if (arr) wrsid = myImgApp->DispImage(arr, n1, opt);
+  if(dr3)  wrsid = myImgApp->Disp3DDrawer(dr3, n1, dopt);
+  else wrsid = myImgApp->DispScDrawer( dr, n1, dopt); 
+  }
+else if (arr) wrsid = myImgApp->DispImage(arr, n1, dopt);
 
 if(wrsid != 0) {
@@ -1153 +1151 @@
   (*it).second.wrsid.push_back(wrsid);
   }
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
+
 return;
 }
@@ -1184 +1182 @@
 
 int wrsid = 0;
-bool fgsr = true;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
-wrsid = myImgApp->DispImage(arr, n1, opt);
+wrsid = myImgApp->DispImage(arr, n1, dopt);
 
 if(wrsid != 0) {
@@ -1193 +1189 @@
   (*it).second.wrsid.push_back(wrsid);
   }
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
 return;
 }
@@ -1230 +1225 @@
 
 int wrsid = 0;
-bool fgsr = true;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 PISurfaceDrawer* sdr = new PISurfaceDrawer(arr, true, true, true);
-wrsid = myImgApp->Disp3DDrawer(sdr, n1, opt);
+wrsid = myImgApp->Disp3DDrawer(sdr, n1, dopt);
 if(wrsid >= 0) {
   NObjList::iterator it = myObjs->find(nom);
@@ -1240 +1233 @@
   }
 
-if (fgsr) myImgApp->RestoreGraphicAtt();  
 return; 
 }
@@ -1265 +1257 @@
 
 int wrsid = 0;
-bool fgsr = true;
-dopt = "defline," + dopt;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
+dopt = "defline " + dopt;
 
 string n1,r1;
@@ -1279 +1269 @@
   pin->SelectErrBar(erx.c_str(), ery.c_str(), erz.c_str());
   string titre = nmz + "%" + nmy + "%" + nmz;
-  wrsid = myImgApp->Disp3DDrawer(pin, n1, opt, titre);  
+  wrsid = myImgApp->Disp3DDrawer(pin, n1, dopt, titre);  
 }
 else {
   PINTuple* pin = new PINTuple(nt, false);
-  pin->SetStats(Services2NObjMgr::GetStatsOption(dopt));
   pin->SelectXY(nmx.c_str(), nmy.c_str());
   pin->SelectWt(wt.c_str());
@@ -1289 +1278 @@
   pin->SelectErrBar(erx.c_str(), ery.c_str());
   string titre = nmy + "%" + nmx;
-  wrsid = myImgApp->DispScDrawer( (PIDrawer*)pin, n1, opt, titre);
+  wrsid = myImgApp->DispScDrawer( (PIDrawer*)pin, n1, dopt, titre);
   }
 
@@ -1298 +1287 @@
   }
 
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
 return;
 }
@@ -1326 +1314 @@
    return;}
 
-// Decodage des options classiques
-bool fgsr = true;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 // Decodage des erreurs a representer
 bool errx=false, erry=false, errz=false;
@@ -1350 +1335 @@
   pigfd->SelectXY(numvx,numvy);
   pigfd->SelectErrBar(errx,erry,errz);
-  wrsid = myImgApp->Disp3DDrawer(pigfd,n1,opt);  
+  wrsid = myImgApp->Disp3DDrawer(pigfd,n1,dopt);  
 } else {                   // display 2D
   PIGenFitDat* pigfd = new PIGenFitDat(((GeneralFitData*)obj),false);
   pigfd->SelectX(numvx);
   pigfd->SelectErrBar(errx,erry);
-  wrsid = myImgApp->DispScDrawer((PIDrawer*)pigfd,n1,opt);
+  wrsid = myImgApp->DispScDrawer((PIDrawer*)pigfd,n1,dopt);
 }
 
@@ -1363 +1348 @@
   (*it).second.wrsid.push_back(wrsid);
 }
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
+
 return;
 }
@@ -1424 +1409 @@
 PIYfXDrawer * vxydrw = new PIYfXDrawer(avx, avy, true);
 
-// Decodage des options classiques
-bool fgsr = true;
-int opt = servnobjm->DecodeDispOption(dopt, fgsr);
 string nx,rx;
 ParseObjectName(nomvx, rx, nx);
@@ -1434 +1416 @@
 string title = ny + " (Y) vs. " + nx + " (X)";
 // display 2D
-int wrsid = myImgApp->DispScDrawer(vxydrw, title, opt);
-
-if (fgsr) myImgApp->RestoreGraphicAtt(); 
+int wrsid = myImgApp->DispScDrawer(vxydrw, title, dopt);
+
 return;
 
@@ -1452 +1433 @@
 
 
-/* --Methode-- */
+/* --Methode-- 
 void NamedObjMgr::SetGraphicAttributes(string gratt)
 {
@@ -1460 +1441 @@
 }
 
-/* --Methode-- */
 void NamedObjMgr::SetGraphicWinZone(int nzx, int nzy, bool fcr)
 {
@@ -1467 +1447 @@
 else myImgApp->SetZone(nzx, nzy);
 }
+*/
 
 /* --Methode-- */