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

Timestamp:

Mar 11, 2014, 11:21:43 AM (10 years ago)

Author:

lemeur

Message:

refection generale des secteurs et applications de softwares (suite)

File:

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

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

@@ -12 +12 @@
 }
 
-softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect,dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// softwareGenerator::softwareGenerator(string inputFileName, sectionToExecute* sect,dataManager* data) : abstractSoftware(inputFileName, sect,data)
+// {
+//   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
+//   nameOfSoftware_ = new  nomDeLogiciel("generator");
+//   //  registerElement(nomdElements::RFgun,TBoolOk);
+// }
+
+softwareGenerator::softwareGenerator(string inputFileName, computingBlock* cmpb,dataManager* data) : abstractSoftware(inputFileName, cmpb,data)
 {
   cout << " softwareUsersprogram::softwareGenerator ENREGISTREMENT " << endl;
@@ -21 +28 @@
 bool softwareGenerator::createInputFile(particleBeam* beamBefore, string workingDir)
 {
-  abstractElement* firstElement = getSectionToExecute()->getElements().front();
+  abstractElement* firstElement = getComputingBlock()->getFirstElement();
   
   if ( firstElement->getNomdElement().getElementType() != nomdElements::RFgun ) {
@@ -93 +100 @@
   bool result = true;
 
-  if ( getSectionToExecute()->getElements().size() != 1 ) {
+  if ( getComputingBlock()->getNumberOfElements() != 1 ) {
     dataManager_->consoleMessage(" softwareGenerator::buildBeamAfterElements : only one element (rfgun) must be calculated " );
     return false;