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

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

@@ -17 +17 @@
 #include "GWt_dialog.h"
 #include "GWt_console.h"
+#include "GWt_sector.h"
 #include "GWt_globalParameters.h"
 #include "GWt_sectionToExecute.h"
@@ -23 +24 @@
 #define BAVARD 0
 
-GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,PspaApplication* pspa,WContainerWidget* parent)
-  : WContainerWidget(parent)
-{
-  dtmanage_ = dataManager;
-  pspa_ = pspa;
+GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,GWt_sector* sect)
+  : WContainerWidget(),
+dtmanage_(dataManager),
+UIsector_(sect)
+{
   
   // bouton execute
@@ -51 +52 @@
 void GWt_softwarePanel::addSectionToExecuteW()
 {      
+  cout << "***********************************" << endl;
+  cout << "*  A réécrire  *" << endl;
+  cout << "***********************************" << endl;
+  return;
 #if BAVARD > 0
   cout << "***********************************" << endl;
@@ -56 +61 @@
 #endif
 
-  abstractElement* premierElement;
-  abstractElement* dernierElement;
+  abstractElement* premierElement = NULL;
+  abstractElement* dernierElement = NULL;
 
   int premierIndex = 0;
@@ -63 +68 @@
   
   cout << "sections_.size() = " << sections_.size() << endl;
-
+/*
   // if there is no section
   if(sections_.size() == 0) {
@@ -87 +92 @@
   
   dtmanage_->addSectionToExecute(premierElement,premierIndex,dernierElement,dernierIndex,nomDeLogiciel());
-
+*/
   std::string premierElementLabel = "";
   std::string dernierElementLabel = "";
@@ -109 +114 @@
   fillComboWithSoftwares(softCombo);
 
-  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(sections_.size()),this);
+  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(sections_.size()),this,UIsector_);
 
   stringstream st;
@@ -165 +170 @@
   // traitement de la premiere ligne
   // on impose le depart du calcul au premier element
-  string premier = dtmanage_->getLabelFromElementNumero(1);
+  string premier = "";
+  if (UIsector_->getSectorControler()) {
+    if (UIsector_->getSectorControler()->getSectionsToExecute().size() > 0) {
+      if (UIsector_->getSectorControler()->getSectionsToExecute()[0]->getElements().size() > 0) {
+        premier = UIsector_->getSectorControler()->getSectionsToExecute()[0]->getElements()[0]->getLabel();
+      }
+    }
+  }
+  
+  // FIXME :  A réécrire
+  /*
   if (sections_.size() > 0) {
     sections_[0]->setFirstElementCurrentSelection(premier);
@@ -235 +250 @@
     exec_go_->enable();
   }
-
+*/
   return true;
 }
@@ -241 +256 @@
 bool GWt_softwarePanel::areDataCoherent()
 {
+// FIXME
+  cout << "***********************************" << endl;
+  cout << "**  To be move in controler  **" << endl;
+  cout << "***********************************" << endl;
+  return true;
 #if BAVARD > 0
   cout << "***********************************" << endl;
@@ -247 +267 @@
 
   bool caMarche = true;
-
+/*
   // initialize dataManager
   dtmanage_->initializeExecution();
@@ -299 +319 @@
       sections_[a]->setWarnings(diagnosticWarnings);
     }//a
-    
+    */
   return caMarche;
 }
@@ -319 +339 @@
 
       // delete from dataManager
-      dtmanage_->clearSectionToExecute(sectionIndex);
+      UIsector_->getSectorControler()->clearSectionToExecute(sectionIndex);
 
       // delete from User Interface
@@ -352 +372 @@
   //  exec_go_->setDisabled(true);
   calculDialog.hide();  
-  pspa_->faireDessin();
+  UIsector_->getAccelerator()->faireDessin();
 }
 
 void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) 
 {
-  if (cBox == NULL) return;
+  // FIXME
+  cout << "***********************************" << endl;
+  cout << "**  To be move in controler  **" << endl;
+  cout << "***********************************" << endl;
+  return;
+
+/*  if (cBox == NULL) return;
 
   // get the last item selected
@@ -376 +402 @@
   }
   cBox->refresh();
+*/
 }