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

Timestamp:

Mar 8, 2013, 9:29:14 AM (11 years ago)

Author:

garnier

Message:

correction du bug #36

File:

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

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

@@ -47 +47 @@
 PspaApplication::PspaApplication(const WEnvironment& env) : WApplication(env)
 ,applicationDefaultTitle_("portail PSPA")
+,beamLine_(NULL)
 {
     
@@ -87 +88 @@
     WPushButton* boutonLoadNew = new WPushButton();
     WPushButton* boutongraphicalAnalysis = new WPushButton();
+    WPushButton* boutonTrash = new WPushButton();
     
     boutonSauve->setStyleClass("saveButton");
@@ -92 +94 @@
     boutonLoadNew->setStyleClass("loadNewButton");
     boutongraphicalAnalysis->setStyleClass("histoButton");
+    boutonTrash->setStyleClass("trashButton");
     
     boutonSauve->setToolTip ("sauvegarder votre configuration");
@@ -97 +100 @@
     boutonLoadNew->setToolTip ("charger une configuration");
     boutongraphicalAnalysis->setToolTip ("analyse graphique");
+    boutonTrash->setToolTip ("tout effacer");
     
     boutonSauve->setMaximumSize(38,38);
@@ -106 +110 @@
     boutongraphicalAnalysis->setMaximumSize(38,38);
     boutongraphicalAnalysis->setMinimumSize(38,38);
+    boutonTrash->setMaximumSize(38,38);
+    boutonTrash->setMinimumSize(38,38);
     
     boutonSauve->clicked().connect(this, &PspaApplication::sauver);
@@ -115 +121 @@
     boutongraphicalAnalysis->clicked().connect(this, &PspaApplication::dialogOnGraphics);
     
+    boutonTrash->clicked().connect(this, &PspaApplication::removeBeamLine);
+
     toolbarLayout->addWidget(boutonSauve , 0,Wt::AlignMiddle);
     toolbarLayout->addWidget(boutonRestaure , 0,Wt::AlignMiddle);
     toolbarLayout->addWidget(boutonLoadNew , 0,Wt::AlignMiddle);
     toolbarLayout->addWidget(boutongraphicalAnalysis , 0,Wt::AlignMiddle);
+    toolbarLayout->addWidget(boutonTrash , 0,Wt::AlignMiddle);
     toolbarLayout->addWidget(new WText("") , 1,Wt::AlignMiddle);
     
@@ -202 +211 @@
 void PspaApplication::createBeamLine()
 {
-  beamLine_ = new GWt_LigneFaisceau(this);
-  beamLine_->setMinimumSize(300,100);
+    if (!beamLine_) {
+        beamLine_ = new GWt_LigneFaisceau(this);
+    } else {
+        beamLine_->clear();
+    }
+    beamLine_->setMinimumSize(300,100);
+    setTitle(applicationDefaultTitle_);
 }
 
@@ -987 +1001 @@
 }
 
-
+void PspaApplication::removeBeamLine() {
+    createBeamLine();
+}