Changeset 455 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc

Timestamp:

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

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/abstractSoftware.cc (modified) (2 diffs)

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

@@ -7 +7 @@
 abstractSoftware::abstractSoftware()
 {
-  globParamPtr_ = NULL;
-  sectParamPtr_ = NULL; //xx
   dataManager_ = NULL;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, globalParameters* globals, dataManager* dt) 
+abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect)
 {
   inputFileName_ = inputFileName;
-  globParamPtr_ = globals;
-  sectParamPtr_ = NULL; //xx
-  dataManager_ = dt;
-  numeroDeb_ = 0;
-  numeroFin_ = 0;
+  sectionToExecute_ = sect;
+  numeroDeb_deprecated_ = 0;
+  numeroFin_deprecated_ = 0;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
 }
 
-abstractSoftware::abstractSoftware(string inputFileName,sectorParameters* lattice,dataManager* dt) 
+bool abstractSoftware::initComputationLimits_deprecated(unsigned int numeroDeb,unsigned int numeroFin_deprecated_)
 {
-  inputFileName_ = inputFileName;
-  globParamPtr_ = NULL;
-  sectParamPtr_ = lattice;
-  dataManager_ = dt;
-  numeroDeb_ = 0;
-  numeroFin_ = 0;
-  nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
+/*  numeroDeb_deprecated_ = numeroDeb;
+  numeroFin_deprecated__ = numeroFin_deprecated_;
+  return ComputationLimitsOk_deprecated();
+*/
 }
 
-bool abstractSoftware::initComputationLimits(unsigned int numeroDeb,unsigned int numeroFin) 
+bool abstractSoftware::ComputationLimitsOk_deprecated() const 
 {
-  numeroDeb_ = numeroDeb;
-  numeroFin_ = numeroFin;
-  return ComputationLimitsOk();
-}
-
-bool abstractSoftware::ComputationLimitsOk() const 
-{
-  if (numeroDeb_ < 1 || numeroFin_ < 1 || numeroDeb_ > dataManager_->getBeamLineSize() || numeroFin_ > dataManager_->getBeamLineSize() ) {
+/*  if (numeroDeb_deprecated_ < 1 || numeroFin_deprecated__ < 1 || numeroDeb_deprecated_ > dataManager_->getBeamLineSize() || numeroFin_deprecated__ > dataManager_->getBeamLineSize() ) {
     dataManager_->consoleMessage(" abstractSoftware::initComputationLimit : num of element out of limits in software " + getName() );
     return false;
@@ -50 +36 @@
     return true;
   }
+*/
+  return true;
 }