Changeset 426 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

Timestamp:

Oct 25, 2013, 3:50:49 PM (11 years ago)

Author:

touze

Message:

preparation pour ajouter une maille FODO

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h (modified) (7 diffs)

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

@@ -19 +19 @@
 
 #include "GWt_dialog.h"
-#include "dataManager.h"
 #include "GWt_console.h"
 #include "GWt_abstractElementFactory.h"
 #include "GWt_softwarePanel.h"
 #include "GWt_ligneFaisceau.h"
+#include "GWt_globalParameters.h"
+
+#include "dataManager.h"
 
 using namespace Wt;
@@ -31 +33 @@
         
  private :
-    
+  
   dataManager* dtmanage_;
   string nameOfCase_;
@@ -41 +43 @@
   GWt_LigneFaisceau* beamLine_;
     
-  WWidget* globalParam_;
+  // WWidget* globalParam_;
+  GWt_globalParameters* globalParam_; // xx
+  
   GWt_dialog* graphicsDialog_;
   WButtonGroup *group_;
@@ -66 +70 @@
   WWidget* createPalette();
   WWidget* createBeamLine();
-  WWidget* createGlobalParamWidget();
   WWidget* createExecuteWidget();
   WContainerWidget* createDrawingWidget();
 
+  //WWidget* createGlobalParamWidget();
+  WWidget* createDashBoard(); // xx
+  void messageBox1(); // xx
+  void messageBox2(); // xx
+  
   // extensions (.001, .002,...) pour les fichiers "snapshot" 
   int extensionFile_;
- 
   void closeGraphicDialog();
   
@@ -85 +92 @@
   void dialogOnGraphics();
   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); 
-  //void faireDessinParmela(WContainerWidget* toto, particleBeam* beam, string namex, string namey  );
-  //  void faireDessinTransport(WContainerWidget* toto, particleBeam* beam, string namex, string namey);
   void faireDessinEnveloppe(WContainerWidget* toto, string type);
-  //  void scatterPlot1D(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor);
-
-  // void chartPlot2vec(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor, bool drawPoints, string title, string legendx, string legendy, int width, int height, bool makeIcon=false);
   void chartPlot2vec(WContainerWidget* toto,vector<double>& xcor,vector<double>& ycor,Wt::Chart::SeriesType seriesType,Wt::Chart::FillRangeType fillRange,Wt::Chart::AxisValue value,bool isGridLinesEnables,string title,string legendx,string legendy,int width,int height,bool makeIcon = false);
 
@@ -102 +102 @@
   void dessinerEnveloppe();
   void dessinerPhaseSpace();
-
   void dessinerHistogramme();
 
@@ -116 +115 @@
   }
   
-  inline WWidget* getGlobalParam() {
-    return globalParam_;
+  inline GWt_globalParameters* getGlobalParam() const {
+    return globalParam_; 
   }
+
+
+  /* inline WWidget* getGlobalParam() { */
+  /*   return globalParam_; */
+  /* } */
 
   inline GWt_softwarePanel* getExecuteWidget() {