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


Ignore:
Timestamp:
Dec 28, 2012, 7:50:58 PM (12 years ago)
Author:
lemeur
Message:

addConsoleMessge en static + bricoles

Location:
Interface_Web/trunk/pspaWT/include
Files:
1 added
13 edited

Legend:

Unmodified
Added
Removed

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

    r225 r226  
    22#define GWTABSTRACELEMENT_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "abstractElement.h"
    66
    … …  
    1616 protected :
    1717
    18   PspaApplication* pspa_;
     18  //  PspaApplication* pspa_;
    1919  abstractElement* element_;
    2020
    … …  
    3030 public :
    3131
    32   GWt_abstractElement(PspaApplication* ps,abstractElement* elem);
     32  GWt_abstractElement(abstractElement* elem);
    3333
    3434  // methode Factory
    35   static GWt_abstractElement *ajoute(PspaApplication* ps,abstractElement* ptr);
     35  static GWt_abstractElement *ajoute(abstractElement* ptr);
    3636
    3737  void clicked();

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

    r180 r226  
    22#define GWT_BEAM_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66
    … …  
    1919 public :
    2020
    21   GWt_beam(PspaApplication* ps,abstractElement* elem);
     21  GWt_beam(abstractElement* elem);
    2222  ~GWt_beam() {;}
    2323  virtual void dialogDone();

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

    r202 r226  
    22#define GWT_BEND_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66
    … …  
    1919 public :
    2020
    21   GWt_bend(PspaApplication* ps,abstractElement* elem);
     21  GWt_bend(abstractElement* elem);
    2222  ~GWt_bend() {;}
    2323  virtual void dialogDone();

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

    r153 r226  
    22#define GWT_CELL_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66#include "abstractElement.h"
    … …  
    2929 public :
    3030
    31   GWt_cell(PspaApplication* ps,abstractElement* elem);
     31  GWt_cell(abstractElement* elem);
    3232  ~GWt_cell() {;}
    3333  virtual void dialogDone();

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

    r153 r226  
    22#define GRAPHDRIFTELEMENT_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66#include "abstractElement.h"
    … …  
    2222 public:
    2323
    24   GWt_drift(PspaApplication* ps,abstractElement* elem);
     24  GWt_drift(abstractElement* elem);
    2525  ~GWt_drift() {;}
    2626  virtual void dialogDone();

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

    r225 r226  
    22#define GWT_FIT_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66
    … …  
    1616 public :
    1717
    18 GWt_fit(PspaApplication* ps,abstractElement* elem);
     18GWt_fit(abstractElement* elem);
    1919~GWt_fit() {;}
    2020 virtual void dialogDone();

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

    r224 r226  
    4545
    4646
    47  WContainerWidget* console_;
     47 // WContainerWidget* console_;
    4848 WWidget* globalParam_;
    4949 WWidget* beamLine_;
    … …  
    102102 }
    103103 
    104  void addConsoleMessage(WString msg);
     104 // void addConsoleMessage(WString msg);
    105105
    106106 void updateSelections();

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

    r156 r226  
    22#define GWT_RFGUN_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66#include "abstractElement.h"
    … …  
    2727 public :
    2828
    29   GWt_rfgun(PspaApplication* ps,abstractElement* elem);
     29  GWt_rfgun(abstractElement* elem);
    3030  ~GWt_rfgun() {;}
    3131  virtual void dialogDone();

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

    r153 r226  
    22#define GWTSOLENO_SEEN
    33
    4 #include "GWt_pspaApplication.h"
     4//#include "GWt_pspaApplication.h"
    55#include "GWt_abstractElement.h"
    66#include "abstractElement.h"
    … …  
    2323 public :
    2424
    25   GWt_soleno(PspaApplication* ps, abstractElement* elem);
     25  GWt_soleno( abstractElement* elem);
    2626  ~GWt_soleno() {;}
    2727  virtual  void dialogDone();

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

    r190 r226  
    4242  inline particleBeam* getCurrentBeam() {return currentBeam_;}
    4343
    44   particleBeam* getDiagnosticBeam(int index);
     44  particleBeam* getDiagnosticBeam(unsigned index);
    4545
    4646  void addSectionToExecute(int debut, int fin, nomDeLogiciel prog);

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

    r126 r226  
    2121
    2222  void raz();
    23   int size(); 
     23  unsigned size(); 
    2424  abstractElement* addElement(typedElement elemType);
    2525  abstractElement* getElementPointer(string label) const;

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

    r224 r226  
    6161  particleBeam();
    6262
    63   ~particleBeam() {;}
     63  virtual ~particleBeam() {;}
    6464
    6565  bool setFromParmela(unsigned numeroElement,double referencefrequency);

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

    r58 r226  
    66typedef struct 
    77{
    8   int firstElement;
    9   int lastElement;
     8  unsigned firstElement;
     9  unsigned lastElement;
    1010  nomDeLogiciel software;
    1111}  sectionToExecute;
Note: See TracChangeset for help on using the changeset viewer.