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

Timestamp:

Mar 28, 2013, 4:32:42 PM (11 years ago)

Author:

garnier

Message:

Correction dans les comboBox

File:

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

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

@@ -129 +129 @@
   fillComboWithSoftwares(softCombo);
 
-  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo,this);
+  GWt_sectionToExecute* newSection = new GWt_sectionToExecute(lineFromCombo, lineToCombo, softCombo,createAddDeletePushButtons(sections_.size()),this);
+
+  stringstream st;
+  st << sections_.size();
+
+  // this is the mean to identify this section!
+  newSection->setObjectName(st.str());
 
   // push back on sections vector
   sections_.push_back(newSection);
 
-  Wt::WContainerWidget* container = new Wt::WContainerWidget();
+/*  Wt::WContainerWidget* container = new Wt::WContainerWidget();
   Wt::WGridLayout* containerLayout = new Wt::WGridLayout();
   containerLayout->setContentsMargins(0,0,0,0);
@@ -142 +148 @@
   
   // add buttons
-  containerLayout->addWidget(createAddDeletePushButtons(),0,1);
+  containerLayout->addWidget(createAddDeletePushButtons(sections_.size()-1),0,1);
 
   container->setLayout(containerLayout);
+*/
   
   // add to sections
-  contenuSections_->addWidget(container);  
+//  contenuSections_->addWidget(container);
+  contenuSections_->addWidget(newSection);
 }
 
@@ -374 +382 @@
 }
 
-void GWt_softwarePanel::deleteSectionToExecuteW()
-{
-/*  if ( dtmanage_->getJobListSize() == 0 ) return;
-  // delete from dataManager
-  dtmanage_->clearSectionToExecute(dtmanage_->getJobListSize()-1);
-
-  // delete from User Interface
-  sections_.pop_back();
-*/
+void GWt_softwarePanel::deleteSectionToExecuteW(int sectionLabel)
+{
+  stringstream st;
+  st << sectionLabel;
+  std::string sectionName = st.str();
+  
+  if ( dtmanage_->getJobListSize() == 0 ) return;
+  for (unsigned int sectionIndex = 0; sectionIndex< sections_.size(); sectionIndex++) {
+    if (sections_[sectionIndex]->objectName() == sectionName) {
+
+      // delete from dataManager
+      dtmanage_->clearSectionToExecute(sectionIndex);
+
+      // delete from User Interface
+      contenuSections_->removeWidget(sections_[sectionIndex]);
+      delete sections_[sectionIndex];
+      sections_.erase (sections_.begin()+sectionIndex);
+    }
+  }  
 }
 
@@ -494 +512 @@
 
 
-Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons() {
+Wt::WContainerWidget* GWt_softwarePanel::createAddDeletePushButtons(int sectionNumber) {
 
   WContainerWidget* buttonContainer= new WContainerWidget();
@@ -510 +528 @@
   WPushButton* exec_delete = new WPushButton("-");
   //  warningsContainer_->setStyleClass("warningsContainer");
-  exec_delete->clicked().connect(this, &GWt_softwarePanel::deleteSectionToExecuteW);
+
+  exec_delete->clicked().connect(boost::bind(&GWt_softwarePanel::deleteSectionToExecuteW, this, sectionNumber));
   exec_delete->setStyleClass("roundButton");
   exec_delete->setMaximumSize(20,20);