Changeset 240 in PSPA

Timestamp:

Jan 18, 2013, 2:46:56 PM (12 years ago)

Author:

garnier

Message:

Correction de la console qui est désormais une classe à part et initilisée une

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• include/GWt_pspaApplication.h (modified) (2 diffs)
• include/GWt_tools.h (modified) (2 diffs)
• src/GWt_abstractElement.cc (modified) (3 diffs)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (12 diffs)
• src/GWt_globalParameters.cc (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (10 diffs)
• src/GWt_tools.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/History

@@ -10 +10 @@
   uniquement des méthodes modifiées en vue de faire mieux. Quelques problèmes
   au niveau graphiques à prévoir avec cette modification qui vont être corrigées.
+- Correction de la console qui est désormais une classe à part et initilisée une
+  seule fois à chaque nouvelle session
 
 21 December 2012  Laurent Garnier

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -19 +19 @@
 #include "GWt_dialog.h"
 #include "dataManager.h"
+#include "GWt_tools.h"
 
 using namespace Wt;
@@ -61 +62 @@
  list<GWt_sectionToExecute*> selectedSections_;
  WFileUpload* uploadFileSelectorWidget_;
+ GWt_console* console_;
+  
 
  WText*   createTitle(const WString&);

Interface_Web/trunk/pspaWT/include/GWt_tools.h

@@ -1 @@
-#ifndef GWTTOOLS_SEEN
-#define GWTTOOLS_SEEN
+#ifndef GWTCONSOLE_SEEN
+#define GWTCONSOLE_SEEN
 
 #include <iostream>
@@ -11 +11 @@
 using namespace std;
 
-class GWt_tools
+class GWt_console : public WContainerWidget
 {
 
- public : 
+public: 
+  GWt_console();
+  virtual ~GWt_console();
+  void addConsoleMessage(WString msg);
+};
 
-  static WContainerWidget* console_;
-
-
-  static void addConsoleMessage(WString msg);
-
-
-};
 #endif

Interface_Web/trunk/pspaWT/src/GWt_abstractElement.cc

@@ -19 +19 @@
 #include <Wt/WLineEdit>
 #include <Wt/WBreak>
+#include <Wt/WApplication>
 
 GWt_abstractElement::GWt_abstractElement(abstractElement* elem)
@@ -44 +45 @@
 {
   string* param = element_-> getParametersString();
+ 
   if ( param == NULL )
     {
-      GWt_tools::addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName());
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName());
+      }
     }
   //   int compteur = -1;
@@ -54 +59 @@
   if ( nbparam != element_->getNbParams()) 
     {
-      GWt_tools::addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName());
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+      console->addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName());
+      }
     }
 

Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc

@@ -90 +90 @@
     } else {
 #ifdef PSPA_DEBUG
-      GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver but no button press");
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver but no button press");
+      }
 #endif
     }
@@ -100 +103 @@
 
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver");
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver");
+      }
 #endif
 }
@@ -121 +127 @@
 
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
+  }
 #endif
 }
@@ -128 +137 @@
 {
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage(" GWt_dropZoneLigneFaiseau::mouseDragged");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage(" GWt_dropZoneLigneFaiseau::mouseDragged");
+  }
 #endif
 }
@@ -135 +147 @@
 {
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut up");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut up");
+  }
 #endif
 }
@@ -142 +157 @@
 {
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseDown up");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseDown up");
+  }
 #endif
 }
@@ -149 +167 @@
 {
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage(" GWt_dropZoneLigneFaiseau::dropEvent");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage(" GWt_dropZoneLigneFaiseau::dropEvent");
+  }
 #endif
 
@@ -167 +188 @@
   }
 
-  GWt_tools::addConsoleMessage(e.getElementName());
+    if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage(e.getElementName());
+    }
 
   abstractElement* ptr = pspa_->getDataManager()->addElement(eType);
@@ -333 +357 @@
   
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("remove from drag Zone");
+  if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+    GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+    console->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");
+  console->addConsoleMessage("remove from drag Zone");
+  }
   cout << "remove from drag Zone id" << layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) << " count:" << layout->count()<< endl;
 #endif
@@ -341 +369 @@
       layout->removeItem (layout->itemAt(2));
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("remove first link");
+  console->addConsoleMessage("remove first link");
 #endif
     }
@@ -350 +378 @@
       layout->removeItem (layout->itemAt(layout->count()-3));
 #ifdef PSPA_DEBUG
-  GWt_tools::addConsoleMessage("remove last link");
+  console->addConsoleMessage("remove last link");
 #endif
     }
@@ -359 +387 @@
     layout->removeItem (layout->itemAt(layout->indexOf((WLayoutItem*)(layout->findWidgetItem (other)))));
 #ifdef PSPA_DEBUG
-    GWt_tools::addConsoleMessage("remove drop zone");
+    console->addConsoleMessage("remove drop zone");
 #endif
   }

Interface_Web/trunk/pspaWT/src/GWt_globalParameters.cc

@@ -108 +108 @@
   if ( param == NULL )
     {
-      GWt_tools::addConsoleMessage(" GWt_globalParameters : empty parameter set");
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage(" GWt_globalParameters : empty parameter set");
+      }
     }
   int nbparam = atoi(param[0].c_str());
   if ( nbparam != 4 ) 
     {
-      GWt_tools::addConsoleMessage(" GWt_globalParameters : wrong number of parameters");
+      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
+        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
+        console->addConsoleMessage(" GWt_globalParameters : wrong number of parameters");
+      }
     }
   frequencyEdit_->setText(param[1].c_str());

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -100 +100 @@
   // console_->setOverflow(WContainerWidget::OverflowAuto);  
 
-  GWt_tools::console_->clear();
-  GWt_tools::console_->decorationStyle().setBackgroundColor (WColor("lightgray"));
-  GWt_tools::console_->setMaximumSize(600,200);
-  GWt_tools::console_->setMinimumSize(300,100);
-  GWt_tools::console_->setOverflow(WContainerWidget::OverflowAuto);  
-  layout->addWidget(GWt_tools::console_, 3, 2);
+
+  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);
 
 
@@ -473 +475 @@
 void PspaApplication::executer()
 {
-  GWt_tools::addConsoleMessage(string("on va peut etre y arriver"));
+  console_->addConsoleMessage(string("on va peut etre y arriver"));
+    
+  
   static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals();
 
@@ -487 +491 @@
   }
   //  cout << " PspaApplication : retour d'execution resultat =  " << resultat << endl; 
-  GWt_tools::addConsoleMessage(resultat);
+  console_->addConsoleMessage(resultat);
   //  cout << " PspaApplication : affichage console termine  " << endl; 
 
@@ -500 +504 @@
 {
   cout << " on sauve " << endl;
-  GWt_tools::addConsoleMessage("sauvegarde");
+  console_->addConsoleMessage("sauvegarde");
 
   dialogSave_ = new WDialog("save");
@@ -515 +519 @@
 void PspaApplication::dialogSaveDone(WDialog::DialogCode code)
 {
-  if ( code != Wt::WDialog::Accepted ) { GWt_tools::addConsoleMessage(" pas de sauvegarde"); return;}
-  else { GWt_tools::addConsoleMessage("sauvegarde sur repertoire : " + workingDir_);}
+
+  if ( code != Wt::WDialog::Accepted ) { console_->addConsoleMessage(" pas de sauvegarde"); return;}
+  else { console_->addConsoleMessage("sauvegarde sur repertoire : " + workingDir_);}
   nameOfCase_ = saveNameEdit_->text().toUTF8();
   cout << " PspaApplication::dialogSaveDone() nameOfCase_= " << nameOfCase_ << endl;
@@ -531 +536 @@
 void PspaApplication::restaurer()
 {
-  GWt_tools::addConsoleMessage(string("on va recharger..."));
+  console_->addConsoleMessage(string("on va recharger..."));
   dialogOpen_ = new WDialog("open");
   new WText("name of case : ",dialogOpen_->contents());
@@ -546 +551 @@
 {
 
-  if ( code != Wt::WDialog::Accepted ) { GWt_tools::addConsoleMessage(" pas de restauration"); return;}
-  else { GWt_tools::addConsoleMessage("restauration depuis le repertoire " + workingDir_ );}
+  if ( code != Wt::WDialog::Accepted ) { console_->addConsoleMessage(" pas de restauration"); return;}
+  else { console_->addConsoleMessage("restauration depuis le repertoire " + workingDir_ );}
 
   nameOfCase_ = openNameEdit_->text().toUTF8();
@@ -566 +571 @@
   bobo->restoreElementCollection();
 
-  GWt_tools::addConsoleMessage(string("...terminee"));
+  console_->addConsoleMessage(string("...terminee"));
 }
 
@@ -613 +618 @@
     {
       nameOfCase_ = nomDuFichier;
-      GWt_tools::addConsoleMessage(string("restauration..."));
+      console_->addConsoleMessage(string("restauration..."));
 
       if ( !dtmanage_->restoreElements(workingDir_, uploadFileSelectorWidget_->spoolFileName()) ) {
@@ -626 +631 @@
       bobo->restoreElementCollection();
 
-      GWt_tools::addConsoleMessage(string("...terminee"));
+      console_->addConsoleMessage(string("...terminee"));
       message->show();
     }

Interface_Web/trunk/pspaWT/src/GWt_tools.cc

@@ -4 +4 @@
 #include <Wt/WText>
 
-WContainerWidget* GWt_tools::console_ = new WContainerWidget();
+GWt_console::GWt_console()
+:WContainerWidget()
+{
+}
 
-void GWt_tools::addConsoleMessage(WString msg) {
-  WText *w = new WText(console_);
+
+GWt_console::~GWt_console()
+{
+}
+
+
+void GWt_console::addConsoleMessage(WString msg) {
+
+  WText *w = new WText(this);
   w->setTextFormat(PlainText);
   w->setText(msg);
@@ -15 +25 @@
    * Little javascript trick to make sure we scroll along with new content
    */
-  WApplication *app = WApplication::instance();
-  app->doJavaScript(console_->jsRef() + ".scrollTop += "
-                    + console_->jsRef() + ".scrollHeight;");
+  wApp->doJavaScript(this->jsRef() + ".scrollTop += "
+                    + this->jsRef() + ".scrollHeight;");
   
 }
+