Changeset 419 in PSPA

Timestamp:

Jun 21, 2013, 2:32:47 PM (11 years ago)

Author:

lemeur

Message:

ajout de l'include algorithm

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/dataManager.h (modified) (4 diffs)
• controler/include/sectionToExecute.h (modified) (1 diff)
• controler/src/abstractSoftware.cc (modified) (1 diff)
• controler/src/dataManager.cc (modified) (4 diffs)
• controler/src/sectionToExecute.cc (modified) (1 diff)
• userInterface/src/GWt_softwarePanel.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/dataManager.h

@@ -31 +31 @@
   particleBeam* getDiagnosticBeam(string elementLabel);
 
-  void addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, abstractSoftware* prog);
+  sectionToExecute*  addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel);
 
   abstractElement* addElement(nomdElements::typedElement elemType);
@@ -65 +65 @@
     bool restoreElements(string inputFileName);
     
-    abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
     
     /** return the jobList size
      */
-    inline int getJobListSize() {
+    inline int getJobListSize() const {
         return jobList_.size();
     }
@@ -86 +85 @@
      return NULL if the index does not exist
      */
-    inline sectionToExecute* getJobListAt(int a) {
-        if (a < 0) return NULL;
-        if (a >= getJobListSize()) return NULL;
-        return jobList_[a];
-    }
+
+    /* inline sectionToExecute* getJobListAt(int a) { */
+    /*     if (a < 0) return NULL; */
+    /*     if (a >= getJobListSize()) return NULL; */
+    /*     return jobList_[a]; */
+    /* } */
+
+
+
+    /* inline const abstractSoftware* getSoftwareOfSection( int index) const { */
+    /*     if (index < 0) return NULL; */
+    /*     if (index >= getJobListSize()) return NULL; */
+    /*  return jobList_[index]->getSoftware(); */
+    /* } */
     
     /** Clear a specific jobList */
@@ -111 +119 @@
     void removeFile(string nameOfFile);
     void clearSectionToExecute();
- 
+     abstractSoftware* createSoftwareConnexion(nomDeLogiciel logi);
+
   };
 #endif

Interface_Web/trunk/pspaWT/sources/controler/include/sectionToExecute.h

@@ -25 +25 @@
     
     /** Deprecated : To be removed ! */
-    inline int getElementNumberInSection() {
+    inline int getElementNumberInSection() const {
         return firstElementNumberInBeamLine;
     }
     
     /** Deprecated : To be removed ! */
-    inline int getLastElementNumberInSection()  {
+    inline int getLastElementNumberInSection()  const {
         return lastElementNumberInBeamLine;
     }
-    inline abstractSoftware* getSoftware() {
+    inline abstractSoftware* getSoftware() const {
         return software;
     }

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

@@ -1 +1 @@
 #include "abstractSoftware.h"
 #include "dataManager.h"
-
+#include <algorithm>
 abstractSoftware::abstractSoftware()
 {

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

@@ -64 +64 @@
 }
 
-void dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, abstractSoftware* prog)
-{
-    jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
+sectionToExecute*  dataManager::addSectionToExecute(abstractElement* debut,int debutIndex, abstractElement* fin, int finIndex, nomDeLogiciel logiciel)
+{
+  abstractSoftware* prog;
+  string inputFileName;
+  if(logiciel == nomDeLogiciel::parmela) {
+    inputFileName = "parmin";
+    prog = new softwareParmela(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::transport) {
+    inputFileName = "transport.input";
+    prog =  new softwareTransport(inputFileName, &globParam_, this);
+  } else if (logiciel == nomDeLogiciel::generator) {
+    inputFileName = "generator.in";
+    prog = new softwareGenerator(inputFileName, &globParam_, this);
+  } else if (logiciel  == nomDeLogiciel::test) {
+    prog = new softwareTest(inputFileName, &globParam_, this);
+  } else {
+    prog = NULL;
+  }
+
+  //  abstractSoftware* prog = createSoftwareConnexion(logiciel);
+  jobList_.push_back(new sectionToExecute(debut, debutIndex, fin, finIndex, prog));
+  //  return prog;
+  return jobList_.back();
 }
 
@@ -81 +101 @@
 
 void dataManager::clearSectionToExecute(int a) {
+  cout << " dataManager::clearSectionToExecute efaacement section d'index : " << a << endl;
   if (a<0) return;
   if (a>= jobList_.size()) return;
+
+  // lors de la creation de la section on a fait un 'new' d'un softwareXXXX
+  // on fait ici le 'delete'
+
+  const abstractSoftware* soft = jobList_.at(a)->getSoftware();
+    if ( soft != NULL ) delete soft;
   jobList_.erase (jobList_.begin()+a);
 }
@@ -160 +187 @@
       }
       
-      delete softw;
       if ( success ) {
         currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
@@ -328 +354 @@
     string inputFileName;
     if(logi == nomDeLogiciel::parmela) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : parmela " << endl;
         inputFileName = "parmin";
         return new softwareParmela(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::transport) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : transport " << endl;
         inputFileName = "transport.input";
         return new softwareTransport(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::generator) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : generator " << endl;
         inputFileName = "generator.in";
         return new softwareGenerator(inputFileName, &globParam_, this);
     } else if (logi == nomDeLogiciel::test) {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : test " << endl;
         return new softwareTest(inputFileName, &globParam_, this);
     } else {
+      cout << " dataManager::createSoftwareConnexion : logiciel identifie : null " << endl;
         return NULL;
     }

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

@@ -18 +18 @@
     software = s;
 }
+

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

@@ -104 +104 @@
   
   
-  abstractSoftware* soft = NULL;
-  dtmanage_->addSectionToExecute(premierElement,premierIndex, dernierElement, dernierIndex, soft);
+  //  abstractSoftware* soft = NULL;
+  //  dtmanage_->addSectionToExecute(premierElement,premierIndex, dernierElement, dernierIndex, soft);
+  dtmanage_->addSectionToExecute(premierElement,premierIndex, dernierElement, dernierIndex, nomDeLogiciel());
 
   std::string premierElementLabel = "";
@@ -340 +341 @@
     
       nomDeLogiciel prog = nomDeLogiciel ( sections_[a]->getSoftwareCurrentText().toUTF8());
-      abstractSoftware* softToExec = dtmanage_->createSoftwareConnexion(prog);
-      dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
+      //      abstractSoftware* softToExec = dtmanage_->createSoftwareConnexion(prog);
+      sectionToExecute* sectToExec = dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
                                      debut,
                                      pspa_->getBeamLine()->getAbstractElement(fin),
                                      fin,
-                                     softToExec);
-    
+                                     prog);
+
+      abstractSoftware* softToExec = sectToExec->getSoftware(); 
       diagnosticErrors = "";
       diagnosticWarnings = "";