Changeset 2645 in Sophya

Timestamp:

Feb 7, 2005, 3:23:45 PM (21 years ago)

Author:

cmv

Message:

openppf modified to allow for object selection at the line command level. cmv 070205

Location:

trunk/SophyaPI/PIext

Files:

• basexecut.cc (modified) (2 diffs)
• nobjmgr.cc (modified) (1 diff)
• nobjmgr.h (modified) (1 diff)

trunk/SophyaPI/PIext/basexecut.cc

@@ -364 +364 @@
 }
 else if (kw == "openppf" ) {
-  if (tokens.size() < 1) { cout << "Usage: openppf file " << endl; return(0); }
-  mObjMgr->ReadAll(tokens[0]);  
+  if (tokens.size()<1) {cout<<"Usage: openppf file [objname1 objname2 ...]"<<endl; return(0); }
+  else if (tokens.size()==1) mObjMgr->ReadAll(tokens[0]);  
+  else mObjMgr->ReadObj(tokens); 
 }
 else if ((kw == "saveobjs") || (kw == "saveppf"))  {
@@ -1460 +1461 @@
 mpiac->RegisterCommand(kw, usage, this, "FileIO");
 kw = "openppf";
-usage = "Reads all objects from a PPF file \n Usage: openppf filename";
+usage = "Reads all or some objects from a PPF file \n Usage: openppf filename [objname1 objname2 ...]";
 usage += "\n  Related commands: saveall openfits";  
 mpiac->RegisterCommand(kw, usage, this, "FileIO");

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -926 +926 @@
 AddObj_P(ppobj->DataObj(), nobj, true);
 cout << "NamedObjMgr::ReadObj(...) object " << nobj << " read from file " << endl;
+return;
+}
+/* --Methode-- */ 
+void NamedObjMgr::ReadObj(vector<string> & flnm_objname)
+// flnm_objname[0] = nom du fichier .ppf
+// flnm_objname[1...] = nom des tags des objects a lire
+{
+if(flnm_objname.size()<2) return;
+ZSync(*myMutex);
+int nread=0;
+try {
+  PInPersist pis(flnm_objname[0]);
+  for(int i=1;i<flnm_objname.size();i++) {
+    bool ok = pis.GotoNameTag(flnm_objname[i]);
+    if(!ok) {
+      cout<<"NamedObjMgr::ReadObj(...) Unknown object: "<<flnm_objname[i]<<endl;
+      continue;
+    }
+    PPersist *ppobj = pis.ReadObject();;
+    if(ppobj==NULL) {
+      cout<<"NamedObjMgr::ReadObj(...) impossible to read "<<flnm_objname[i]<<endl;
+      continue;
+    }
+    AddObj_P(ppobj->DataObj(),flnm_objname[i],true);
+    nread++;
+    cout<<"NamedObjMgr::ReadObj(...) object "<<flnm_objname[i]<<" read from file "<<endl;
+  }
+} catch (IOExc iox) {
+  cerr<<"NamedObjMgr::ReadObj()/Error Exception - Msg= "<<iox.Msg()<<endl;
+}
+cout<<nread<<" objects have been read"<<endl;
 return;
 }

trunk/SophyaPI/PIext/nobjmgr.h

@@ -70 +70 @@
   virtual void          ReadObj(PInPersist& s, int num=-1);
   virtual void          ReadObj(string const & nomppf, string & nobj);
+  virtual void          ReadObj(vector<string> & flnm_objname);
   virtual void          ReadAll(string const & nomppf);
   virtual void          ReadFits(string const & flnm, string & nobj);