Changeset 386 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareGenerator.cc

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/src/softwareGenerator.cc (modified) (4 diffs)

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

@@ -8 +8 @@
 
 softwareGenerator::softwareGenerator() : abstractSoftware()
-{;}
+{
+  nameOfSoftware_ = nomDeLogiciel("generator");
+}
 
 softwareGenerator::softwareGenerator(string inputFileName, globalParameters* globals, dataManager* dt) : abstractSoftware(inputFileName, globals, dt)
-{;}
+{
+  nameOfSoftware_ = nomDeLogiciel("generator");
+}
 
 bool softwareGenerator::createInputFile(particleBeam* beamBefore, unsigned int numeroDeb, unsigned int numeroFin, string workingDir)
 {
-  if ( numeroDeb != numeroFin ) return false;
+  if ( !initComputationLimits(numeroDeb,numeroFin) ) return false;
+
+  if ( numeroDeb_ != numeroFin_ ) return false;
 
   abstractElement* elPtr;
-  elPtr = dataManager_->getElementPointerFromNumero(numeroDeb);
+  elPtr = dataManager_->getElementPointerFromNumero(numeroDeb_);
 
   if ( elPtr->getNomdElement().getElementType() != RFgun ) {
@@ -46 +52 @@
 }
 
-bool softwareGenerator::execute(unsigned int numeroDeb,unsigned int numeroFin,string workingDir) {
+bool softwareGenerator::execute(string workingDir) {
   
   bool ExecuteStatus = true;
   
   ostringstream sortie;
-  sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb << " A L'ELEMENT " << numeroFin << endl;
+  sortie << " EXECUTION DE GENERATOR DE l'ELEMENT " << numeroDeb_ << " A L'ELEMENT " << numeroFin_ << endl;
 
   string generatorJob = workingDir + "generator";
@@ -83 +89 @@
 }
 
-bool  softwareGenerator::buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) {
+bool  softwareGenerator::buildBeamAfterElements( string workingDir) {
 
   bool result = true;
-  if ( numeroDeb != numeroFin ) {
+  if ( !ComputationLimitsOk() ) return false;
+
+  if ( numeroDeb_ != numeroFin_ ) {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : only one element (rfgun) must be calculated " );
     return false;
   }
-
-  beams.push_back(particleBeam());
+  // on initialise une nouvelle sortie diagnostic 
+  particleBeam* newDiag = dataManager_->updateCurrentDiagnostic(true);
+
+  //  beams.push_back(particleBeam());
   vector<double> centroid;
   bareParticle refPart;
@@ -97 +107 @@
   vector<bareParticle> particlesPassives; // on ne fait rien de ces particules pour l'instant
   if (beamFromGenerator(string("faisceau.ini"),workingDir, centroid, refPart,particles, particlesPassives )) {
-    beams.back().setWithParticles(centroid, refPart,particles); 
+    newDiag->setWithParticles(centroid, refPart,particles); 
   } else {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : error  " );