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

Timestamp:

Dec 13, 2012, 11:24:21 AM (12 years ago)

Author:

garnier

Message:

fix bug #3 : scroll console output

File:

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

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -3 +3 @@
 #include <vector>
 
+#include "GWt_pspaApplication.h"
+#include "GWt_LigneFaisceau.h"
+#include "GWt_globalParameters.h"
+#include "GWt_dialog.h"
+#include "particleBeam.h"
+#include "bareParticle.h"
+#include "nomDeLogiciel.h"
+#include "mixedTools.h"
+#include "nomdElements.h"
+
 #include <Wt/WLineEdit>
-#include <Wt/WText>
 #include <Wt/WGridLayout>
 #include <Wt/WVBoxLayout>
@@ -17 +26 @@
 #include <Wt/WFileUpload>
 
-
-#include "GWt_pspaApplication.h"
-#include "GWt_LigneFaisceau.h"
-#include "GWt_globalParameters.h"
-#include "GWt_dialog.h"
-#include "particleBeam.h"
-#include "bareParticle.h"
-#include "nomDeLogiciel.h"
-#include "mixedTools.h"
-#include "nomdElements.h"
-
 using namespace Wt::Chart;
 
@@ -80 +78 @@
   layout->addWidget(beamLine_, 2, 1, 1, 1);
   
-  console_ = new WTextArea();
+  console_ = new WContainerWidget();
+  console_->decorationStyle().setBackgroundColor (WColor("gray")); 
   console_->setMaximumSize(600,200);
   layout->addWidget(console_, 3, 1);
   console_->setMinimumSize(300,100);
-  
+  console_->setOverflow(WContainerWidget::OverflowAuto);  
+
   //-----------
   // A supprimer et a mettre en fenetre
@@ -477 +477 @@
   // Upload automatically when the user entered a file.
   uploadFileSelectorWidget->changed().connect(uploadFileSelectorWidget, &WFileUpload::upload);
-  //  uploadFileSelectorWidget->changed().connect(boutonLoadNew, &Wt::WPushButton::disable);
   
   // React to a succesfull upload.
@@ -726 +725 @@
   return result;
 }
+
+void PspaApplication::addConsoleMessage(WString msg) {
+  WText *w = new WText(console_);
+  
+  w->setText(msg);
+  w->setInline(false);
+  
+  /*
+   * Little javascript trick to make sure we scroll along with new content
+   */
+  WApplication *app = WApplication::instance();
+  app->doJavaScript(console_->jsRef() + ".scrollTop += "
+                    + console_->jsRef() + ".scrollHeight;");
+  
+}