Changeset 260 in PSPA


Ignore:
Timestamp:
Jan 21, 2013, 10:55:46 PM (12 years ago)
Author:
garnier
Message:

refactoring

Location:
Interface_Web/trunk/pspaWT
Files:
12 edited
16 moved

Legend:

Unmodified
Added
Removed

  • Interface_Web/trunk/pspaWT/htdocs/pspa.css

    r259 r260  
    4545  background-size : 100% 100%;
    4646}
     47
     48.ligneFaisceau {
     49  background-image : url("background.png");
     50}

  • Interface_Web/trunk/pspaWT/sources/controler/include/nomdElements.h

    r257 r260  
    1212  typedElement e_;  // type entier (enum)
    1313  std::string eName_;  // nom de l'element
    14   std::string eImg_;  // nom du fichier de l'icone
    1514  std::string eLabel_; // label affiche sous l'icone
    1615  unsigned nbParam_;   // nombre de parametres a saisir
    … …  
    1918  static   typedElement fromLabel(std::string s);
    2019  static   std::string toName(typedElement eType);
    21   static   std::string toImage(typedElement eType);
    2220  static   std::string toLabel(typedElement eType);
    2321  static   unsigned toNbParam(typedElement eType);
    … …  
    3331
    3432  static int getNumberOfElements();
    35   static string getImageFromType( typedElement tp);
    3633  static std::string getLabelFromType(typedElement tp);
    3734  static typedElement getTypeFromLabel(std::string lb);

  • Interface_Web/trunk/pspaWT/sources/controler/src/nomdElements.cc

    r259 r260  
    4444}
    4545
    46 std::string nomdElements::toImage(typedElement eType)
    47 {
    48   switch(eType) {
    49   case beam : return string("htdocs/beam.jpg"); break;
    50   case RFgun : return string("htdocs/rfgun.jpg"); break;
    51   case drift : return string("htdocs/drift.jpg"); break;
    52   case cell : return string("htdocs/cell.jpg"); break;
    53   case bend : return string("htdocs/bend.jpg"); break;
    54   case soleno :  return string("htdocs/lens.jpg"); break;
    55   case fit :  return string("htdocs/fit.jpg"); break;
    56   default : return string("");
    57   }
    58 }
    5946
    6047std::string nomdElements::toLabel(typedElement eType)
    … …  
    9178  e_= fromImage("");
    9279  eName_ = toName(e_);
    93   eImg_ = toImage(e_);
    9480  eLabel_ = toLabel(e_);
    9581  nbParam_ = toNbParam(e_);
    … …  
    10086  e_= ne.e_;
    10187  eName_ = ne.eName_;
    102   eImg_ = ne.eImg_;
    10388  eLabel_ = ne.eLabel_;
    10489  nbParam_ = ne.nbParam_;
    … …  
    10994  e_= ne.e_;
    11095  eName_ = ne.eName_;
    111   eImg_ = ne.eImg_;
    11296  eLabel_ = ne.eLabel_;
    11397  nbParam_ = ne.nbParam_;
    … …  
    119103  e_= fromImage(s);
    120104  eName_ = toName(e_);
    121   eImg_ = toImage(e_);
    122105  eLabel_ = toLabel(e_);
    123106  nbParam_ = toNbParam(e_);
    … …  
    128111  e_= eType;
    129112  eName_ = toName(e_);
    130   eImg_ = toImage(e_);
    131113  eLabel_ = toLabel(e_);
    132114  nbParam_ = toNbParam(e_);
    … …  
    135117int nomdElements::getNumberOfElements() {
    136118  return inconnu;
    137 }
    138 
    139 std::string nomdElements::getImageFromType( typedElement tp)
    140 {
    141   return toImage(tp);
    142119}
    143120
    … …  
    161138}
    162139
    163 std::string nomdElements::getElementImage() const {
    164   return eImg_;
    165 }
    166 
    167140std::string nomdElements::getElementLabel() const
    168141{
    … …  
    183156  e_= ne.e_;
    184157  eName_ = ne.eName_;
    185   eImg_ = ne.eImg_;
    186158  eLabel_ = ne.eLabel_;
    187159  nbParam_ = ne.nbParam_;

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

    r257 r260  
    88
    99#include <Wt/WDialog>
     10#include <Wt/WImage>
    1011#include <Wt/WPushButton>
    1112#include <Wt/WContainerWidget>
    … …  
    4546
    4647  virtual void dialogDone() = 0;
     48  virtual WImage* getImage() = 0;
     49
    4750};
    4851#endif

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

    r257 r260  
    22#define GWT_BEAM_SEEN
    33
    4 //#include "GWt_pspaApplication.h"
     4
    55#include "GWt_abstractElement.h"
    66
    … …  
    2222  ~GWt_beam() {;}
    2323  virtual void dialogDone();
     24
     25  WImage* getImage();
     26
     27 private:
     28  WImage* image_;
    2429};
    2530

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

    r257 r260  
    2222  ~GWt_bend() {;}
    2323  virtual void dialogDone();
     24
     25  WImage* getImage();
     26
     27 private:
     28  WImage* image_;
    2429};
    2530#endif

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

    r257 r260  
    3232  ~GWt_cell() {;}
    3333  virtual void dialogDone();
     34
     35  WImage* getImage();
     36
     37 private:
     38  WImage* image_;
    3439};
    3540#endif

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

    r257 r260  
    2525  ~GWt_drift() {;}
    2626  virtual void dialogDone();
     27  WImage* getImage();
     28
     29 private:
     30  WImage* image_;
    2731};
    2832#endif

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

    r257 r260  
    1919~GWt_fit() {;}
    2020 virtual void dialogDone();
     21
     22  WImage* getImage();
     23
     24 private:
     25  WImage* image_;
    2126};
    2227#endif

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

    r257 r260  
    3030  ~GWt_rfgun() {;}
    3131  virtual void dialogDone();
     32
     33  WImage* getImage();
     34
     35 private:
     36  WImage* image_;
     37
    3238};
    3339#endif

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

    r257 r260  
    3131  ~GWt_soleno() {;}
    3232  virtual  void dialogDone();
     33
     34  WImage* getImage();
     35
     36 private:
     37  WImage* image_;
    3338};
    3439#endif

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

    r257 r260  
    4444  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    4545  dialog_->finished().connect(this, &GWt_beam::dialogDone);
     46
     47  // make image
     48  image_ = new WImage("htdocs/beam.jpg",this);
     49
    4650}
    4751
    … …  
    6973}
    7074
     75WImage* GWt_beam::getImage() {
     76  return image_;
     77}

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

    r257 r260  
    4545  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    4646  dialog_->finished().connect(this, &GWt_bend::dialogDone);
     47
     48  // make image
     49  image_ = new WImage("htdocs/bend.jpg",this);
    4750}
    4851
    … …  
    7073  delete [] envoi;
    7174}
     75
     76
     77WImage* GWt_bend::getImage() {
     78  return image_;
     79}

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

    r257 r260  
    6666  WPushButton *submit = new WPushButton("OK",dialog_->contents());
    6767  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    68   dialog_->finished().connect(this, &GWt_cell::dialogDone); 
     68  dialog_->finished().connect(this, &GWt_cell::dialogDone);
     69
     70  // make image
     71  image_ = new WImage("htdocs/cell.jpg",this);
     72 
    6973}
    7074
    … …  
    9498  delete [] envoi;
    9599}
     100
     101
     102WImage* GWt_cell::getImage() {
     103  return image_;
     104}

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

    r257 r260  
    2323  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    2424  dialog_->finished().connect(this, &GWt_drift::dialogDone); 
     25
     26  // make image
     27  image_ = new WImage("htdocs/drift.jpg",this);
    2528}
    2629
    … …  
    4245  delete [] envoi;
    4346}
     47
     48
     49WImage* GWt_drift::getImage() {
     50  return image_;
     51}

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

    r257 r260  
    113113     }
    114114     if (abstractElement_ != NULL) {
    115          WImage *elemImage = new WImage(abstractElement->getNomdElement().getImageFromType(eType).c_str(),this);
    116          dragElementZone_->addWidget(elemImage);
     115         dragElementZone_->addWidget(abstractElement->getImage());
    117116         dragElementZone_->setMaximumSize(32,32);
    118117         dragElementZone_->setMinimumSize(32,32);

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

    r257 r260  
    4646  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    4747  dialog_->finished().connect(this, &GWt_fit::dialogDone);
     48
     49  // make image
     50  image_ = new WImage("htdocs/fit.jpg",this);
     51
    4852}
    4953
    … …  
    7074  delete [] envoi;
    7175}
     76
     77
     78WImage* GWt_fit::getImage() {
     79  return image_;
     80}

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

    r259 r260  
    2525  ligneFaisceauLayout_ = new WHBoxLayout();
    2626  //  decorationStyle().setBackgroundColor (WColor(245,245,245));
    27   decorationStyle().setBackgroundImage (WApplication::appRoot()+"/htdocs/background.png");
     27  setStyleClass("ligneFaisceau");
    2828  setLayout(ligneFaisceauLayout_);
    2929

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

    r257 r260  
    4141  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    4242  dialog_->finished().connect(this, &GWt_rfgun::dialogDone);
     43
     44  // make image
     45  image_ = new WImage("htdocs/rfgun.jpg",this);
     46
    4347}
    4448
    … …  
    6468  delete [] envoi;
    6569}
     70
     71
     72WImage* GWt_rfgun::getImage() {
     73  return image_;
     74}

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

    r257 r260  
    2727  submit->clicked().connect(dialog_, &Wt::WDialog::accept);
    2828  dialog_->finished().connect(this, &GWt_soleno::dialogDone);
     29
     30  // make image
     31  image_ = new WImage("htdocs/soleno.jpg",this);
    2932}
    3033
    … …  
    5255  delete [] envoi;
    5356}
     57
     58
     59WImage* GWt_soleno::getImage() {
     60  return image_;
     61}
Note: See TracChangeset for help on using the changeset viewer.