Changeset 233 in PSPA for Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

Timestamp:

Jan 9, 2013, 12:53:41 PM (11 years ago)

Author:

lemeur

Message:

fenetrage

File:

• Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc (modified) (10 diffs)

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -6 +6 @@
 #include "GWt_LigneFaisceau.h"
 #include "GWt_globalParameters.h"
-#include "GWt_dialog.h"
+// #include "GWt_dialog.h"
 #include "GWt_draggableImage.h"
 #include "particleBeam.h"
@@ -52 +52 @@
   }
   
-  WContainerWidget *w = root();
+  WContainerWidget *widroot = root();
   useStyleSheet (WApplication::appRoot()+"../include/pspa.css");        
   dtmanage_ = new dataManager();
@@ -66 +66 @@
   WPushButton* boutonSauve = new WPushButton(" sauvegarder la config");
   WPushButton* boutonRestaure = new WPushButton(" restaurer la config");
-  WPushButton* boutonLoadNew = new WPushButton(" charger une nouvelle config");
+  WPushButton* boutonLoadNew = new WPushButton(" upload config");
+  WPushButton* boutongraphicalAnalysis = new WPushButton("analyse graphique");
   boutonSauve->setMinimumSize(30,30);
   boutonRestaure->setMinimumSize(30,30);
   //  boutonLoadNew->setMinimumSize(30,30);
   
+  boutonSauve->clicked().connect(this, &PspaApplication::sauver);
+  boutonRestaure->clicked().connect(this, &PspaApplication::restaurer);
   // Upload when the button is clicked.
   // React to a succesfull upload.
   boutonLoadNew->clicked().connect(this, &PspaApplication::openFileSelector);
 
+boutongraphicalAnalysis->clicked().connect(this, &PspaApplication::dialogOnGraphics);
 
 
@@ -80 +84 @@
   toolbarLayout->addWidget(boutonRestaure , 1);
   toolbarLayout->addWidget(boutonLoadNew , 1);
-  boutonSauve->clicked().connect(this, &PspaApplication::sauver);
-  boutonRestaure->clicked().connect(this, &PspaApplication::restaurer);
+  toolbarLayout->addWidget(boutongraphicalAnalysis , 1);
+
   layout->addLayout(toolbarLayout, 1, 0, 1, 2);
   layout->addWidget(createPalette(), 2, 0, 4, 1);
@@ -101 +105 @@
   GWt_tools::console_->setMinimumSize(300,100);
   GWt_tools::console_->setOverflow(WContainerWidget::OverflowAuto);  
-  layout->addWidget(GWt_tools::console_, 3, 1);
+  layout->addWidget(GWt_tools::console_, 3, 2);
 
 
@@ -111 +115 @@
   globalParam_ = createGlobalParamWidget();
   //  leDessin_ = new WContainerWidget();
-  leDessin_ = createDrawingWidget();
+  //  leDessin_ = createDrawingWidget();
+  graphicsDialog_ = new GWt_dialog("graphical analysis",createDrawingWidget(),false);
+  graphicsDialog_->setMinimumSize(400,400);
+  graphicsDialog_->setClosable(true);
 
 
@@ -117 +124 @@
   WWidget* executeWidget = createExecuteWidget();
 
-  layout->addWidget( globalParam_, 4, 1);
-  layout->addWidget( leDessin_, 3, 2);
-  layout->addWidget( executeWidget , 5, 1);
+  layout->addWidget( globalParam_, 3, 1);
+  //  layout->addWidget( leDessin_, 3, 2);
+  layout->addWidget( executeWidget , 4, 1);
   //-----------
   
@@ -132 +139 @@
   layout->setColumnStretch(1, 1);
   
-  w->setLayout(layout);  
+  widroot->setLayout(layout);  
 }
 
@@ -230 +237 @@
 }
 
+void PspaApplication::dialogOnGraphics()
+{
+  // GWt_dialog* graphicsDialog = new GWt_dialog("graphical analysis",createDrawingWidget(),false);
+  // graphicsDialog->setMinimumSize(400,400);
+  // graphicsDialog->setClosable(true);
+
+
+    graphicsDialog_->show();
+
+}
 
 WContainerWidget* PspaApplication::createDrawingWidget()
@@ -236 +253 @@
 
 
-  dessin->addWidget(new WText("graphic analysis :  "));
+
+
+  choixEnveloppeDessin_ = new WComboBox();
+  choixEnveloppeDessin_->addItem("x");
+  //  choixEnveloppeDessin_->addItem("y");
+  WPushButton* okEnv = new WPushButton("draw enveloppe");
+ okEnv->clicked().connect(this, &PspaApplication::dessinerEnveloppe);
+
+
+  dessin->addWidget(new WText(" enveloppe :  "));
+  dessin->addWidget(choixEnveloppeDessin_);
+  dessin->addWidget(okEnv);
+
   dessin->addWidget(new WBreak());
-  dessin->addWidget(new WText(" drawing after element :  "));
-
 
   choixElementDessin_ = new WComboBox();
+
+
 
   choixTypeDessinFaisceau_ = new WComboBox();
   choixTypeDessinFaisceau_->addItem("courant_snyder");
   choixTypeDessinFaisceau_->addItem("macroparticles");
-
+  WPushButton* caroule = new WPushButton("dessiner");
+ caroule->clicked().connect(this, &PspaApplication::dessiner);
+
+  dessin->addWidget(new WText(" phase space after element :  "));
   dessin->addWidget(choixElementDessin_);
   dessin->addWidget(choixTypeDessinFaisceau_);
-  WPushButton* caroule = new WPushButton("dessiner");
  dessin->addWidget(caroule);
- caroule->clicked().connect(this, &PspaApplication::dessiner);
   dessin->addWidget(new WBreak());
 
-  WPushButton* okEnv = new WPushButton("draw enveloppe");
-
-  dessin->addWidget(new WText(" drawing enveloppe :  "));
-  choixEnveloppeDessin_ = new WComboBox();
-  choixEnveloppeDessin_->addItem("x");
-  choixEnveloppeDessin_->addItem("y");
-
-  dessin->addWidget(okEnv);
- okEnv->clicked().connect(this, &PspaApplication::dessinerEnveloppe);
+
+
 
  /////////////////////////////////////////////////////////////////////