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

Timestamp:

Oct 26, 2012, 5:58:24 PM (12 years ago)

Author:

lemeur

Message:

premiere version pour la creation d'un input parmela

Location:

Interface_Web/trunk/pspaWT/include

Files:

• GWt_cell.h (added)
• GWt_globalParameters.h (added)
• GWt_initialBeam.h (added)
• LigneFaisceau.h (modified) (2 diffs)
• abstractElementDefinition.h (modified) (4 diffs)
• bendDefinition.h (modified) (1 diff)
• cellDefinition.h (modified) (1 diff)
• dataManager.h (modified) (3 diffs)
• driftDefinition.h (modified) (2 diffs)
• driftForm.h (modified) (1 diff)
• elementCell.h (added)
• elementsCollection.h (modified) (6 diffs)
• globalParameters.h (added)
• graphDriftElement.h (added)
• initialBeamDefinition.h (added)
• mixedTools.h (added)
• nomdElements.h (modified) (1 diff)
• pspa.h (modified) (3 diffs)
• soleDefinition.h (modified) (1 diff)

Interface_Web/trunk/pspaWT/include/LigneFaisceau.h

@@ -23 +23 @@
 
   WHBoxLayout* beamLayout_;
-  dataManager* dtmanage_;
+  //  dataManager* dtmanage_;
+  PspaApplication* pspa_;
 
 public:
@@ -30 +31 @@
 private:
   void dropEvent(WDropEvent evt);
-  void lancerCalcul();
-  void openDriftParametersForm();
-  PspaApplication* pspa_;
+  //  void lancerCalcul();
+  //  void openDriftParametersForm(int etiquette);
+
+
 };
 

Interface_Web/trunk/pspaWT/include/abstractElementDefinition.h

@@ -5 +5 @@
 #include <sstream>
 #include <string>
+
 
 #include "mathematicalTools.h"
@@ -17 +18 @@
  protected:
 
+  double phaseStep_; // a recuperer dans les parametres globaux (methode setPhaseStep)
+  double phaseStepMax_;
+
+  double defaultLength_;
+  double defaultAperture_;
+
+
+
   string label_;
   nomdElement elementName_;
@@ -22 +31 @@
   double aperture_; // cm
 
-  double stepmaxcm_;//  (cm)
+  double stepmaxcm_;
+  //  bool curvedTrajectory_;
 
-  bool curvedTrajectory_;
+  void setDefaultValues() 
+  {
+      defaultLength_ = 0.0;
+      defaultAperture_ = 1.e+6;
+    phaseStep_ = 0.0;
+    phaseStepMax_ = 10.;
+  }
+
+
+  void setDefaults() 
+  {
+    lenghtElem_ = defaultLength_;
+    aperture_ = defaultAperture_;
+  }
+
  public :
 
 
- AbstractElementDefinition() : label_(string("")), lenghtElem_(0.0), aperture_(0.0), stepmaxcm_(1000000.), curvedTrajectory_(false) {;}
+ AbstractElementDefinition() 
+    {
+      label_ = string("");
+      setDefaultValues();
+      setDefaults();
+      stepmaxcm_ = 1000000;
+      //      curvedTrajectory_ = false;
+    }
 
 
-AbstractElementDefinition(string lab, double ll, double ap)
+  AbstractElementDefinition(string lab)
     {
       label_ = lab;
-      lenghtElem_ = ll;
-      aperture_ = ap;
-      stepmaxcm_ = 1000000. ;
-      curvedTrajectory_ = false;
+      setDefaultValues();
+      setDefaults();
+      stepmaxcm_ = 1000000;
+      //      curvedTrajectory_ = false;
     }
 
 virtual  ~AbstractElementDefinition() {;}
+
+  void setPhaseStep(double ph) { phaseStep_ = ph;}
+
+
+ void setParameters(double ll, double aper) 
+  {
+    lenghtElem_ = ll;
+    aperture_ = aper;
+  }
+
+ virtual void setParametersString(string* param)  = 0;
 
 string getLabel() const
@@ -53 +95 @@
   }
 
-  double getStepMaxcm() const
-  {
-    return stepmaxcm_;
-  }
 
  double getLenghtOfElement() const { return lenghtElem_;}
 
- //  double setLenght(double xl) { lenghtElem_ = xl;}
+ virtual string* getParametersString() const = 0;
 
 
  virtual string parmelaOutputFlow() const =0;
 
+ virtual double getInitialKineticEnergy() const {return 0.0;}
 
 };

Interface_Web/trunk/pspaWT/include/bendDefinition.h

@@ -24 +24 @@
  BendDefinition()  : AbstractElementDefinition() {elementName_ = bend;}
 
- BendDefinition(string lab, double ll, double ap, double WrMeV, double alphaRad) ;
+ BendDefinition(string lab) ;
 
 

Interface_Web/trunk/pspaWT/include/cellDefinition.h

@@ -74 +74 @@
 }
 
-  CellDefinition(string lab, double ll, double ap, double freq, double E0, int nc, double stepmax_cm, int symIndex, double sinphi, double cosphi, double Baxial, carteChamp* carte );
+  CellDefinition(string lab);
 
 

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -4 +4 @@
 #include "abstractElementDefinition.h"
 #include "elementsCollection.h"
-
-
-using namespace std;
+#include "globalParameters.h"
+//#include "driftDefinition.h"
+//using namespace std;
 
 class dataManager
@@ -12 +12 @@
 
   elementsCollection elementsGallery_;
+  globalParameters globParam_;
+
+
   void createInputFileParmela( int indexDeb, int indexFin);
   void executeParmela( int indexDeb, int indexFin);
@@ -18 +21 @@
 
   
-  dataManager();
-  ~dataManager();
+  dataManager() {;}
+  ~dataManager() {;}
 
   inline int beamLineSize() {return elementsGallery_.size();}
-
-  void addDrift();
+  inline globalParameters* getGlobalParameters()  {return &globParam_;}
+  AbstractElementDefinition* addCell();
+  AbstractElementDefinition* addDrift();
+  AbstractElementDefinition* addInitialBeam();
   void executeAll();
 };

Interface_Web/trunk/pspaWT/include/driftDefinition.h

@@ -2 +2 @@
 #define DRIFTDEFINITION_SEEN
 
+#include <iostream>
 #include <string>
 #include "abstractElementDefinition.h"
 #include "mathematicalTools.h"
-
+#include "mixedTools.h"
 
 using namespace std;
@@ -13 +14 @@
 {
 
-
+  int nbParam_;
+  string* parametersString_;
 
  public:
 
- DriftDefinition() : AbstractElementDefinition() {elementName_ = drift;}
+ DriftDefinition() : AbstractElementDefinition() 
+{
+  elementName_ = drift;
+  nbParam_ = 2;
+  parametersString_ = new string[nbParam_+1];
+}
 
- DriftDefinition(string lab, double ll, double ap) : AbstractElementDefinition(lab, ll, ap)
+ DriftDefinition(string lab) : AbstractElementDefinition(lab)
  {
    elementName_ = drift;
+  nbParam_ = 2;
+  parametersString_ = new string[nbParam_+1];
 }
 
   ~DriftDefinition() {;}
 
+ virtual string* getParametersString() const 
+ {
+   std::cout << " getParametersString long= " << lenghtElem_ << " ouv= " << aperture_ << std::endl;
+   parametersString_[0] = mixedTools::intToString(nbParam_);
+   parametersString_[1] = mixedTools::doubleToString(lenghtElem_);
+   parametersString_[2] = mixedTools::doubleToString(aperture_);
+   return parametersString_;
+ }
+
+ virtual void setParametersString(string* param)
+ {
+        if ( param == NULL )
+        {
+          cerr << "  DriftDefinition::setParametersString parameters empty parameter set";
+          return;
+        }
+        int nbparam = atoi(param[0].c_str());
+    if ( nbparam != nbParam_ ) 
+        {
+          cerr << "  DriftDefinition::setParametersString parameters do not match for a DRIFT";
+          return;
+        }
+    lenghtElem_ = atof(param[1].c_str());
+    aperture_  = atof(param[2].c_str());
+ }
 
 virtual  string parmelaOutputFlow() const

Interface_Web/trunk/pspaWT/include/driftForm.h

@@ -12 +12 @@
 #include <Wt/WText>
 #include <Wt/WLabel>
+#include <Wt/WBreak>
 
 using namespace Wt;
 
-class driftForm : public WTable
+class driftForm 
 {
  public:
 
-  driftForm(PspaApplication* ps, WContainerWidget *parent = 0);
+  driftForm(PspaApplication* ps);
 
  private:
 
   void submit();
+  void driftDialogDone();
 
 
   PspaApplication* pspa_;
-  WLineEdit* xlengthEdit_;
-  WLineEdit* apertureEdit_;
+    WLineEdit* xlengthEdit_;
+  //  WLineEdit* apertureEdit_;
 };
 #endif

Interface_Web/trunk/pspaWT/include/elementsCollection.h

@@ -7 +7 @@
 #include "abstractElementDefinition.h"
 #include "driftDefinition.h"
-#include "cellDefinition.h"
-#include "bendDefinition.h"
-#include "soleDefinition.h"
+#include "initialBeamDefinition.h"
+#include "elementCell.h"
+//#include "cellDefinition.h"
+//#include "bendDefinition.h"
+//#include "soleDefinition.h"
 
 
-using namespace std;
+//using namespace std;
 
 
@@ -19 +21 @@
 
 
-  vector < pair<AbstractElementDefinition*, double > > elements_;
-  double zdebCurrent_;
+  vector < AbstractElementDefinition*> elements_;
+
 
  public:
 
 
-  elementsCollection() {zdebCurrent_ = 0.0;}
+  elementsCollection() {;}
 
 ~elementsCollection() 
@@ -32 +34 @@
     for (k=0; k < elements_.size(); k++)
       {
-        if ( elements_[k].first != NULL ) delete elements_[k].first;
+        if ( elements_[k] != NULL ) delete elements_[k];
       }
   }
@@ -38 +40 @@
  inline int size() { return elements_.size(); }
 
-inline void createDrift(string label, double lenght, double aperture)
+inline AbstractElementDefinition* createNewDrift()
  {
-   elements_.push_back( make_pair(new DriftDefinition(label,lenght, aperture), zdebCurrent_ ));
-   zdebCurrent_ += lenght;
+   elements_.push_back(new DriftDefinition());
+   return elements_.back();
  }
 
-inline void createBend(string label, double lenght, double aperture, double WrMeV, double alphaDeg)
+inline AbstractElementDefinition* createNewInitialBeam()
  {
-   elements_.push_back( make_pair (new BendDefinition(label, lenght, aperture,  WrMeV,  alphaDeg), zdebCurrent_) );
-   zdebCurrent_ += lenght;
+   elements_.push_back(new initialBeamDefinition());
+   return elements_.back();
  }
 
-inline void createCell(string lab, double lenght, double ap, double freq, double E0, int nc, double dwtmax, int symIndex, double sinphi, double cosphi, double Baxial, carteChamp* carte)
+inline AbstractElementDefinition* createNewCell()
  {
-   elements_.push_back( make_pair( new CellDefinition(lab, lenght, ap, freq, E0, nc, dwtmax, symIndex, sinphi, cosphi, Baxial, carte), zdebCurrent_) );
-   zdebCurrent_ += lenght;
+   elements_.push_back(new elementCell());
+   return elements_.back();
  }
-
-inline  void createSolenoid(string label,double lenght,double aperture,double BGauss)
-  {
-    elements_.push_back( make_pair( new SolenoidDefinition(label,lenght,aperture,BGauss), zdebCurrent_) );
-   zdebCurrent_ += lenght;
-  }
 
 
@@ -70 +66 @@
    for ( k=0; k < elements_.size() ; k++)
      {
-       if ( elements_[k].first->getLabel() == label ) return elements_[k].first;         
+       if ( elements_[k]->getLabel() == label ) return elements_[k];     
      }
-   cerr << " elementsCollection::getElementPointer() : unknown element label: " << label << endl;
+   std::cerr << " elementsCollection::getElementPointer() : unknown element label: " << label << std::endl;
    return NULL;
  }
@@ -80 +76 @@
  {
    if ( index >= elements_.size() ) return NULL;
-   else  return elements_[index].first;          
+   else  return elements_[index];        
  }
 

Interface_Web/trunk/pspaWT/include/nomdElements.h

@@ -5 +5 @@
 typedef enum 
   {
-    drift, cell, bend, sole, solenoidalBmap
+    initialBeam, drift, cell, bend, sole, solenoidalBmap
   }    nomdElement;
 

Interface_Web/trunk/pspaWT/include/pspa.h

@@ -11 +11 @@
 #include <Wt/WImage>
 #include <Wt/WTextArea>
+
+#include "dataManager.h"
 
 // c++0x only, for std::bind
@@ -26 +28 @@
   WWidget* createPalette();
   WWidget* createBeamLine();
+  WWidget* createGlobalParamWidget();
   void createDragImage(const char *url, const char *smallurl,
                   const char *mimeType,
@@ -33 +36 @@
   }
 
+  inline dataManager* getDataManager() const 
+  {
+    return dtmanage_;
+  }
+
  private :
   WTextArea* console_;
+  dataManager* dtmanage_;
 };
 

Interface_Web/trunk/pspaWT/include/soleDefinition.h

@@ -19 +19 @@
  SolenoidDefinition() :  AbstractElementDefinition() {elementName_ = sole;}
 
- SolenoidDefinition(string lab,double ll,double ap,double BGauss) : AbstractElementDefinition(lab,ll,ap)
+ SolenoidDefinition(string lab) : AbstractElementDefinition(lab)
     {
       elementName_ = sole;