Changeset 340 in PSPA for Interface_Web/trunk

Timestamp:

Feb 20, 2013, 5:13:37 PM (11 years ago)

Author:

touze

Message:

réaménagement dans dessin histo

Location:

Interface_Web/trunk/pspaWT/sources/userInterface

Files:

• include/GWt_pspaApplication.h (modified) (4 diffs)
• src/GWt_pspaApplication.cc (modified) (6 diffs)

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

@@ -41 +41 @@
   GWt_LigneFaisceau* beamLine_;
     
-  // WContainerWidget* console_;
   WWidget* globalParam_;
-  // WContainerWidget* leDessin_;
   GWt_dialog* graphicsDialog_;
   WButtonGroup *group_;
-
+  vector<GWt_dialog*> eDialog_;
+  
   WText* probleme_;
   WComboBox* choixElementDessin_;
   WComboBox* choixTypeDessinFaisceau_;
-    WComboBox* choixAbsPhase_;
-    WComboBox* choixOrdPhase_;
+  WComboBox* choixAbsPhase_;
+  WComboBox* choixOrdPhase_;
   WComboBox* choixEnveloppeDessin_;
   WComboBox* choixHistoDessin_;
@@ -79 +78 @@
   
   void dialogOnGraphics();
-    void faireDessinParmela(WContainerWidget* toto, particleBeam* beam, unsigned indexAbs, unsigned indexOrd );
+  void faireDessinParmela(WContainerWidget* toto, particleBeam* beam, unsigned indexAbs, unsigned indexOrd );
   void faireDessinTransport(WContainerWidget* toto, particleBeam* beam);
   void faireDessinEnveloppe(WContainerWidget* toto, string type);
@@ -85 +84 @@
     
   bool removeExtensionFromConfigName(string& config);
-    
+  
   void dessiner();
   void dessinerEnveloppe();
@@ -91 +90 @@
   void dessinerHistogramme();
 
-    public :
+ public :
   
   PspaApplication(const WEnvironment& env);
-
-
+  
   string getSelection();
   void faireDessin();

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

@@ -297 +297 @@
 {
   cout << " close graphicsDialog_" << endl;
+  for(unsigned i = 0; i < eDialog_.size(); i++) eDialog_[i]->done(WDialog::Rejected);
+  eDialog_.clear();
   graphicsDialog_->done(WDialog::Rejected);
 }
@@ -518 +520 @@
     
   GWt_dialog* envDialog = new GWt_dialog("enveloppe",toto,false);
+  eDialog_.push_back(envDialog);
   envDialog->setMinimumSize(400,400);
   envDialog->setClosable(true);
@@ -534 +537 @@
 {
   cout << " faireDessinParmela " << endl;
-    GWt_dialog* pointsDialog = new GWt_dialog("space phase",toto,false);
-    pointsDialog->setMinimumSize(400,400);
-    pointsDialog->setClosable(true);
-    // pointsDialog->show();
-    
+  GWt_dialog* pointsDialog = new GWt_dialog("space phase",toto,false);
+  eDialog_.push_back(pointsDialog);
+  pointsDialog->setMinimumSize(400,400);
+  pointsDialog->setClosable(true);
+  // pointsDialog->show();
+  
     
     
@@ -647 +651 @@
 }
 
-
-// void PspaApplication::addElemToGlobals()
-// {
-//   static_cast<GWt_globalParameters*>(globalParam_)->addElem();
-// }
-
 void PspaApplication::faireDessinTransport(WContainerWidget* toto, particleBeam* beam)
 {
-    //  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
-    //  toto->clear();
-    
-    //  new WText(nameOfCase_ + " : espace de phase x,x' "+ " nb partic. "+ mixedTools::intToString(partic.size()), toto);
-    
-    GWt_dialog* ellipseDialog = new GWt_dialog("ellipse",toto,false);
-    ellipseDialog->setMinimumSize(400,400);
-    ellipseDialog->setClosable(true);
-    ellipseDialog->show();
-    
-    
-    new WText(nameOfCase_ + " : emittance x,x' " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , ellipseDialog->contents());
-    new WBreak(ellipseDialog->contents());
-    new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", ellipseDialog->contents());
-    new WBreak(ellipseDialog->contents());
-    new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", ellipseDialog->contents());
-    new WBreak(ellipseDialog->contents());
-    new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", ellipseDialog->contents());
-    
-    vector<double> xcor;
-    vector<double> ycor;
-    //  dtmanage_->getCurrentBeam()->donneesDessinEllipseXxp(xcor,ycor);
-    beam->donneesDessinEllipseXxp(xcor,ycor);
-    scatterPlot1D(ellipseDialog->contents(),xcor,ycor);
-    
+  GWt_dialog* ellipseDialog = new GWt_dialog("ellipse",toto,false);
+  eDialog_.push_back(ellipseDialog);
+  ellipseDialog->setMinimumSize(400,400);
+  ellipseDialog->setClosable(true);
+  ellipseDialog->show();
+    
+  new WText(nameOfCase_ + " : emittance x,x' " + mixedTools::doubleToString(beam->getUnnormalizedEmittanceX()) + " pi.mm.mrad" , ellipseDialog->contents());
+  new WBreak(ellipseDialog->contents());
+  new WText(" xmax = " + mixedTools::doubleToString(beam->getSigmaTransportij(1,1)) + " cm ", ellipseDialog->contents());
+  new WBreak(ellipseDialog->contents());
+  new WText(" x' max = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,2)) + " mrad ", ellipseDialog->contents());
+  new WBreak(ellipseDialog->contents());
+  new WText(" corr. 12 = " + mixedTools::doubleToString(beam->getSigmaTransportij(2,1))  + " sqrt(cm.rad) ", ellipseDialog->contents());
+  
+  vector<double> xcor;
+  vector<double> ycor;
+  //  dtmanage_->getCurrentBeam()->donneesDessinEllipseXxp(xcor,ycor);
+  beam->donneesDessinEllipseXxp(xcor,ycor);
+  scatterPlot1D(ellipseDialog->contents(),xcor,ycor);  
 }
 
@@ -861 +853 @@
   // pour mon test : histo en energie
   toto_->clear();
-    
-  GWt_dialog* pourVoir= new GWt_dialog("histogramme",toto_,false);
-  pourVoir->setMinimumSize(400,400);
-  pourVoir->setClosable(true);
-  pourVoir->show();
+  
+  GWt_dialog* histoDialog = new GWt_dialog("histogramme",toto_,false);
+  eDialog_.push_back(histoDialog);
+  histoDialog->setMinimumSize(400,400);
+  histoDialog->setClosable(true);
+  histoDialog->show();
   
   int index = choixHistoDessin_->currentIndex();    
@@ -889 +882 @@
   cout<<"xcor.size()= "<<xcor.size()<<", hist.size()= "<<hist.size()<<endl;
   //////////////////////////////////////////////////////////////////////////////////
-    
-  WContainerWidget *w = toto_;
+
+  WContainerWidget *w= histoDialog->contents();
   int nbpts= xcor.size()+cnts+1;
   WStandardItemModel *model = new WStandardItemModel(nbpts,2,w);