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

Timestamp:

Nov 6, 2007, 12:21:54 AM (18 years ago)

Author:

ansari

Message:

suite corrections pour eviter blocage: Request UpdateObjMgrWindow() -> SOpExObj::AddOpe()/run() - Reza 05/11/2007

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -120 +120 @@
       NamedObjMgr _momg;
       _momg.UpdateObjMgrWindow(-1);
+      obmWUpdReq = false;
     }
   }
@@ -1708 +1709 @@
 {
 if (!myImgApp)  return;
-if (myMtxLocked) {
-  obmWUpdReq = true;
-  obmWvis = false;
-  (myImgApp->ObjMgrW())->SetUnSensitive();
+NObjMgrSync zs(0); zs.NOp();
+UpdateObjMgrWindow_P(did);
+}
+
+/* --Methode-- */
+void NamedObjMgr::SetObjMgrWindowVisibility(bool fgvis)
+{
+obmWvis = fgvis;
+}
+
+/* --Methode-- */
+void NamedObjMgr::UpdateObjMgrWindow_P(int did)
+{
+obmWUpdReq = false;
+obmWvis = false;
+if (!myImgApp)  return;
+if ( !_fgimgapp )  myImgApp->LockMutex();
+if ( !(myImgApp->ObjMgrW())->Visible() || 
+     ( (did >= 0) && (myImgApp->ObjMgrW())->GetCurDirId() != did) ) {
+  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
   return;
-}
-NObjMgrSync zs(0); zs.NOp();
+  }
+
 if (did < 0) {
   string cdir = *currDir;
@@ -1721 +1738 @@
   did = (myImgApp->ObjMgrW())->GetCurDirId();
 }
-
-UpdateObjMgrWindow_P(did);
-(myImgApp->ObjMgrW())->SetSensitive();
-obmWUpdReq = false;
-obmWvis = true;
-}
-
-/* --Methode-- */
-void NamedObjMgr::SetObjMgrWindowVisibility(bool fgvis)
-{
-obmWvis = fgvis;
-}
-
-/* --Methode-- */
-void NamedObjMgr::UpdateObjMgrWindow_P(int did)
-{
-if (!myImgApp)  return;
-if ( !_fgimgapp )  myImgApp->LockMutex();
-if ( !(myImgApp->ObjMgrW())->Visible() || 
-     ( (myImgApp->ObjMgrW())->GetCurDirId() != did) ) {
-  if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
-  return;
-  }
 
 (myImgApp->ObjMgrW())->ClearObjList();
@@ -1756 +1750 @@
   (myImgApp->ObjMgrW())->AddObj(cn.c_str(), (*it).second.oid);
   }
+
+(myImgApp->ObjMgrW())->SetSensitive();
 if ( !_fgimgapp )  myImgApp->UnlockMutex(true);
+obmWvis = true;
 return;
 }