Changeset 414 in PSPA

Timestamp:

Mar 30, 2013, 4:24:38 PM (11 years ago)

Author:

lemeur

Message:

cosmetique diagrammes

Location:

Interface_Web/trunk/pspaWT/sources

Files:

• controler/include/particleBeam.h (modified) (1 diff)
• controler/src/particleBeam.cc (modified) (2 diffs)
• userInterface/include/GWt_pspaApplication.h (modified) (1 diff)
• userInterface/src/GWt_pspaApplication.cc (modified) (7 diffs)

Interface_Web/trunk/pspaWT/sources/controler/include/particleBeam.h

@@ -122 +122 @@
   virtual bool FileInput(ifstream& ifs);
 
-  void histogramme(unsigned int index,vector<double>&xcor,vector<int>& hist,double out[3]);
+  void histogramme(unsigned int index,vector<double>&xcor,vector<int>& hist,vector<string>& legende);
 };
 #endif

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

@@ -580 +580 @@
 }
 
-void particleBeam::histogramme(unsigned int iabs,vector<double>& xcor,vector<int>& hist,double out[3])
+void particleBeam::histogramme(unsigned int iabs,vector<double>& xcor,vector<int>& hist, vector<string>& legende)
 {
+  double out[3];
   // out[0]= nbre de particules, out[1]= moyenne, out[2]= ecart-type
   vector<double> vshf;
@@ -592 +593 @@
     out[2] *= EREST_keV; // ecart-type en KeV
   }
+  // legendes
+  string unites[2];
+  if(iabs == 0 || iabs == 1 || iabs == 2) {
+    unites[0]= unites[1]= " mm";
+  }
+  if(iabs == 3 || iabs == 4) {
+    unites[0]= unites[1]= " mrad";
+  }
+  if(iabs == 5) {
+    unites[0]= " MeV"; unites[1]= " KeV";
+  }
+
+  legende.clear();
+  legende.push_back(" entries : "+ mixedTools::intToString((int)out[0]) );
+  legende.push_back(" mean : "+ mixedTools::doubleToString(out[1])+unites[0]);
+  legende.push_back(" sigma rms : "+ mixedTools::doubleToString(out[2])+unites[1]);
 }
 

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

@@ -84 +84 @@
   
   void dialogOnGraphics();
-  void faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string namex, string namey, int typeFaisceau);
+  void faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string elementLabel, string namex, string namey, int typeFaisceau);
 
  //  void setModelComponentForPhaseSpace(WStandardItemModel* model, vector<bareParticle>& partic, unsigned indexParticleComponent, unsigned modelComponent); 

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

@@ -538 +538 @@
     
     toto_->clear();
-    faireDessinPhaseSpace(toto_, beam, nameAbs, nameOrd, typeFaisceau);
+    faireDessinPhaseSpace(toto_, beam, elementLabel, nameAbs, nameOrd, typeFaisceau);
 
   // if ( typeFaisceau == 0 )
@@ -600 +600 @@
 }
 
-void PspaApplication::faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string namex, string namey, int typeFaisceau)
+void PspaApplication::faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string elementLabel, string namex, string namey, int typeFaisceau)
 {
 
@@ -628 +628 @@
   phaseSpaceDialog->setMinimumSize(400,400);
   phaseSpaceDialog->setClosable(true);
-  new WText(nameOfCase_, phaseSpaceDialog->contents());
+  new WText(" case : " + nameOfCase_, phaseSpaceDialog->contents());
+  new WBreak(phaseSpaceDialog->contents());
+  new WText(" after element :  " + elementLabel, phaseSpaceDialog->contents());
 
   for (int k=0 ; k < legende.size(); k++) {
@@ -951 +953 @@
   toto_->clear();
   
-  std::time_t result = std::time(NULL);
-  GWt_dialog* histoDialog = new GWt_dialog(WString("histogramme&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")+std::asctime(std::localtime(&result))+")",toto_,false);
-  eDialog_.push_back(histoDialog);
-  histoDialog->setMinimumSize(400,400);
-  histoDialog->setClosable(true);
+  // std::time_t result = std::time(NULL);
+  // GWt_dialog* histoDialog = new GWt_dialog(WString("histogramme&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")+std::asctime(std::localtime(&result))+")",toto_,false);
+  // eDialog_.push_back(histoDialog);
+  // histoDialog->setMinimumSize(400,400);
+  // histoDialog->setClosable(true);
 
   string elementLabel = choixHistoDessin_->currentText().toUTF8();    
@@ -971 +973 @@
   }
 
-  histoDialog->show();
+  unsigned iabs= choixVariableHisto_->currentIndex();  
   vector<double> xcor;
   vector<int> hist;
-  double out[3]= {0.0};
-  unsigned iabs= choixVariableHisto_->currentIndex();  
-  beam->histogramme(iabs,xcor,hist,out);
+  //  double out[3]= {0.0};
+  vector<string> legende;
+  beam->histogramme(iabs,xcor,hist,legende);
 
   cout<<"xcor.size()= "<<xcor.size()<<", hist.size()= "<<hist.size()<<endl;
@@ -1010 +1012 @@
   y.at(j)= 0.0;
   //////////////////////////////////////////////////////////////////////////////////
+  std::time_t result = std::time(NULL);
+  GWt_dialog* histoDialog = new GWt_dialog(WString("histogramme&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")+std::asctime(std::localtime(&result))+")",toto_,false);
+  eDialog_.push_back(histoDialog);
+  histoDialog->setMinimumSize(400,400);
+  histoDialog->setClosable(true);
+
+  histoDialog->show();
 
   WContainerWidget *w= histoDialog->contents();
 
-  // legendes
-  string unites[2];
-  if(iabs == 0 || iabs == 1 || iabs == 2) {
-    unites[0]= unites[1]= " mm";
-  }
-  if(iabs == 3 || iabs == 4) {
-    unites[0]= unites[1]= " mrad";
-  }
-  if(iabs == 5) {
-    unites[0]= " MeV"; unites[1]= " KeV";
-  }
-
-  new WText(" entries : "+ mixedTools::intToString((int)out[0]),w);
+  // // legendes
+  // string unites[2];
+  // if(iabs == 0 || iabs == 1 || iabs == 2) {
+  //   unites[0]= unites[1]= " mm";
+  // }
+  // if(iabs == 3 || iabs == 4) {
+  //   unites[0]= unites[1]= " mrad";
+  // }
+  // if(iabs == 5) {
+  //   unites[0]= " MeV"; unites[1]= " KeV";
+  // }
+
+  new WText(" case : " + nameOfCase_, w);
   new WBreak(w);
-  new WText(" mean : "+ mixedTools::doubleToString(out[1])+unites[0],w);
-  new WBreak(w);
-  new WText(" sigma rms : "+ mixedTools::doubleToString(out[2])+unites[1],w);
+  new WText(" after element :  " + elementLabel, w);
+
+  for (int k=0 ; k < legende.size(); k++) {
+    new WBreak(w);
+    new WText(legende.at(k), w);
+  }
+
+
+  // new WText(" entries : "+ mixedTools::intToString((int)out[0]),w);
+  // new WBreak(w);
+  // new WText(" mean : "+ mixedTools::doubleToString(out[1])+unites[0],w);
+  // new WBreak(w);
+  // new WText(" sigma rms : "+ mixedTools::doubleToString(out[2])+unites[1],w);
   //////////////////////////////////////////////////////////////////////////////////
 
@@ -1055 +1074 @@
   chartPlot2vec(w,x,y,seriesType,fillRange,location,isGridLinesEnabled,titre,xname,yname,500,300);
 }
+
+