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

Timestamp:

Dec 19, 2013, 6:22:39 PM (11 years ago)

Author:

garnier

Message:

Modification pour remettre en marche le Run. Desormais Transport passe, mais aucun test ne permet de dire si c est bon

File:

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

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

@@ -3 +3 @@
 #include <algorithm>
 #include <iostream>
-
 
 abstractSoftware::abstractSoftware()
@@ -11 +10 @@
 }
 
-abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect)
+abstractSoftware::abstractSoftware(string inputFileName, sectionToExecute* sect, dataManager* data)
 {
   inputFileName_ = inputFileName;
@@ -17 +16 @@
   numeroDeb_deprecated_ = 0;
   numeroFin_deprecated_ = 0;
+  dataManager_ = data;
   nameOfSoftware_ = nomDeLogiciel("unknownSoftware");
 }
 
-bool abstractSoftware::initComputationLimits_deprecated(unsigned int numeroDeb,unsigned int numeroFin_deprecated_)
-{
-/*  numeroDeb_deprecated_ = numeroDeb;
-  numeroFin_deprecated__ = numeroFin_deprecated_;
-  return ComputationLimitsOk_deprecated();
-*/
-}
 
 bool abstractSoftware::ComputationLimitsOk_deprecated() const 
 {
 /*  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() );
+    consoleMessage(" abstractSoftware::initComputationLimit : num of element out of limits in software " + getName() );
     return false;
   } else {