Changeset 143 in PSPA

Timestamp:

Dec 6, 2012, 11:39:15 AM (12 years ago)

Author:

garnier

Message:

ajout de GWt_dialog

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (1 diff)
• icons/patientez.gif (added)
• include/GWt_dialog.h (added)
• src/GWt_dialog.cc (added)
• src/GWt_pspaApplication.cc (modified) (9 diffs)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -22 +22 @@
 #macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
 
-application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_initialBeam.cc GWt_soleno.cc GWt_bend.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementInitialBeam.cc elementSoleno.cc elementBend.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc nomdElements.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
+application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_initialBeam.cc GWt_soleno.cc GWt_bend.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementInitialBeam.cc elementSoleno.cc elementBend.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dialog.cc nomdElements.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -20 +20 @@
 #include "GWt_LigneFaisceau.h"
 #include "GWt_globalParameters.h"
+#include "GWt_dialog.h"
 #include "particleBeam.h"
 #include "bareParticle.h"
@@ -184 +185 @@
   exec_ok->clicked().connect(this, &PspaApplication::checkSectionSelection);
   
-  // signal de probleme
-  probleme_ = new WText("y a un probleme");
-  probleme_->decorationStyle().setBackgroundColor (WColor("red"));
-  probleme_->setHidden(true);
-
   // le panel 
   WPanel *panelLogiciels = new WPanel(executeW);
@@ -198 +194 @@
   contenuSections_->addWidget(exec_ok);
   contenuSections_->addWidget(exec_go_);
-  contenuSections_->addWidget(probleme_);
   contenuSections_->addWidget(new WBreak());
   contenuSections_->addWidget(new WBreak());
@@ -323 +318 @@
         {
           addConsoleMessage(" bad section definition !  \n ");
-          probleme_->setHidden(false);
+          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", true,false,true);
+          warningDialog.exec();
           return;
         }
@@ -336 +332 @@
         {
           addConsoleMessage(" bad section definition !  \n ");
-          probleme_->setHidden(false);
+          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", true,false,true);
+          warningDialog.exec();
           return;
         }
@@ -345 +342 @@
     }
 
-  if (!areDataCoherent()) probleme_->setHidden(false);
+  if (!areDataCoherent()) {
+    GWt_dialog warningDialog("PSPA : Vérification des sections", " données incohérentes !", true,false,true);
+    warningDialog.exec();
+  }
   else 
     {
-      probleme_->setHidden(true);
       exec_go_->setDisabled(false);
     }
@@ -376 +375 @@
       caMarche = false; 
       addConsoleMessage(diagnostic.c_str());
+      GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic.c_str(), true,false,true);
+      calculDialog.exec();
     }
 
@@ -395 +396 @@
   static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals();
 
-  Wt::WDialog calculDialog("Calcul en cours");
-  new Wt::WText("Veuillez patienter", calculDialog.contents());
-  calculDialog.setModal (false);
+  GWt_dialog calculDialog("Calcul en cours", "Veuillez patienter...", false,true);
   calculDialog.show();
 
@@ -403 +402 @@
 
   string resultat;
-  if ( !dtmanage_->executeAll(resultat)) probleme_->setHidden(false);
+  if ( !dtmanage_->executeAll(resultat)) {
+    GWt_dialog warningDialog("PSPA : Echec", " echec lors de l'exécution !", true,false,true);
+    warningDialog.exec();
+  }
   //  cout << " PspaApplication : retour d'execution resultat =  " << resultat << endl; 
   addConsoleMessage(resultat);