Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h

Timestamp:

Dec 16, 2013, 5:16:54 PM (10 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/include/abstractSoftware.h (modified) (5 diffs)

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

@@ -15 +15 @@
 
 class dataManager;
+class sectionToExecute;
 
 class abstractSoftware
@@ -21 +22 @@
  protected :
   
-  unsigned numeroDeb_, numeroFin_;
-  globalParameters* globParamPtr_;
-  sectorParameters* sectParamPtr_; //xx
+  unsigned numeroDeb_deprecated_, numeroFin_deprecated_;
   dataManager* dataManager_;
   string inputFileName_;
@@ -41 +40 @@
 
   bool launchJob(string commandLine, string& resul);
-  bool initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin);
-  bool ComputationLimitsOk() const;
+  bool initComputationLimits_deprecated(unsigned int numeroDeb,unsigned int numeroFin);
+  bool ComputationLimitsOk_deprecated() const;
 
   void registerElement(nomdElements::typedElement nomdel,trivaluedBool b);
 
- public :
+  sectionToExecute* getSectionToExecute() {
+    return sectionToExecute_;
+  }
 
-  abstractSoftware(string,globalParameters*,dataManager*);
-  abstractSoftware(string,sectorParameters*,dataManager*);
+  public :
+
+  abstractSoftware(string, sectionToExecute*);
   ~abstractSoftware() {;}
 
@@ -58 +60 @@
   trivaluedBool doAcceptElement(nomdElements::typedElement typdel);
 
-  virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
+  virtual bool createInputFile(particleBeam* beamBefore, string workingDir) = 0;
   virtual bool execute(string workingDir) = 0;
   virtual bool buildBeamAfterElements(string workingDir) = 0;
@@ -72 +74 @@
     return nameOfSoftware_.getString();
   }
+  private :
+  sectionToExecute* sectionToExecute_;
+  
 };
 #endif