Changeset 396 in PSPA for Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

Timestamp:

Mar 22, 2013, 9:37:45 AM (11 years ago)

Author:

garnier

Message:

Passage a la version avec uniqquement des ComboBox. Tests en cours

File:

• Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc (modified) (10 diffs)

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

@@ -128 +128 @@
   fillComboWithSoftwares(softCombo);
 
-  GWt_sectionToExecute* newSectionOld = new GWt_sectionToExecute(lineFrom, lineTo, softCombo);
-  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo);
+  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo,this);
 
   // push back on sections vector
-  sections.push_back(newSectionOld);
   sections.push_back(newSection);
 
   // push back on User interface
-  contenuSections_->addWidget(newSectionOld);
   contenuSections_->addWidget(newSection);
-
-    
 
 }
@@ -244 +239 @@
   string premier = dtmanage_->getLabelFromElementNumero(1);
   if (sections.size() > 0) {
-    sections[0]->setFirstElementLineEditCurrentText(premier);
-//...
-  }
-  
-  Wt::WString currentString =  sections[0]->getLastElementLineEditCurrentText();
+    sections[0]->setFirstElementCurrentSelection(premier);
+  }
+  
+  Wt::WString currentString =  sections[0]->getLastElementCurrentText();
   int current = dtmanage_->getNumeroFromElementLabel(currentString.toUTF8());
   
@@ -257 +251 @@
     currentString =  dtmanage_->getLabelFromElementNumero(current);
     if (sections.size() > 0) {
-      sections[0]->setLastElementLineEditCurrentText(currentString);
+      sections[0]->setLastElementCurrentSelection(currentString);
 //...
     }
@@ -275 +269 @@
         }
       
-      sections[a]->setFirstElementLineEditCurrentText(currentString);
-//...
+      sections[a]->setFirstElementCurrentSelection(currentString);
+
       // fin
-      string finString =  sections[a]->getLastElementLineEditCurrentText().toUTF8();
+      string finString =  sections[a]->getLastElementCurrentText().toUTF8();
       
       int numeroFin = dtmanage_->getNumeroFromElementLabel( finString);
@@ -294 +288 @@
     }
   //  exec_go_->setDisabled(false);
+
+  if (!areDataCoherent()) {
+    exec_go_->disable();
+  } else {
+    exec_go_->enable();
+  }
+
   return true;
 }
@@ -306 +307 @@
     
   for (int a = 0; a< sections.size(); a++)
-    {
-      string debString = sections[a]->getFirstElementLineEditCurrentText().toUTF8();
-      string finString = sections[a]->getLastElementLineEditCurrentText().toUTF8();
-      
-      int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
-        int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
-
-      nomDeLogiciel prog = nomDeLogiciel ( sections[a]->getSoftwareCurrentText().toUTF8());
-      dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
-                                     debut,
-                                     pspa_->getBeamLine()->getAbstractElement(fin),
-                                     fin,
-                                     dtmanage_->createSoftwareConnexion(prog));
-        
-      // check sections
-      for (int i=debut-1; i<fin; i++) {
-        if (pspa_->getBeamLine()) {
-          if (pspa_->getBeamLine()->getAbstractElement(i)) {
-            trivaluedBool tb = pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString());
-            if (tb  == TBoolError ) {
-              diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " is not allowed with "+ prog.getString()+"\n ";
-              caMarche = false;
-              tbResume = tb;
-            } else if ( tb == TBoolIgnore ) {
-              diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " will be ignored by  "+ prog.getString()+"\n ";
-              if ( tbResume != TBoolError ) tbResume = tb;
-            } else {
-              pspa_->getBeamLine()->update(i);
-            }
-          }
-        }
+  {
+    string debString = sections[a]->getFirstElementCurrentText().toUTF8();
+    string finString = sections[a]->getLastElementCurrentText().toUTF8();
+    
+    int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
+    int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
+    
+    nomDeLogiciel prog = nomDeLogiciel ( sections[a]->getSoftwareCurrentText().toUTF8());
+    dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
+                                   debut,
+                                   pspa_->getBeamLine()->getAbstractElement(fin),
+                                   fin,
+                                   dtmanage_->createSoftwareConnexion(prog));
+    
+    // check sections
+    for (int i=debut-1; i<fin; i++) {
+      if (pspa_->getBeamLine()) {
+        if (pspa_->getBeamLine()->getAbstractElement(i)) {
+          trivaluedBool tb = pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString());
+          if (tb  == TBoolError ) {
+            diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " is not allowed with "+ prog.getString()+"\n ";
+            caMarche = false;
+            tbResume = tb;
+          } else if ( tb == TBoolIgnore ) {
+            diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " will be ignored by  "+ prog.getString()+"\n ";
+            if ( tbResume != TBoolError ) tbResume = tb;
+          } else {
+            pspa_->getBeamLine()->update(i);
+          }
+        }
       }
     }
-
+  }
+  
   if ( tbResume == TBoolError ) {
     GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
@@ -375 +376 @@
     fillComboWithElements(sections[a]->getLastElement());
   }
-  
-  string premierText, dernierText;
-  if ( dtmanage_->getJobListSize() > 0 )
-  {
-    premierText = dtmanage_->getLabelFromElementNumero(1);
-      dernierText = dtmanage_->getLabelFromElementNumero( dtmanage_->getBeamLineSize() );
-      sections[0]->setFirstElementLineEditCurrentText(premierText);
-      sections[0]->setLastElementLineEditCurrentText(dernierText);
-//...
-    }
+  if (sections.size() == 0) {
+    return;
+  }
+  // the first element will always be the first element of the beamLine
+  sections[0]->getFirstElement()->setCurrentIndex(0);
+  
+  // the last element will always be the last element of the beamLine
+  sections[sections.size()-1]->getLastElement()->setCurrentIndex(sections[sections.size()-1]->getLastElement()->count());
+
+  // set default values
+
+  // update
+  updateSectionSelection();
 }
 
@@ -401 +405 @@
 {
 
-  if ( !updateSectionSelection() ) return;
-
-
-    if (!areDataCoherent()) {
-      //    GWt_dialog warningDialog("PSPA : verification des sections", " donnees incoherentes !", GWt_dialog::Error,true,true);
-      //    warningDialog.exec();
-      //    exec_go_->setDisabled(true);
+  if (!areDataCoherent()) {
+    //    GWt_dialog warningDialog("PSPA : verification des sections", " donnees incoherentes !", GWt_dialog::Error,true,true);
+    //    warningDialog.exec();
+    //    exec_go_->setDisabled(true);
     return;
-    }
-
+  }
+  
   GWt_console* console = NULL;
   if (static_cast<GWt_console*> (wApp->findWidget ("console"))) {
@@ -437 +438 @@
 void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) {
   if (cBox == NULL) return;
+
+  // get the last item selected
+  WString selectedString = cBox->currentText ();
   cBox->clear();
 
@@ -445 +449 @@
     }
   }
+  
+  for (int a=0; a<cBox->count(); a++) {
+    if (cBox->itemText (a) == selectedString) {
+      cBox->setCurrentIndex(a);
+    }
+  }
 }