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

Timestamp:

Dec 16, 2013, 5:16:54 PM (11 years ago)

Author:

garnier

Message:

grosse modification pour intégrer les sections

File:

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

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

@@ -14 +14 @@
 #include <Wt/WComboBox>
 #include <Wt/WPushButton>
-#include <Wt/WDialog>
-#include <Wt/WPdfImage>
-#include <Wt/Chart/WCartesianChart>
-#include <Wt/WLength>
 #include <Wt/WButtonGroup>
 
@@ -23 +19 @@
 #include "GWt_console.h"
 #include "GWt_softwarePanel.h"
-#include "GWt_ligneFaisceau.h"
 #include "GWt_globalParameters.h"
 #include "GWt_sectorParameters.h"
@@ -30 +25 @@
 
 class GWt_abstractElementFactory;
+class GWt_ligneFaisceau;
 
 using namespace Wt;
@@ -39 +35 @@
   
   dataManager* dtmanage_;
-  string nameOfCase_;
   string workingDir_;
   WDialog* dialogSave_;
@@ -45 +40 @@
   WLineEdit* saveNameEdit_;
   WLineEdit* openNameEdit_;
-  GWt_ligneFaisceau* beamLine_;
+  GWt_ligneFaisceau* beamLine_deprecated_;
     
   GWt_globalParameters* globalParam_;
   GWt_sectorParameters* sectorParam_;
-  
-  GWt_dialog* graphicsDialog_;
-  WButtonGroup *group_;
-  vector<GWt_dialog*> eDialog_;
-  
+  string nameOfCase_;
+
   WText* probleme_;
-  WComboBox* choixElementDessin_;
-  WComboBox* choixTypeDessinFaisceau_;
-  WComboBox* choixAbsPhase_;
-  WComboBox* choixOrdPhase_;
-  WComboBox* choixEnveloppeDessin_;
-  WComboBox* choixHistoDessin_;
-  WComboBox* choixVariableHisto_;
 
-  WContainerWidget* toto_;
   WString applicationDefaultTitle_;
     
-  GWt_softwarePanel* executeWidget_;
   WFileUpload* uploadFileSelectorWidget_;
   GWt_console* console_;
@@ -73 +56 @@
   WText* createTitle(const WString&);
   WWidget* createPalette(WContainerWidget* parent);
-  WWidget* createBeamLine();
+  WWidget* createBeamLine_deprecated();
   WWidget* createExecuteWidget();
-  WContainerWidget* createDrawingWidget();
 
   WWidget* createDashBoard(WContainerWidget*);
+  
   void messageBox1();
   void messageBox2();
@@ -83 +66 @@
   // extensions (.001, .002,...) pour les fichiers "snapshot" 
   int extensionFile_;
-  void closeGraphicDialog();
   
   void createDragImage(const char *url,const char *smallurl,const char *mimeType,WContainerWidget *p,WString());
@@ -93 +75 @@
   void fileTooLarge();
   
-  void dialogOnGraphics();
-  void faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string elementLabel, string namex, string namey, int typeFaisceau);
-  void faireDessinEnveloppe(WContainerWidget* toto, string type);
-  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);
-
   bool removePathFromConfigName(string& config);
   bool removeExtensionFromConfigName(string& config);
-  void removeBeamLine();
     
-  void dessiner();
-  void dessinerEnveloppe();
-  void dessinerPhaseSpace();
-  void dessinerHistogramme();
-
  public :
   
@@ -122 +93 @@
   }
 
-  inline GWt_softwarePanel* getExecuteWidget() {
-    return executeWidget_;
-  }
-
   inline GWt_ligneFaisceau* getBeamLine() {
-    return beamLine_;
+    return beamLine_deprecated_;
   }