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

Timestamp:

Mar 9, 2013, 5:12:55 PM (11 years ago)

Author:

lemeur

Message:

complements graphiques, legendes et unification unites

File:

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

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

@@ -5 +5 @@
 #include "softwareTransport.h"
 #include "GWt_pspaApplication.h"
-#include "GWt_console.h"
+#include "GWt_console.h"Ò
 #include "softwareGenerator.h"
 #include "softwareTest.h"
@@ -261 +261 @@
 
 // on ne tient pas compte des elements "snapshot" presents dans la beamLine
-void dataManager::donneesRmsEnveloppe(string type,vector<double>& xcor,vector<double>& ycor)
+void dataManager::donneesRmsEnveloppe(string type,vector<double>& xcor,vector<double>& ycor, string& titre, string& legendx, string& legendy)
 {
   double longueur = 0.0;
@@ -267 +267 @@
   xcor.clear();
   ycor.clear();
-
+  titre.clear();
+  titre = " rms enveloppe ";
+  legendx.clear();
+  legendx = " z (m)";
   if ( type == "x" ) {
     unsigned i = 0;
@@ -274 +277 @@
     for (unsigned k = firstComputedElemNumero_ -1 ; k < lastComputedElemNumero_ ; k++) {
       abstractElement* elPtr = pspa_->getBeamLine()->getAbstractElement(k);
-      if(elPtr->getNomdElement().getElementType() == snapshot) continue;
-      if(elPtr->getNomdElement().getElementType() == fit) continue;
+           if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+      //      if(elPtr->getNomdElement().getElementType() == fit) continue;
 
       if ( !diagnosticBeam_.at(i).momentRepresentationOk() ) {
@@ -284 +287 @@
       valeur = diagnosticBeam_.at(i).getXmaxRms();
       cout << " dataManager::donneesRmsEnveloppe index = " << k <<  " longueur = " << longueur << " enveloppe : " << valeur << endl;
-      xcor.push_back(longueur);
+      xcor.push_back(0.01*longueur);  // on passe en metres
       ycor.push_back(valeur);
       i++;
     }
+    legendy.clear();
+    legendy = " x (cm) ";
   }
 }