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

Timestamp:

Jan 2, 2004, 12:31:36 AM (22 years ago)

Author:

ansari

Message:

Suite modifs pour piapp multi-thread - introduction de lock lors de la mise a jour de la fenetre ObjMgr par NamedObjMgr - Reza 1 Jan 2004

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -108 +108 @@
 
 /* --Methode-- */
-NamedObjMgr::NamedObjMgr()
-{
+NamedObjMgr::NamedObjMgr(bool fgimgapp)
+{
+_fgimgapp = fgimgapp;
 if (fgOInit == 0) { 
   myNObj = 0;
@@ -302 +303 @@
 if (myImgApp)  { 
   string str = '/' + dirname;
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->AddDirectory(str.c_str(), myDirId);
   }
@@ -333 +335 @@
   }
 
-if (myImgApp)  
+if (myImgApp) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
+}
 myDirs->erase(it);
 if (verbeux) cout << "NamedObjMgr::DeleteDir() " << dirname << " deleted " << endl;  
@@ -459 +463 @@
 list<string>::iterator ii;
 for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj(*ii,true);
-if (myImgApp)  
+if (myImgApp) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
   (myImgApp->ObjMgrW())->UpdateList(did);
+}
 }
 
@@ -561 +567 @@
 (*itr).second.nobj++;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
-  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
-  }
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    string oln = nobj + "  (T= " + no.obja->GetDataObjType() + ")" ; 
+    (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+  }
+}
 if (verbeux) cout << "NamedObjMgr::AddObj()  Object " << nom << " ( "  
      << typeid(*obj).name() << " ) added (Total= " << myObjs->size() << ")" << endl;  
@@ -632 +641 @@
 (*itr).second.nobj++;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
-  string oln = n2 + "  (T= " + no.obja->GetDataObjType() + ")" ; 
-  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
+    string oln = n2 + "  (T= " + no.obja->GetDataObjType() + ")" ; 
+    (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+  }
 }
 if (verbeux) 
@@ -681 +693 @@
 if (fgd) delete (*it).second.obj;
 
-if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
-  int olid = (*it).second.oid;
-  (myImgApp->ObjMgrW())->DelObjList(did, olid);
+if (myImgApp != NULL) {
+  if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+  if ( (myImgApp->ObjMgrW())->Visible() ) {
+    int olid = (*it).second.oid;
+    (myImgApp->ObjMgrW())->DelObjList(did, olid);
+  }
 }
 myObjs->erase(it);
@@ -1474 +1489 @@
 {
 if (!myImgApp)  return;
+if ( !_fgimgapp )  ZSync(myImgApp->getMutex(),2);
+
 (myImgApp->ObjMgrW())->ClearObjList();