Changeset 3355 in Sophya

Timestamp:

Oct 23, 2007, 12:02:12 AM (18 years ago)

Author:

ansari

Message:

ajout decodage attributs graphiques samew=WdgName wname=Nom inset=fx1,fx2,fy1,fy2 - Reza 22/10/2007

Location:

trunk/SophyaPI/PIext

Files:

• graphexecut.cc (modified) (2 diffs)
• nobjmgr.cc (modified) (1 diff)
• nobjmgr.h (modified) (2 diffs)
• pistdimgapp.cc (modified) (12 diffs)
• pistdimgapp.h (modified) (2 diffs)

trunk/SophyaPI/PIext/graphexecut.cc

@@ -463 +463 @@
 usage = "Define the display rectangle for drawers added as insets \n";
 usage += " over existing graphic objects - limits expressed as fraction \n";  
-usage += " graphic object size (0. .. 1.) Xmax at right, YMax top. ";
+usage += " graphic object size (0. .. 1.) Xmax at right, YMax top \n ";
 usage += " Usage: setinsetlimits xmin xmax ymin ymax";
 usage += "\n  Related commands: graphicatt /inset";  
@@ -859 +859 @@
 usage += "o Most objects can be also be displayed overlayed \n";
 usage += "  on the last displayed widget (gr_att= same) \n";
-usage += "o The overlay can be on a selected rectangle of the \n";  
-usage += "  last displayed widget (gr_att= inset) - See setinsetlimits\n";
+usage += "  or by specifying a widget name samew=Widgetname \n";
+usage += "o The widget/window name can be specified (gr_att wname=Name) \n";
+usage += "o The overlay can be on a selected rectangle of the last \n";  
+usage += "  displayed widget (gr_att: inset  or inset=fxmin,fxmax,fymin,fymax) \n";
 usage += "\n  Related commands: newwin zone stacknext graphicatt setinsetlimits";  
 piac->RegisterHelp(kw, usage, grp);

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -1638 +1638 @@
 
 /* --Methode-- */
+int NamedObjMgr::NameToOId(string & nom)
+{
+ZSync zs(*myMutex); zs.NOp(); 
+return NameToOId_P(nom);
+}
+
+/* --Methode-- */
+int NamedObjMgr::NameToOId_P(string & nom)
+{
+string n1,r1;
+ParseObjectName(nom, r1, n1);
+nom = '/' + r1 + '/' + n1;
+NObjList::iterator it = myObjs->find(nom);
+if (it == myObjs->end()) return(-1); 
+else return((*it).second.oid);
+}
+
+
+/* --Methode-- */
 void NamedObjMgr::AddWRsId(string & nom, int wrsid)
 {

trunk/SophyaPI/PIext/nobjmgr.h

@@ -100 +100 @@
   virtual void                  SetTmpDir(string const& tmpdir);
 
+// Pour convertir un nom d'objet en identificateur d'objet (OId)
+  virtual int           NameToOId(string & nom);
+
 // Ajoute un identificateur d'objet widget/drawer/fenetre pour l'objet nom
 // Ces identificateurs servent lors de la destruction de l'objet nom
@@ -125 +128 @@
   virtual void          SaveObj_P(string & nom, POutPersist& s, bool keeppath=false);
 
+  virtual int           NameToOId_P(string & nom);
   virtual void          AddWRsId_P(string & nom, int wrsid);
   virtual void          UpdateObjMgrWindow_P(int did);

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -761 +761 @@
   }
 
+// <ZThread> global PIApplication event loop synchronisation
+SyncPIS zs(getMutex(), fglock, 2);
+
 // On decode les options graphiques
 vector<string> opts;
-DispWinEnum dwopt = ParseDisplayOption(sop, opts);
+string wname = name; 
+DispWinEnum dwopt = ParseDisplayOption(sop, opts, wname);
 
 // Pas de same ou inset pour DispImage
 if ((dwopt == Disp_Same) || (dwopt == Disp_Inset) ) dwopt = Disp_Next;
-
-// <ZThread> global PIApplication event loop synchronisation
-SyncPIS zs(getMutex(), fglock, 2);
 
 // Choix de la taille de fenetre
@@ -778 +779 @@
 if (sy > 400+mFgScSz*100) sy = 400+mFgScSz*100;
 px = py = 0;
-win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)name.c_str());
+win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)wname.c_str());
 if (fgimagnav) {  // Creation de naviguateur d'image 
-  piin = new PIImageNavigator(win, (char *)name.c_str(), sx, sy, px,py);
+  piin = new PIImageNavigator(win, (char *)wname.c_str(), sx, sy, px,py);
   piin->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
   piin->Show();
@@ -789 +790 @@
 }
 else { // Creation de widget PIImage normal
-  pii = new PIImage(win, (char *)name.c_str(), sx, sy, px,py);
+  pii = new PIImage(win, (char *)wname.c_str(), sx, sy, px,py);
   pii->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
   pii->SetZoomWin(zoom, false);
@@ -845 +846 @@
   }
 
+// <ZThread> global PIApplication event loop synchronisation
+SyncPIS zs(getMutex(), fglock, 2);
+
 // On decode les options graphiques
 vector<string> opts;
-DispWinEnum dwopt = ParseDisplayOption(sop, opts);
+string wname = name;
+DispWinEnum dwopt = ParseDisplayOption(sop, opts, wname);
 if ( (!mLastWdg) && ( (dwopt == Disp_Same) || (dwopt == Disp_Inset) ) )  dwopt = Disp_Next;
-
-// <ZThread> global PIApplication event loop synchronisation
-SyncPIS zs(getMutex(), fglock, 2);
 
 // Trace en superpoistion
@@ -898 +900 @@
 sx = 200+mFgScSz*100;
 sy = 200+mFgScSz*100;
-win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)name.c_str());
-
-scw = new PIScDrawWdg(win, (char *)name.c_str(), sx, sy, px, py);
+win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)wname.c_str());
+
+scw = new PIScDrawWdg(win, (char *)wname.c_str(), sx, sy, px, py);
 scw->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 scw->SetUserData(NULL, oid);
@@ -923 +925 @@
 //   Titre du plot
 if (mAddTitle) {
-  if (title.length() <= 0)  title = name;  string t2="";   
+  if (title.length() <= 0)  title = wname;  string t2="";   
   scw->SetTitles(title, t2);    
 }
@@ -948 +950 @@
   }
 
+// <ZThread> global PIApplication event loop synchronisation
+SyncPIS zs(getMutex(), fglock, 2);
+
 // On decode les options graphiques
 vector<string> opts;
-DispWinEnum dwopt = ParseDisplayOption(sop, opts);
+string wname = name;
+DispWinEnum dwopt = ParseDisplayOption(sop, opts, wname);
 
 if ( (!mLastWdg) && ( (dwopt == Disp_Same) || (dwopt == Disp_Inset) ) )  dwopt = Disp_Next;
-
-// <ZThread> global PIApplication event loop synchronisation
-SyncPIS zs(getMutex(), fglock, 2);
 
 // Trace en superpoistion
@@ -1002 +1005 @@
 sx = 200+mFgScSz*100;
 sy = 200+mFgScSz*100;
-win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)name.c_str());
-PIDraw3DWdg* wd3 = new PIDraw3DWdg(win, (char *)name.c_str(), sx, sy, px, py);
+win = GetWindow(dwopt, sx, sy, px, py, flag, (char *)wname.c_str());
+PIDraw3DWdg* wd3 = new PIDraw3DWdg(win, (char *)wname.c_str(), sx, sy, px, py);
 wd3->SetBinding(PIBK_elastic, PIBK_elastic, PIBK_elastic, PIBK_elastic);
 wd3->SetUserData(NULL, oid);
@@ -1026 +1029 @@
 //   Titre du plot
 if (mAddTitle) {
-  if (title.length() <= 0)  title = name;  string t2="";   
+  if (title.length() <= 0)  title = wname;  string t2="";   
   wd3->SetTitles(title, t2);    
 }
@@ -1493 +1496 @@
 {
 if (mStW)  mStW->DispNext();
+}
+
+/* --Methode-- */
+void PIStdImgApp::SelectLastWidget(string & nom)
+{
+
+  if ( (mLastWdg != NULL) && (mLastWdg->Nom() == nom) ) return;
+  if ( (mCurWdg != NULL) && (mCurWdg->Nom() == nom) ) {
+    mLastWdg = mCurWdg;
+    return;
+  }
+
+  PIWdg* bw = NULL;
+  long wsid = -1;
+  BWMList::iterator it;
+  for(it = mBWList.begin(); it != mBWList.end(); it++) {
+    if ( ((*it).second->Nom() == nom) && ((*it).first > wsid)) { 
+      bw = (*it).second; wsid = (*it).first; 
+    } 
+  }
+  if (bw != NULL) {
+    if (bw->kind() == PIImageNavigator::ClassId) 
+      mLastWdg = dynamic_cast<PIImageNavigator *>(bw)->ImageWdg();
+    else mLastWdg = dynamic_cast<PIBaseWdg *>(bw);
+  }
+  return;
+}
+
+/* --Methode-- */
+void PIStdImgApp::SelectLastWidgetByObjName(string & nom)
+{
+  int oid = ObjMgr()->NameToOId(nom);
+  if (oid < 0) return;
+
+  if ( (mLastWdg != NULL) && (mLastWdg->UserFlag() == oid) ) return;
+  if ( (mCurWdg != NULL) && (mCurWdg->UserFlag() == oid) ) {
+    mLastWdg = mCurWdg;
+    return;
+  }
+
+  PIWdg* bw = NULL;
+  long wsid = -1;
+  BWMList::iterator it;
+  for(it = mBWList.begin(); it != mBWList.end(); it++) {
+    if ( ((*it).second->UserFlag() == oid) && ((*it).first > wsid)) { 
+      bw = (*it).second; wsid = (*it).first; 
+    } 
+  }
+  if (bw != NULL) {
+    if (bw->kind() == PIImageNavigator::ClassId) 
+      mLastWdg = dynamic_cast<PIImageNavigator *>(bw)->ImageWdg();
+    else mLastWdg = dynamic_cast<PIBaseWdg *>(bw);
+  }
+  return;
 }
 
@@ -1749 +1806 @@
 
 /* --Methode-- */
-DispWinEnum PIStdImgApp::ParseDisplayOption(string const & sop, vector<string>& opts)
+DispWinEnum PIStdImgApp::ParseDisplayOption(string const & sop, vector<string>& opts, string& wname)
 {
   DispWinEnum rc = Disp_Next;
@@ -1774 +1831 @@
     else if (token == "same")  rc = Disp_Same;
     else if (token == "inset")   rc = Disp_Inset;
-    else  if (token == "stack")   rc = Disp_Stack;
-    else  if (token == "next")   rc = Disp_Next;
+    else if (token == "stack")   rc = Disp_Stack;
+    else if (token == "next")   rc = Disp_Next;
+    else if (token.substr(0,6)=="samew=") {
+      string snom=token.substr(6);
+      SelectLastWidget(snom);
+      rc = Disp_Same;
+    }
+    else if (token.substr(0,6)=="inset=") {
+      double fx1,fx2,fy1,fy2;
+      fx1=fy1=0.4; fx2=fy2=0.6;
+      sscanf(token.substr(6).c_str(),"%lg,%lg,%lg,%lg",&fx1,&fx2,&fy1,&fy2);
+      SetInsetLimits(fx1, fx2, fy1, fy2);
+      rc = Disp_Inset;
+    }
+    else if (token.substr(0,6)=="wname=") {   // specification de nom de widget
+      wname=token.substr(6);
+    }
     // Option a etre decode par les drawers, etc ...
     else  opts.push_back(token); 

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -114 +114 @@
      void StackWinNext();
 
+  // Pour specifier le widget pour le trace en superpose, en specifiant un nom de widget
+     void SelectLastWidget(string & nom);
+  // Pour specifier le widget pour le trace en superpose, en specifiant un nom d'objet
+     void SelectLastWidgetByObjName(string & nom);
+     
      void DeleteWindow(PIWindow* w);
      void DeleteWidget(PIWdg* w, bool dw=true, bool dwin=true);
@@ -156 +161 @@
      void  SetDefaultGraphicAttributes(string const & opt);
      void  SetDefaultAxesAttributes(string const & opt);
-     DispWinEnum ParseDisplayOption(string const & opt, vector<string>& opts);
+     DispWinEnum ParseDisplayOption(string const & opt, vector<string>& opts, string& wname);
+     inline DispWinEnum ParseDisplayOption(string const & opt, vector<string>& opts)
+       {
+         string wname;
+         return ParseDisplayOption(opt, opts, wname);
+       }
 
 // Gestion fichiers PS