Ignore:
Timestamp:
Dec 6, 2013, 4:45:25 PM (11 years ago)
Author:
garnier
Message:

Renommage de toutes les classes d’élément dans le GWt_ par GWt_elementXXX

Location:
Interface_Web/trunk/pspaWT/sources/userInterface/src
Files:
6 edited
9 copied

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc

    r431 r437  
    77#include "GWt_abstractElement.h"
    88#include "GWt_elementLigneFaisceau.h"
    9 #include "GWt_rfgun.h"
    10 #include "GWt_drift.h"
    11 #include "GWt_cell.h"
    12 #include "GWt_bend.h"
    13 #include "GWt_soleno.h"
    14 #include "GWt_beam.h"
    15 #include "GWt_fit.h"
    16 //#include "GWt_snapshot.h"
    179
    1810#include "GWt_draggableImage.h"

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElementFactory.cc

    r431 r437  
    3434}
    3535
    36 GWt_drift* GWt_abstractElementFactory::createDriftElement()
     36GWt_elementDrift* GWt_abstractElementFactory::createDriftElement()
    3737{
    3838  if (isDriftElementEnable) {
    39     return new GWt_drift();
     39    return new GWt_elementDrift();
    4040  }
    4141  return NULL;
    4242}
    4343
    44 GWt_rfgun* GWt_abstractElementFactory::createRFGunElement()
     44GWt_elementRfgun* GWt_abstractElementFactory::createRFGunElement()
    4545{
    4646  if (isRFGunElementEnable) {
    47     return new GWt_rfgun();
     47    return new GWt_elementRfgun();
    4848  }
    4949  return NULL;
    5050}
    5151
    52 GWt_cell* GWt_abstractElementFactory::createCellElement()
     52GWt_elementCell* GWt_abstractElementFactory::createCellElement()
    5353{
    5454  if (isCellElementEnable) {
    55     return new GWt_cell();
     55    return new GWt_elementCell();
    5656  }
    5757  return NULL;
    5858}
    5959
    60 GWt_bend* GWt_abstractElementFactory::createBendElement()
     60GWt_elementBend* GWt_abstractElementFactory::createBendElement()
    6161{
    6262  if (isBendElementEnable) {
    63     return new GWt_bend();
     63    return new GWt_elementBend();
    6464  }
    6565  return NULL;
    6666}
    6767
    68 GWt_soleno* GWt_abstractElementFactory::createSolenoElement()
     68GWt_elementSoleno* GWt_abstractElementFactory::createSolenoElement()
    6969{
    7070  if (isSolenoElementEnable) {
    71     return new GWt_soleno();
     71    return new GWt_elementSoleno();
    7272  }
    7373  return NULL;
    7474}
    7575
    76 GWt_beam* GWt_abstractElementFactory::createBeamElement()
     76GWt_elementBeam* GWt_abstractElementFactory::createBeamElement()
    7777{
    7878  if (isBeamElementEnable) {
    79     return new GWt_beam();
     79    return new GWt_elementBeam();
    8080  }
    8181  return NULL;
    8282}
    8383
    84 GWt_fit* GWt_abstractElementFactory::createFitElement()
     84GWt_elementFit* GWt_abstractElementFactory::createFitElement()
    8585{
    8686  if (isFitElementEnable) {
    87     return new GWt_fit();
     87    return new GWt_elementFit();
    8888  }
    8989  return NULL;
    9090}
    9191
    92 GWt_snapshot* GWt_abstractElementFactory::createSnapshotElement()
     92GWt_elementSnapshot* GWt_abstractElementFactory::createSnapshotElement()
    9393{
    9494  if (isSnapshotElementEnable) {
    95     return new GWt_snapshot();
     95    return new GWt_elementSnapshot();
    9696  }
    9797  return NULL;
    9898}
    9999
    100 GWt_mpole* GWt_abstractElementFactory::createMPoleElement()
     100GWt_elementMpole* GWt_abstractElementFactory::createMPoleElement()
    101101{
    102102  if (isMPoleElementEnable) {
    103     return new GWt_mpole();
     103    return new GWt_elementMpole();
    104104  }
    105105  return NULL;
    … …  
    110110  vector <GWt_abstractElement*> elems;
    111111  if (isRFGunElementEnable) {
    112     elems.push_back(new GWt_rfgun());
     112    elems.push_back(new GWt_elementRfgun());
    113113  }
    114114  if (isBeamElementEnable) {
    115     elems.push_back(new GWt_beam());
     115    elems.push_back(new GWt_elementBeam());
    116116  }
    117117  if (isDriftElementEnable) {
    118     elems.push_back(new GWt_drift());
     118    elems.push_back(new GWt_elementDrift());
    119119  }
    120120  if (isBendElementEnable) {
    121     elems.push_back(new GWt_bend());
     121    elems.push_back(new GWt_elementBend());
    122122  }
    123123  if (isCellElementEnable) {
    124     elems.push_back(new GWt_cell());
     124    elems.push_back(new GWt_elementCell());
    125125  }
    126126  if (isSolenoElementEnable) {
    127     elems.push_back(new GWt_soleno());
     127    elems.push_back(new GWt_elementSoleno());
    128128  }
    129129  if (isFitElementEnable) {
    130     elems.push_back(new GWt_fit());
     130    elems.push_back(new GWt_elementFit());
    131131  }
    132132  if (isSnapshotElementEnable) {
    133     elems.push_back(new GWt_snapshot());
     133    elems.push_back(new GWt_elementSnapshot());
    134134  }
    135135  if (isMPoleElementEnable) {
    136     elems.push_back(new GWt_mpole());
     136    elems.push_back(new GWt_elementMpole());
    137137  }
    138138

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_dropZoneLigneFaisceau.cc

    r418 r437  
    44#include <Wt/WApplication>
    55
     6#include "GWt_abstractElementFactory.h"
    67#include "GWt_dropZoneLigneFaisceau.h"
    78#include "GWt_ligneFaisceau.h"

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementBeam.cc

    r436 r437  
    1 #include "GWt_beam.h"
     1#include "GWt_elementBeam.h"
    22#include "mixedTools.h"
    33
    … …  
    88#include <Wt/WPushButton>
    99
    10 GWt_beam::GWt_beam(GWt_elementLigneFaisceau* elemLigne)
     10GWt_elementBeam::GWt_elementBeam(GWt_elementLigneFaisceau* elemLigne)
    1111:GWt_abstractElement(new elementBeam())
    1212{
    … …  
    1515}
    1616
    17 void GWt_beam::initilializeDialog()
     17void GWt_elementBeam::initilializeDialog()
    1818{
    1919  string* param = beginDialog();
    … …  
    6363  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    6464  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    65   dialog_->finished().connect(this, &GWt_beam::dialogDone); 
     65  dialog_->finished().connect(this, &GWt_elementBeam::dialogDone); 
    6666}
    6767
    68 void GWt_beam::dialogDone(WDialog::DialogCode code)
     68void GWt_elementBeam::dialogDone(WDialog::DialogCode code)
    6969{
    7070  if (code != Wt::WDialog::Accepted) return;
    … …  
    8484  envoi[++compteur] = p0Edit_->text().toUTF8();
    8585  if ( compteur !=  (int)nbParam ) {
    86     cerr << " GWt_beam::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     86    cerr << " GWt_elementBeam::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    8787    return;
    8888  }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementBend.cc

    r436 r437  
    11 
    2 #include "GWt_bend.h"
     2#include "GWt_elementBend.h"
    33#include "mixedTools.h"
    44
    … …  
    99#include <Wt/WPushButton>
    1010
    11 GWt_bend::GWt_bend(GWt_elementLigneFaisceau* elemLigne )
     11GWt_elementBend::GWt_elementBend(GWt_elementLigneFaisceau* elemLigne )
    1212:GWt_abstractElement(new elementBend())
    1313{
    … …  
    1616}
    1717
    18 void GWt_bend::initilializeDialog()
     18void GWt_elementBend::initilializeDialog()
    1919{
    2020  string* param = beginDialog();
    … …  
    5252  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    5353  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    54   dialog_->finished().connect(this, &GWt_bend::dialogDone);
     54  dialog_->finished().connect(this, &GWt_elementBend::dialogDone);
    5555}
    5656
    57 void GWt_bend::dialogDone(WDialog::DialogCode code)
     57void GWt_elementBend::dialogDone(WDialog::DialogCode code)
    5858{
    5959  if (code != Wt::WDialog::Accepted) return;
    … …  
    7272  envoi[++compteur] = beta2Edit_->text().toUTF8();
    7373  if ( compteur !=  (int)nbParam ) {
    74     cerr << " GWt_bend::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     74    cerr << " GWt_elementBend::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    7575    return;
    7676  }
    … …  
    8080}
    8181
    82 WImage* GWt_bend::getImage() {
    83   return image_;
    84 }
    85 

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementCell.cc

    r436 r437  
    11
    2 #include "GWt_cell.h"
     2#include "GWt_elementCell.h"
    33#include "mixedTools.h"
    44
    … …  
    1010#include <Wt/WPanel>
    1111
    12 GWt_cell::GWt_cell(GWt_elementLigneFaisceau* elemLigne)
     12GWt_elementCell::GWt_elementCell(GWt_elementLigneFaisceau* elemLigne)
    1313:GWt_abstractElement(new elementCell())
    1414{
    … …  
    1717}
    1818
    19 void GWt_cell::initilializeDialog()
     19void GWt_elementCell::initilializeDialog()
    2020{
    2121  string* param = beginDialog();
    … …  
    7474  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    7575  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    76   dialog_->finished().connect(this, &GWt_cell::dialogDone);
     76  dialog_->finished().connect(this, &GWt_elementCell::dialogDone);
    7777}
    7878
    79 void GWt_cell::dialogDone(WDialog::DialogCode code)
     79void GWt_elementCell::dialogDone(WDialog::DialogCode code)
    8080{
    8181  if (code != Wt::WDialog::Accepted) return;
    … …  
    9797  envoi[++compteur] = scaleFactorEdit_->text().toUTF8();
    9898  if ( compteur !=  (int)nbParam ) {
    99     cerr << " GWt_cell::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     99    cerr << " GWt_elementCell::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    100100    return;
    101101  }
    … …  
    104104  delete [] envoi;
    105105}
    106 
    107 WImage* GWt_cell::getImage() {
    108   return image_;
    109 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementDrift.cc

    r436 r437  
    11
    2 #include "GWt_drift.h"
     2#include "GWt_elementDrift.h"
    33#include "mixedTools.h"
    44
    … …  
    99#include <Wt/WPushButton>
    1010
    11 GWt_drift::GWt_drift(GWt_elementLigneFaisceau* elemLigne)
     11GWt_elementDrift::GWt_elementDrift(GWt_elementLigneFaisceau* elemLigne)
    1212:GWt_abstractElement(new elementDrift())
    1313{
    … …  
    1616}
    1717
    18 void GWt_drift::initilializeDialog()
     18void GWt_elementDrift::initilializeDialog()
    1919{
    2020  string* param = beginDialog();
    … …  
    3131  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    3232  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    33   dialog_->finished().connect(this, &GWt_drift::dialogDone);
     33  dialog_->finished().connect(this, &GWt_elementDrift::dialogDone);
    3434}
    3535
    36 void GWt_drift::dialogDone(WDialog::DialogCode code)
     36void GWt_elementDrift::dialogDone(WDialog::DialogCode code)
    3737{
    3838  if (code != Wt::WDialog::Accepted) return;
    … …  
    4747  envoi[++compteur] = apertureEdit_->text().toUTF8();
    4848  if ( compteur !=  (int)nbParam ) {
    49     cerr << " GWt_drift::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     49    cerr << " GWt_elementDrift::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    5050    return;
    5151  }
    … …  
    5555}
    5656
    57 WImage* GWt_drift::getImage() {
    58   return image_;
    59 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementFit.cc

    r436 r437  
    1 #include "GWt_fit.h"
     1#include "GWt_elementFit.h"
    22#include "mixedTools.h"
    33
    … …  
    99#include <Wt/WComboBox>
    1010
    11 GWt_fit::GWt_fit(GWt_elementLigneFaisceau* elemLigne)
     11GWt_elementFit::GWt_elementFit(GWt_elementLigneFaisceau* elemLigne)
    1212:GWt_abstractElement(new elementFit())
    1313{
    … …  
    1616}
    1717
    18 void GWt_fit::initilializeDialog()
     18void GWt_elementFit::initilializeDialog()
    1919{
    2020  string* param = beginDialog();
    … …  
    5454  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    5555  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    56   dialog_->finished().connect(this, &GWt_fit::dialogDone);
     56  dialog_->finished().connect(this, &GWt_elementFit::dialogDone);
    5757}
    5858
    59 void GWt_fit::dialogDone(WDialog::DialogCode code)
     59void GWt_elementFit::dialogDone(WDialog::DialogCode code)
    6060{
    6161  if (code != Wt::WDialog::Accepted) return;
    … …  
    6868  envoi[++compteur] = labelEdit_->text().toUTF8();
    6969  string variableString = nameEdit_->currentText().toUTF8();
    70   cout << " GWt_fit::dialogDone() variable a fitter : " << variableString << endl;
     70  cout << " GWt_elementFit::dialogDone() variable a fitter : " << variableString << endl;
    7171  envoi[++compteur] = variableString;
    7272  envoi[++compteur] = valueEdit_->text().toUTF8();
    7373  envoi[++compteur] = tolerEdit_->text().toUTF8();
    7474  if ( compteur !=  (int)nbParam ) {
    75     cerr << " GWt_fit::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     75    cerr << " GWt_elementFit::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    7676    return;
    7777  }
    … …  
    8181}
    8282
    83 WImage* GWt_fit::getImage() {
    84   return image_;
    85 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc

    r431 r437  
    22
    33#include "GWt_elementLigneFaisceau.h"
     4#include "GWt_abstractElementFactory.h"
    45#include "nomdElements.h"
    56#include "GWt_console.h"
    67#include "abstractElement.h"
    7 #include "GWt_rfgun.h"
    8 #include "GWt_drift.h"
    9 #include "GWt_cell.h"
    10 #include "GWt_bend.h"
    11 #include "GWt_soleno.h"
    12 #include "GWt_beam.h"
    13 #include "GWt_fit.h"
    14 #include "GWt_snapshot.h"
    15 #include "GWt_mpole.h"
    168
    179
    … …  
    9587  switch (  eType ) {
    9688  case nomdElements::RFgun :
    97     GWt_abstractElement_ = new GWt_rfgun(this);
     89    GWt_abstractElement_ = new GWt_elementRfgun(this);
    9890    break;
    9991  case nomdElements::drift :
    100     GWt_abstractElement_ = new GWt_drift(this);
     92    GWt_abstractElement_ = new GWt_elementDrift(this);
    10193    break;
    10294  case nomdElements::cell  :
    103     GWt_abstractElement_ = new GWt_cell(this);
     95    GWt_abstractElement_ = new GWt_elementCell(this);
    10496    break;
    10597  case nomdElements::bend  :
    106     GWt_abstractElement_ = new GWt_bend(this);
     98    GWt_abstractElement_ = new GWt_elementBend(this);
    10799    break;
    108100  case nomdElements::soleno  :
    109     GWt_abstractElement_ = new GWt_soleno(this);
     101    GWt_abstractElement_ = new GWt_elementSoleno(this);
    110102    break;
    111103  case nomdElements::beam  :
    112     GWt_abstractElement_ = new GWt_beam(this);
     104    GWt_abstractElement_ = new GWt_elementBeam(this);
    113105    break;
    114106  case nomdElements::fit  :
    115     GWt_abstractElement_ = new GWt_fit(this);
     107    GWt_abstractElement_ = new GWt_elementFit(this);
    116108    break;
    117109  case nomdElements::mpole  :
    118     GWt_abstractElement_ = new GWt_mpole(this);
     110    GWt_abstractElement_ = new GWt_elementMpole(this);
    119111    break;
    120112  case nomdElements::snapshot :
    … …  
    123115      incr++;
    124116      pspa_->setExtensionFile(incr);
    125       GWt_abstractElement_ = new GWt_snapshot(this,incr);
     117      GWt_abstractElement_ = new GWt_elementSnapshot(this,incr);
    126118      break;
    127119    }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementMpole.cc

    r436 r437  
    11
    2 #include "GWt_mpole.h"
     2#include "GWt_elementMpole.h"
    33#include "mixedTools.h"
    44
    … …  
    99#include <Wt/WPushButton>
    1010
    11 GWt_mpole::GWt_mpole(GWt_elementLigneFaisceau* elm) : GWt_abstractElement(new elementMultipole())
     11GWt_elementMpole::GWt_elementMpole(GWt_elementLigneFaisceau* elm) : GWt_abstractElement(new elementMultipole())
    1212{
    1313  elementLigneFaiseauContainer_ = elm;
    … …  
    1515}
    1616
    17 void GWt_mpole::initilializeDialog()
     17void GWt_elementMpole::initilializeDialog()
    1818{
    1919  string* param = beginDialog();
    … …  
    2929  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    3030  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    31   dialog_->finished().connect(this, &GWt_mpole::dialogDone);
     31  dialog_->finished().connect(this, &GWt_elementMpole::dialogDone);
    3232}
    3333
    34 void GWt_mpole::dialogDone(WDialog::DialogCode code)
     34void GWt_elementMpole::dialogDone(WDialog::DialogCode code)
    3535{
    3636  if (code != Wt::WDialog::Accepted) return;
    … …  
    4545  envoi[++compteur] = componentEdit_->text().toUTF8();
    4646  if ( compteur !=  (int)nbParam ) {
    47     cerr << " GWt_mpole::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     47    cerr << " GWt_elementMpole::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    4848    return;
    4949  }
    … …  
    5454}
    5555
    56 WImage* GWt_mpole::getImage() {
     56WImage* GWt_elementMpole::getImage() {
    5757  return image_;
    5858}

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementRfgun.cc

    r436 r437  
    1 #include "GWt_rfgun.h"
     1#include "GWt_elementRfgun.h"
    22#include "mixedTools.h"
    33
    … …  
    88#include <Wt/WPushButton>
    99
    10 GWt_rfgun::GWt_rfgun(GWt_elementLigneFaisceau* elemLigne)
     10GWt_elementRfgun::GWt_elementRfgun(GWt_elementLigneFaisceau* elemLigne)
    1111:GWt_abstractElement(new elementRfgun())
    1212{
    … …  
    1515}
    1616
    17 void GWt_rfgun::initilializeDialog()
     17void GWt_elementRfgun::initilializeDialog()
    1818{
    1919  string* param = beginDialog();
    … …  
    5353  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    5454  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    55   dialog_->finished().connect(this, &GWt_rfgun::dialogDone);
     55  dialog_->finished().connect(this, &GWt_elementRfgun::dialogDone);
    5656}
    5757
    58 void GWt_rfgun::dialogDone(WDialog::DialogCode code)
     58void GWt_elementRfgun::dialogDone(WDialog::DialogCode code)
    5959{
    6060  if (code != Wt::WDialog::Accepted) return;
    … …  
    7575  envoi[++compteur] = totalChargeEdit_->text().toUTF8();
    7676  if ( compteur !=  (int)nbParam ) {
    77     cerr << " GWt_rfgun::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     77    cerr << " GWt_elementRfgun::dialogDone() pb nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    7878    return;
    7979  }
    … …  
    8282  delete [] envoi;
    8383}
    84 
    85 WImage* GWt_rfgun::getImage() {
    86   return image_;
    87 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementSnapshot.cc

    r436 r437  
    11
    2 #include "GWt_snapshot.h"
     2#include "GWt_elementSnapshot.h"
    33#include "mixedTools.h"
    44
    … …  
    99#include <Wt/WPushButton>
    1010
    11 GWt_snapshot::GWt_snapshot(GWt_elementLigneFaisceau* elemLigne, int num) : GWt_abstractElement(new elementSnapshot(num))
     11GWt_elementSnapshot::GWt_elementSnapshot(GWt_elementLigneFaisceau* elemLigne, int num) : GWt_abstractElement(new elementSnapshot(num))
    1212{
    1313  elementLigneFaiseauContainer_ = elemLigne;
    … …  
    1515}
    1616
    17 void GWt_snapshot::initilializeDialog()
     17void GWt_elementSnapshot::initilializeDialog()
    1818{
    1919  string* param = beginDialog();
    … …  
    2727  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    2828  submit->clicked().connect(dialog_,&Wt::WDialog::accept);
    29   dialog_->finished().connect(this, &GWt_snapshot::dialogDone);
     29  dialog_->finished().connect(this, &GWt_elementSnapshot::dialogDone);
    3030}
    3131
    32 void GWt_snapshot::dialogDone(WDialog::DialogCode code)
     32void GWt_elementSnapshot::dialogDone(WDialog::DialogCode code)
    3333{
    3434  if (code != Wt::WDialog::Accepted) return;
    … …  
    4242  envoi[++compteur] = snapshotFile_->text().toUTF8();
    4343  if ( compteur !=  (int)nbParam ) {
    44     cerr << " GWt_snapshot::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
     44    cerr << " GWt_elementSnapshot::dialogDone() : pb dans le nb de parametres, compteur = " << compteur << " nbParam= " << nbParam << endl;
    4545    return;
    4646  }
    … …  
    4949  delete [] envoi;
    5050}
    51 
    52 WImage* GWt_snapshot::getImage() {
    53   return image_;
    54 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementSoleno.cc

    r436 r437  
    1 #include "GWt_soleno.h"
     1#include "GWt_elementSoleno.h"
    22#include "mixedTools.h"
    33
    … …  
    88#include <Wt/WPushButton>
    99
    10 GWt_soleno::GWt_soleno(GWt_elementLigneFaisceau* elemLigne)
     10GWt_elementSoleno::GWt_elementSoleno(GWt_elementLigneFaisceau* elemLigne)
    1111:GWt_abstractElement(new elementSoleno())
    1212{
    … …  
    1515}
    1616
    17 void GWt_soleno::initilializeDialog()
     17void GWt_elementSoleno::initilializeDialog()
    1818{
    1919  string* param = beginDialog();
    … …  
    3535  WPushButton *submit= new WPushButton("OK",dialog_->contents());
    3636  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    37   dialog_->finished().connect(this, &GWt_soleno::dialogDone); 
     37  dialog_->finished().connect(this, &GWt_elementSoleno::dialogDone); 
    3838}
    3939
    40 void GWt_soleno::dialogDone(WDialog::DialogCode code)
     40void GWt_elementSoleno::dialogDone(WDialog::DialogCode code)
    4141{
    4242  if (code != Wt::WDialog::Accepted) return;
    … …  
    6363  delete [] envoi;
    6464}
    65 
    66 WImage* GWt_soleno::getImage() {
    67   return image_;
    68 }

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc

    r431 r437  
    44#include "GWt_ligneFaisceau.h"
    55
    6 #include "GWt_drift.h"
    7 #include "GWt_rfgun.h"
    8 #include "GWt_cell.h"
    9 #include "GWt_soleno.h"
    10 #include "GWt_bend.h"
    116#include "nomDeLogiciel.h"
    127

  • Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

    r436 r437  
    44#include "GWt_pspaApplication.h"
    55#include "GWt_draggableImage.h"
     6#include "GWt_abstractElementFactory.h"
    67#include "GWt_serverFileSelector.h"
    78#include "particleBeam.h"
Note: See TracChangeset for help on using the changeset viewer.