Changeset 390 in PSPA

Timestamp:

Mar 13, 2013, 12:09:28 PM (11 years ago)

Author:

garnier

Message:

testing

Location:

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources

Files:

• controler/src/dataManager.cc (modified) (1 diff)
• userInterface/src/GWt_sectionToExecute.cc (modified) (2 diffs)
• userInterface/src/GWt_softwarePanel.cc (modified) (4 diffs)

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/controler/src/dataManager.cc

@@ -133 +133 @@
       
       if (softw == NULL) {
-        success = false;
-        consoleMessage("dataManager::executeAll : unknown software");
-        break;
-      }
-        
+        success = false;
+        consoleMessage("dataManager::executeAll : unknown software");
+        break;
+      }
+      
       success = softw->createInputFile(currentBeam_,debut,fin,workingDir);
       if ( success ) {
-        success = softw->execute(debut,fin,workingDir);
-        if ( success ) {
-          success = softw->buildBeamAfterElements(debut,fin,diagnosticBeam_,workingDir);
-        }
-      }
-        
+        success = softw->execute(debut,fin,workingDir);
+        if ( success ) {
+          success = softw->buildBeamAfterElements(debut,fin,diagnosticBeam_,workingDir);
+        }
+      }
+      
       delete softw;
       if ( success ) {

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_sectionToExecute.cc

@@ -9 +9 @@
 software(soft)
 {
-    addWidget(new Wt::WText(" from : "));
+    addWidget(new Wt::WText(" fromC : "));
     addWidget(first);
-    addWidget(new Wt::WText(" to : "));
+    addWidget(new Wt::WText(" toC : "));
     addWidget(last);
     addWidget(soft);
@@ -23 +23 @@
 software(soft)
 {;
-    addWidget(new Wt::WText(" from : "));
+    addWidget(new Wt::WText(" fromLE : "));
     addWidget(first);
-    addWidget(new Wt::WText(" to : "));
+    addWidget(new Wt::WText(" toLE : "));
     addWidget(last);
     addWidget(soft);

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc

@@ -281 +281 @@
   if (sections.size() > 0) {
     sections[0]->setFirstElementLineEditCurrentText(premier);
+//...
   }
   
@@ -293 +294 @@
     if (sections.size() > 0) {
       sections[0]->setLastElementLineEditCurrentText(currentString);
-    }
-  }
-//  current++;
+//...
+    }
+  }
+  current++;
   currentString = dtmanage_->getLabelFromElementNumero(current);
   
@@ -310 +312 @@
       
       sections[a]->setFirstElementLineEditCurrentText(currentString);
+//...
       // fin
       string finString =  sections[a]->getLastElementLineEditCurrentText().toUTF8();
@@ -410 +413 @@
       sections[0]->setFirstElementLineEditCurrentText(premierText);
       sections[0]->setLastElementLineEditCurrentText(dernierText);
+//...
     }
 }