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

Timestamp:

Nov 29, 2012, 9:39:16 AM (12 years ago)

Author:

lemeur

Message:

diagnostics et dessins (en cours)

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_pspaApplication.h (modified) (2 diffs)
• abstractElement.h (modified) (2 diffs)
• dataManager.h (modified) (4 diffs)
• particleBeam.h (modified) (2 diffs)

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -36 +36 @@
  WWidget* globalParam_;
  WWidget* beamLine_;
- WContainerWidget* leDessin_;
+ WWidget* leDessin_;
  WPushButton *exec_go_;
  WText* probleme_;
@@ -48 +48 @@
  WWidget* createGlobalParamWidget();
  WWidget* createExecuteWidget();
+ WWidget* createDrawingWidget();
  
  void createDragImage(const char *url,const char *smallurl,const char *mimeType,WContainerWidget *p,WString name);

Interface_Web/trunk/pspaWT/include/abstractElement.h

@@ -25 +25 @@
   string label_;
   nomdElement elementName_;
+  //  string transportElementName_;
   double lenghtElem_; // cm
   double aperture_; // cm
@@ -44 +45 @@
   string getLabel() const;
   nomdElement getName() const;
-  std::string getNameOfElement();
-  std::string getNameString() const;
+  string getNameOfElement();
+  string getNameString() const;
+  //  string getTransportName() const;
   double getLenghtOfElement() const;
   int getNbParams() const;  

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -15 +15 @@
   elementsCollection elementsGallery_;
   globalParameters globParam_;
-  particleBeam currentBeam_;
+  particleBeam* currentBeam_;
+
+  vector<particleBeam> diagnosticBeam_;
 
   vector<sectionToExecute*> jobList_;
@@ -26 +28 @@
  public:
 
-  dataManager() {;}
+  dataManager() {currentBeam_ = NULL;}
   ~dataManager() {
     unsigned k;
@@ -32 +34 @@
       if ( jobList_[k] != NULL ) delete jobList_[k];
     }
+    if ( currentBeam_ == NULL ) delete currentBeam_;
   }
 
@@ -37 +40 @@
   inline globalParameters* getGlobalParameters()  {return &globParam_;}
   inline elementsCollection* getCollection() {return &elementsGallery_;}
-  inline particleBeam& getCurrentBeam() {return currentBeam_;}
+  inline particleBeam* getCurrentBeam() {return currentBeam_;}
   void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);
  

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -49 +49 @@
 
 
+      void readTransportMoments(ifstream& inp);
 
 
@@ -70 +71 @@
   ~particleBeam() {;}
 
-  bool setFromParmela(double referencefrequency);
+  bool setFromParmela(unsigned numeroElement,double referencefrequency);
       void buildMomentRepresentation();