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

Timestamp:

Mar 12, 2014, 11:15:56 AM (10 years ago)

Author:

lemeur

Message:

maj de History

File:

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

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

@@ -23 +23 @@
 #define BAVARD 1
 
-GWt_softwarePanelBis::GWt_softwarePanelBis(dataManager* dataManager,GWt_machine* mach)
+GWt_softwarePanel::GWt_softwarePanel(dataManager* dataManager,GWt_machine* mach)
   : WContainerWidget(),
 dtmanage_(dataManager),
@@ -36 +36 @@
   contenuSections_->addWidget(new WBreak());
   contenuSections_->addWidget(new WBreak());
-  cout << " GWt_softwarePanelBis::GWt_softwarePanelBis DISPLAY SOFTWARE PANEL " << endl;
+  cout << " GWt_softwarePanel::GWt_softwarePanel DISPLAY SOFTWARE PANEL " << endl;
       displayFromControler();
   
@@ -42 +42 @@
 }
 
-GWt_softwarePanelBis::~GWt_softwarePanelBis() {
-}
-
-void GWt_softwarePanelBis::displayFromControler()
+GWt_softwarePanel::~GWt_softwarePanel() {
+}
+
+void GWt_softwarePanel::displayFromControler()
 {      
-  cout << " GWt_softwarePanelBis::displayFromControler() " << endl<<endl;
+  cout << " GWt_softwarePanel::displayFromControler() " << endl<<endl;
 
   // Clear all
@@ -55 +55 @@
   // Get all sectionsToExecute from this machine
   if (!UImachine_->getMachineControler()) {
-    cout << " GWt_softwarePanelBis::displayFromControler() PAS DE MACHINE " << endl;
+    cout << " GWt_softwarePanel::displayFromControler() PAS DE MACHINE " << endl;
     return;
   } else {
-    cout << " GWt_softwarePanelBis::displayFromControler() MACHINE TROUVEE " << endl;
+    cout << " GWt_softwarePanel::displayFromControler() MACHINE TROUVEE " << endl;
   }
   
   if (UImachine_->getMachineControler()->getComputingBlocks().size() == 0) {
     // FIXME : Add a message to tell the user to add first an element
-    cout << " GWt_softwarePanelBis::displayFromControler() PAS DE BLOCK " << endl;
+    cout << " GWt_softwarePanel::displayFromControler() PAS DE BLOCK " << endl;
   } else {
-    cout << " GWt_softwarePanelBis::displayFromControler() NOMBRE DE BLOCK " << UImachine_->getMachineControler()->getComputingBlocks().size() << endl;
+    cout << " GWt_softwarePanel::displayFromControler() NOMBRE DE BLOCK " << UImachine_->getMachineControler()->getComputingBlocks().size() << endl;
 
     unsigned int firstElemeOfComputingBlockIndex = 0;
 
     for (unsigned int a=0; a<UImachine_->getMachineControler()->getComputingBlocks().size(); a++) {
-      cout << " GWt_softwarePanelBis::displayFromControler() BLOC No " << a+1 << endl;
+      cout << " GWt_softwarePanel::displayFromControler() BLOC No " << a+1 << endl;
       abstractElement* premierElement = NULL;
       abstractElement* dernierElement = NULL;
@@ -85 +85 @@
       if (premierElement) premierElementLabel = premierElement->getLabel();
       if (dernierElement) dernierElementLabel = dernierElement->getLabel();
-      cout << " GWt_softwarePanelBis::displayFromControler() dernier element a afficher " << dernierElementLabel << endl;
+      cout << " GWt_softwarePanel::displayFromControler() dernier element a afficher " << dernierElementLabel << endl;
       
       WComboBox* lineFromCombo = new WComboBox();
@@ -119 +119 @@
       GWt_computingBlock* newBlock = new GWt_computingBlock(lineFromCombo,lineToCombo,softCombo,createAddDeletePushButtons(blocPtr),blocPtr,UImachine_);
 
-      cout << " GWt_softwarePanelBis::displayFromControler j'ajoute un bloc : " << newBlock << endl;
-      cout << " GWt_softwarePanelBis::displayFromControler nb widget avant : " << contenuSections_->count() << endl;
+      cout << " GWt_softwarePanel::displayFromControler j'ajoute un bloc : " << newBlock << endl;
+      cout << " GWt_softwarePanel::displayFromControler nb widget avant : " << contenuSections_->count() << endl;
       contenuSections_->addWidget(newBlock);
-      cout << " GWt_softwarePanelBis::displayFromControler nb widget apres : " << contenuSections_->count() << endl;
+      cout << " GWt_softwarePanel::displayFromControler nb widget apres : " << contenuSections_->count() << endl;
       
     }
@@ -128 +128 @@
 }
 
-void GWt_softwarePanelBis::fillComboWithElements(Wt::WComboBox* cBox) 
+void GWt_softwarePanel::fillComboWithElements(Wt::WComboBox* cBox) 
 {
 
@@ -145 +145 @@
 }
 
-void GWt_softwarePanelBis::fillComboWithSoftwares(Wt::WComboBox* cBox, std::string selected)
+void GWt_softwarePanel::fillComboWithSoftwares(Wt::WComboBox* cBox, std::string selected)
 {
 #if BAVARD > 0
@@ -167 +167 @@
 
 
-Wt::WContainerWidget* GWt_softwarePanelBis::createAddDeletePushButtons(computingBlock* cpbl) 
+Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons(computingBlock* cpbl) 
 {
   WContainerWidget* buttonContainer= new WContainerWidget();
@@ -175 +175 @@
   // preparation du bouton add
   WPushButton* exec_add = new WPushButton("+");
-  //  exec_add->clicked().connect(this, &GWt_softwarePanelBis::addComputingBlock);
-  exec_add->clicked().connect(boost::bind(&GWt_softwarePanelBis::addComputingBlock, this, cpbl));
+  //  exec_add->clicked().connect(this, &GWt_softwarePanel::addComputingBlock);
+  exec_add->clicked().connect(boost::bind(&GWt_softwarePanel::addComputingBlock, this, cpbl));
   exec_add->setStyleClass("roundButton");
   exec_add->setMaximumSize(20,20);
@@ -185 +185 @@
   //  warningsContainer_->setStyleClass("warningsContainer");
 
-  exec_delete->clicked().connect(boost::bind(&GWt_softwarePanelBis::deleteComputingBlock, this, cpbl));
+  exec_delete->clicked().connect(boost::bind(&GWt_softwarePanel::deleteComputingBlock, this, cpbl));
   exec_delete->setStyleClass("roundButton");
   exec_delete->setMaximumSize(20,20);
@@ -197 +197 @@
 }
 
-void GWt_softwarePanelBis::addComputingBlock(computingBlock* cpbl) {
+void GWt_softwarePanel::addComputingBlock(computingBlock* cpbl) {
   // We put the last element of the previous sectionToExecute inside
   
@@ -209 +209 @@
 
 
-// void GWt_softwarePanelBis::deleteComputingBlock(int sectionLabel)
-// {
-//   cout << " GWt_softwarePanelBis::deleteComputingBlock()" << endl;
-
-//   stringstream st;
-//   st << sectionLabel;
-//   std::string sectionName = st.str();
-//   //FIXME
-//   vector<computingBlock*>& compBloc = UImachine_->getMachineControler()->getComputingBlocks();
-//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nb blocs = " << compBloc.size() << endl;
-//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nb widgets = " << sectionName << endl;
-//   cout << " GWt_softwarePanelBis::deleteComputingBlock() nom bloc a detruire = " << contenuSections_->count() << endl;
-
-//   for ( unsigned k=0; k <  compBloc.size(); k++) {
-
-//   }
-// /*  if ( dtmanage_->getJobListSize() == 0 ) return;
-//   for (unsigned int sectionIndex = 0; sectionIndex< UIsectionsToExecute_deprecated_.size(); sectionIndex++) {
-//     if (UIsectionsToExecute_deprecated_[sectionIndex]->objectName() == sectionName) {
-
-//       // delete from dataManager
-//       UIsector_->getSectorControler()->clearSectionToExecute(sectionIndex);
-
-//       // delete from User Interface
-//       contenuSections_->removeWidget(UIsectionsToExecute_deprecated_[sectionIndex]);
-//       delete UIsectionsToExecute_deprecated_[sectionIndex];
-//       UIsectionsToExecute_deprecated_.erase (UIsectionsToExecute_deprecated_.begin()+sectionIndex);
-//     }
-//   }  
-// */
-//   displayFromControler();
-// }
-
-void GWt_softwarePanelBis::deleteComputingBlock(computingBlock* cpbl)
-{
-  cout << " GWt_softwarePanelBis::deleteComputingBlock(computingBlock*)" << endl;
+
+void GWt_softwarePanel::deleteComputingBlock(computingBlock* cpbl)
+{
+  cout << " GWt_softwarePanel::deleteComputingBlock(computingBlock*)" << endl;
 
   UImachine_->getMachineControler()->eraseComputingBlock(cpbl);