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

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

@@ -8 +8 @@
 
 #include "sector.h"
+#include "softwareParmela.h"
+#include "softwareTransport.h"
+#include "softwareGenerator.h"
+#include "softwareGenerator.h"
+#include "softwareUsersprogram.h"
+#include "softwareTest.h"
+#include "softwareMadx.h" //xx
+#include "softwareUnknown.h" //xx
 
-sector::sector(std::string name):
+#include "sectionToExecute.h"
+#include "dataManager.h"
+
+sector::sector(dataManager* data, std::string name):
 reflected_(false),
 duplicatedFrom_(NULL),
 repetitionNumber_(1),
-name_(name)
+name_(name),
+dataManager_(data),
+sectorParam_(this)
 {
   
@@ -20 +33 @@
 sector::~sector()  {
 }
+
+void sector::addElementAfter(abstractElement* currentElement ,abstractElement* previousElement){
+  if (previousElement == NULL) {
+    if (sectionToExecute_.size() == 0) {
+      sectionToExecute_.push_back(new sectionToExecute(currentElement));
+    } else {
+      sectionToExecute_.insert ( sectionToExecute_.begin() , new sectionToExecute(currentElement) );
+    }
+  } else {
+ 
+    for (unsigned int i=0; i<sectionToExecute_.size(); i++) {
+      sectionToExecute* section = sectionToExecute_[i];
+      if (section->insertAfter(previousElement,currentElement)) {
+        return;
+      }
+    }
+  }
+}
+
+void sector::clearSectionToExecute()
+{
+  unsigned k;
+  for(k = 0; k < sectionToExecute_.size(); k++)
+  {
+    if ( sectionToExecute_[k] != NULL ) clearSectionToExecute(k);
+  }
+  sectionToExecute_.clear();
+}
+
+void sector::clearSectionToExecute(int a)
+{
+  cout << " dataManager::clearSectionToExecute : effacement de la section d'index = " << a << endl;
+  if (a < 0) return;
+  if (a >= (int)sectionToExecute_.size()) return;
+  
+  // lors de la creation de la section on a fait un 'new' d'un
+  // softwareXXXX : on fait ici le 'delete'
+  
+  const abstractSoftware* soft = sectionToExecute_.at(a)->getSoftware();
+  if ( soft != NULL ) delete soft;
+  sectionToExecute_.erase (sectionToExecute_.begin()+a);
+}