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

Timestamp:

Mar 12, 2013, 1:54:41 PM (11 years ago)

Author:

lemeur

Message:

amélioration fiabilité graphique

File:

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

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

@@ -4 +4 @@
 #include "globalParameters.h"
 #include "particleBeam.h"
-
+#include "nomDeLogiciel.h"
 #include <iostream>
 #include <string>
@@ -17 +17 @@
  protected :
 
+  unsigned numeroDeb_, numeroFin_;
   globalParameters* globParamPtr_;
   dataManager* dataManager_;
   string inputFileName_;
-
+  nomDeLogiciel nameOfSoftware_;
   abstractSoftware();
 
   bool launchJob(string commandLine, string& resul);
-
+  bool initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin);
+  bool ComputationLimitsOk() const;
  public :
 
@@ -30 +32 @@
   ~abstractSoftware() {;}
 
+  inline nomDeLogiciel getNomDeLogiciel() const {
+    return nameOfSoftware_;
+  }
+
   virtual bool createInputFile(particleBeam* beamBefore,unsigned int numeroDeb, unsigned int numeroFin, string workingDir) = 0;
 
 
-  virtual bool  execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir) = 0;
+  virtual bool  execute(string workingDir) = 0;
 
- virtual bool buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) = 0;
+ virtual bool buildBeamAfterElements(string workingDir) = 0;
 
     /** Color of the background of this sofware
@@ -44 +50 @@
     /** Name of this software
      */
-    virtual string getName() = 0;
+    inline string getName() const {
+      return nameOfSoftware_.getString();
+    }
 
 };