Changeset 493 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_accelerator.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/userInterface/src/GWt_accelerator.cc (modified) (11 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_accelerator.cc

@@ -1 +1 @@
 #include "GWt_accelerator.h"
 #include "GWt_sector.h"
+#include "GWt_machine.h"
 
 #include <Wt/WLabel>
@@ -24 +25 @@
 dataManager_(dt)
 {
+  cout << " GWt_accelerator::GWt_accelerator CONSTRUCTION NOUVEL ACCELERATOR " << endl;
   setObjectName("accelerator");
   addStyleClass("acceleratorPanel");
@@ -58 +60 @@
   addSectorParameters->setMinimumSize(32,32);
   
+
+  // expand machine 
+  WPushButton* expandMachine = new WPushButton("init/expand machine",menu);
+  // set tooltips
+  expandMachine->setToolTip("expand the machine");
+  // Set class for actions elements
+  expandMachine->setStyleClass("Button WhiteButton expand");
+  expandMachine->setMaximumSize(128,32);
+  expandMachine->setMinimumSize(128,32);
+
+  // action
+  expandMachine->clicked().connect(this,&GWt_accelerator::expandMachine);
+
+
+
+
   // Run
   WPushButton* runParameters = new WPushButton("",menu);
@@ -84 +102 @@
 
   WContainerWidget* acceleratorGlobalView = new WGroupBox("Global view",acceleratorScrollArea);
-  acceleratorDetailledView_ = new WGroupBox("Detailled view",acceleratorScrollArea);
-
+  acceleratorDetailledView_ = new WGroupBox("Detailled view of sector",acceleratorScrollArea);
+  acceleratorComputingView_ = new WGroupBox("Computing view",acceleratorScrollArea);
   acceleratorGlobalViewLayout_= new WHBoxLayout();
   acceleratorGlobalView->setLayout(acceleratorGlobalViewLayout_);
@@ -121 +139 @@
   if (sect.size() == 0) {
     // Add the first sector
-    addSector();
+       addSector();
   } else {
     for (unsigned long a=0; a< sect.size(); a++) {
@@ -127 +145 @@
     }
   }
-}
-
+  //  cout << " INTERVENTION GWt_accelerator::readConfiguration  " << endl;
+  //  if ( dataManager_->getCurrentMachine() )   cout << " GWt_accelerator::readConfiguration nb elem. " <<  dataManager_->getCurrentMachine()->getNumberOfElements() <<   endl;
+    
+    new GWt_machine(this, dataManager_->getCurrentMachine());
+}
+
+void GWt_accelerator::expandMachine() {
+  cout << " coucou depuis GWt_accelerator::expandMachine() " << endl;
+  if (getDataManager()->expandMachine()) new GWt_machine(this, dataManager_->getCurrentMachine());
+}
 
 void GWt_accelerator::run()
 {
   cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::executer() " << endl<<endl;
+  cout << " GWt_accelerator::executer() " << endl<<endl;
   
   if (!areDataCoherent()) {
@@ -156 +182 @@
 }
 
+
+// recuperer les noms d'elements pour remplir les combos des menus de graphique
 void GWt_accelerator::faireDessin()
 {
@@ -161 +189 @@
   choixHistoDessin_->clear();
   
-  for (unsigned k = 0; k < getDataManager()->getSectors().size(); k++) {
-    sector* sector = getDataManager()->getSectors()[k];
-    for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
-      sectionToExecute* section = sector->getSectionsToExecute()[l];
-      for (unsigned m = 0; m < section->getElements().size(); m++) {
-        
-        abstractElement* elPtr = section->getElements()[m];
-        //    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-        
+  if ( getDataManager()->getCurrentMachine() ) {
+    for (unsigned k = 0; k < getDataManager()->getCurrentMachine()->getComputingBlocks().size(); k++) {
+      computingBlock* cpblk = getDataManager()->getCurrentMachine()->getComputingBlocks().at(k);
+      for (unsigned l = 0; l < cpblk->getNumberOfElements(); l++) {
+        abstractElement* elPtr = cpblk->getElement(k);
         choixElementDessin_->addItem(elPtr->getLabel());
         choixHistoDessin_->addItem(elPtr->getLabel());
@@ -175 +199 @@
     }
   }
+  // for (unsigned k = 0; k < getDataManager()->getSectors().size(); k++) {
+  //   sector* sector = getDataManager()->getSectors()[k];
+  //   for (unsigned l = 0; l < sector->getSectionsToExecute().size(); l++) {
+  //     sectionToExecute* section = sector->getSectionsToExecute()[l];
+  //     for (unsigned m = 0; m < section->getElements().size(); m++) {
+        
+  //       abstractElement* elPtr = section->getElements()[m];
+  //       //    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+        
+  //       choixElementDessin_->addItem(elPtr->getLabel());
+  //       choixHistoDessin_->addItem(elPtr->getLabel());
+  //     }
+  //   }
+  // }
+
 }
 
@@ -675 +714 @@
   // FIXME
   cout << "***********************************" << endl;
-  cout << "**  To be move in controler  **" << endl;
+  cout << "**  GWt_accelerator::areDataCoherent()   **" << endl;
   cout << "***********************************" << endl;
-  return true;
-#if BAVARD > 0
-  cout << "***********************************" << endl;
-  cout << " GWt_softwarePanel::areDataCoherent() " << endl<<endl;
-#endif
-  
-  bool caMarche = true;
+  if ( !dataManager_ ) return false;
+  return dataManager_->areDataCoherent();
+    //  return true;
+  
+  //  bool caMarche = true;
   /*
    // initialize dataManager
@@ -737 +774 @@
    }//a
    */
-  return caMarche;
-}
-
+  //  return caMarche;
+}
+