Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/sector.h

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/include/sector.h (modified) (4 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/sector.h

@@ -10 +10 @@
 
 
-class sectionToExecute;
+//class sectionToExecute;
 class abstractElement;
 class dataManager;
@@ -60 +60 @@
    Return the vector of sectionToExecute of this
    */
-  inline std::vector <sectionToExecute*> getSectionsToExecute() { return sectionToExecute_;};
-  
+  //  inline std::vector <sectionToExecute*> getSectionsToExecute() { return sectionToExecute_;};
+  inline std::vector <abstractElement*>& getElements() { return elements_;};
   /**
    Add a sectionToExecute
    */
-  inline void addSectionToExecute(sectionToExecute* s) {
-    if (s) sectionToExecute_.push_back(s);
-  };
+  //  inline void addSectionToExecute(sectionToExecute* s) {
+  //    if (s) sectionToExecute_.push_back(s);
+  //  };
   
   /** Add an element after another one. Will put it in the same sectionToExecuteList. If the element after is NULL
@@ -85 +85 @@
  set the specific software for the given sectionToExecute number
  */
-  bool setSoftware(nomDeLogiciel, unsigned int sectionToExecuteNumber);
+  //  bool setSoftware(nomDeLogiciel, unsigned int sectionToExecuteNumber);
 
-  void clearSectionToExecute();
+  //  void clearSectionToExecute();
   /** Clear a specific jobList */
-  void clearSectionToExecute(int a);
+  //void clearSectionToExecute(int a);
 
   void removeElement(abstractElement* currentElement);
@@ -105 +105 @@
   }
   
+
+  bool isInside(abstractElement* previousElement);
+
 private:
 
-  std::vector <sectionToExecute*> sectionToExecute_;
+  bool insertAfter(abstractElement* previousElement,abstractElement* currentElement);
+
+
+
+
+  std::vector<abstractElement*>  elements_;
+  //  std::vector <sectionToExecute*> sectionToExecute_;
+
   particleBeam* currentBeam_;