Changeset 395 in PSPA

Timestamp:

Mar 20, 2013, 3:15:11 PM (11 years ago)

Author:

garnier

Message:

Preparation des ComboBox

Location:

Interface_Web/branches/12_03_12-managerComboBox/pspaWT

Files:

• History (modified) (1 diff)
• sources/userInterface/include/GWt_sectionToExecute.h (modified) (1 diff)
• sources/userInterface/include/GWt_softwarePanel.h (modified) (2 diffs)
• sources/userInterface/src/GWt_ligneFaisceau.cc (modified) (1 diff)
• sources/userInterface/src/GWt_softwarePanel.cc (modified) (3 diffs)

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/History

@@ -6 +6 @@
      =========================================================
 
+20 Mars : Laurent Garnier
+- GWt_LigneFaisceau : renommage
+- GWt_softwarePanel : Preparation des ComboBox
+- GWt_sectionToExecute : Ajout de qq méthodes pour manipuler les ComboBox
 13 Mars : Laurent Garnier
 - Etape 2 ok, test ok

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/include/GWt_sectionToExecute.h

@@ -36 +36 @@
     }
     
+    inline Wt::WComboBox * getFirstElement() {
+        return firstElement;
+    }
+    
+    inline Wt::WComboBox * getLastElement() {
+        return lastElement;
+    }
+    
+    inline Wt::WComboBox * getSoftware() {
+        return software;
+    }
     void setFirstElementCurrentSelection(Wt::WString);
     void setLastElementCurrentSelection(Wt::WString);

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/include/GWt_softwarePanel.h

@@ -28 +28 @@
 
     void addSectionToExecuteW();
-    void updateSelections();
+    void updateSections();
     
     private :
@@ -38 +38 @@
     void executer();
     bool areDataCoherent();
+    void fillComboWithElements(Wt::WComboBox* cBox);
+    void fillComboWithSoftwares(Wt::WComboBox* cBox);
     
     dataManager* dtmanage_;

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc

@@ -157 +157 @@
   }
   
-  pspa_->getExecuteWidget()->updateSelections();
+  pspa_->getExecuteWidget()->updateSections();
 }
 

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

@@ -119 +119 @@
   WLineEdit* lineFrom = new WLineEdit(premierElementLabel);
   WLineEdit* lineTo = new WLineEdit(dernierElementLabel);
+
+  WComboBox* lineFromCombo = new WComboBox();
+  WComboBox* lineToCombo = new WComboBox();
+  fillComboWithElements(lineFromCombo);
+  fillComboWithElements(lineToCombo);
+
   WComboBox* softCombo = new WComboBox();
-
-  unsigned nb = nomDeLogiciel::getNumberOfSoftwares();
-  unsigned k;
-  for(k = 0; k < nb; k++) {
-    softCombo->addItem(nomDeLogiciel(k).getString());
-  }
-
-  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFrom, lineTo, softCombo);
+  fillComboWithSoftwares(softCombo);
+
+  GWt_sectionToExecute* newSectionOld = new GWt_sectionToExecute(lineFrom, lineTo, softCombo);
+  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo);
+
+  // push back on sections vector
+  sections.push_back(newSectionOld);
   sections.push_back(newSection);
+
+  // push back on User interface
+  contenuSections_->addWidget(newSectionOld);
   contenuSections_->addWidget(newSection);
 
-    
-    
-    // ______________test !!!!! _______________________
-/*
- 
-    
-     
-    // create a new section
-    WContainerWidget* addedSection = new WContainerWidget;
-
-    // add components
-    addedSection->addWidget(new WText("TEST from : "));
-    WComboBox* debCombo = new WComboBox();
-    WComboBox* finCombo = new WComboBox();
-    WComboBox* softwareCombo = new WComboBox();
-
-    // fill the combo with all elements
-    for (int a=0; a< pspa_->getBeamLine()->getBeamLineSize(); a++) {
-        abstractElement* abs = pspa_->getBeamLine()->getAbstractElement(a);
-        if (abs != NULL){
-            debCombo->addItem(abs->getLabel());
-            finCombo->addItem(abs->getLabel());
-        }
-    }
-    // set selection
-    int index = 0;
-    if (debut_section.size() > 0) {
-        index = finCombo->currentIndex ()+1;
-    }
-    debCombo->setCurrentIndex(index);
-//...
-    // push it in the vector
-    debut_section.push_back(debCombo);
-    fin_section.push_back(finCombo);
-    software_section.push_back(softwareCombo);
-    
-    addedSection->addWidget(debCombo);
-    addedSection->addWidget(new WText("TEST to : "));
-    addedSection->addWidget(finCombo);
-    addedSection->addWidget(softwareCombo);
-    
-    contenuSections_->addWidget(addedSection);
-    }
-*/
     
 
@@ -404 +368 @@
 
 
-void GWt_softwarePanel::updateSelections()
-{
+void GWt_softwarePanel::updateSections()
+{
+  // update all sections in order to manage new/deleted items
+  for (int a = 0; a< sections.size(); a++) {
+    fillComboWithElements(sections[a]->getFirstElement());
+    fillComboWithElements(sections[a]->getLastElement());
+  }
+  
   string premierText, dernierText;
   if ( dtmanage_->getJobListSize() > 0 )
-    {
-      premierText = dtmanage_->getLabelFromElementNumero(1);
+  {
+    premierText = dtmanage_->getLabelFromElementNumero(1);
       dernierText = dtmanage_->getLabelFromElementNumero( dtmanage_->getBeamLineSize() );
       sections[0]->setFirstElementLineEditCurrentText(premierText);
@@ -464 +434 @@
 }
 
+
+void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) {
+  if (cBox == NULL) return;
+  cBox->clear();
+
+  for (int a=0; a< pspa_->getBeamLine()->getBeamLineSize(); a++) {
+    abstractElement* abs = pspa_->getBeamLine()->getAbstractElement(a);
+    if (abs != NULL){
+      cBox->addItem(abs->getLabel());
+    }
+  }
+}
+
+
+void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox) {
+  if (cBox == NULL) return;
+  cBox->clear();
+
+  unsigned nb = nomDeLogiciel::getNumberOfSoftwares();
+  unsigned k;
+  for(k = 0; k < nb; k++) {
+    cBox->addItem(nomDeLogiciel(k).getString());
+  }
+  
+}