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


Ignore:
Timestamp:
Nov 16, 2012, 4:08:33 PM (12 years ago)
Author:
lemeur
Message:

classe abstraite pour les GWt_elements

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

Legend:

Unmodified
Added
Removed

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

    r41 r83  
    55
    66#include "GWt_pspaApplication.h"
     7#include "GWt_abstractElement.h"
    78#include "abstractElement.h"
    89
    … …  
    1617using namespace std;
    1718
    18 class GWt_cell : public WContainerWidget
     19class GWt_cell : public GWt_abstractElement
    1920{
    20     PspaApplication* pspa_;
    21     abstractElement* cell_;
    22     WDialog* dialog_;
    23     WPushButton* dropped_;
     21    /* PspaApplication* pspa_; */
     22    /* abstractElement* cell_; */
     23    /* WDialog* dialog_; */
     24    /* WPushButton* dropped_; */
    2425
    2526  WLineEdit* lenghtElemEdit_; // cm
    … …  
    3435
    3536  GWt_cell() {;}
    36   ~GWt_cell() {;}
    3737
    3838 public :
    … …  
    4040 GWt_cell(PspaApplication* ps,abstractElement* elem, string image);
    4141
    42 WPushButton* getButton();
     42  ~GWt_cell() {;}
    4343
    44 void openParametersForm();
    4544
    46 void dialogDone();
     45  //WPushButton* getButton();
     46
     47  //void openParametersForm();
     48
     49virtual void dialogDone();
    4750};
    4851

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

    r82 r83  
    55#include "abstractElement.h"
    66
    7 //#include <Wt/WApplication>
    8 #include <Wt/WContainerWidget>
    9 //#include <Wt/WText>
    10 //#include <Wt/WBreak>
    11 //#include <Wt/WDialog>
    12 //#include <Wt/WPushButton>
     7//#include <Wt/WContainerWidget>
     8#include "GWt_abstractElement.h"
     9#include <Wt/WDialog>
     10#include <Wt/WPushButton>
    1311
    1412#include <iostream>
    … …  
    2119
    2220
    23 class GWt_drift : public WContainerWidget
     21class GWt_drift : public GWt_abstractElement
    2422{
    2523
    26   PspaApplication* pspa_;
    27   abstractElement* driftElement_;
    28   WDialog* dialog_;
    29   WPushButton* dropped_;
     24  /* PspaApplication* pspa_; */
     25  /* abstractElement* driftElement_; */
     26  /* WDialog* dialog_; */
     27  /* WPushButton* dropped_; */
    3028  WLineEdit* xlengthEdit_;
    3129  WLineEdit* apertureEdit_;
    … …  
    4038  ~GWt_drift() {;}
    4139
    42   WPushButton* getButton();
    43   WDialog* getDialog();
    44   void openDriftParametersForm();
    45   void driftDialogDone();
     40  /* WPushButton* getButton(); */
     41  /* WDialog* getDialog(); */
     42  /* void openDriftParametersForm(); */
     43virtual  void dialogDone();
    4644
    4745

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

    r41 r83  
    33
    44#include "GWt_pspaApplication.h"
     5#include "GWt_abstractElement.h"
    56#include "abstractElement.h"
    67
    78
    8 #include <Wt/WContainerWidget>
     9//#include <Wt/WContainerWidget>
    910
    1011#include <iostream>
    … …  
    1617
    1718
    18 class GWt_initialBeam : public WContainerWidget
     19class GWt_initialBeam : public GWt_abstractElement
    1920{
    20     PspaApplication* pspa_;
    21   abstractElement* initialBeam_;
    22   WDialog* dialog_;
    23   WPushButton* dropped_;
     21  /*   PspaApplication* pspa_; */
     22  /* abstractElement* initialBeam_; */
     23  /* WDialog* dialog_; */
     24  /* WPushButton* dropped_; */
    2425
    2526
    … …  
    3334
    3435GWt_initialBeam() {;}
    35 ~GWt_initialBeam() {;}
    3636
    3737public :
    3838
    3939 GWt_initialBeam(PspaApplication* ps,abstractElement* elem, string image);
     40~GWt_initialBeam() {;}
    4041
    41 WPushButton* getButton();
    42 WDialog* getDialog();
    43 void openParametersForm();
    44 void dialogDone();
     42/* WPushButton* getButton(); */
     43/* WDialog* getDialog(); */
     44/* void openParametersForm(); */
     45virtual void dialogDone();
    4546
    4647};

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

    r82 r83  
    44
    55#include "GWt_pspaApplication.h"
     6#include "GWt_abstractElement.h"
    67#include "abstractElement.h"
    78
    … …  
    1617
    1718
    18 class GWt_soleno : public WContainerWidget
     19class GWt_soleno : public  GWt_abstractElement
    1920{
    2021
    21   PspaApplication* pspa_;
    22   abstractElement* solenoElement_;
    23   WDialog* dialog_;
    24   WPushButton* dropped_;
     22  //  PspaApplication* pspa_;
     23  //   abstractElement* solenoElement_;
     24  //  WDialog* dialog_;
     25    //  WPushButton* dropped_;
    2526  WLineEdit* xlengthEdit_;
    2627  WLineEdit* apertureEdit_;
    … …  
    3637
    3738
    38   WPushButton* getButton();
    39   WDialog* getDialog();
    40   void openParametersForm();
    41   void dialogDone();
     39//  WPushButton* getButton();
     40//  WDialog* getDialog();
     41//  void openParametersForm();
     42virtual  void dialogDone();
    4243
    4344};
Note: See TracChangeset for help on using the changeset viewer.