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

Timestamp:

Oct 25, 2013, 3:51:05 PM (11 years ago)

Author:

touze

Message:

preparation pour ajouter une maille FODO

File:

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

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

@@ -19 +19 @@
 #include "GWt_globalParameters.h"
 #include "GWt_sectionToExecute.h"
-
+#include "GWt_pspaApplication.h"
 
 GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,PspaApplication* pspa)
@@ -29 +29 @@
   // bouton execute
   exec_go_ = new WPushButton("execute!");
-  //    exec_go_->setMinimumSize(300,300);
-  //  exec_go_->setDisabled(true);
   exec_go_->clicked().connect(this, &GWt_softwarePanel::executer);
-  
-    
-  // preparation du bouton push_ok
-  //  WPushButton* exec_ok = new WPushButton("ok");
-  //  exec_ok->clicked().connect(this, &GWt_softwarePanel::updateSectionSelection);
-  
+
   // le panel
   WPanel *panelLogiciels = new WPanel(this);
@@ -43 +36 @@
   
   contenuSections_ = new WContainerWidget();
-  //  contenuSections_->addWidget(exec_ok);
   contenuSections_->addWidget(exec_go_);
   contenuSections_->addWidget(new WBreak());
@@ -56 +48 @@
 
 void GWt_softwarePanel::addSectionToExecuteW()
-{    
-  
+{      
   abstractElement* premierElement;
   abstractElement* dernierElement;
@@ -63 +54 @@
   int premierIndex = 0;
   int dernierIndex = 0;
-
-    // if there is no section
+  
+  // if there is no section
   if(sections_.size() == 0) {
-      premierElement = pspa_->getBeamLine()->getAbstractElement(0);
-      premierIndex = 0;
-
-  // if this is not the first :
-  // - first element will be the last of the previous section
-  // (or the same if it is the last of the beam line)
-  // - lastElement will be the last of the beam line
-  // - software will be the first of the list
-      
+    premierElement = pspa_->getBeamLine()->getAbstractElement(0);
+    premierIndex = 0;
+    
+    // if this is not the first :
+    // - first element will be the last of the previous section
+    // (or the same if it is the last of the beam line)
+    // - lastElement will be the last of the beam line
+    // - software will be the first of the list
+    
   } else {
     dernierElement = pspa_->getBeamLine()->getAbstractElement(pspa_->getBeamLine()->getBeamLineSize()-1);
     dernierIndex = pspa_->getBeamLine()->getBeamLineSize()-1;
-
+    
     premierElement = dernierElement;
     premierIndex = dernierIndex;
-    
-/*    int indexOfLastElementOfLastSection = dtmanage_->getJobListAt(dtmanage_->getJobListSize()-1)->getLastElementNumberInSection();
-
-    
-    // if there are still elements at the end
-    if (pspa_->getBeamLine()->getAbstractElement(indexOfLastElementOfLastSection+1) != NULL ) {
-      premierIndex = indexOfLastElementOfLastSection+1;
-      premierElement = pspa_->getBeamLine()->getAbstractElement(indexOfLastElementOfLastSection+1);
-
-      // if this is the last element
-    } else {
-      premierIndex = indexOfLastElementOfLastSection;
-      premierElement = pspa_->getBeamLine()->getAbstractElement(indexOfLastElementOfLastSection);
-        
-    }
- */
   }
   
@@ -102 +77 @@
   dernierIndex = pspa_->getBeamLine()->getBeamLineSize()-1;
   //  cout << "PspaApplication::addSectionToExecute() : " << premierText << " à  " << dernierText << endl;
-  
   
   //  abstractSoftware* soft = NULL;
@@ -140 +114 @@
   // push back on sections vector
   sections_.push_back(newSection);
-
   contenuSections_->addWidget(newSection);
-  
   updateSections();
 }
-
-
-// void GWt_softwarePanel::disableSectionExecute()
-// {
-//   exec_go_->setDisabled(true);
-// }
-
-
-// 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);
-// */
-//         }
-//     }
-    
-
-// }
 
 bool GWt_softwarePanel::updateSectionSelection()
@@ -435 +314 @@
 }
 
-
-
-/*
- string GWt_softwarePanel::getSelection()
-{
-  list<GWt_sectionToExecute*>::iterator itr = selectedSections_.begin();
-  string str = (*itr)->fin->text().toUTF8();
-  return str;
-}
-*/
-
 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"))) {
-  //   console = static_cast<GWt_console*> (wApp->findWidget ("console"));
-  //   console->addConsoleMessage(string("on va peut etre y arriver"));
-  // }
+  }  
   
   static_cast<GWt_globalParameters*>(pspa_->getGlobalParam())->updateGlobals();