Changeset 341 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Feb 22, 2013, 10:07:46 AM (11 years ago)

Author:

lemeur

Message:

fin dessins esp. phase + noms de fichiers

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (5 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -16 +16 @@
 dataManager::dataManager(PspaApplication* pspa) :
 currentBeam_(NULL)
-,workingDir_("")
 ,pspa_ ( pspa)
 {
+  //  workingDir_ = pspa_->getWorkingDir();
 }
 
@@ -145 +145 @@
 void dataManager::initializeExecution()
 {
-    if (workingDir_ == "") {
+  string workingDir = pspa_->getWorkingDir();
+    if (workingDir == "") {
         return;
     }
-    removeFile(workingDir_ + "parmdesz");
-    removeFile(workingDir_ + "parmin");
-    removeFile(workingDir_ + "parin.input0");
-    removeFile(workingDir_ + "transport.input");
-    removeFile(workingDir_ + "transport.output");
-    removeFile(workingDir_ + "generator.in");
-    removeFile(workingDir_ + "faisceau.ini");
-    removeFile(workingDir_ + "generator.output");
+    removeFile(workingDir + "parmdesz");
+    removeFile(workingDir + "parmin");
+    removeFile(workingDir + "parin.input0");
+    removeFile(workingDir + "transport.input");
+    removeFile(workingDir + "transport.output");
+    removeFile(workingDir + "generator.in");
+    removeFile(workingDir + "faisceau.ini");
+    removeFile(workingDir + "generator.output");
     diagnosticBeam_.clear();
     currentBeam_ = NULL;
@@ -178 +179 @@
     unsigned k;
     abstractSoftware* softw =NULL;
-    
+    string workingDir = pspa_->getWorkingDir();
     for(k = 0; k < jobList_.size(); k++)
     {
@@ -194 +195 @@
       }
 
-      success = softw->createInputFile(currentBeam_, debut, fin, workingDir_);
+      success = softw->createInputFile(currentBeam_, debut, fin, workingDir);
       if ( success ) {
-        success = softw->execute(debut,fin,workingDir_);
+        success = softw->execute(debut,fin,workingDir);
         if ( success ) {
-          success = softw->buildBeamAfterElements(debut, fin, diagnosticBeam_, workingDir_);
+          success = softw->buildBeamAfterElements(debut, fin, diagnosticBeam_, workingDir);
         }
       }
@@ -215 +216 @@
 
 
-void dataManager::saveConfiguration( string nameOfFile)
+void dataManager::saveConfiguration( string nameOfCase)
 {
     ofstream outfile;
-    string name = workingDir_ + nameOfFile + ".save";
+    string name = pspa_->getWorkingDir() + nameOfCase + ".save";
     outfile.open(name.c_str(), ios::out);
     if (!outfile) {