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

Timestamp:

Aug 9, 1999, 1:57:10 PM (26 years ago)

Author:

ercodmgr

Message:

modifs Fenetre de fit et gestion repertoire /func Reza 9/8/99

File:

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

trunk/SophyaPI/PIext/nobjmgr.cc

@@ -91 +91 @@
 static string* TmpDir;  // Repertoire pour les compilations / link dynamique
 
+static bool BeQuiet = false;  // Moins de messages ...
+
 // Pour completer le nom de l'objet avec le nom du repertoire
 static void RemoveSpacesFromName(string & nom);
@@ -121 +123 @@
   SetKeepOldDirAtt(dirn, true);
   dirn = "tmp";
+  CreateDir(dirn);
+  SetKeepOldDirAtt(dirn, false);
+  dirn = "func";
   CreateDir(dirn);
   SetKeepOldDirAtt(dirn, false);
@@ -239 +244 @@
   (myImgApp->ObjMgrW())->DelDirectory((*it).second.id);
 myDirs->erase(it);
-cout << "amedObjMgr::DeleteDir() " << dirname << " deleted " << endl;  
+cout << "NamedObjMgr::DeleteDir() " << dirname << " deleted " << endl;  
 return(true);
 }
@@ -334 +339 @@
 
 /* --Methode-- */
-void NamedObjMgr::CleanTmpDir()
-{
-}
-
-/* --Methode-- */
-void NamedObjMgr::CleanOldDir()
-{
-}
+void NamedObjMgr::CleanDir(string & dirname)
+{
+if ( !CheckDirName(dirname) ) {
+  cout << "NamedObjMgr::CleanDir( " << dirname << ") Error - Invalid name !" << endl;
+  return(false); 
+  }
+NObjDirList::iterator itr = myDirs->find(dirname);
+if (itr == myDirs->end()) {
+  cout << "NamedObjMgr::CleanDir( " << dirname << ") Error - No such directory !" << endl;
+  return(false);
+  }
+
+int did = (*itr).second.id;
+NObjList::iterator it;  
+list<int>::iterator iwr;
+bool nodisp = true;
+list<string> odel;
+for(it = myObjs->begin(); it != myObjs->end(); it++) {
+  if ((*it).second.dirid != did) continue;
+  nodisp = true;
+  if (myImgApp) 
+    for(iwr=(*it).second.wrsid.begin(); iwr != (*it).second.wrsid.end(); iwr++) 
+      if (myImgApp->CheckWRsId(*iwr)) { nodisp = false; break; }
+  if (nodisp) odel.push_back((*it).first);
+  }
+list<string>::iterator ii;
+for(ii=odel.begin(); ii != odel.end(); ii++)  DelObj(*ii,true);
+}
+
 
 
@@ -390 +416 @@
   }
 
+// Si c'est le repertoire /func, on nettoie
+if (nrep == "func")  {
+  BeQuiet = true;   
+  CleanDir(nrep);
+  BeQuiet = false;
+  }
+
 myNObj++;
 if (nobj.length() < 1) { 
@@ -404 +437 @@
 it = myObjs->find(nom);
 if (it != myObjs->end()) { // l'objet existe deja
-  if ( (*itr).second.keepold ) { // On met l'ancien objet dans /old
+  if (nrep == "func") {  // Dans /func , on garde les objets affiches, donc del. par Clean
+    sprintf(buff, "%d", (*it).second.oid); 
+    string nomnew = "/func/" + nobj + buff;
+    RenameObj(nom, nomnew);
+    }                              
+  else if ( (*itr).second.keepold ) { // On met l'ancien objet dans /old
     string on,od;
 //    ParseObjectName((*it).first, od, on); 
@@ -501 +539 @@
 (*itr).second.nobj--;
 
+if (BeQuiet) return(true);  
 if (fgd) cout << "NamedObjMgr::DelObj()  Object " << nom << " deleted (Total= " << myObjs->size() << ")" << endl;
 else  cout << "NamedObjMgr::DelObj()  Object " << nom << " removed (Total= " << myObjs->size() << ")" << endl;