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

Timestamp:

Mar 30, 2013, 3:05:50 PM (12 years ago)

Author:

lemeur

Message:

vérification (dataManager) de la consécution des sections

File:

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

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

@@ -29 +29 @@
 void dataManager::consoleMessage(string message) {
     GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-    if (console) console->addConsoleMessage(message);
+    if (console) console->addConsoleMessage(message + "\n");
     pspa_->processEvents();
 }
@@ -124 +124 @@
   abstractSoftware* softw = NULL;
   string workingDir = pspa_->getWorkingDir();
-  
+  int debut;
+  int fin;
+  // on verifie la consecution des sections
+  int lastel = 0;
   for(unsigned k = 0; k < jobList_.size(); k++)
     {
+      if ( jobList_[k]->getElementNumberInSection() != lastel +1 ) {
+        consoleMessage("dataManager::executeAll ERROR : sections should be consecutive ");
+        return false;
+      } else {
+        lastel = jobList_[k]->getLastElementNumberInSection();
+      }
+    }
+
+  for(unsigned k = 0; k < jobList_.size(); k++)
+    {
       cout << " dataManager::executeAll je m'apprete a executer : " << (jobList_[k]->getSoftware()->getName()) << endl;
       
-      int debut = jobList_[k]->getElementNumberInSection();
-      int fin = jobList_[k]->getLastElementNumberInSection();
+      debut = jobList_[k]->getElementNumberInSection();
+      fin = jobList_[k]->getLastElementNumberInSection();
       softw = jobList_[k]->getSoftware();
       
@@ -145 +158 @@
           success = softw->buildBeamAfterElements(workingDir);
         }
-//=======
-//        success = softw->execute(debut,fin,workingDir);
-//        if ( success ) {
-//          success = softw->buildBeamAfterElements(debut,fin,diagnosticBeam_,workingDir);
-//        }
-//>>>>>>> .merge-right.r400
       }