Changeset 426 in PSPA


Ignore:
Timestamp:
Oct 25, 2013, 3:50:49 PM (11 years ago)
Author:
touze
Message:

preparation pour ajouter une maille FODO

Location:
Interface_Web/trunk/pspaWT/sources/userInterface/include
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_globalParameters.h

    r272 r426  
    22#define GWT_GLOBALPARAMETERS_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4#include <string>
    55
    66#include <Wt/WApplication>
    77#include <Wt/WContainerWidget>
    8 #include <Wt/WPanel>
    9 
     8#include <Wt/WDialog>
     9#include <Wt/WText>
    1010
    1111using namespace Wt;
    1212using namespace std;
    1313
     14class dataManager;
     15
    1416class GWt_globalParameters : public WContainerWidget
    1517{
    16    
    17     PspaApplication* pspa_;
    18     //  dataManager* dtmanage_;
    19     WLineEdit* frequencyEdit_;
    20     WLineEdit* stepEdit_;
    21     WLineEdit* nstepMAxEdit_;
    22     WLineEdit* nscEdit_;
    23    
    24     //  vector<WComboBox*> sectionSelection_;
    25    
    26    
    27     /* WLineEdit* origineEdit1_; */
    28     /* WLineEdit* origineEdit2_; */
    29     /* WComboBox* selectionBox1_; */
    30    
    31     /* WLineEdit* extremiteEdit1_; */
    32     /* WLineEdit* extremiteEdit2_; */
    33     /* WComboBox* selectionBox2_; */
    34    
    35     //  WContainerWidget* contenuSections_;
    36    
    37     GWt_globalParameters() {;}
    38    
    39 public:
    40    
    41     //  GWt_globalParameters(dataManager* dt);
    42     GWt_globalParameters(PspaApplication* ps);
    43    
    44     void updateGlobals();
    45    
    46    
    47     void renew();
    48    
    49     //    void addElem();
    50    
    51     //    void addSection();
    52    
    53     //   void getExecute(unsigned index, unsigned& first, unsigned& last, int& programm);
    54    
    55     //  void lancerCalcul();
    56    
     18  WLineEdit* frequencyEdit_;
     19  WLineEdit* stepEdit_;
     20  WLineEdit* nstepMAxEdit_;
     21  WLineEdit* nscEdit_;
     22
     23  dataManager* dt_;
     24  WText *status_;
     25  WDialog *dialog_;
     26  string envoi_[5];
     27
     28  string* dialogBegin();
     29  void setStatus();
     30
     31 public :
     32 
     33  GWt_globalParameters() {;}
     34  GWt_globalParameters(dataManager*);
     35  GWt_globalParameters(dataManager*,WContainerWidget*);
     36  virtual ~GWt_globalParameters() {;}
     37   
     38  void initilializeDialog();
     39  void dialogDone(WDialog::DialogCode code);
     40  void updateGlobals();
     41  void renew();
     42  string* getGlobalParameters();
    5743};
    5844#endif

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

    r417 r426  
    1919
    2020#include "GWt_dialog.h"
    21 #include "dataManager.h"
    2221#include "GWt_console.h"
    2322#include "GWt_abstractElementFactory.h"
    2423#include "GWt_softwarePanel.h"
    2524#include "GWt_ligneFaisceau.h"
     25#include "GWt_globalParameters.h"
     26
     27#include "dataManager.h"
    2628
    2729using namespace Wt;
    … …  
    3133       
    3234 private :
    33    
     35 
    3436  dataManager* dtmanage_;
    3537  string nameOfCase_;
    … …  
    4143  GWt_LigneFaisceau* beamLine_;
    4244   
    43   WWidget* globalParam_;
     45  // WWidget* globalParam_;
     46  GWt_globalParameters* globalParam_; // xx
     47 
    4448  GWt_dialog* graphicsDialog_;
    4549  WButtonGroup *group_;
    … …  
    6670  WWidget* createPalette();
    6771  WWidget* createBeamLine();
    68   WWidget* createGlobalParamWidget();
    6972  WWidget* createExecuteWidget();
    7073  WContainerWidget* createDrawingWidget();
    7174
     75  //WWidget* createGlobalParamWidget();
     76  WWidget* createDashBoard(); // xx
     77  void messageBox1(); // xx
     78  void messageBox2(); // xx
     79 
    7280  // extensions (.001, .002,...) pour les fichiers "snapshot"
    7381  int extensionFile_;
    74  
    7582  void closeGraphicDialog();
    7683 
    … …  
    8592  void dialogOnGraphics();
    8693  void faireDessinPhaseSpace(WContainerWidget* toto, particleBeam* beam, string elementLabel, string namex, string namey, int typeFaisceau);
    87 
    88  //  void setModelComponentForPhaseSpace(WStandardItemModel* model, vector<bareParticle>& partic, unsigned indexParticleComponent, unsigned modelComponent);
    89   //void faireDessinParmela(WContainerWidget* toto, particleBeam* beam, string namex, string namey  );
    90   //  void faireDessinTransport(WContainerWidget* toto, particleBeam* beam, string namex, string namey);
    9194  void faireDessinEnveloppe(WContainerWidget* toto, string type);
    92   //  void scatterPlot1D(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor);
    93 
    94   // 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);
    9595  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);
    9696
    … …  
    102102  void dessinerEnveloppe();
    103103  void dessinerPhaseSpace();
    104 
    105104  void dessinerHistogramme();
    106105
    … …  
    116115  }
    117116 
    118   inline WWidget* getGlobalParam() {
    119     return globalParam_;
     117  inline GWt_globalParameters* getGlobalParam() const {
     118    return globalParam_; 
    120119  }
     120
     121
     122  /* inline WWidget* getGlobalParam() { */
     123  /*   return globalParam_; */
     124  /* } */
    121125
    122126  inline GWt_softwarePanel* getExecuteWidget() {
Note: See TracChangeset for help on using the changeset viewer.