Changeset 2460 in Sophya for trunk/SophyaPI/PIext

Timestamp:

Nov 22, 2003, 6:46:07 PM (22 years ago)

Author:

ansari

Message:

Adaptation aux modifs interface PPersist - Reza 22 Nov 2003

Location:

trunk/SophyaPI/PIext

Files:

• nobjmgr.cc (modified) (4 diffs)
• pisiadw.cc (modified) (2 diffs)

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -855 +855 @@
 
 int nread = 0;
-if ( (s.NbTags() < 1) || (num >= s.NbTags()) ) {
+int nbtags = 0;
+#ifdef SANS_EVOLPLANCK
+nbtags = s.NbTags();
+#else 
+nbtags = s.NbNameTags();
+#endif
+if ( (nbtags < 1) || (num >= nbtags) ) {
   if (num >= 0) { 
     cerr << "NamedObjMgr::ReadObj(PInPersist, " << num << "  Error! NbTags =" 
-         << s.NbTags() << endl;
+         << nbtags << endl;
     return;
   }
@@ -886 +892 @@
 }
  
-if (num < 0) { n0 = 0; n1 = s.NbTags(); } 
+if (num < 0) { n0 = 0; n1 = nbtags; } 
 else { n0 = num; n1 = num+1; }
 for(i=n0; i<n1; i++) {
@@ -902 +908 @@
   } ENDTRY;
 #else
-  s.GotoTagNum(i);
+  s.GotoNameTagNum(i);
   nom = s.GetTagName(i);
   try {
@@ -936 +942 @@
 try {
   ppin = new PInPersist(flnm);
-  if (ppin->NbTags() < 1)  obj = ppin->ReadObject();
+  if (ppin->NbNameTags() < 1)  obj = ppin->ReadObject();
   else   obj = NULL; 
 }

trunk/SophyaPI/PIext/pisiadw.cc

@@ -261 +261 @@
 if (!ok) { mPin = NULL;  dap->SetReady(); return; }
 
-if (mPin->NbTags() < 1) {
+int nbtags = 0;
+#ifdef SANS_EVOLPLANCK
+nbtags = mPin->NbTags();
+#else 
+nbtags = mPin->NbNameTags();
+#endif
+
+if (nbtags < 1) {
   delete mPin;   mPin = NULL;
   string no="";
@@ -286 +293 @@
 #else
 string tn;
-for(i=0; i<mPin->NbTags(); i++) {
+for(i=0; i<mPin->NbNameTags(); i++) {
   tn = mPin->GetTagName(i);
   objlist->AppendItem(tn.c_str(), 5000+i);