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


Ignore:
Timestamp:
Dec 8, 2012, 5:53:21 PM (12 years ago)
Author:
lemeur
Message:

normalisation de l'usage de nomdElements

Location:
Interface_Web/trunk/pspaWT/include
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/include/GWt_abstractElement.h

    r126 r153  
    3232 public :
    3333
    34   GWt_abstractElement(PspaApplication* ps,abstractElement* elem,string image);
     34  //  GWt_abstractElement(PspaApplication* ps,abstractElement* elem,string image);
     35  GWt_abstractElement(PspaApplication* ps,abstractElement* elem);
    3536
    3637  // methode Factory
    37   static GWt_abstractElement *ajoute(PspaApplication* ps,abstractElement* ptr,const string& type);
     38  static GWt_abstractElement *ajoute(PspaApplication* ps,abstractElement* ptr);
    3839
    3940  void clicked();

  • Interface_Web/trunk/pspaWT/include/GWt_bend.h

    r113 r153  
    2626 public :
    2727
    28   GWt_bend(PspaApplication* ps,abstractElement* elem, string image);
     28  GWt_bend(PspaApplication* ps,abstractElement* elem);
    2929  ~GWt_bend() {;}
    3030  virtual void dialogDone();

  • Interface_Web/trunk/pspaWT/include/GWt_cell.h

    r113 r153  
    2929 public :
    3030
    31   GWt_cell(PspaApplication* ps,abstractElement* elem, string image);
     31  GWt_cell(PspaApplication* ps,abstractElement* elem);
    3232  ~GWt_cell() {;}
    3333  virtual void dialogDone();

  • Interface_Web/trunk/pspaWT/include/GWt_drift.h

    r113 r153  
    2222 public:
    2323
    24   GWt_drift(PspaApplication* ps,abstractElement* elem,string image);
     24  GWt_drift(PspaApplication* ps,abstractElement* elem);
    2525  ~GWt_drift() {;}
    2626  virtual void dialogDone();

  • Interface_Web/trunk/pspaWT/include/GWt_initialBeam.h

    r113 r153  
    2727 public :
    2828
    29   GWt_initialBeam(PspaApplication* ps,abstractElement* elem, string image);
     29  GWt_initialBeam(PspaApplication* ps,abstractElement* elem);
    3030  ~GWt_initialBeam() {;}
    3131  virtual void dialogDone();

  • Interface_Web/trunk/pspaWT/include/GWt_soleno.h

    r113 r153  
    2323 public :
    2424
    25   GWt_soleno(PspaApplication* ps, abstractElement* elem, string image);
     25  GWt_soleno(PspaApplication* ps, abstractElement* elem);
    2626  ~GWt_soleno() {;}
    2727  virtual  void dialogDone();

  • Interface_Web/trunk/pspaWT/include/abstractElement.h

    r131 r153  
    2525
    2626  string label_;
    27   typedElement elementName_;
    28   //  string transportElementName_;
     27  nomdElements elementName_;
     28
    2929  double lenghtElem_; // cm
    3030  double aperture_; // cm
    … …  
    4545  void setLabel(string lab);
    4646  string getLabel() const;
    47   typedElement getName() const;
    48   string getNameOfElement();
    49   string getNameString() const;
    50   //  string getTransportName() const;
     47  //  typedElement getName() const;
     48  nomdElements getName() const;
     49
     50  //  string getNameOfElement();
     51  //  string getNameString() const;
     52
    5153  double getLenghtOfElement() const;
    5254  int getNbParams() const; 

  • Interface_Web/trunk/pspaWT/include/nomdElements.h

    r152 r153  
    2020  nomdElements();
    2121  nomdElements(nomdElements& ne);
     22  nomdElements(const nomdElements& ne);
    2223  nomdElements(const std::string& s);
    2324  nomdElements(typedElement& eType);
    … …  
    2728  typedElement getElementType() const;
    2829  std::string getElementName() const;
    29   std::string getElementLabel();
     30  std::string getElementLabel() const;
    3031  std::string getElementImage() const;
    3132

  • Interface_Web/trunk/pspaWT/include/particleBeam.h

    r149 r153  
    7878
    7979      //       bool setFromTransport(ifstream& inp, unsigned nblignes);
    80           bool  setFromTransport(string elementLabel, typedElement elemType);
     80          bool  setFromTransport(string elementLabel, const nomdElements elem);
    8181
    8282  inline void clear()
Note: See TracChangeset for help on using the changeset viewer.