Changeset 358 in PSPA

Timestamp:

Mar 4, 2013, 5:57:49 PM (11 years ago)

Author:

lemeur

Message:

transfert de la verif depuis check/ok vers execute

Location:

Interface_Web/trunk/pspaWT/sources/userInterface

Files:

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

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

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

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

@@ -43 +43 @@
     
   // preparation du bouton push_ok
-  WPushButton* exec_ok = new WPushButton("check/ok");
-  exec_ok->clicked().connect(this, &GWt_softwarePanel::checkSectionSelection);
+  WPushButton* exec_ok = new WPushButton("ok");
+  exec_ok->clicked().connect(this, &GWt_softwarePanel::updateSectionSelection);
   
   // le panel
@@ -119 +119 @@
 
 
-void GWt_softwarePanel::checkSectionSelection()
+// void GWt_softwarePanel::checkSectionSelection()
+// {
+//   if ( selectedSections_.empty() ) return;
+  
+//   // traitement de la premiere ligne
+//   // on impose le depart du calcul au premier element
+//   string premier = dtmanage_->getLabelFromElementNumero(1);
+//   (*selectedSections_.begin())->debut->setText(premier);
+  
+//   string currentString =  (*selectedSections_.begin())->fin->text().toUTF8();
+//   int current = dtmanage_->getNumeroFromElementLabel(currentString);
+    
+//   // si la fin est mal definie on prend toute la config par defaut
+//   if ( current <= 0 || current > dtmanage_->getBeamLineSize() )
+//     {
+//       current = dtmanage_->getBeamLineSize();
+//       currentString =  dtmanage_->getLabelFromElementNumero(current);
+//       (*selectedSections_.begin())->fin->setText(currentString);
+//     }
+//   current++;
+//   currentString = dtmanage_->getLabelFromElementNumero(current);
+  
+//   // traitement des suivantes (on avance d'un cran dans la liste)
+//   list<GWt_sectionToExecute*>::iterator itr, itr0;
+//   itr0 = selectedSections_.begin();
+//   itr0++;
+//   for (itr = itr0; itr != selectedSections_.end(); itr++)
+//     {
+//       // debut
+//       if ( current > dtmanage_->getBeamLineSize() )
+//         {
+//        GWt_dialog warningDialog("PSPA :: verification des sections", " bad section definition !", GWt_dialog::Error,true,true);
+//        warningDialog.exec();
+//        return;
+//         }
+      
+//       (*itr)->debut->setText(currentString);
+//       // fin
+//       string finString =  (*itr)->fin->text().toUTF8();
+      
+//       int numeroFin = dtmanage_->getNumeroFromElementLabel( finString);
+      
+//       if ( numeroFin < current || numeroFin > dtmanage_->getBeamLineSize())
+//         {
+//        GWt_dialog warningDialog("PSPA : Checking of sections", " bad section definition !", GWt_dialog::Error, true,true);
+//        warningDialog.exec();
+//        return;
+//         }
+      
+//       // preparation de la ligne suivante
+//       current = numeroFin +1;
+//       currentString = dtmanage_->getLabelFromElementNumero(current);
+//     }
+  
+//   if (!areDataCoherent()) {
+//     GWt_dialog warningDialog("PSPA : verification des sections", " donnees incoherentes !", GWt_dialog::Error,true,true);
+//     warningDialog.exec();
+//   }
+//   else
+//     {
+//       exec_go_->setDisabled(false);
+        
+//         // All ok, then put colors on beamLine
+//         list<GWt_sectionToExecute*>::iterator itr2;
+//         for(itr2 = selectedSections_.begin();itr2 != selectedSections_.end(); itr2++)
+//         {
+//             string debString = (*itr2)->debut->text().toUTF8();
+//             string finString = (*itr2)->fin->text().toUTF8();
+            
+            
+//             int debut = dtmanage_->getNumeroFromElementLabel(debString);
+//             int fin = dtmanage_->getNumeroFromElementLabel(finString);
+// /**
+//  for (int i=debut; i=<fin; i++) {
+//                 getBeamLine()->getAbstractElement(i)->setBGColor(
+                
+//             }
+//             nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
+//             dtmanage_->addSectionToExecute(debut,fin,prog);
+// */
+//         }
+//     }
+    
+
+// }
+
+void GWt_softwarePanel::updateSectionSelection()
 {
   if ( selectedSections_.empty() ) return;
@@ -172 +258 @@
       currentString = dtmanage_->getLabelFromElementNumero(current);
     }
-  
-  if (!areDataCoherent()) {
-    GWt_dialog warningDialog("PSPA : verification des sections", " donnees incoherentes !", GWt_dialog::Error,true,true);
-    warningDialog.exec();
-  }
-  else
-    {
-      exec_go_->setDisabled(false);
+  exec_go_->setDisabled(false);
+
         
         // All ok, then put colors on beamLine
@@ -200 +280 @@
 */
         }
-    }
-    
-
 }
 
@@ -273 +350 @@
 void GWt_softwarePanel::executer()
 {
+    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"))) {