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

Timestamp:

Nov 15, 2013, 3:30:50 PM (11 years ago)

Author:

touze

Message:

systeme periodique (mailles) + multipoles + madx

File:

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

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

@@ -3 +3 @@
 
 #include <cstdlib>
-#include <list>
+#include <string.h>
+#include <vector>
 
 #include <Wt/WApplication>
@@ -9 +10 @@
 #include <Wt/WContainerWidget>
 #include <Wt/WText>
+#include <Wt/WLineEdit>
 #include <Wt/WPanel>
 #include <Wt/WComboBox>
@@ -24 +26 @@
 #include "GWt_ligneFaisceau.h"
 #include "GWt_globalParameters.h"
+#include "GWt_sectorParameters.h"
 
 #include "dataManager.h"
@@ -43 +46 @@
   GWt_LigneFaisceau* beamLine_;
     
-  // WWidget* globalParam_;
-  GWt_globalParameters* globalParam_; // xx
+  GWt_globalParameters* globalParam_;
+  GWt_sectorParameters* sectorParam_;
   
   GWt_dialog* graphicsDialog_;
@@ -73 +76 @@
   WContainerWidget* createDrawingWidget();
 
-  //WWidget* createGlobalParamWidget();
-  WWidget* createDashBoard(); // xx
-  void messageBox1(); // xx
-  void messageBox2(); // xx
+  WWidget* createDashBoard();
+  void messageBox1();
+  void messageBox2();
   
   // extensions (.001, .002,...) pour les fichiers "snapshot" 
@@ -119 +121 @@
   }
 
-
-  /* inline WWidget* getGlobalParam() { */
-  /*   return globalParam_; */
-  /* } */
-
   inline GWt_softwarePanel* getExecuteWidget() {
     return executeWidget_;