Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
- Timestamp:
- Jun 21, 2013, 10:16:56 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r401 r418 35 35 pspa_(pspa) 36 36 { 37 initialize_ligneFaisceau( inconnu);38 } 39 40 41 GWt_elementLigneFaisceau::GWt_elementLigneFaisceau( typedElement type,PspaApplication* pspa)37 initialize_ligneFaisceau(nomdElements::inconnu); 38 } 39 40 41 GWt_elementLigneFaisceau::GWt_elementLigneFaisceau(nomdElements::typedElement type,PspaApplication* pspa) 42 42 : WContainerWidget(), 43 43 firstTimeInsertMessage_(NULL), … … 53 53 } 54 54 55 void GWt_elementLigneFaisceau::initialize_ligneFaisceau( typedElement eType)55 void GWt_elementLigneFaisceau::initialize_ligneFaisceau(nomdElements::typedElement eType) 56 56 { 57 57 cout<<"new GWt_elementLigneFaisceau : "<< this << endl; … … 62 62 // +----------+--------+---------+ 63 63 64 65 64 WGridLayout *gridLayout = new WGridLayout(); 66 65 … … 94 93 95 94 switch ( eType ) { 96 case RFgun :95 case nomdElements::RFgun : 97 96 GWt_abstractElement_ = new GWt_rfgun(this); 98 97 break; 99 case drift :98 case nomdElements::drift : 100 99 GWt_abstractElement_ = new GWt_drift(this); 101 100 break; 102 case cell :101 case nomdElements::cell : 103 102 GWt_abstractElement_ = new GWt_cell(this); 104 103 break; 105 case bend :104 case nomdElements::bend : 106 105 GWt_abstractElement_ = new GWt_bend(this); 107 106 break; 108 case soleno :107 case nomdElements::soleno : 109 108 GWt_abstractElement_ = new GWt_soleno(this); 110 109 break; 111 case beam :110 case nomdElements::beam : 112 111 GWt_abstractElement_ = new GWt_beam(this); 113 112 break; 114 case fit :113 case nomdElements::fit : 115 114 GWt_abstractElement_ = new GWt_fit(this); 116 115 break; 117 case snapshot :116 case nomdElements::snapshot : 118 117 { 119 118 int incr = pspa_->getExtensionFile(); … … 123 122 break; 124 123 } 125 case inconnu :124 case nomdElements::inconnu : 126 125 GWt_abstractElement_ = NULL; 127 126 } … … 207 206 if (getGWt_AbstractElement()->getAbstractElement()) { 208 207 if (getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()) { 209 setBGColor(WColor(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor())); 208 // setBGColor(WColor(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getColor())); 209 setBGColor(WColor(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getNomDeLogiciel()->getColor())); 210 210 softwareName_->setText(getGWt_AbstractElement()->getAbstractElement()->getAbstractSoftware()->getName()); 211 211 … … 278 278 279 279 if(n < 10) { 280 str= elem.get ElementLabel()+"0"+number;280 str= elem.getGenericLabel()+"0"+number; 281 281 } else { 282 str= elem.get ElementLabel()+number;282 str= elem.getGenericLabel()+number; 283 283 } 284 284 }
Note: See TracChangeset
for help on using the changeset viewer.