Changeset 102 in PSPA

Timestamp:

Nov 21, 2012, 2:28:02 PM (12 years ago)

Author:

lemeur

Message:

creation d'un diagnostic de coherence

Location:

Interface_Web/trunk/pspaWT

Files:

• include/GWt_pspaApplication.h (modified) (1 diff)
• include/abstractElement.h (modified) (3 diffs)
• src/GWt_pspaApplication.cc (modified) (4 diffs)
• src/dataManager.cc (modified) (4 diffs)
• src/elementInitialBeam.cc (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -44 +44 @@
   WPushButton *exec_go_;
 
+  WText* probleme_;
 
   list<GWt_sectionToExecute*> selectedSections_;

Interface_Web/trunk/pspaWT/include/abstractElement.h

@@ -16 +16 @@
 
  protected:
+
+  bool parmelaOk_;
+  bool transportOk_;
 
   int nbParam_;
@@ -52 +55 @@
     lenghtElem_ = defaultLength_;
     aperture_ = defaultAperture_;
+    parmelaOk_ = false;
+    transportOk_ = false;
   }
 
@@ -105 +110 @@
  int getNbParams() const {return nbParam_;};
 
+ bool is_parmela_element() const {return parmelaOk_;};
+ bool is_transport_element() const {return transportOk_;};
+
  virtual string* getParametersString() const = 0;
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -90 +90 @@
 
   WContainerWidget* executeW =new WContainerWidget();
-
-
-  //   WVBoxLayout* executeLayout = new WVBoxLayout();
-
-  //  executeW->decorationStyle().setBackgroundColor (WColor("yellow"));
   executeW->setMaximumSize(600,150);
   executeW->setMinimumSize(600,150);
-
-  
-
-
-    //    executeLayout->addWidget(boutonGo);
 
   // bouton execute
@@ -120 +110 @@
   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 
@@ -131 +125 @@
   contenuSections_->addWidget( exec_ok);
     contenuSections_->addWidget(exec_go_);
+    contenuSections_->addWidget(probleme_);
   contenuSections_->addWidget(new WBreak());
   contenuSections_->addWidget(new WBreak());
@@ -416 +411 @@
         else if ( prog == nomDeLogiciel::transport ) 
           {
+
+            if ( !dtmanage_->getCurrentBeam().momentRepresentationOk() )
+              {         
+                addConsoleMessage(" the beam is not OK for transport");
+                probleme_->setHidden(false);
+                return;
+              }
+
+
             resul = dtmanage_->executeTransport( debut, fin);
             faireDessinTransport();

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -116 +116 @@
 
   createInputFileParmela(indexDeb, indexFin);
+
   ostringstream sortie;
   sortie << " EXECUTION DE PARMELA DE l'ELEMENT " << indexDeb << " A L'ELEMENT " << indexFin << endl;
@@ -154 +155 @@
     {
 
-      // if ( currentBeam_.particleRepresentationOk() )
-      //        {
-      //          currentBeam_.buildMomentRepresentation();
-      //        }
-      // else
-      //        {
           cerr << " dataManager::createInputFileTransport : the beam is not OK " << endl;
-          return;
-          //    }
     }
   indexDeb--;
@@ -213 +206 @@
   indexDeb--;
   indexFin--;
+
+ 
+
+
   ofstream outfile;
   string name = WORKINGAREA + "/parmin";
@@ -258 +255 @@
 }
 
-  void dataManager::initializeExecution()
-  {
-    currentBeam_.clear();
-  }
+void dataManager::initializeExecution()
+{
+  ifstream testParmdesz;
+  string parmdesz = WORKINGAREA + "/parmdesz";
+  testParmdesz.open(parmdesz.c_str(), ios::in);
+  if (testParmdesz)
+    {
+      testParmdesz.close();
+      remove(parmdesz.c_str());
+    }
+  currentBeam_.clear();
+}
 
   // string dataManager::executeAll()

Interface_Web/trunk/pspaWT/src/elementInitialBeam.cc

@@ -14 +14 @@
       nbParam_ = 6;
       parametersString_ = new string[nbParam_+1];
+      parmelaOk_ = true;
     }