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

Timestamp:

Mar 4, 2013, 6:08:02 PM (11 years ago)

Author:

garnier

Message:

Changement de la couleur des sections selectionnes + plein dautres choses

File:

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

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

@@ -1 @@
-//
 //  GWt_softwarePanel.cpp
 //  PSPA
@@ -260 +259 @@
   exec_go_->setDisabled(false);
 
+}
+
+
+bool GWt_softwarePanel::areDataCoherent()
+{
+    bool caMarche = true;
+    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();
         
-        // All ok, then put colors on beamLine
-        list<GWt_sectionToExecute*>::iterator itr2;
-        for(itr2 = selectedSections_.begin();itr2 != selectedSections_.end(); itr2++)
-        {
-            string debString = (*itr2)->debut->text().toUTF8();
-            string finString = (*itr2)->fin->text().toUTF8();
-            
-            
-            int debut = dtmanage_->getNumeroFromElementLabel(debString);
-            int fin = dtmanage_->getNumeroFromElementLabel(finString);
-/**
- for (int i=debut; i=<fin; i++) {
-                getBeamLine()->getAbstractElement(i)->setBGColor(
-                
+        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)) {
+                    if (!pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(prog.getString())) {
+                        diagnostic += pspa_->getBeamLine()->getAbstractElement(i)->getLabel()+ "could not be associate with "+ prog.getString()+" ";
+                        caMarche = false;
+                    } else {
+                        pspa_->getBeamLine()->update(i);
+                    }
+                }
             }
-            nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
-            dtmanage_->addSectionToExecute(debut,fin,prog);
+        }
+    }
+    
+//    trivaluedBool essai = dtmanage_->checkExecute(diagnostic);
+
+    if ( caMarche == false ) {
+        GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
+        calculDialog.exec();
+/*
+ } else if ( essai == warning )  {
+        GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true);
+        calculDialog.exec();
 */
-        }
-}
-
-
-bool GWt_softwarePanel::areDataCoherent()
-{
-  bool caMarche = true;
-  dtmanage_->initializeExecution();
-  
-  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();
-        
-      int debut = dtmanage_->getNumeroFromElementLabel(debString);
-      int fin = dtmanage_->getNumeroFromElementLabel(finString);
-      nomDeLogiciel prog = nomDeLogiciel ( (*itr)->selection->currentIndex() );
-      dtmanage_->addSectionToExecute(debut,fin,prog);
-    }
-  
-  string diagnostic;
-  trivaluedBool essai = dtmanage_->checkExecute(diagnostic);
-  if ( essai == error ) {
-    caMarche = false;
-    GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true);
-    calculDialog.exec();
-  } else if ( essai == warning )  {
-    caMarche = true;
-    GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true);
-    calculDialog.exec();
-  }
-  
-  return caMarche;
+    }
+    
+    return caMarche;
 }