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

Timestamp:

Mar 27, 2013, 5:47:22 PM (11 years ago)

Author:

garnier

Message:

merge avec la branche 12_03_12-managerComboBox

Location:

Interface_Web/trunk/pspaWT

Files:

• . (modified) (1 prop)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (8 diffs)

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

@@ -77 +77 @@
   
   /*
-   * The main layout is a 3x2 grid layout.
+   * The main layout is a 4x3 grid layout.
    */
-  WGridLayout *layout = new WGridLayout();
+  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);
@@ -131 +131 @@
   toolbarLayout->addWidget(new WText("") , 1,Wt::AlignMiddle);
   
-  WContainerWidget * layoutContainer = new WContainerWidget();
-  layoutContainer->setLayout(toolbarLayout);
-  layoutContainer->decorationStyle().setBackgroundImage ("/htdocs/fond_toolbar.png");
-  layout->addWidget(layoutContainer, 1, 0, 1, 2);
-  layout->addWidget(createPalette(), 2, 0, 4, 1);
-  
-  createBeamLine();
+  WContainerWidget * toolbarLayoutContainer = new WContainerWidget();
+  toolbarLayoutContainer->setLayout(toolbarLayout);
+  toolbarLayoutContainer->decorationStyle().setBackgroundImage ("/htdocs/fond_toolbar.png");
+    
+  mainGridLayout->addWidget(toolbarLayoutContainer, 1, 0, 1, 3);
+  mainGridLayout->addWidget(createPalette(), 2, 0, 4, 1);
+
   
   WScrollArea* scroll = new  WScrollArea();
-  scroll->setWidget(beamLine_);
-  layout->addWidget(scroll, 2, 1, 1, 1);
+  scroll->setWidget(createBeamLine());
+  scroll->setMinimumSize(300,150);
+
+  mainGridLayout->addWidget(scroll, 2, 1, 1, 2);
   
   
@@ -151 +153 @@
   // console_->setOverflow(WContainerWidget::OverflowAuto);
   
-  
-  console_ = new GWt_console();
-  console_->clear();
-  console_->decorationStyle().setBackgroundColor (WColor("lightgray"));
-  console_->setMaximumSize(600,200);
-  console_->setMinimumSize(300,100);
-  console_->setOverflow(WContainerWidget::OverflowAuto);
-  layout->addWidget(console_, 3, 2);
   
   //-----------
@@ -171 +165 @@
   executeWidget_ = new GWt_softwarePanel(dtmanage_,this);
   
-  layout->addWidget( globalParam_, 3, 1);
+  mainGridLayout->addWidget( globalParam_, 3, 1);
   //  layout->addWidget( leDessin_, 3, 2);
-  layout->addWidget( executeWidget_ , 4, 1);
+  mainGridLayout->addWidget( executeWidget_ , 4, 1);
   //-----------
   
-  layout->setColumnResizable(1);
-  layout->setRowResizable(2);
+  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.
    */
-  layout->setRowStretch(2, 1);
-  layout->setColumnStretch(1, 1);
-  
-  widroot->setLayout(layout);
+  mainGridLayout->setRowStretch(4, 1);
+  mainGridLayout->setColumnStretch(2, 1);
+  
+  widroot->setLayout(mainGridLayout);
+
+  // set auto scrollbar if needed
+  widroot->setOverflow(WContainerWidget::OverflowAuto);
+
 }
 
@@ -210 +215 @@
 }
 
-void PspaApplication::createBeamLine()
+Wt::WWidget* PspaApplication::createBeamLine()
 {
   extensionFile_= 0;
@@ -220 +225 @@
   beamLine_->setMinimumSize(300,100);
   setTitle(applicationDefaultTitle_);
+
+  return beamLine_;
 }
 
@@ -225 +232 @@
 {
     WContainerWidget* globalParam = new GWt_globalParameters(this);
-    globalParam->setMaximumSize(600,150);
-    globalParam->setMinimumSize(600,150);
     return globalParam;
 }
@@ -980 +985 @@
 void PspaApplication::removeBeamLine() {
   createBeamLine();
+  executeWidget_->updateSections();
 }