Changeset 469 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

Timestamp:

Dec 19, 2013, 3:53:53 PM (10 years ago)

Author:

garnier

Message:

Désormais il est de nouveau possible d'ajouter des sections et dy affecter des softwares (ne marche pour le moment quavec la 1ere sectionToExecute. Autres améliorations et renommages

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc (modified) (9 diffs)

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

@@ -67 +67 @@
       abstractElement* dernierElement = NULL;
       
-      int premierIndex = 0;
-      int dernierIndex = 0;
-      
       std::string premierElementLabel = "";
       std::string dernierElementLabel = "";
@@ -84 +81 @@
       fillComboWithElements(lineToCombo);
       
-      // set selection
-      lineFromCombo->setCurrentIndex(premierIndex);
-      lineToCombo->setCurrentIndex(dernierIndex);
+      // set to first
+      lineFromCombo->setCurrentIndex(0);
+      // set to last
+      lineToCombo->setCurrentIndex(lineToCombo->count());
       
       WComboBox* softCombo = new WComboBox();
-      fillComboWithSoftwares(softCombo);
+      sector * sector = UIsector_->getSectorControler();
+      sectionToExecute* sect = UIsector_->getSectorControler()->getSectionsToExecute()[a];
+      abstractSoftware* abs = sect->getSoftware();
+      
+      fillComboWithSoftwares(softCombo,UIsector_->getSectorControler()->getSectionsToExecute()[a]->getSoftware()->getName());
+
+      // disable the "to" comboBox
+      lineToCombo->disable();
+
+      // disable the first "from" comboBox
+      if (a==0) {
+        lineFromCombo->disable();
+      }
+      // disable the last "to" comboBox
+      if (a==UIsector_->getSectorControler()->getSectionsToExecute().size()-1) {
+        lineToCombo->disable();
+      }
       
       // Add the sectionToExecute Widget
-      GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(UIsectionsToExecute_.size()),this,UIsector_);
-      
+      GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(a),UIsector_->getSectorControler()->getSectionsToExecute()[a],UIsector_);
+      
+      // FIXME ?
       stringstream st;
       st << UIsectionsToExecute_.size();
@@ -103 +118 @@
       UIsectionsToExecute_.push_back(newSection);
       contenuSections_->addWidget(newSection);
-      updateSections();
+//      updateSections();
 
       
@@ -116 +131 @@
   cout << " GWt_softwarePanel::updateSections() " << endl<<endl;
 #endif
-  return;
-  
+
+  /*
   // update all sections in order to manage new/deleted items
   for (int a = 0; a < UIsectionsToExecute_.size(); a++) {
@@ -140 +155 @@
   // set default values
   updateSectionSelection();
+*/
 }
 
@@ -248 +264 @@
   if (s > 0) {
     abstractElement* abs = UIsector_->getSectorControler()->getSectionsToExecute()[s-1]->getLastElement();
-    UIsector_->getSectorControler()->addSectionToExecute(new sectionToExecute(abs));
+    UIsector_->getSectorControler()->addSectionToExecute(new sectionToExecute(abs,NULL));
     UIsector_->getSectorControler()->getSectionsToExecute()[s]->removeLastElement();
   }
@@ -290 +306 @@
   if (cBox == NULL) return;
 
-  // get the last item selected
-  WString selectedString = cBox->currentText();
-  cBox->clear();
-
   if (!UIsector_->getSectorControler()) {
     return;
@@ -306 +318 @@
     }
   }
-  
-  for(int a = 0; a < cBox->count(); a++) {
-    if (cBox->itemText (a) == selectedString) {
-      cBox->setCurrentIndex(a);
-    }
-  }
-  cBox->refresh();
-}
-
-void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox) 
+}
+
+void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox, std::string selected)
 {
 #if BAVARD > 0
@@ -329 +334 @@
   for(k = 0; k <= nb; k++) { //xx
     cBox->addItem(nomDeLogiciel(k).getString());
-  }
-  cBox->setCurrentIndex(nb); // xx
+    if (nomDeLogiciel(k).getString() == selected) {
+      cBox->setCurrentIndex(cBox->count()-1);
+    }
+  }
   cBox->refresh();
 }