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

Timestamp:

Mar 29, 2013, 6:19:53 PM (11 years ago)

Author:

garnier

Message:

Passage en blanc des elements ignorés dans la beamLine

File:

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

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

@@ -271 +271 @@
       if ( current > dtmanage_->getBeamLineSize() )
         {
-          GWt_dialog warningDialog("PSPA :: verification des sections", " bad section definition 1 !", GWt_dialog::Error,true,true);
-          warningDialog.exec();
-          return false;
+          sections_[a]->setErrors("This section element could not be after previous session last element");
+          exec_go_->disable();
+          return false;
         }
       
@@ -283 +283 @@
       int numeroFin = dtmanage_->getNumeroFromElementLabel( finString);
       
-      if ( numeroFin < current || numeroFin > dtmanage_->getBeamLineSize())
-        {
-          GWt_dialog warningDialog("PSPA : Checking of sections", " bad section definition 2 !", GWt_dialog::Error, true,true);
-          warningDialog.exec();
-          return false;
-        }
+      if ( numeroFin < current)
+      {
+        sections_[a]->setErrors("Last section element should be after first section element");
+        exec_go_->disable();
+        return false;
+      }
+
+      if (numeroFin > dtmanage_->getBeamLineSize())
+      {
+        sections_[a]->setErrors("Last section element number is greater than the beam line size");
+        exec_go_->disable();
+        return false;
+      }
       
       // preparation de la ligne suivante