Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/include/dataManager.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/dataManager.h (modified) (7 diffs)

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

@@ -14 +14 @@
 #include "nomDeLogiciel.h"
 #include "sector.h"
+#include "expandedMachine.h"
+#include "computingBlock.h"
 
 #include "sectorParameters.h" //xx
@@ -24 +26 @@
  public:
   
-  dataManager() {;}
+ dataManager() :   
+  pspa_ (NULL),
+    currentMachine_(NULL)
+      {;}
   dataManager(PspaApplication*);
   virtual ~dataManager();
@@ -33 +38 @@
   particleBeam* getDiagnosticBeam_deprecated(string elementLabel);
 
+
+  //provisoire 
+  inline expandedMachine* getCurrentMachine() {return currentMachine_;}
+
+  inline expandedMachine* expandMachine() {
+    if ( !currentMachine_ ) currentMachine_ = new expandedMachine(this);
+    currentMachine_->fromSectors( sectors_, this );
+    return currentMachine_;
+  }
+
+  bool areDataCoherent() {
+    bool resultat = false;
+    if ( !currentMachine_ ) return false;
+    resultat = currentMachine_->areDataCoherent();
+    return resultat;
+  }
+
+
 /** Add a new sector
  */
@@ -39 +62 @@
   /** return all sectors
    */
-  inline std::vector <sector*> getSectors() {return jobList_;};
+  inline std::vector <sector*> getSectors() {return sectors_;};
   
   
@@ -60 +83 @@
   void writeToAMLFile(string fileName);
     
-  /** return the jobList size
+  /** return the sectors size
    */
-  inline unsigned long getJobListSize() const {
-    return jobList_.size();
-  }
+  //  inline unsigned long getSectorsSize() const {
+  //    return sectors_.size();
+  // }
   
   // si newBeam = true, on cree un nouveau diag
@@ -84 +107 @@
   };
 
-  
+  abstractElement* getElementInSectorsByLabel(string etiq);
+
+
+  void messageEcran(string niveau, string msg) const;
+
+
+
  private:
 
@@ -92 +121 @@
   vector<particleBeam> diagnosticBeam_;
   vector<unsigned> indexElementToIndexDiag_;
-  vector <sector*> jobList_;
+  //  vector <sector*> jobList_;
+  vector <sector*> sectors_;
+  expandedMachine* currentMachine_;
   void removeFile(string nameOfFile);
 };