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

Timestamp:

Jun 21, 2013, 10:16:56 AM (11 years ago)

Author:

lemeur

Message:

definition des compatibilites des elements dans les software

File:

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

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

@@ -329 +329 @@
   
   for (int a = 0; a< sections_.size(); a++)
-  {
-    string debString = sections_[a]->getFirstElementCurrentText().toUTF8();
-    string finString = sections_[a]->getLastElementCurrentText().toUTF8();
-    
-    int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
-    int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
-    
-    nomDeLogiciel prog = nomDeLogiciel ( sections_[a]->getSoftwareCurrentText().toUTF8());
-    dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
-                                   debut,
-                                   pspa_->getBeamLine()->getAbstractElement(fin),
-                                   fin,
-                                   dtmanage_->createSoftwareConnexion(prog));
-    
-    diagnosticErrors = "";
-    diagnosticWarnings = "";
-
-    // 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 ) {
-            // j'insiste pour remettre le nom generique de l'element refuse (glm / 30/03/2013)
-            diagnosticErrors += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementName() + " is not allowed with "+ prog.getString()+"<br /> ";
-
-            caMarche = false;
-
-            // intialize thissoftware
-            pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(nomDeLogiciel::unknownSoftware);
-
-          } else if ( tb == TBoolIgnore ) {
-            diagnosticWarnings += pspa_->getBeamLine()->getAbstractElement(i)->getLabel() + " will be ignored by  "+ prog.getString()+"<br /> ";
-            
-
-          }
-          pspa_->getBeamLine()->update(i);
-        }
+    {
+      string debString = sections_[a]->getFirstElementCurrentText().toUTF8();
+      string finString = sections_[a]->getLastElementCurrentText().toUTF8();
+    
+      // int debut = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(debString)+1; // FIXME : Should NOT be +1
+      // int fin = pspa_->getBeamLine()->getAbstractElementIndexFromLabel(finString)+1; // FIXME : Should NOT be +1
+
+      int debut = pspa_->getBeamLine()->getAbstractElementNumeroFromLabel(debString);
+      int fin = pspa_->getBeamLine()->getAbstractElementNumeroFromLabel(finString);
+    
+      nomDeLogiciel prog = nomDeLogiciel ( sections_[a]->getSoftwareCurrentText().toUTF8());
+      abstractSoftware* softToExec = dtmanage_->createSoftwareConnexion(prog);
+      dtmanage_->addSectionToExecute(pspa_->getBeamLine()->getAbstractElement(debut),
+                                     debut,
+                                     pspa_->getBeamLine()->getAbstractElement(fin),
+                                     fin,
+                                     softToExec);
+    
+      diagnosticErrors = "";
+      diagnosticWarnings = "";
+
+      // 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());
+
+
+            trivaluedBool tb = softToExec->doAcceptElement(pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getElementType() );
+
+            if (tb  == TBoolOk ) {
+              pspa_->getBeamLine()->getAbstractElement(i)->setSoftware(softToExec);
+            } else {
+              pspa_->getBeamLine()->getAbstractElement(i)->setSoftware( NULL );
+
+              if ( tb == TBoolIgnore ) {
+                diagnosticWarnings += pspa_->getBeamLine()->getAbstractElement(i)->getLabel() + " will be ignored by  "+ prog.getString()+"<br /> ";           
+              } else {
+                // j'insiste pour remettre le nom generique de l'element refuse (glm / 30/03/2013)
+                diagnosticErrors += pspa_->getBeamLine()->getAbstractElement(i)->getNomdElement().getExpandedName() + " is not allowed with "+ prog.getString()+"<br /> ";
+                caMarche = false;
+              }
+            }
+            pspa_->getBeamLine()->update(i);
+          }
+        }
       }
-    }
-    // set errors and warnings
-    sections_[a]->setErrors(diagnosticErrors);
-    sections_[a]->setWarnings(diagnosticWarnings);
-  }
+      // set errors and warnings
+      sections_[a]->setErrors(diagnosticErrors);
+      sections_[a]->setWarnings(diagnosticWarnings);
+    }
     
   return caMarche;