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

Timestamp:

Apr 27, 2005, 1:55:00 PM (20 years ago)

Author:

ansari

Message:

1/ Prise en charge de DataTable et SwPPFDataTable pour piapp (NObjMgrAdapter) :
nomhistadapter.cc et piiinit.cc
2/ Lecture de tous les objets ds un fichier PPF par NamedObjMgr::ReadAll() pour
fichier PPF sans nametag.
3/ Ajout bloc try/catch ds PIStdImgApp::Run() (boucle d'evenements)

Reza , 27 Avril 2005

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -1047 +1047 @@
 {
 ZSync(*myMutex);
+#ifdef SANS_EVOLPLANCK
 bool ok = true;
 PPersist* obj=NULL;
 
 PInPersist* ppin=NULL;
-#ifdef SANS_EVOLPLANCK
 TRY{
   ppin = new PInPersist(flnm);
@@ -1058 +1058 @@
 }  CATCH(merr) 
   { printf("NamedObjMgr::ReadAll()/Error Exception= %ld (%s) \n", 
-    (long)merr, PeidaExc(merr));  ok = false; } ENDTRY;
-#else
-try {
-  ppin = new PInPersist(flnm);
-  if (ppin->NbNameTags() < 1)  obj = ppin->ReadObject();
-  else   obj = NULL; 
-}
-catch (IOExc iox) {
-    cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
-    ok = false;
-}
-#endif
+    (long)merr, PeidaExc(merr));  ok = false; } 
+ENDTRY;
 if (!ok)  return;
 if (obj) {
@@ -1077 +1067 @@
 else ReadObj((*ppin), -1);
 delete ppin;
+#else
+try {
+  PInPersist pis(flnm);
+  if (pis.NbNameTags() >= 1)  { 
+    if (pis.NbNameTags() < pis.NbTopLevelObjects()) { 
+      cout << "NamedObjMgr::ReadAll()/Warning File " << flnm << " NbNameTags="
+           << pis.NbNameTags() << " < NbTopLevelObjects= " 
+           << pis.NbTopLevelObjects() << endl;
+      cout << " ... Reading " << pis.NbNameTags() << " objects at NameTags " ;
+    }
+    ReadObj(pis, -1);
+    return;
+  }
+
+  string nom = servnobjm->FileName2Name(flnm);  
+  int kn = 1;
+  for(int ii=0; ii<pis.NbTopLevelObjects(); ii++) {
+    PPersist* obj = pis.ReadObject();
+    if (!obj) continue;
+    AddObj_P(obj->DataObj(), nom, false);
+    kn++;
+    nom += (string)MuTyV(kn);
+  }
+}
+catch (IOExc& iox) {
+  cerr << "NamedObjMgr::ReadAll()/Error Exception - Msg= " << iox.Msg() << endl;
+}
+#endif
 return;
 }