Changeset 266 in PSPA


Ignore:
Timestamp:
Jan 22, 2013, 1:43:06 PM (11 years ago)
Author:
garnier
Message:

refactoring suite

Location:
Interface_Web/trunk/pspaWT
Files:
1 deleted
18 edited

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/History

    r261 r266  
    8822 Janvier 2012  Laurent Garnier
    99- Fix probleme de compilation introduit par la dernière revision (260)
     10- refactoring (suite)
    1011
    111221 Janvier 2012  Laurent Garnier

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

    r261 r266  
    22#define GWTABSTRACELEMENT_SEEN
    33
    4 //#include "GWt_pspaApplication.h"
    54#include "GWt_draggableImage.h"
    65#include "abstractElement.h"
    … …  
    1514using namespace std;
    1615
     16class GWt_elementLigneFaisceau;
     17
    1718class GWt_abstractElement : public WContainerWidget
    1819{
    … …  
    2021
    2122  //  PspaApplication* pspa_;
    22   abstractElement* element_;
     23  abstractElement* abstractElement_;
    2324
    2425  WDialog* dialog_;
    … …  
    3334 public :
    3435
    35   GWt_abstractElement(abstractElement* elem);
     36  GWt_abstractElement(abstractElement* ,GWt_elementLigneFaisceau*);
    3637
    3738  // methode Factory
    … …  
    4748  virtual void dialogDone() = 0;
    4849  virtual WImage* getImage() = 0;
    49 
     50   
     51private:
     52    GWt_elementLigneFaisceau* elementLigneFaiseauContainer_;
    5053};
    5154#endif

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

    r260 r266  
    1919 public :
    2020
    21   GWt_beam(abstractElement* elem);
     21  GWt_beam(abstractElement* elem ,GWt_elementLigneFaisceau*);
    2222  ~GWt_beam() {;}
    2323  virtual void dialogDone();

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

    r260 r266  
    1919 public :
    2020
    21   GWt_bend(abstractElement* elem);
     21  GWt_bend(abstractElement* elem ,GWt_elementLigneFaisceau*);
    2222  ~GWt_bend() {;}
    2323  virtual void dialogDone();

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

    r260 r266  
    2929 public :
    3030
    31   GWt_cell(abstractElement* elem);
     31  GWt_cell(abstractElement* elem ,GWt_elementLigneFaisceau*);
    3232  ~GWt_cell() {;}
    3333  virtual void dialogDone();

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

    r260 r266  
    2222 public:
    2323
    24   GWt_drift(abstractElement* elem);
     24  GWt_drift(abstractElement* elem ,GWt_elementLigneFaisceau*);
    2525  ~GWt_drift() {;}
    2626  virtual void dialogDone();

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

    r260 r266  
    1616 public :
    1717
    18 GWt_fit(abstractElement* elem);
     18GWt_fit(abstractElement* elem ,GWt_elementLigneFaisceau*);
    1919~GWt_fit() {;}
    2020 virtual void dialogDone();

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

    r260 r266  
    2727 public :
    2828
    29   GWt_rfgun(abstractElement* elem);
     29  GWt_rfgun(abstractElement* elem ,GWt_elementLigneFaisceau*);
    3030  ~GWt_rfgun() {;}
    3131  virtual void dialogDone();

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

    r260 r266  
    2828 public :
    2929
    30   GWt_soleno( abstractElement* elem);
     30  GWt_soleno( abstractElement* elem ,GWt_elementLigneFaisceau*);
    3131  ~GWt_soleno() {;}
    3232  virtual  void dialogDone();

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

    r262 r266  
    44
    55#include "GWt_abstractElement.h"
     6#include "GWt_elementLigneFaisceau.h"
    67#include "GWt_rfgun.h"
    78#include "GWt_drift.h"
    … …  
    2021#include <Wt/WApplication>
    2122
    22 GWt_abstractElement::GWt_abstractElement(abstractElement* elem)
     23GWt_abstractElement::GWt_abstractElement(abstractElement* elem,GWt_elementLigneFaisceau* elemLigne)
    2324  : WContainerWidget()
    2425{
    2526  //  pspa_ = ps;
    26   element_ = elem;
     27  abstractElement_ = elem;
     28    elementLigneFaiseauContainer_ = elemLigne;
     29}
    2730
    28   // FIXME : A quoi sert ce bout de code ?
    29   /*
    30   dropped_ = new GWt_draggableImage(element_->getNomdElement().getElementImage());
    31   dropped_->setObjectName("aPushButton");
    32   //  dropped_->setIcon(element_->getNomdElement().getElementImage());
    33   dropped_->setMaximumSize(50,37);
    34   dropped_->clicked().connect(this,&GWt_abstractElement::clicked);
    35 
    36   wc_ = new WContainerWidget();
    37   wc_->setObjectName("aContainer");
    38   wc_->addWidget(dropped_);
    39   */
    40 
    41   WBreak *bk= new WBreak();
    42   bk->setObjectName("aBreak");
    43 //  wc_->addWidget(bk);
    44   //wc_->addWidget(new WBreak());
    45 }
    4631
    4732string* GWt_abstractElement::beginDialog()
    4833{
    49   string* param = element_-> getParametersString();
     34  string* param = abstractElement_-> getParametersString();
    5035 
    5136  if ( param == NULL )
    … …  
    5338      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
    5439        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
    55         console->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName());
     40        console->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + abstractElement_->getNomdElement().getElementName());
    5641      }
    5742    }
    … …  
    6045  //  int nbparam = atoi(param[++compteur].c_str());
    6146  int nbparam = atoi(param->c_str());
    62   if ( nbparam != element_->getNbParams())
     47  if ( nbparam != abstractElement_->getNbParams())
    6348    {
    6449      if ( static_cast<GWt_console*> (wApp->findWidget ("console"))) {
    6550        GWt_console* console = static_cast<GWt_console*> (wApp->findWidget ("console"));
    66       console->addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName());
     51      console->addConsoleMessage(" element seems not to be a " + abstractElement_->getNomdElement().getElementName());
    6752      }
    6853    }
    6954
    70   dialog_ = new WDialog("element " + element_->getNomdElement().getElementName());
     55  dialog_ = new WDialog("element " + abstractElement_->getNomdElement().getElementName());
    7156  new WText(" label of the element : ",dialog_->contents());
    7257  //  labelEdit_ = new WLineEdit(param[++compteur].c_str(), dialog_->contents());
    … …  
    7964void GWt_abstractElement::updateLabelWidget()
    8065{
    81   string str = element_->getLabel();
     66    elementLigneFaiseauContainer_->setElementName(abstractElement_->getLabel());
     67   
     68    /*  string str = abstractElement_->getLabel();
    8269  wc_item_->setText(str);
     70*/
    8371}
    8472
    8573void GWt_abstractElement::setLabelWidget()
    8674{
    87   string str = element_->getLabel();
     75/*
     76 string str = abstractElement_->getLabel();
    8877  wc_item_ = new WText(str);
    8978  wc_item_->setObjectName("aText");
    9079  wc_->addWidget(wc_item_);
     80*/
    9181}
    9282
    … …  
    10393
    10494abstractElement* GWt_abstractElement::getElement() {
    105   return element_;
     95  return abstractElement_;
    10696}
    10797
    10898GWt_abstractElement* GWt_abstractElement::ajoute(abstractElement* ptr)
    10999{
    110   typedElement eType = ptr->getNomdElement().getElementType();
     100/*
     101 typedElement eType = ptr->getNomdElement().getElementType();
    111102
    112103  switch (  eType ) {
    … …  
    121112  default : return NULL;
    122113  }
     114*/
    123115}
    124116

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

    r260 r266  
    88#include <Wt/WPushButton>
    99
    10 GWt_beam::GWt_beam(abstractElement* elem) : GWt_abstractElement(elem) {
     10GWt_beam::GWt_beam(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne) {
    1111
    1212
    … …  
    4848  image_ = new WImage("htdocs/beam.jpg",this);
    4949
     50  // activate slots
     51    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     52
    5053}
    5154
    5255void GWt_beam::dialogDone()
    5356{
    54   unsigned nbParam = element_->getNbParams();
     57  unsigned nbParam = abstractElement_->getNbParams();
    5558  string* envoi = new string[nbParam+1];
    5659  int compteur = -1;
    … …  
    6871    return;
    6972  }
    70   element_->setParametersString(envoi);
     73  abstractElement_->setParametersString(envoi);
    7174  updateLabelWidget();
    7275  delete [] envoi;

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

    r260 r266  
    99#include <Wt/WPushButton>
    1010
    11 GWt_bend::GWt_bend(abstractElement* elem) : GWt_abstractElement(elem)
     11GWt_bend::GWt_bend(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)
    1212{
    1313
    … …  
    4848  // make image
    4949  image_ = new WImage("htdocs/bend.jpg",this);
     50
     51    // activate slots
     52    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     53   
     54
    5055}
    5156
    5257void GWt_bend::dialogDone()
    5358{
    54   unsigned nbParam = element_->getNbParams();
     59  unsigned nbParam = abstractElement_->getNbParams();
    5560  string* envoi = new string[nbParam+1];
    5661  int compteur = -1;
    … …  
    6974    return;
    7075  }
    71   element_->setParametersString(envoi);
     76  abstractElement_->setParametersString(envoi);
    7277  updateLabelWidget();
    7378  delete [] envoi;

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

    r260 r266  
    1010#include <Wt/WPanel>
    1111
    12 GWt_cell::GWt_cell(abstractElement* elem) : GWt_abstractElement(elem)
     12GWt_cell::GWt_cell(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)
    1313{
    1414
    … …  
    7171  image_ = new WImage("htdocs/cell.jpg",this);
    7272 
     73    // activate slots
     74    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     75   
     76
    7377}
    7478
    7579void GWt_cell::dialogDone()
    7680{
    77   unsigned nbParam = element_->getNbParams();
     81  unsigned nbParam = abstractElement_->getNbParams();
    7882  string* envoi = new string[nbParam+1];
    7983  int compteur = -1;
    … …  
    9498    return;
    9599  }
    96   element_->setParametersString(envoi);
     100  abstractElement_->setParametersString(envoi);
    97101  updateLabelWidget();
    98102  delete [] envoi;

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

    r260 r266  
    99#include <Wt/WPushButton>
    1010
    11 GWt_drift::GWt_drift(abstractElement* elem) : GWt_abstractElement(elem)
     11GWt_drift::GWt_drift(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem,elemLigne)
    1212{
    1313
    … …  
    2626  // make image
    2727  image_ = new WImage("htdocs/drift.jpg",this);
     28   
     29    // activate slots
     30    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     31   
    2832}
    2933
    3034void GWt_drift::dialogDone()
    3135{
    32   unsigned nbParam = element_->getNbParams();
     36  unsigned nbParam = abstractElement_->getNbParams();
    3337  string* envoi = new string[nbParam+1];
    3438  int compteur = -1;
    … …  
    4145    return;
    4246  }
    43   element_->setParametersString(envoi);
     47  abstractElement_->setParametersString(envoi);
    4448  updateLabelWidget();
    4549  delete [] envoi;

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

    r260 r266  
    99#include <Wt/WComboBox>
    1010
    11 GWt_fit::GWt_fit(abstractElement* elem) : GWt_abstractElement(elem)
     11GWt_fit::GWt_fit(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)
    1212{
    1313
    … …  
    5050  image_ = new WImage("htdocs/fit.jpg",this);
    5151
     52    // activate slots
     53    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     54   
    5255}
    5356
    5457void GWt_fit::dialogDone()
    5558{
    56   unsigned nbParam = element_->getNbParams();
     59  unsigned nbParam = abstractElement_->getNbParams();
    5760  string* envoi = new string[nbParam+1];
    5861  int compteur = -1;
    … …  
    7073    return;
    7174  }
    72   element_->setParametersString(envoi);
     75  abstractElement_->setParametersString(envoi);
    7376  updateLabelWidget();
    7477  delete [] envoi;

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

    r260 r266  
    11#include <iostream>
    22
    3 #include "GWt_elementLigneFaiseau.h"
     3#include "GWt_elementLigneFaisceau.h"
    44#include "GWt_ligneFaisceau.h"
    55#include "GWt_drift.h"
    … …  
    3535
    3636  // add the first drop zone
    37   ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau());
     37  ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau());
    3838
    3939    // add a last element to push everything
    … …  
    6262
    6363  // add first dropZone
    64   ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau());
     64  ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau());
    6565
    6666  for(k = 0; k < (unsigned)nbElem; k++)
    … …  
    7474 */
    7575      nObjets_[ptr->getNomdElement().getElementType()].incr();
    76       GWt_elementLigneFaiseau* dropZone = new GWt_elementLigneFaiseau(ptr);
     76      GWt_elementLigneFaisceau* dropZone = new GWt_elementLigneFaisceau(ptr);
    7777
    7878        /*      dropZone->addElement(gw->getWidget());
    … …  
    105105
    106106//  ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau(ptr),0);
    107   ligneFaisceauLayout_->insertWidget(ligneFaisceauLayout_->count()-1,new GWt_elementLigneFaiseau(ptr),0);
     107  ligneFaisceauLayout_->insertWidget(ligneFaisceauLayout_->count()-1,new GWt_elementLigneFaisceau(ptr),0);
    108108}
    109109

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

    r260 r266  
    88#include <Wt/WPushButton>
    99
    10 GWt_rfgun::GWt_rfgun(abstractElement* elem) : GWt_abstractElement(elem)
     10GWt_rfgun::GWt_rfgun(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)
    1111{
    1212
    … …  
    4545  image_ = new WImage("htdocs/rfgun.jpg",this);
    4646
     47    // activate slots
     48    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     49   
    4750}
    4851
    4952void GWt_rfgun::dialogDone()
    5053{
    51   unsigned nbParam = element_->getNbParams();
     54  unsigned nbParam = abstractElement_->getNbParams();
    5255  string* envoi = new string[nbParam+1];
    5356  int compteur = -1;
    … …  
    6467    return;
    6568  }
    66   element_->setParametersString(envoi);
     69  abstractElement_->setParametersString(envoi);
    6770  updateLabelWidget();
    6871  delete [] envoi;

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

    r260 r266  
    88#include <Wt/WPushButton>
    99
    10 GWt_soleno::GWt_soleno(abstractElement* elem) : GWt_abstractElement(elem)
     10GWt_soleno::GWt_soleno(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)
    1111{
    1212  string* param = beginDialog();
    … …  
    3030  // make image
    3131  image_ = new WImage("htdocs/soleno.jpg",this);
     32   
     33    // activate slots
     34    image_->clicked().connect(this,&GWt_abstractElement::clicked);
     35   
    3236}
    3337
    … …  
    3539void GWt_soleno::dialogDone()
    3640{
    37   unsigned nbParam = element_->getNbParams();
     41  unsigned nbParam = abstractElement_->getNbParams();
    3842  string* envoi = new string[nbParam+1];
    3943  int compteur = -1;
    … …  
    5155    return;
    5256  }
    53   element_->setParametersString(envoi);
     57  abstractElement_->setParametersString(envoi);
    5458  updateLabelWidget();
    5559  delete [] envoi;
Note: See TracChangeset for help on using the changeset viewer.