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

Timestamp:

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

Author:

touze

Message:

nvx histos

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc (modified) (1 diff)

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

@@ -264 +264 @@
 bool GWt_softwarePanel::areDataCoherent()
 {
-    bool caMarche = true;
-    trivaluedBool tbResume = TBoolOk;
-    dtmanage_->initializeExecution();
-    string diagnostic;
-    
-    list<GWt_sectionToExecute*>::iterator itr;
-    for(itr = selectedSections_.begin(); itr != selectedSections_.end(); itr++)
+  bool caMarche = true;
+  trivaluedBool tbResume = TBoolOk;
+  dtmanage_->initializeExecution();
+  string diagnostic;
+    
+  list<GWt_sectionToExecute*>::iterator itr;
+  for(itr = selectedSections_.begin(); itr != selectedSections_.end(); itr++)
     {
-        string debString = (*itr)->debut->text().toUTF8();
-        string finString = (*itr)->fin->text().toUTF8();
+      string debString = (*itr)->debut->text().toUTF8();
+      string finString = (*itr)->fin->text().toUTF8();
+      
+      int debut = dtmanage_->getNumeroFromElementLabel(debString);
+      int fin = dtmanage_->getNumeroFromElementLabel(finString);
+      nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
+      dtmanage_->addSectionToExecute(debut,fin,prog);
         
-        int debut = dtmanage_->getNumeroFromElementLabel(debString);
-        int fin = dtmanage_->getNumeroFromElementLabel(finString);
-        nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
-        dtmanage_->addSectionToExecute(debut,fin,prog);
-        
-        // check sections
-        for (int i=debut-1; i<fin; i++) {
-            if (pspa_->getBeamLine()) {
-                if (pspa_->getBeamLine()->getAbstractElement(i)) {
-                  trivaluedBool tb = pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString());
-                    if (tb  == TBoolError ) {
-                      diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " is not allowed with "+ prog.getString()+"\n ";
-                        caMarche = false;
-                        tbResume = tb;
-                    } else if ( tb == TBoolIgnore ) {
-                      diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " will be ignored by  "+ prog.getString()+"\n ";
-                      if ( tbResume != TBoolError ) tbResume = tb;
-                    } else {
-                        pspa_->getBeamLine()->update(i);
-                    }
-                }
-            }
-        }
-    }
-    
-    if ( tbResume == TBoolError ) {
-        GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
-        calculDialog.exec();
-    } else if (tbResume == TBoolIgnore ) {
-        GWt_dialog calculDialog("PSPA check execute : WARNING", diagnostic , GWt_dialog::Warning,false,true);
-        calculDialog.exec();
-    }
-/*
- } else if ( essai == warning )  {
-        GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true);
-        calculDialog.exec();
-*/
-    
-    
-    return caMarche;
+      // check sections
+      for (int i=debut-1; i<fin; i++) {
+        if (pspa_->getBeamLine()) {
+          if (pspa_->getBeamLine()->getAbstractElement(i)) {
+            trivaluedBool tb = pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString());
+            if (tb  == TBoolError ) {
+              diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " is not allowed with "+ prog.getString()+"\n ";
+              caMarche = false;
+              tbResume = tb;
+            } else if ( tb == TBoolIgnore ) {
+              diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " will be ignored by  "+ prog.getString()+"\n ";
+              if ( tbResume != TBoolError ) tbResume = tb;
+            } else {
+              pspa_->getBeamLine()->update(i);
+            }
+          }
+        }
+      }
+    }
+
+  if ( tbResume == TBoolError ) {
+    GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
+    calculDialog.exec();
+  } else if (tbResume == TBoolIgnore ) {
+    GWt_dialog calculDialog("PSPA check execute : WARNING", diagnostic , GWt_dialog::Warning,false,true);
+    calculDialog.exec();
+  }
+
+  /*
+    } else if ( essai == warning )  {
+    GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true);
+    calculDialog.exec();
+  */
+    
+  return caMarche;
 }