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

Timestamp:

Dec 13, 1999, 12:19:25 AM (26 years ago)

Author:

ercodmgr

Message:

FileChooser multiples ds PIStdImgApp, Correction Ndisp ds PINTuple, Fenetre NObjMgrWind non bloquant desormais ds piapp - Reza 12/12/99

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -368 +368 @@
 list<string>::iterator ii;
 for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj(*ii,true);
+if (myImgApp)  
+  (myImgApp->ObjMgrW())->UpdateList(did);
 }
 
@@ -466 +468 @@
 (*itr).second.nobj++;
 
+if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
+  string oln = nobj + "  (T= " + typeid(*obj).name() + ")" ; 
+  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+  }
 if (verbeux) cout << "NamedObjMgr::AddObj()  Object " << nom << " ( "  
      << typeid(*obj).name() << " ) added (Total= " << myObjs->size() << ")" << endl;  
@@ -512 +518 @@
 itr = myDirs->find(r2);
 (*itr).second.nobj++;
+
+if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
+  (myImgApp->ObjMgrW())->DelObjList(dids, no.oid);
+  string oln = n2 + "  (T= " + typeid(*(no.obj)).name() + ")" ; 
+  (myImgApp->ObjMgrW())->AddObjList(did, oln.c_str(), no.oid);
+}
 if (verbeux) 
   cout << "NamedObjMgr::RenameObj() - Object " << nom << " renamed to " << nomnew << endl;
@@ -537 +549 @@
 {
 string n1,r1;
-ParseObjectName(nom, r1, n1);
+int did = ParseObjectName(nom, r1, n1);
 nom = '/' + r1 + '/' + n1;
 NObjList::iterator it = myObjs->find(nom);
@@ -555 +567 @@
 if (fgd) delete (*it).second.obj;
 
+if ( (myImgApp != NULL) && (myImgApp->ObjMgrW())->Visible() ) {
+  int olid = (*it).second.oid;
+  (myImgApp->ObjMgrW())->DelObjList(did, olid);
+}
 myObjs->erase(it);
 (*itr).second.nobj--;
+
 
 if (!verbeux) return(true);  
@@ -707 +724 @@
 if (nobj.length()<1)  nobj = servnobjm->FileName2Name(flnm);
 AddObj(ppobj->DataObj(), nobj, true);
+cout << "NamedObjMgr::ReadObj(...) object " << nobj << " read from file " << endl;
 return;
 }
@@ -1267 +1285 @@
 {
 if (!myImgApp)  return;
-(myImgApp->ObjMgrW())->ClearHelpList();
+(myImgApp->ObjMgrW())->ClearObjList();
 
 NObjList::iterator it;  
@@ -1275 +1293 @@
   cn = (*it).first.substr(1);
   cn = cn.substr(cn.find('/')+1) + "  (T= " + typeid(*((*it).second.obj)).name() + ")" ;
-  (myImgApp->ObjMgrW())->AddObj(cn.c_str());
+  (myImgApp->ObjMgrW())->AddObj(cn.c_str(), (*it).second.oid);
   }
 }