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


Ignore:
Timestamp:
Oct 28, 2012, 4:12:23 PM (12 years ago)
Author:
lemeur
Message:

renommages

Location:
Interface_Web/trunk/pspaWT/include
Files:
2 added
2 deleted
12 edited

Legend:

Unmodified
Added
Removed

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

    r38 r41  
    44
    55
    6 #include "pspa.h"
    7 #include "abstractElementDefinition.h"
     6#include "GWt_pspaApplication.h"
     7#include "abstractElement.h"
    88
    99#include <Wt/WContainerWidget>
    … …  
    1919{
    2020    PspaApplication* pspa_;
    21     AbstractElementDefinition* cell_;
     21    abstractElement* cell_;
    2222    WDialog* dialog_;
    2323    WPushButton* dropped_;
    … …  
    3838 public :
    3939
    40  GWt_cell(PspaApplication* ps,AbstractElementDefinition* elem, string image);
     40 GWt_cell(PspaApplication* ps,abstractElement* elem, string image);
    4141
    4242WPushButton* getButton();

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

    r39 r41  
    22#define GRAPHDRIFTELEMENT_SEEN
    33
    4 #include "pspa.h"
    5 #include "abstractElementDefinition.h"
     4#include "GWt_pspaApplication.h"
     5#include "abstractElement.h"
    66
    77//#include <Wt/WApplication>
    … …  
    2525
    2626  PspaApplication* pspa_;
    27   AbstractElementDefinition* driftElement_;
     27  abstractElement* driftElement_;
    2828  WDialog* dialog_;
    2929  WPushButton* dropped_;
    … …  
    3636 public:
    3737
    38   GWt_drift(PspaApplication* ps, AbstractElementDefinition* elem, string image);
     38  GWt_drift(PspaApplication* ps, abstractElement* elem, string image);
    3939  WPushButton* getButton();
    4040  WDialog* getDialog();

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

    r38 r41  
    22#define GWT_GLOBALPARAMETERS_SEEN
    33
    4 //#include "dataManager.h"
    5 #include "pspa.h"
     4#include "GWt_pspaApplication.h"
    65
    76#include <Wt/WApplication>
    87#include <Wt/WContainerWidget>
    98#include <Wt/WPanel>
    10 
    11 //#include <iostream>
    12 //#include <string>
    13 //#include <sstream>
    149
    1510

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

    r38 r41  
    22#define GWT_INITIALBEAM_SEEN
    33
    4 #include "pspa.h"
    5 #include "abstractElementDefinition.h"
     4#include "GWt_pspaApplication.h"
     5#include "abstractElement.h"
    66
    7 //#include <Wt/WApplication>
     7
    88#include <Wt/WContainerWidget>
    99
    … …  
    1919{
    2020    PspaApplication* pspa_;
    21   AbstractElementDefinition* initialBeam_;
     21  abstractElement* initialBeam_;
    2222  WDialog* dialog_;
    2323  WPushButton* dropped_;
    … …  
    3737public :
    3838
    39  GWt_initialBeam(PspaApplication* ps,AbstractElementDefinition* elem, string image);
     39 GWt_initialBeam(PspaApplication* ps,abstractElement* elem, string image);
    4040
    4141WPushButton* getButton();

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

    r38 r41  
    33
    44#include "dataManager.h"
    5 #include "pspa.h"
     5#include "GWt_pspaApplication.h"
    66
    77#include <Wt/WApplication>

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

    r38 r41  
    22#define DATAMANAGER_SEEN
    33
    4 #include "abstractElementDefinition.h"
     4#include "abstractElement.h"
    55#include "elementsCollection.h"
    66#include "globalParameters.h"
    … …  
    2626  inline int beamLineSize() {return elementsGallery_.size();}
    2727  inline globalParameters* getGlobalParameters()  {return &globParam_;}
    28   AbstractElementDefinition* addCell();
    29   AbstractElementDefinition* addDrift();
    30   AbstractElementDefinition* addInitialBeam();
     28  abstractElement* addCell();
     29  abstractElement* addDrift();
     30  abstractElement* addInitialBeam();
    3131  void executeAll();
    3232};

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

    r40 r41  
    44#include <iostream>
    55#include <string>
    6 #include "abstractElementDefinition.h"
     6#include "abstractElement.h"
    77#include "mathematicalTools.h"
    88#include "MathematicalConstants.h"
    … …  
    1313
    1414// aimant dipolaire,  DANS LE PLAN XZ (le champ est dans la direction Y)
    15 class elementBend : public AbstractElementDefinition
     15class elementBend : public abstractElement
    1616{
    1717
    … …  
    2222 public:
    2323
    24  elementBend()  : AbstractElementDefinition() {elementName_ = bend;}
     24 elementBend()  : abstractElement() {elementName_ = bend;}
    2525
    2626 elementBend(string lab) ;

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

    r38 r41  
    44#include <iostream>
    55#include <string>
    6 #include "abstractElementDefinition.h"
     6#include "abstractElement.h"
    77#include "mathematicalTools.h"
    88#include "mixedTools.h"
    … …  
    1111
    1212
    13 class elementCell : public AbstractElementDefinition
     13class elementCell : public abstractElement
    1414{
    1515
    … …  
    5656 public :
    5757
    58   elementCell()  : AbstractElementDefinition()
     58  elementCell()  : abstractElement()
    5959    {
    6060      label_ = string("");

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

    r40 r41  
    44#include <iostream>
    55#include <string>
    6 #include "abstractElementDefinition.h"
     6#include "abstractElement.h"
    77#include "mathematicalTools.h"
    88#include "mixedTools.h"
    … …  
    1111
    1212
    13 class elementDrift : public AbstractElementDefinition
     13class elementDrift : public abstractElement
    1414{
    1515
    … …  
    1919 public:
    2020
    21  elementDrift() : AbstractElementDefinition()
     21 elementDrift() : abstractElement()
    2222{
    2323  elementName_ = drift;
    … …  
    2626}
    2727
    28  elementDrift(string lab) : AbstractElementDefinition(lab)
     28 elementDrift(string lab) : abstractElement(lab)
    2929 {
    3030   elementName_ = drift;

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

    r40 r41  
    44#include <iostream>
    55#include <string>
    6 #include "abstractElementDefinition.h"
     6#include "abstractElement.h"
    77#include "mathematicalTools.h"
    88#include "mixedTools.h"
    … …  
    1111
    1212
    13 class elementInitialBeam : public AbstractElementDefinition
     13class elementInitialBeam : public abstractElement
    1414{
    1515
    … …  
    5353 public:
    5454
    55  elementInitialBeam() : AbstractElementDefinition()
     55 elementInitialBeam() : abstractElement()
    5656    {
    5757      label_ = string("");

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

    r40 r41  
    44#include <iostream>
    55#include <string>
    6 #include "abstractElementDefinition.h"
     6#include "abstractElement.h"
    77
    88#include "mathematicalTools.h"
    … …  
    1010 
    1111using namespace std;
    12 class elementSoleno : public AbstractElementDefinition
     12class elementSoleno : public abstractElement
    1313{
    1414
    … …  
    1717 public :
    1818
    19  elementSoleno() :  AbstractElementDefinition() {elementName_ = sole;}
     19 elementSoleno() :  abstractElement() {elementName_ = sole;}
    2020
    21  elementSoleno(string lab) : AbstractElementDefinition(lab)
     21 elementSoleno(string lab) : abstractElement(lab)
    2222    {
    2323      elementName_ = sole;

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

    r40 r41  
    55#include <iostream>
    66#include <string>
    7 #include "abstractElementDefinition.h"
     7#include "abstractElement.h"
    88#include "elementDrift.h"
    99#include "elementInitialBeam.h"
    … …  
    1818
    1919
    20   vector < AbstractElementDefinition*> elements_;
     20  vector < abstractElement*> elements_;
    2121
    2222
    … …  
    3737 inline int size() { return elements_.size(); }
    3838
    39 inline AbstractElementDefinition* createNewDrift()
     39inline abstractElement* createNewDrift()
    4040 {
    4141   elements_.push_back(new elementDrift());
    … …  
    4343 }
    4444
    45 inline AbstractElementDefinition* createNewInitialBeam()
     45inline abstractElement* createNewInitialBeam()
    4646 {
    4747   elements_.push_back(new elementInitialBeam());
    … …  
    4949 }
    5050
    51 inline AbstractElementDefinition* createNewCell()
     51inline abstractElement* createNewCell()
    5252 {
    5353   elements_.push_back(new elementCell());
    … …  
    5757
    5858
    59 inline AbstractElementDefinition* getElementPointer(string label) const
     59inline abstractElement* getElementPointer(string label) const
    6060 {
    6161   bool test = false;
    … …  
    7070
    7171
    72 inline AbstractElementDefinition* getElementPointer(int index) const
     72inline abstractElement* getElementPointer(int index) const
    7373 {
    7474   if ( index >= elements_.size() ) return NULL;
Note: See TracChangeset for help on using the changeset viewer.