Changeset 367 in PSPA for Interface_Web

Timestamp:

Mar 5, 2013, 9:32:52 PM (11 years ago)

Author:

lemeur

Message:

suppression bouton ok ; retablissement warning elements ignores

Location:

Interface_Web/trunk/pspaWT/sources/userInterface

Files:

• include/GWt_softwarePanel.h (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (1 diff)
• src/GWt_softwarePanel.cc (modified) (17 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_softwarePanel.h

@@ -38 +38 @@
     
     private :
-    void disableSectionExecute();
+    //    void disableSectionExecute();
     //    void checkSectionSelection();
-    void updateSectionSelection();
+    bool updateSectionSelection();
     void deleteSectionToExecuteW();
     string getSelection();

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

@@ -281 +281 @@
 
   choixHistoDessin_ = new WComboBox();
-  Wt::WRadioButton *button3= new WRadioButton(" histogram of");
+  Wt::WRadioButton *button3= new WRadioButton(" histogram after element ");
   group_->addButton(button3,3);
 
   glayout->addWidget(button3,3,1);
-  glayout->addWidget(choixVariableHisto_,3,2);
-  glayout->addWidget(new WText("after element"),3,3);
-  glayout->addWidget(choixHistoDessin_,3,4);
+  glayout->addWidget(choixHistoDessin_,3,2);
+  //  glayout->addWidget(new WText(" of "),3,3);
+  glayout->addWidget(choixVariableHisto_,3,3);
   /////////////////////////////////////////////////////////////////////
   

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

@@ -30 +30 @@
   exec_go_ = new WPushButton("execute!");
   //    exec_go_->setMinimumSize(300,300);
-  exec_go_->setDisabled(true);
+  //  exec_go_->setDisabled(true);
   exec_go_->clicked().connect(this, &GWt_softwarePanel::executer);
   
@@ -42 +42 @@
     
   // preparation du bouton push_ok
-  WPushButton* exec_ok = new WPushButton("ok");
-  exec_ok->clicked().connect(this, &GWt_softwarePanel::updateSectionSelection);
+  //  WPushButton* exec_ok = new WPushButton("ok");
+  //  exec_ok->clicked().connect(this, &GWt_softwarePanel::updateSectionSelection);
   
   // le panel
@@ -52 +52 @@
   contenuSections_->addWidget(exec_add);
   contenuSections_->addWidget(exec_delete);
-  contenuSections_->addWidget(exec_ok);
+  //  contenuSections_->addWidget(exec_ok);
   contenuSections_->addWidget(exec_go_);
   contenuSections_->addWidget(new WBreak());
@@ -66 +66 @@
 void GWt_softwarePanel::addSectionToExecuteW()
 {    
-  disableSectionExecute();
+  //  disableSectionExecute();
   
   string premierText, dernierText;
@@ -93 +93 @@
   selectedSections_.back()->debut->setText(premierText);
   selectedSections_.back()->fin = new WLineEdit();
-  selectedSections_.back()->fin->changed().connect(this,&GWt_softwarePanel::disableSectionExecute);
+  //  selectedSections_.back()->fin->changed().connect(this,&GWt_softwarePanel::disableSectionExecute);
   selectedSections_.back()->fin->setText(dernierText);
   selectedSections_.back()->selection = new WComboBox();
@@ -112 +112 @@
 
 
-void GWt_softwarePanel::disableSectionExecute()
-{
-  exec_go_->setDisabled(true);
-}
+// void GWt_softwarePanel::disableSectionExecute()
+// {
+//   exec_go_->setDisabled(true);
+// }
 
 
@@ -204 +204 @@
 // }
 
-void GWt_softwarePanel::updateSectionSelection()
-{
-  if ( selectedSections_.empty() ) return;
+bool GWt_softwarePanel::updateSectionSelection()
+{
+  if ( selectedSections_.empty() ) return false;
   
   // traitement de la premiere ligne
@@ -237 +237 @@
           GWt_dialog warningDialog("PSPA :: verification des sections", " bad section definition !", GWt_dialog::Error,true,true);
           warningDialog.exec();
-          return;
+          return false;
         }
       
@@ -250 +250 @@
           GWt_dialog warningDialog("PSPA : Checking of sections", " bad section definition !", GWt_dialog::Error, true,true);
           warningDialog.exec();
-          return;
+          return false;
         }
       
@@ -257 +257 @@
       currentString = dtmanage_->getLabelFromElementNumero(current);
     }
-  exec_go_->setDisabled(false);
-
+  //  exec_go_->setDisabled(false);
+  return true;
 }
 
@@ -265 +265 @@
 {
     bool caMarche = true;
+    trivaluedBool tbResume = TBoolOk;
     dtmanage_->initializeExecution();
     string diagnostic;
@@ -283 +284 @@
             if (pspa_->getBeamLine()) {
                 if (pspa_->getBeamLine()->getAbstractElement(i)) {
-                    if (!pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString())) {
-                        diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getLabel()+ "could not be associate with "+ prog.getString()+" ";
+                  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);
@@ -294 +300 @@
     }
     
-//    trivaluedBool essai = dtmanage_->checkExecute(diagnostic);
-
-    if ( caMarche == false ) {
+    if ( tbResume == TBoolError ) {
         GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
         calculDialog.exec();
+    } else if (tbResume == TBoolIgnore ) {
+        GWt_dialog calculDialog("PSPA check execute : WARNING", diagnostic , GWt_dialog::Warning,false,true);
+        calculDialog.exec();
+    }
 /*
  } else if ( essai == warning )  {
@@ -304 +312 @@
         calculDialog.exec();
 */
-    }
+    
     
     return caMarche;
@@ -312 +320 @@
 {
   if ( selectedSections_.empty() ) return;
-  disableSectionExecute();
+  //  disableSectionExecute();
   selectedSections_.back()->ligneDeWidget->clear();
   delete selectedSections_.back()->ligneDeWidget;
@@ -344 +352 @@
 void GWt_softwarePanel::executer()
 {
+
+  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);
+      //    exec_go_->setDisabled(true);
     return;
     }
@@ -369 +381 @@
   }
       
-  exec_go_->setDisabled(true);
+  //  exec_go_->setDisabled(true);
   calculDialog.hide();  
   pspa_->faireDessin();