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

Timestamp:

Nov 7, 2012, 10:22:55 AM (12 years ago)

Author:

lemeur

Message:

developpements sur particleBeam

Location:

Interface_Web/trunk/pspaWT/include

Files:

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

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -19 +19 @@
 class PspaApplication : public WApplication
 {
-public:
-  PspaApplication(const WEnvironment& env);
+
+
+ private :
+  WTextArea* console_;
+  dataManager* dtmanage_;
+  WWidget* globalParam_;
+  WWidget* beamLine_;
+  WContainerWidget* leDessin_;
+
+
+
   WWidget* createPalette();
   WWidget* createBeamLine();
@@ -27 +36 @@
                   const char *mimeType,
                   WContainerWidget *p);
+
+  void executer();
+  void sauver();
+  void restaurer();
+
+
+  void faireDessin();
+
+public:
+  PspaApplication(const WEnvironment& env);
+  inline dataManager* getDataManager() const 
+  {
+    return dtmanage_;
+  }
+
+
   inline void addConsoleMessage(WString msg) {
     console_->setText   (console_->text()+msg+"\n");    
   }
 
-  inline dataManager* getDataManager() const 
-  {
-    return dtmanage_;
-  }
-  void executer();
-  void sauver();
-  void restaurer();
- private :
-  WTextArea* console_;
-  dataManager* dtmanage_;
-  WWidget* globalParam_;
-  WWidget* beamLine_;
 };
 

Interface_Web/trunk/pspaWT/include/bareParticle.h

@@ -34 +34 @@
 ~bareParticle() {;}
 
+ inline bareParticle& operator = (const bareParticle& bp)
+   {
+     position_ = bp.position_;
+     betagamma_ = bp.betagamma_;
+     gamma_ = bp.gamma_;
+     return *this;
+   }
 
  bareParticle(const TRIDVECTOR&  pos , const TRIDVECTOR& bg)

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -29 +29 @@
   inline globalParameters* getGlobalParameters()  {return &globParam_;}
   inline elementsCollection* getCollection() {return &elementsGallery_;}
+  inline particleBeam& getCurrentBeam() {return currentBeam_;}
   abstractElement* addElement(nomdElement elemType);
   abstractElement* addCell();

Interface_Web/trunk/pspaWT/include/particleBeam.h

@@ -36 +36 @@
 {
 
+  bool particleRepresentationOk_;
+  bool momentRepresentationOk_;
 
-
+  bareParticle referenceParticle_;
 
   vector<bareParticle> goodPartic_;
+
+      vector< vector<double> > rij_transportMoments_;
+
+      vector<double> centroid_;
 
 
 
 
+      void buildMomentRepresentation();
+
  public:
 
- particleBeam()  {;}
+ particleBeam()  
+   {
+     rij_transportMoments_.resize(6);
+     unsigned dim=0;
+     unsigned k;
+     for ( k=0; k < 6; k++)
+       {
+         rij_transportMoments_.at(k).resize(++dim); 
+       }
+     particleRepresentationOk_ = false;
+     momentRepresentationOk_ = false;
+
+   }
 
   ~particleBeam() {;}