Changeset 386 in PSPA for Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

Timestamp:

Mar 12, 2013, 1:54:41 PM (11 years ago)

Author:

lemeur

Message:

amélioration fiabilité graphique

File:

• Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc (modified) (5 diffs)

Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc

@@ -98 +98 @@
   removeFile(workingDir + "generator.output");
   diagnosticBeam_.clear();
+  indexElementToIndexDiag_.clear();
   currentBeam_ = NULL;
   firstComputedElemNumero_ = getBeamLineSize();
@@ -136 +137 @@
       success = softw->createInputFile(currentBeam_,debut,fin,workingDir);
       if ( success ) {
-        success = softw->execute(debut,fin,workingDir);
+        success = softw->execute(workingDir);
         if ( success ) {
-          success = softw->buildBeamAfterElements(debut,fin,diagnosticBeam_,workingDir);
+          success = softw->buildBeamAfterElements(workingDir);
         }
       }
@@ -144 +145 @@
       delete softw;
       if ( success ) {
-        currentBeam_ = &diagnosticBeam_.back();
+        currentBeam_ = &diagnosticBeam_.at(indexElementToIndexDiag_.back());
         cout << " execute termine avec succes " << endl;
       } else {
@@ -251 +252 @@
 particleBeam* dataManager::getDiagnosticBeam(unsigned index)
 {
-    if (index >= diagnosticBeam_.size()) {
-        return NULL;
-    } else {
-        return &diagnosticBeam_.at(index);
-    }
-}
-
+  if (index >= indexElementToIndexDiag_.size() ) {
+    return NULL;
+  } else {
+    int indDiag = indexElementToIndexDiag_.at(index);
+    return &diagnosticBeam_.at(indDiag);
+  }
+}
+
+particleBeam* dataManager::getDiagnosticBeam(string elementLabel)
+{
+  return getDiagnosticBeam( getNumeroFromElementLabel(elementLabel) -1);
+}
 
 
@@ -277 +283 @@
     for (unsigned k = firstComputedElemNumero_ -1 ; k < lastComputedElemNumero_ ; k++) {
       abstractElement* elPtr = pspa_->getBeamLine()->getAbstractElement(k);
-           if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+      //     if(elPtr->getNomdElement().getElementType() == snapshot) continue;
       //      if(elPtr->getNomdElement().getElementType() == fit) continue;
-
-      if ( !diagnosticBeam_.at(i).momentRepresentationOk() ) {
-        diagnosticBeam_.at(i).buildMomentRepresentation();
+      particleBeam* beamToDraw = getDiagnosticBeam(i);
+      if ( !beamToDraw->momentRepresentationOk() ) {
+        beamToDraw->buildMomentRepresentation();
       }
 
       longueur += elPtr->getLenghtOfElement();
-      valeur = diagnosticBeam_.at(i).getXmaxRms();
+      valeur = beamToDraw->getXmaxRms();
       cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
       xcor.push_back(0.01*longueur);  // on passe en metres