Changeset 427 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

Timestamp:

Oct 25, 2013, 3:51:05 PM (11 years ago)

Author:

touze

Message:

preparation pour ajouter une maille FODO

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc (modified) (11 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -8 +8 @@
 #include "GWt_softwarePanel.h"
 #include "GWt_globalParameters.h"
-// #include "GWt_dialog.h"
 #include "GWt_draggableImage.h"
 #include "particleBeam.h"
@@ -36 +35 @@
 #include <Wt/WRadioButton>
 
+#include <Wt/WPanel>
+#include <Wt/WMessageBox>
+
 #define HAS_IMAGEMAGIC 1
 
@@ -76 +78 @@
   useStyleSheet("htdocs/pspa.css");
   dtmanage_ = new dataManager(this);
-  // dtmanage_->setWorkingDir(workingDir_);
-  
-  /*
-   * The main layout is a 4x3 grid layout.
-   */
-  WGridLayout *mainGridLayout = new WGridLayout();
-  //  layout->addWidget(createTitle("<a href='workingArea/parmin'> Menu (In future)</a>"), 0, 0, 1, 2);
-  //  layout->addWidget(createTitle("Menu (In future)"), 0, 0, 1, 2);
-  
+
+  // The main layout is a 4x3 grid layout.
+  WGridLayout *mainGridLayout = new WGridLayout();  
   WHBoxLayout *toolbarLayout = new WHBoxLayout();
   
@@ -100 +96 @@
   
   boutonSauve->setToolTip ("sauvegarder votre configuration");
-  boutonRestaure->setToolTip (" restaurer la configuration depuis le serveur");
+  boutonRestaure->setToolTip ("restaurer la configuration depuis le serveur");
   boutonLoadNew->setToolTip ("charger une configuration");
   boutongraphicalAnalysis->setToolTip ("analyse graphique");
@@ -118 +114 @@
   boutonSauve->clicked().connect(this, &PspaApplication::sauver);
   boutonRestaure->clicked().connect(this, &PspaApplication::restaurer);
-  // Upload when the button is clicked.
-  // React to a succesfull upload.
+  // Upload when the button is clicked. React to a succesfull upload.
   boutonLoadNew->clicked().connect(this, &PspaApplication::openFileSelector);
-  
   boutongraphicalAnalysis->clicked().connect(this, &PspaApplication::dialogOnGraphics);
-  
   boutonTrash->clicked().connect(this, &PspaApplication::removeBeamLine);
-  
   toolbarLayout->addWidget(boutonSauve , 0,Wt::AlignMiddle);
   toolbarLayout->addWidget(boutonRestaure , 0,Wt::AlignMiddle);
@@ -140 +132 @@
   mainGridLayout->addWidget(createPalette(), 2, 0, 4, 1);
 
-  
   WScrollArea* scroll = new  WScrollArea();
   scroll->setWidget(createBeamLine());
   scroll->setMinimumSize(300,150);
-
   mainGridLayout->addWidget(scroll, 2, 1, 1, 2);
-  
-  
-  // console_ = new WContainerWidget();
-  // console_->decorationStyle().setBackgroundColor (WColor("lightgray"));
-  // console_->setMaximumSize(600,200);
-  // layout->addWidget(console_, 3, 1);
-  // console_->setMinimumSize(300,100);
-  // console_->setOverflow(WContainerWidget::OverflowAuto);
-  
-  
+
   //-----------
+
   // A supprimer et a mettre en fenetre
-  globalParam_ = createGlobalParamWidget();
-  //  leDessin_ = new WContainerWidget();
-  //  leDessin_ = createDrawingWidget();
+  // xx globalParam_ = createGlobalParamWidget();
+  // xx mainGridLayout->addWidget(globalParam_,3,1);
+
+  WWidget* dboard = createDashBoard();
+  dboard->setMinimumSize(300,100);
+  mainGridLayout->addWidget(dboard,3,1);
+  //-----------
+
   graphicsDialog_ = new GWt_dialog("graphical analysis",createDrawingWidget(),false);
   graphicsDialog_->setMinimumSize(400,400);
@@ -167 +154 @@
   
   executeWidget_ = new GWt_softwarePanel(dtmanage_,this);
-  
-  mainGridLayout->addWidget( globalParam_, 3, 1);
-  //  layout->addWidget( leDessin_, 3, 2);
-  mainGridLayout->addWidget( executeWidget_ , 4, 1);
-  //-----------
+  executeWidget_->setMinimumSize(400,100);
+  mainGridLayout->addWidget(executeWidget_,4,1);
   
   console_ = new GWt_console();
-
-  // manage sizes
   console_->setMinimumSize(300,100);
-  executeWidget_->setMinimumSize(400,100);
-
-  mainGridLayout->addWidget(console_, 3, 2,2,1);
-  
-  
-  /*
-   * Let row 2 and column 1 take the excess space.
-   */
-  mainGridLayout->setRowStretch(4, 1);
-  mainGridLayout->setColumnStretch(2, 1);
+  mainGridLayout->addWidget(console_,3,2,2,1);
+
+  // Let row 2 and column 1 take the excess space.
+  mainGridLayout->setRowStretch(4,1);
+  mainGridLayout->setColumnStretch(2,1);
   
   widroot->setLayout(mainGridLayout);
-
   // set auto scrollbar if needed
   widroot->setOverflow(WContainerWidget::OverflowAuto);
-
+}
+
+// WWidget* PspaApplication::createGlobalParamWidget()
+// {
+//   WContainerWidget* globalParam = new GWt_globalParameters(this);
+//   globalParam->setMinimumSize(300,100);
+//   return globalParam;
+// }
+
+WWidget* PspaApplication::createDashBoard()
+{
+  WContainerWidget *result = new WContainerWidget();
+  
+  WPanel *panel = new WPanel(result);
+  panel->setTitle("dashboard");
+  
+  WContainerWidget *textdiv;
+  textdiv = new WContainerWidget();
+  textdiv->setStyleClass("text");
+  
+  globalParam_ = new GWt_globalParameters(dtmanage_,textdiv);
+
+  WContainerWidget *cnt = new WContainerWidget();
+  WContainerWidget *buttons = new WContainerWidget();
+  buttons->setStyleClass("buttons");
+
+  WPushButton *button;
+  button = new WPushButton("globalParameters", buttons);
+  button->clicked().connect(this, &PspaApplication::messageBox1);
+  
+  button = new WPushButton("fodoCells", buttons);
+  button->clicked().connect(this, &PspaApplication::messageBox2);
+ 
+  styleSheet().addRule(".buttons","padding: 5px;");
+  styleSheet().addRule(".text", "padding: 4px 8px");
+  styleSheet().addRule("body", "margin: 0px;");
+
+  cnt->addWidget(buttons);
+  cnt->addWidget(textdiv);
+  panel->setCentralWidget(cnt);
+  return result;
+}
+
+void PspaApplication::messageBox1()
+{
+  globalParam_->initilializeDialog();
+  return;
+}
+
+void PspaApplication::messageBox2()
+{
+  return;
 }
 
@@ -203 +230 @@
     new WBreak(palette);
   }
-
   return palette;  
 }
@@ -231 +257 @@
   return beamLine_;
 }
-
-WWidget* PspaApplication::createGlobalParamWidget()
-{
-  WContainerWidget* globalParam = new GWt_globalParameters(this);
-  globalParam->setMinimumSize(300,100);
-  return globalParam;
-}
-
 
 void PspaApplication::dialogOnGraphics()
@@ -639 +657 @@
   new WText(" after element :  " + elementLabel, phaseSpaceDialog->contents());
 
-  for (int k=0 ; k < legende.size(); k++) {
+  for (int k=0 ; k < (int)legende.size(); k++) {
     new WBreak(phaseSpaceDialog->contents());
     new WText(legende.at(k), phaseSpaceDialog->contents());
@@ -1062 +1080 @@
   new WText(" after element :  " + elementLabel, w);
 
-  for (int k=0 ; k < legende.size(); k++) {
+  for (int k=0 ; k < (int)legende.size(); k++) {
     new WBreak(w);
     new WText(legende.at(k), w);