Changeset 3366 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Oct 30, 2007, 1:57:40 PM (18 years ago)

Author:

ansari

Message:

Tentative pour regler le probleme de blocage de piapp suite a affichage de la fefenetre de gestion d'objets.

1/ Protection dans NamedObjMgr() pour eviter deadlock de mutex (ds NamedObjMgr::UpdateObjMgrWindow() en particulier)
2/ Introduction de la classe SOpExObj (fichier piacmd.h .cc) pour execution d'operations sur objets, initiees depuis la boucle d'evts, dans un thread separe.

Reza , 30/10/2007

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (55 diffs)
• nobjmgr.h (modified) (1 diff)
• piacmd.cc (modified) (1 diff)
• piacmd.h (modified) (1 diff)
• pisiadw.cc (modified) (4 diffs)
• pisiadw.h (modified) (2 diffs)
• pistdimgapp.cc (modified) (4 diffs)
• pistdimgapp.h (modified) (2 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -98 +98 @@
 // Pour gestion multithread 
 static ZMutex* myMutex = NULL;
+static bool myMtxLocked = false;   // if myMutex has been locked
+static bool obmWvis = false;  // true -> ObjMgrWindow() is active/visible
+static bool obmWUpdReq = false; // true -> ObjMgrWindow Update requested
 // ..................................................................
+// .... Classe NObjMgrSync ....
+class NObjMgrSync {
+public:
+  explicit NObjMgrSync(int sigbr) 
+  {
+    myMtxLocked = true;
+    myMutex->lock();
+    _sigbr = sigbr;
+  }
+  ~NObjMgrSync()
+  {
+    if (_sigbr == 1) myMutex->signal(); 
+    else  if (_sigbr == 2) myMutex->broadcast(); 
+    myMutex->unlock();
+    myMtxLocked = false;
+    if (obmWUpdReq) {
+      NamedObjMgr _momg;
+      _momg.UpdateObjMgrWindow(-1);
+    }
+  }
+  inline int NOp() { return _sigbr; } 
+
+  int _sigbr;
+};
+//.............................
 
 //++
@@ -229 +257 @@
     return(false);
   }
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
 #ifdef SANS_EVOLPLANCK
   bool fg = true;
@@ -247 +275 @@
     return(false);
   }
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
 #ifdef SANS_EVOLPLANCK
   DVList::ValList::const_iterator it;
@@ -265 +293 @@
     return(false);
   }
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
 #ifdef SANS_EVOLPLANCK
   return(false);
@@ -280 +308 @@
     return("");
   }
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   //  cout << " DEBUG::GetVar " << *myVars << endl;
   return(myVars->GetS(key));
@@ -289 +317 @@
 {
   //  cout << " DEBUG::GetVarList " << *myVars << endl;
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   return(*myVars);
 }
@@ -296 +324 @@
 bool NamedObjMgr::CreateDir(string & dirname)
 {
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   return CreateDir_P(dirname);
 }
@@ -336 +364 @@
   return(false); 
   }
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjDirList::iterator it = myDirs->find(dirname);
 if (it == myDirs->end()) {
@@ -357 +385 @@
 if (myImgApp) {
   if ( !_fgimgapp )  myImgApp->LockMutex();
+  if ((myImgApp->ObjMgrW())->GetCurDirId() == (*it).second.id) {
+    (myImgApp->ObjMgrW())->SetCurDir(*currDir);
+    obmWUpdReq = true;
+  }
   (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
+  
   if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
 }
@@ -368 +401 @@
 void NamedObjMgr::LockDir(string & dirname)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 if ( !CheckDirName(dirname) ) return;
 NObjDirList::iterator it = myDirs->find(dirname);
@@ -380 +413 @@
 void NamedObjMgr::UnlockDir(string & dirname)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 if ( !CheckDirName(dirname) ) return;
 NObjDirList::iterator it = myDirs->find(dirname);
@@ -392 +425 @@
 void NamedObjMgr::SetKeepOldDirAtt(string & dirname, bool keepold)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 if ( !CheckDirName(dirname) ) return;
 NObjDirList::iterator it = myDirs->find(dirname);
@@ -408 +441 @@
 bool NamedObjMgr::SetCurrentDir(string & dirname)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 if ( !CheckDirName(dirname) ) {
   cout << "NamedObjMgr::SetCurrentDir( " << dirname << ") Error - Invalid name !" << endl;
@@ -426 +459 @@
 void NamedObjMgr::GetCurrentDir(string & dirname)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 dirname = *currDir;
 }
@@ -433 +466 @@
 void NamedObjMgr::ListDirs(string & patt)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjDirList::iterator it;
 string cn;
@@ -453 +486 @@
 void NamedObjMgr::GetDirList(string & patt, vector<string>& lstd)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjDirList::iterator it;
 string cn;
@@ -466 +499 @@
 void NamedObjMgr::CleanDir(string & dirname)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 CleanDir_P(dirname);
 }
@@ -499 +532 @@
 for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj_P(*ii,true);
 
-UpdateObjMgrWindow_P(did);  // On met a jour la fenetre de gestion des objets 
+if (obmWvis) UpdateObjMgrWindow_P(did);  // On met a jour la fenetre de gestion des objets
 }
 
@@ -529 +562 @@
 bool NamedObjMgr::AddObj(AnyDataObj* obj, string & nom, bool crd)
 {
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   return AddObj_P(obj, nom, crd);
 }
@@ -605 +638 @@
 (*itr).second.nobj++;
 
-if (myImgApp != NULL) {
+if (obmWvis && (myImgApp != NULL)) {
   if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
@@ -620 +653 @@
 bool NamedObjMgr::AddObj(AnyDataObj& obj, string & nom, bool crd)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjMgrAdapter* adap = GetServiceObj()->GetAdapter(&obj);
 if (adap == NULL) {
@@ -638 +671 @@
 bool NamedObjMgr::RenameObj(string & nom, string& nomnew)
 {
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   return RenameObj_P(nom, nomnew);
 }
@@ -689 +722 @@
 (*itr).second.nobj++;
 
-if (myImgApp != NULL) {
+if (obmWvis && (myImgApp != NULL)) {
   if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
@@ -706 +739 @@
 bool NamedObjMgr::CopyObj(string & nom, string& nomcp)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 if(nomcp.length()<=0)
   {cout<<"NamedObjMgr::CopyObj() Error, copied obj name "<<nomcp<<" not valid"<<endl;
@@ -723 +756 @@
 bool NamedObjMgr::DelObj(string & nom, bool fgd)
 {
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   return DelObj_P(nom, fgd);
 }
@@ -753 +786 @@
 if (fgd) delete (*it).second.obj;
 
-if (myImgApp != NULL) {
+if (obmWvis && (myImgApp != NULL)) {
   if ( !_fgimgapp )  myImgApp->LockMutex();
   if ( (myImgApp->ObjMgrW())->Visible() ) {
@@ -774 +807 @@
 bool NamedObjMgr::DelObj_Id(int oid)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjList::iterator it;
 string nom;
@@ -790 +823 @@
 void NamedObjMgr::DelObjects(string & patt, bool fgd)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 string n1,r1;
 ParseObjectName(patt, r1, n1);
@@ -808 +841 @@
 AnyDataObj* NamedObjMgr::GetObj(string & nom)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 return GetObj_P(nom);
 }
@@ -826 +859 @@
 NObjMgrAdapter* NamedObjMgr::GetObjAdapter(string & nom)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 return GetObjAdapter_P(nom);
 }
@@ -844 +877 @@
 void NamedObjMgr::ListObjs(string & patt)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 int k;
 AnyDataObj* obj=NULL;
@@ -873 +906 @@
 void NamedObjMgr::GetObjList(string & patt, vector<string> &lst)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 string n1,r1;
 if (patt.length() < 1)  return;
@@ -909 +942 @@
 void NamedObjMgr::ReadObj(string const & flnm, string & nobj)
 {
-ZSync zs(*myMutex); zs.NOp(); 
 PPersist* ppobj=NULL;
 bool ok = true;
@@ -932 +964 @@
 if (!ok)  return;
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
-AddObj_P(ppobj->DataObj(), nobj, true);
+AddObj(ppobj->DataObj(), nobj, true);
 cout << "NamedObjMgr::ReadObj(...) object " << nobj << " read from file " << endl;
 return;
@@ -942 +974 @@
 {
 if(flnm_objname.size()<2) return;
-ZSync zs(*myMutex); zs.NOp(); 
 int nread=0;
 try {
@@ -957 +988 @@
       continue;
     }
-    AddObj_P(ppobj->DataObj(),flnm_objname[i],true);
+    AddObj(ppobj->DataObj(),flnm_objname[i],true);
     nread++;
     cout<<"NamedObjMgr::ReadObj(...) object "<<flnm_objname[i]<<" read from file "<<endl;
@@ -971 +1002 @@
 void NamedObjMgr::ReadObj(PInPersist& s, int num)
 {
-ZSync zs(*myMutex); zs.NOp();
+NObjMgrSync zs(0); zs.NOp();
 ReadObj_P(s, num); 
 }
@@ -1060 +1091 @@
 void NamedObjMgr::ReadAll(string const & flnm)
 {
-ZSync zs(*myMutex); zs.NOp(); 
 #ifdef SANS_EVOLPLANCK
 bool ok = true;
@@ -1077 +1107 @@
 if (obj) {
   string nom = servnobjm->FileName2Name(flnm);
-  AddObj_P(obj->DataObj(), nom, false);
-  }
-else ReadObj_P((*ppin), -1);
+  AddObj(obj->DataObj(), nom, false);
+  }
+else ReadObj((*ppin), -1);
 delete ppin;
 #else
@@ -1091 +1121 @@
       cout << " ... Reading " << pis.NbNameTags() << " objects at NameTags " ;
     }
-    ReadObj_P(pis, -1);
+    ReadObj(pis, -1);
     return;
   }
@@ -1100 +1130 @@
     PPersist* obj = pis.ReadObject();
     if (!obj) continue;
-    AddObj_P(obj->DataObj(), nom, false);
+    AddObj(obj->DataObj(), nom, false);
     kn++;
     nom += (string)MuTyV(kn);
@@ -1116 +1146 @@
 void NamedObjMgr::SaveObj(string & nom, POutPersist& s, bool keeppath)
 {
-  ZSync zs(*myMutex); zs.NOp(); 
+  NObjMgrSync zs(0); zs.NOp(); 
   SaveObj_P(nom, s, keeppath);
 }
@@ -1141 +1171 @@
 void NamedObjMgr::SaveObjects(string & patt, string const& flnm)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 string n1,r1;
 if (patt.length() < 1)  return;
@@ -1183 +1213 @@
 // dont le nom est le dernier argument (liste[n-1])
 {
- ZSync zs(*myMutex); zs.NOp(); 
+ NObjMgrSync zs(0); zs.NOp(); 
 
  if(liste.size()<2) {
@@ -1215 +1245 @@
 void NamedObjMgr::SaveAll(string const& flnm)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 bool ok = true;
 
@@ -1250 +1280 @@
 void NamedObjMgr::PrintObj(string& nom, int lev)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 NObjMgrAdapter* obja=NULL;
 obja = GetObjAdapter_P(nom);
@@ -1272 +1302 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 NObjMgrAdapter* obja=NULL;
@@ -1322 +1352 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 NObjMgrAdapter* obja=NULL;
@@ -1362 +1392 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 NObjMgrAdapter* obja=NULL;
@@ -1412 +1442 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 AnyDataObj* obj=GetObj_P(nom);
@@ -1482 +1512 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 AnyDataObj* obj=GetObj_P(nom);
@@ -1538 +1568 @@
 if ( (dopt == "nodisp") || (dopt == "nodisplay") ) return;
 
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 
 #ifdef SANS_EVOLPLANCK
@@ -1640 +1670 @@
 int NamedObjMgr::NameToOId(string & nom)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 return NameToOId_P(nom);
 }
@@ -1659 +1689 @@
 void NamedObjMgr::AddWRsId(string & nom, int wrsid)
 {
-ZSync zs(*myMutex); zs.NOp(); 
+NObjMgrSync zs(0); zs.NOp(); 
 AddWRsId_P(nom, wrsid);
 }
@@ -1678 +1708 @@
 {
 if (!myImgApp)  return;
-ZSync zs(*myMutex); zs.NOp(); 
+if (myMtxLocked) {
+  obmWUpdReq = true;
+  obmWvis = false;
+  (myImgApp->ObjMgrW())->SetUnSensitive();
+  return;
+}
+NObjMgrSync zs(0); zs.NOp();
+if (did < 0) {
+  string cdir = *currDir;
+  cdir = '/' + cdir;
+  (myImgApp->ObjMgrW())->SetCurDir(cdir);
+  did = (myImgApp->ObjMgrW())->GetCurDirId();
+}
+
 UpdateObjMgrWindow_P(did);
+(myImgApp->ObjMgrW())->SetSensitive();
+obmWUpdReq = false;
+obmWvis = true;
+}
+
+/* --Methode-- */
+void NamedObjMgr::SetObjMgrWindowVisibility(bool fgvis)
+{
+obmWvis = fgvis;
 }
 

trunk/SophyaPI/PIext/nobjmgr.h

@@ -108 +108 @@
 // Pour utilisation par ObjMgrWind
   virtual void          UpdateObjMgrWindow(int did);
+  virtual void          SetObjMgrWindowVisibility(bool fgvis=false);
 
 // Pour completer le nom de l'objet avec le nom du repertoire

trunk/SophyaPI/PIext/piacmd.cc

@@ -401 +401 @@
 Commander::ShowMessage(msg, att);
 }
+
+
+/* --Methode-- */
+SOpExObj::SOpExObj(PIStdImgApp* app)
+{
+  mImgApp = app;
+  fg_thrstop = false;
+  fg_threxe = false;
+}
+
+/* --Methode-- */
+SOpExObj::~SOpExObj()
+{
+}
+
+/* --Methode-- */
+void SOpExObj::AddOpe(string const & line)
+{
+  mutx_inps.lock();
+  inputlines.push(line);   // Ajout d'un element en fin de queue
+  mutx_inps.unlock();
+  mutx_inps.broadcast();
+}
+
+/* --Methode-- */
+void SOpExObj::run()
+{
+  NamedObjMgr omg;
+  while (!fg_thrstop) {
+    mutx_inps.lock();
+    while (inputlines.empty()) { 
+      fg_threxe = false;
+      mutx_inps.wait();
+    }
+    string cmd = inputlines.front().substr(0,3);   // On recupere l'element de tete
+    string nom = inputlines.front().substr(4);   // On recupere l'element de tete
+    inputlines.pop();    // On supprime l'element de tete
+    fg_threxe = true;
+    mutx_inps.unlock();
+    try {
+      if (cmd == "SCO") {  // set cobj 
+        string ss = "set cobj ";
+        ss += nom;
+        cout << " Defining cobj : " << ss << endl;
+        mImgApp->CmdInterpreter()->AddInputLine(ss);
+      }
+      else if (cmd == "DIS") {  // display obj
+        omg.DisplayObj(nom);
+      }
+      else if (cmd == "PRT") {  // print obj
+        omg.PrintObj(nom);
+      }
+      else if (cmd == "DEL") {  // delete obj
+        omg.DelObj(nom);
+      }
+      else if (cmd == "SAV") {  // saveppf obj
+        if (mImgApp->mPpfout)  omg.SaveObj(nom, *(mImgApp->mPpfout), false);
+      }
+      else cerr << "SOpExObj::run() ERROR CMD= " << cmd << endl; 
+    }
+    catch (PThrowable& pex) {  // Catching SOPHYA exceptions 
+      cerr << "SOpExObj::run() SOPHYA exception CMD=" << cmd << " NOM=" << nom << "\n"
+           << (string)typeid(pex).name() << " Msg= " << pex.Msg() << endl;
+    }
+    catch (std::exception& sex) {
+      cerr << "SOpExObj::run() std::exception CMD=" << cmd << " NOM=" << nom << "\n"
+           << (string)typeid(sex).name() << " Msg= " << sex.what() << endl;
+    }
+    catch (...) {
+      cerr << "SOpExObj::run() unknown exception (...) CMD=" 
+           << cmd << " NOM=" << nom << endl;
+    }
+  }
+}

trunk/SophyaPI/PIext/piacmd.h

@@ -100 +100 @@
 
 
+// 
+// ---------------------------------------------------------------------
+// Classe d'execution d'operations simples, comme affichage (display)
+// print , del ... issues en particulier de la boucle d'evts 
+// (PIStdImgApp, ObjMgrWind , ...)
+// ---------------------------------------------------------------------
+
+class SOpExObj : public ZThread  {
+public:
+                        SOpExObj(PIStdImgApp* app);
+  virtual               ~SOpExObj();
+
+  // Thread execution  <ZThread>
+  virtual void          run();
+  void                  AddOpe(string const & line);
+  void                  StopThread();
+
+protected:
+  PIStdImgApp* mImgApp;
+  queue<string> inputlines;
+  ZMutex mutx_inps;
+  bool fg_thrstop;
+  bool fg_threxe;
+};
+
+
+
 
 #endif

trunk/SophyaPI/PIext/pisiadw.cc

@@ -72 +72 @@
 {
 PIWindow::Show();
-string cdir;
-dap->ObjMgr()->GetCurrentDir(cdir);
-cdir = '/' + cdir;
-dirlist->SetValueStr(cdir);
-dap->ObjMgr()->UpdateObjMgrWindow( GetCurDirId() );
-return;
-}
-
+dap->ObjMgr()->UpdateObjMgrWindow( -1 );
+return;
+}
+/* --Methode-- */
+void ObjMgrWind::Hide()
+{
+dap->ObjMgr()->SetObjMgrWindowVisibility(false);
+PIWindow::Hide();
+return;
+}
 
 /* --Methode-- */
@@ -122 +124 @@
 if (nom.length() < 1)  return;
 
+string cmd;
 switch (msg)
   {
   case 10:
-    {
-    string cmd = "set cobj " + nom ;
-    cout << " Setting current object ($cobj) to " << nom << endl;
-    dap->CmdInterpreter()->Interpret(cmd);
-    }
+    cmd = "SCO " + nom;
     break;
   case 20:
-    om->DisplayObj(nom);
+    cmd = "DIS " + nom;
     break;
   case 30:
-    om->PrintObj(nom);
+    cmd = "PRT " + nom;
     break;
   case 40:
-    if (dap->mPpfout)  om->SaveObj(nom, *(dap->mPpfout), false);
+    cmd = "SAV " + nom;
     break;
   case 50:
-    om->DelObj(nom);
-    //    objlist->DeleteItemMsg(objlist->GetSelection());
-    //    dap->ObjMgr()->UpdateObjMgrWindow(dirlist->GetValue()-30000);
+    cmd = "DEL " + nom;
     break;
 
@@ -150 +147 @@
     break;
   }
-    
+ dap->getSOpExObj()->AddOpe(cmd);    
 return;
 }
@@ -158 +155 @@
 {
 if (!Visible()) return;
-if (did != GetCurDirId() )  return;
+if ( (did >0) &&(did != GetCurDirId()) )  return;
 dap->ObjMgr()->UpdateObjMgrWindow(did);
 return;

trunk/SophyaPI/PIext/pisiadw.h

@@ -29 +29 @@
   ~ObjMgrWind();
   virtual void  Show();
+  virtual void  Hide();
   virtual void  Process(PIMessage msg, PIMsgHandler* sender, void* data=NULL);
   inline  void  AddDirectory(const char * dir, int did)
@@ -39 +40 @@
                     { mNitem++;  objlist->AppendItem(objn, oid); }
   inline  int   GetCurDirId() { return (dirlist->GetValue()-30000); }
+
+  inline  void  SetCurDir(string & cd) { dirlist->SetValueStr(cd); }
 
   virtual void  UpdateList(int did);

trunk/SophyaPI/PIext/pistdimgapp.cc

@@ -237 +237 @@
 fg_exc_cmd = false;
 mCmd = NULL;  // Avant d'appeler UpdateStatResource() si PIACmd non cree
+mSopex = NULL; 
 UpdateStatResourceInfo();
 resupd_periodic = new SIA_RU__Periodic(this);
@@ -263 +264 @@
 mObjMgr = new NamedObjMgr(true);
 mCmd = new PIACmd(this);
+mSopex = new SOpExObj(this);
 
 // Pas trop de message de la part de NamedObjMgr
@@ -468 +470 @@
 // Demarrage du thread de l'interpreteur
 CmdInterpreter()->start();
-
+// Demarrage du thread de l'executeur de commandes simples 
+getSOpExObj()->start();
 
 
@@ -2018 +2021 @@
   case 10270 :
     if (mCurWdg) {
-      int oid = mCurWdg->UserFlag();
-      //RZDEL-Mai2005      DeleteWidget(mCurWdg);
-      mObjMgr->DelObj_Id(oid);
+      string ssob = "DEL ";
+      ssob += mCurWdg->Nom();
+      getSOpExObj()->AddOpe(ssob);    
       }
     break;

trunk/SophyaPI/PIext/pistdimgapp.h

@@ -127 +127 @@
      inline NamedObjMgr* ObjMgr() { return mObjMgr; }
      inline PIACmd* CmdInterpreter() { return mCmd; }
+     inline SOpExObj* getSOpExObj() { return mSopex; }
 
      PIWindow* CurrentWindow() { return (mCurWin); };
@@ -189 +190 @@
     NamedObjMgr* mObjMgr;
     PIACmd* mCmd;
+    SOpExObj* mSopex;
 
     PIMenu* m[7];