Changeset 227 in PSPA for Interface_Web/trunk/pspaWT/include

Timestamp:

Dec 30, 2012, 12:11:42 PM (11 years ago)

Author:

lemeur

Message:

usage de WApplication::appRoot() pour WORKINGAREA

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_pspaApplication.h (modified) (1 diff)
• dataManager.h (modified) (2 diffs)
• environmentVariables.h (modified) (1 diff)
• particleBeam.h (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -38 +38 @@
  dataManager* dtmanage_;
  string nameOfCase_;
-
+ string workingDir_;
  WDialog* dialogSave_;
  WDialog* dialogOpen_;

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -21 +21 @@
   vector<sectionToExecute*> jobList_;
 
-  bool createInputFileParmela( unsigned int numeroDeb, unsigned int numerpFin);
-  bool createInputFileTransport( unsigned int numeroDeb, unsigned int numeroFin);
+  bool createInputFileParmela( unsigned int numeroDeb, unsigned int numerpFin, string workingDir);
+  bool createInputFileTransport( unsigned int numeroDeb, unsigned int numeroFin, string workingDir);
   void removeFile(string nameOfFile); 
   void clearSectionToExecute();
@@ -48 +48 @@
   abstractElement* addElement(typedElement elemType);
   string getLabelFromElementNumero(int numero);
-  void initializeExecution();
+  void initializeExecution(string workingDir);
   string checkExecute();
-  bool executeTransport( unsigned int indexDeb, unsigned int indexFin, string& resul);
-  bool executeParmela( unsigned int indexDeb, unsigned int indexFin, string& resul);
-  bool executeAll(string& resul);
-  void saveConfiguration(string nameOfFile);
-  bool restoreElements(string inputFileName);
+  bool executeTransport( unsigned int indexDeb, unsigned int indexFin, string workingDir,  string& resul);
+  bool executeParmela( unsigned int indexDeb, unsigned int indexFin, string workingDir, string& resul);
+  bool executeAll(string workingDir, string& resul);
+  void saveConfiguration(string workingDir, string nameOfFile);
+  bool restoreElements(string workingDir, string inputFileName);
   void donneesRmsEnveloppe( string type, unsigned int numeroDeb, unsigned int numeroFin, vector<double>& xcor, vector<double>& ycor);
 };

Interface_Web/trunk/pspaWT/include/environmentVariables.h

@@ -4 +4 @@
 #include <stdlib.h>
 #include <stdio.h>
-static string WHERE_WE_ARE = string(getenv("PWD"));
-static string WORKINGAREA =  WHERE_WE_ARE.append("/workingArea/");
-
+//static string WHERE_WE_ARE = string(getenv("PWD"));
+//static string WORKINGAREA =  WHERE_WE_ARE.append("/workingArea/");
+static string WORKINGAREA = "../workingArea/";
 #endif
 

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -63 +63 @@
   virtual ~particleBeam() {;}
 
-  bool setFromParmela(unsigned numeroElement,double referencefrequency);
+  bool setFromParmela(string workingDir,unsigned numeroElement,double referencefrequency);
   void buildMomentRepresentation();
 
-  bool  setFromTransport(string elementLabel, const nomdElements elem);
+  bool  setFromTransport(string workingDir, string elementLabel, const nomdElements elem);
 
   //  void setFromBeamParameters(double x, double xp, double y, double yp, double dl, double del, double P0);