Changeset 85 in PSPA for Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

Timestamp:

Nov 19, 2012, 1:09:02 PM (12 years ago)

Author:

lemeur

Message:

bug dans selection de code

File:

• Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -150 +150 @@
 
 
-  if ( selectedSections_.size() == 0 )
+  if ( selectedSections_.size() == 0)
     {
       premierText = "1";
@@ -157 +157 @@
   else  
     {
-      premierText = selectedSections_.back()->fin->text().toUTF8();
-      dernierText = premierText;
+      dernierText = selectedSections_.back()->fin->text().toUTF8();
+      int dernierNumero = atoi(dernierText.c_str());
+      dernierNumero++;
+      if ( dernierNumero <= dtmanage_->beamLineSize() )
+        {
+          premierText = mixedTools::intToString(dernierNumero);   
+          dernierText = premierText;
+        }
+      else 
+        {
+          premierText = mixedTools::intToString( dtmanage_->beamLineSize() );
+          dernierText = premierText;
+        }
     }
 
@@ -208 +219 @@
 {
   if ( selectedSections_.empty() ) return;
+
+  // traitement de la premiere ligne
   (*selectedSections_.begin())->debut->setText("1");
   string currentString =  (*selectedSections_.begin())->fin->text().toUTF8();
@@ -215 +228 @@
       (*selectedSections_.begin())->fin->setText("1");
       current = 1;
-      currentString = "1";
     }
+  current++;
+  if ( current > dtmanage_->beamLineSize() ) current = dtmanage_->beamLineSize();
+  currentString = mixedTools::intToString(current);
+    
+
+  // traitement des suivantes (on avance d'un cran dans la liste)
   list<GWt_sectionToExecute*>::iterator itr, itr0;
   itr0= selectedSections_.begin();
@@ -223 +241 @@
     {
       //      string debString = (*itr)->debut->text().toUTF8();
+      // debut
       (*itr)->debut->setText(  currentString );
-      string finString = (*itr)->fin->text().toUTF8();
-
+      // fin
+      string finString =  (*itr)->fin->text().toUTF8();
       if ( atoi(finString.c_str() ) < current)
         {
@@ -231 +250 @@
         }
 
-      currentString =  (*itr)->fin->text().toUTF8();
-
-      current = atoi ( currentString.c_str() );
-
+      // preparation de la ligne suivante
+      finString =  (*itr)->fin->text().toUTF8();
+      current = atoi(finString.c_str()) +1;
+      if ( current > dtmanage_->beamLineSize() ) current = dtmanage_->beamLineSize();
+      currentString = mixedTools::intToString(current);
     }
-    exec_go_->setDisabled(false);
+  exec_go_->setDisabled(false);
 }