Changeset 407 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

Timestamp:

Mar 28, 2013, 4:32:42 PM (11 years ago)

Author:

garnier

Message:

Correction dans les comboBox

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc (modified) (5 diffs)

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

@@ -2 +2 @@
 #include <string.h>
 #include <vector>
+#include <ctime>
 
 #include "GWt_pspaApplication.h"
@@ -575 +576 @@
 {
   
-  GWt_dialog* envDialog = new GWt_dialog("enveloppe",toto,false);
+  std::time_t result = std::time(NULL);
+  
+  GWt_dialog* envDialog = new GWt_dialog(WString("enveloppe&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")+std::asctime(std::localtime(&result))+")",toto,false);
   eDialog_.push_back(envDialog);
   envDialog->setMinimumSize(400,400);
@@ -618 +621 @@
     return;
   }
-
-  GWt_dialog* phaseSpaceDialog = new GWt_dialog("phase space",toto,false);
+  
+  std::time_t result = std::time(NULL);
+  GWt_dialog* phaseSpaceDialog = new GWt_dialog(WString("phase space&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(")+std::asctime(std::localtime(&result))+")",toto,false);
   eDialog_.push_back(phaseSpaceDialog);
   phaseSpaceDialog->setMinimumSize(400,400);
@@ -852 +856 @@
 }
 
-void PspaApplication::old_dessinerHistogramme()
-{
-  // pour mon test : histo en energie
-  toto_->clear();
-  
-  GWt_dialog* histoDialog = new GWt_dialog("histogramme",toto_,false);
-  eDialog_.push_back(histoDialog);
-  histoDialog->setMinimumSize(400,400);
-  histoDialog->setClosable(true);
-  
-  // int index = choixHistoDessin_->currentIndex();    
-  // particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
-   string elementLabel = choixHistoDessin_->currentText().toUTF8();    
-   particleBeam* beam = dtmanage_->getDiagnosticBeam(elementLabel);
-  if (beam == NULL) {
-    GWt_dialog warningBeamState("histogram","the beam does not exist at the end of this element !", GWt_dialog::Error, false,true);
-    warningBeamState.exec();
-    return;
-  }
-  
-  if (!beam->particleRepresentationOk()) {
-    GWt_dialog warningBeamState("histogram", "the beam state does not allow providing a drawing with macroparticles !", GWt_dialog::Error, false,true);
-    warningBeamState.exec();
-    return;
-  }
-
-  histoDialog->show();
-  vector<double> xcor;
-  vector<int> hist;
-  double out[3]= {0.0};
-
-  unsigned iabs= choixVariableHisto_->currentIndex();  
-  beam->histogramme(iabs,xcor,hist,out);
-
-  cout<<"xcor.size()= "<<xcor.size()<<", hist.size()= "<<hist.size()<<endl;
-  //////////////////////////////////////////////////////////////////////////////////
-
-  WContainerWidget *w= histoDialog->contents();
-  int n = hist.size();
-  int nbpts= 2*(n+1);
-  WStandardItemModel *model = new WStandardItemModel(nbpts,2,w);
-
-  int j= 0;
-  model->setData(j,0,xcor[0]);
-  model->setData(j,1,0.0);
-  j++;
-  model->setData(j,0,xcor[0]);
-  model->setData(j,1,hist[0]);
-  j++;
-
-  for (int i = 1; i < n; ++i) {
-    model->setData(j,0,xcor[i]);
-    model->setData(j,1,hist[i-1]);
-    j++;
-    model->setData(j,0,xcor[i]);
-    model->setData(j,1,hist[i]);
-    j++;
-  }
-
-  model->setData(j,0,xcor[n]);
-  model->setData(j,1,hist[n-1]);
-  j++;
-  model->setData(j,0,xcor[n]);
-  model->setData(j,1,0.0);
-
-  // 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);
-  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);
-    
-  WCartesianChart *chart = new WCartesianChart(w);
-
-  if(iabs == 0) chart->setTitle("x-coordinate");
-  if(iabs == 1) chart->setTitle("y-coordinate");
-  if(iabs == 2) chart->setTitle("z-coordinate");
-  if(iabs == 3) chart->setTitle("xp-divergence");
-  if(iabs == 4) chart->setTitle("yp-devergence");
-  if(iabs == 5) chart->setTitle("kinetic energy");
-  
-  chart->setModel(model);        // set the model
-  chart->setXSeriesColumn(0);    // set the column that holds the categories
-  chart->setLegendEnabled(false); // enable the legend
-    
-  // Provide space for the X and Y axis and title.
-  chart->setPlotAreaPadding(200, Right);
-  chart->setPlotAreaPadding(80, Left);
-  chart->setPlotAreaPadding(40, Top | Bottom);
-    
-  chart->setType(ScatterPlot);
-    
-  WAxis& axis = chart->axis(XAxis);
-  axis.setLabelFormat("%.3f");
-  axis.setGridLinesEnabled(true);
-
-  if(iabs == 0) axis.setTitle(WString(" x (mm)"));
-  if(iabs == 1) axis.setTitle(WString(" y (mm)"));
-  if(iabs == 2) axis.setTitle(WString(" z (mm)"));
-  if(iabs == 3) axis.setTitle(WString(" xp (mrad)"));
-  if(iabs == 4) axis.setTitle(WString(" yp (mrad)"));
-  if(iabs == 5) axis.setTitle(WString(" dEcin/Ecin (%)"));
-  
-  chart->axis(Y1Axis).setGridLinesEnabled(true);
-  //chart->axis(Y1Axis).setTitle(WString("legende y"));
-    
-  WDataSeries s(1, LineSeries);
-  s.setFillRange(ZeroValueFill);
-  chart->addSeries(s);
-    
-  chart->resize(800, 400);
-  chart->setMargin(10, Top | Bottom);
-  chart->setMargin(WLength::Auto, Left | Right);
-    
-  LegendLocation location = LegendOutside;
-  Side side = Right;
-  AlignmentFlag alignment = AlignMiddle;
-  chart->setLegendLocation(location, side, alignment);
-  chart->setLegendStyle(chart->legendFont(), WPen(black), WBrush(WColor(0xFF, 0xFA, 0xE5)));
-}
+
 
 void PspaApplication::removeBeamLine() {
@@ -1076 +950 @@
   toto_->clear();
   
-  GWt_dialog* histoDialog = new GWt_dialog("histogramme",toto_,false);
+  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);