Changeset 386 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/softwareTest.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/softwareTest.cc (modified) (4 diffs)

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

@@ -8 +8 @@
 softwareTest::softwareTest() : abstractSoftware()
 {
-  ;
+  nameOfSoftware_ = nomDeLogiciel("test");
 }
 
@@ -16 +16 @@
 softwareTest::softwareTest(string inputFileName, globalParameters* globals, dataManager* dt) : abstractSoftware( inputFileName, globals, dt)
 {
-  ;
+  nameOfSoftware_ = nomDeLogiciel("test");
 }
 
@@ -30 +30 @@
 }
 
-bool  softwareTest::execute( unsigned int numeroDeb,unsigned int numeroFin,string workingDir) {
+bool  softwareTest::execute(string workingDir) {
     dataManager_->consoleMessage(" softwareTest::execute  " );
   return true;
 }
 
-bool  softwareTest::buildBeamAfterElements(unsigned int numeroDeb,unsigned int numeroFin, vector<particleBeam>& beams, string workingDir) {
+bool  softwareTest::buildBeamAfterElements(string workingDir) {
   dataManager_->consoleMessage(" softwareTest::buildBeamAfterElements  " );
   bool result = true;
   unsigned k;
-  for ( k= numeroDeb; k <= numeroFin; k++)
+  for ( k= numeroDeb_; k <= numeroFin_; k++)
     {
-      beams.push_back(particleBeam());
+      particleBeam* newDiag = dataManager_->updateCurrentDiagnostic(true);
+  //      beams.push_back(particleBeam());
       vector<double> centroid = vector<double>(6,0.0);
       bareParticle refPart;
@@ -55 +56 @@
       else {
         bareParticle refPart (particles.at(0));
-        beams.back().setWithParticles(centroid, refPart,particles); 
+        newDiag->setWithParticles(centroid, refPart,particles); 
       }
     }