Changeset 289 in PSPA
- Timestamp:
- Jan 28, 2013, 5:18:09 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT/sources/userInterface
- Files:
-
- 2 added
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElement.h
r287 r289 34 34 public : 35 35 36 GWt_abstractElement(abstractElement* ,GWt_elementLigneFaisceau*);36 GWt_abstractElement(abstractElement*); 37 37 38 38 // methode Factory … … 49 49 virtual WImage* getImage() = 0; 50 50 virtual WString print() = 0; 51 // virtual void createDragImage() = 0; 51 52 52 53 private: -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_beam.h
r287 r289 15 15 WLineEdit* p0Edit_; // GeV/c 16 16 17 GWt_beam() {;}18 17 19 18 public : 20 19 21 GWt_beam(abstractElement* elem ,GWt_elementLigneFaisceau*); 20 GWt_beam() {;} 21 GWt_beam(abstractElement* elem ); 22 22 ~GWt_beam() {;} 23 23 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_bend.h
r287 r289 14 14 WLineEdit* momentumEdit_; // MeV/c 15 15 16 GWt_bend() {;}17 16 18 17 public : 19 18 20 GWt_bend(abstractElement* elem ,GWt_elementLigneFaisceau*); 19 GWt_bend() {;} 20 GWt_bend(abstractElement* elem); 21 21 ~GWt_bend() {;} 22 22 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_cell.h
r287 r289 25 25 WLineEdit* scaleFactorEdit_; 26 26 27 GWt_cell() {;}28 27 29 28 public : 30 29 31 GWt_cell(abstractElement* elem ,GWt_elementLigneFaisceau*); 30 GWt_cell() {;} 31 GWt_cell(abstractElement* elem); 32 32 ~GWt_cell() {;} 33 33 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_drift.h
r287 r289 17 17 WLineEdit* apertureEdit_; 18 18 19 GWt_drift() {;}20 19 21 20 public: 22 21 23 GWt_drift(abstractElement* elem ,GWt_elementLigneFaisceau*); 22 GWt_drift() {;} 23 GWt_drift(abstractElement* elem ); 24 24 ~GWt_drift() {;} 25 25 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_fit.h
r287 r289 11 11 WLineEdit* tolerEdit_; // cm 12 12 13 GWt_fit() {;}14 13 15 14 public : 16 15 17 GWt_fit(abstractElement* elem ,GWt_elementLigneFaisceau*); 16 GWt_fit() {;} 17 GWt_fit(abstractElement* elem); 18 18 ~GWt_fit() {;} 19 19 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_ligneFaisceau.h
r284 r289 50 50 } 51 51 52 void restoreElementCollection ();52 void restoreElementCollectionFromDataManager(); 53 53 void clickEvent(WContainerWidget*); 54 54 void deleteElement(WContainerWidget*); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h
r272 r289 20 20 #include "dataManager.h" 21 21 #include "GWt_console.h" 22 #include "GWt_abstractElementFactory.h" 22 23 23 24 using namespace Wt; … … 63 64 WFileUpload* uploadFileSelectorWidget_; 64 65 GWt_console* console_; 66 GWt_abstractElementFactory* abstractElementFactory_; 65 67 66 68 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_rfgun.h
r287 r289 22 22 WLineEdit* nb_true_particlesEdit_; 23 23 24 GWt_rfgun() {;}25 24 26 25 public : 27 26 28 GWt_rfgun(abstractElement* elem ,GWt_elementLigneFaisceau*); 27 GWt_rfgun() {;} 28 GWt_rfgun(abstractElement* elem ); 29 29 ~GWt_rfgun() {;} 30 30 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_soleno.h
r287 r289 21 21 WCheckBox* varyB0Edit_; 22 22 23 GWt_soleno() {;}24 23 25 24 void updateB(); … … 27 26 public : 28 27 29 GWt_soleno( abstractElement* elem ,GWt_elementLigneFaisceau*); 28 GWt_soleno() {;} 29 GWt_soleno( abstractElement* elem ); 30 30 ~GWt_soleno() {;} 31 31 virtual void dialogDone(); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc
r272 r289 21 21 #include <Wt/WApplication> 22 22 23 GWt_abstractElement::GWt_abstractElement(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne)23 GWt_abstractElement::GWt_abstractElement(abstractElement* elem) 24 24 : WContainerWidget() 25 25 { 26 26 abstractElement_ = elem; 27 elementLigneFaiseauContainer_ = elemLigne;28 27 } 29 28 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_beam.cc
r287 r289 8 8 #include <Wt/WPushButton> 9 9 10 GWt_beam::GWt_beam(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne) {10 GWt_beam::GWt_beam(abstractElement* elem) : GWt_abstractElement(elem) { 11 11 12 12 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_bend.cc
r287 r289 9 9 #include <Wt/WPushButton> 10 10 11 GWt_bend::GWt_bend(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)11 GWt_bend::GWt_bend(abstractElement* elem ) : GWt_abstractElement(elem) 12 12 { 13 13 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_cell.cc
r287 r289 10 10 #include <Wt/WPanel> 11 11 12 GWt_cell::GWt_cell(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)12 GWt_cell::GWt_cell(abstractElement* elem) : GWt_abstractElement(elem) 13 13 { 14 14 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_drift.cc
r287 r289 9 9 #include <Wt/WPushButton> 10 10 11 GWt_drift::GWt_drift(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem,elemLigne)11 GWt_drift::GWt_drift(abstractElement* elem ) : GWt_abstractElement(elem) 12 12 { 13 13 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r287 r289 98 98 switch ( eType ) { 99 99 case RFgun : 100 abstractElement_ = new GWt_rfgun(abstractElement , this);100 abstractElement_ = new GWt_rfgun(abstractElement); 101 101 break; 102 102 case drift : 103 abstractElement_ = new GWt_drift(abstractElement , this);103 abstractElement_ = new GWt_drift(abstractElement); 104 104 break; 105 105 case cell : 106 abstractElement_ = new GWt_cell(abstractElement , this);106 abstractElement_ = new GWt_cell(abstractElement); 107 107 break; 108 108 case bend : 109 abstractElement_ = new GWt_bend(abstractElement , this);109 abstractElement_ = new GWt_bend(abstractElement); 110 110 break; 111 111 case soleno : 112 abstractElement_ = new GWt_soleno(abstractElement , this);112 abstractElement_ = new GWt_soleno(abstractElement); 113 113 break; 114 114 case beam : 115 abstractElement_ = new GWt_beam(abstractElement , this);115 abstractElement_ = new GWt_beam(abstractElement); 116 116 break; 117 117 case fit : 118 abstractElement_ = new GWt_fit(abstractElement , this);118 abstractElement_ = new GWt_fit(abstractElement); 119 119 break; 120 120 case inconnu : -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_fit.cc
r287 r289 9 9 #include <Wt/WComboBox> 10 10 11 GWt_fit::GWt_fit(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)11 GWt_fit::GWt_fit(abstractElement* elem ) : GWt_abstractElement(elem) 12 12 { 13 13 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r287 r289 48 48 49 49 50 void GWt_LigneFaisceau::restoreElementCollection ()50 void GWt_LigneFaisceau::restoreElementCollectionFromDataManager() 51 51 { 52 52 … … 67 67 68 68 nObjets_[ptr->getNomdElement().getElementType()].incr(); 69 69 70 70 ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau(ptr),1); 71 71 … … 92 92 return; 93 93 } 94 95 // add the element to the datamanager 94 96 abstractElement* ptr = pspa_->getDataManager()->addElement(eType); 97 95 98 // first time we insert an element : 96 99 GWt_elementLigneFaisceau* firstElemIsElement = dynamic_cast <GWt_elementLigneFaisceau*> (ligneFaisceauLayout_->itemAt(0)->widget()); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc
r287 r289 53 53 } 54 54 55 // register the absractElementFactory 56 abstractElementFactory_ = new GWt_abstractElementFactory(); 57 abstractElementFactory_->setRFGunEnable(true); 58 abstractElementFactory_->setDriftEnable(true); 59 abstractElementFactory_->setCellEnable(true); 60 abstractElementFactory_->setBendEnable(true); 61 abstractElementFactory_->setSolenoEnable(true); 62 abstractElementFactory_->setBeamEnable(true); 63 abstractElementFactory_->setFitEnable(true); 64 55 65 // include the styleSheet 56 66 WContainerWidget *widroot = root(); … … 210 220 * to be used as the widget that is visually dragged. 211 221 */ 212 cout << "createDragImage" << dragImage<<endl;213 222 result->setDraggable(mimeType,dragImage,true); 214 223 } … … 601 610 602 611 GWt_LigneFaisceau* bobo = static_cast<GWt_LigneFaisceau*>(beamLine_); 603 bobo->restoreElementCollection ();612 bobo->restoreElementCollectionFromDataManager(); 604 613 605 614 console_->addConsoleMessage(string("...terminee")); … … 661 670 662 671 GWt_LigneFaisceau* bobo = static_cast<GWt_LigneFaisceau*>(beamLine_); 663 bobo->restoreElementCollection ();672 bobo->restoreElementCollectionFromDataManager(); 664 673 665 674 console_->addConsoleMessage(string("...terminee")); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_rfgun.cc
r287 r289 8 8 #include <Wt/WPushButton> 9 9 10 GWt_rfgun::GWt_rfgun(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)10 GWt_rfgun::GWt_rfgun(abstractElement* elem ) : GWt_abstractElement(elem) 11 11 { 12 12 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_soleno.cc
r287 r289 8 8 #include <Wt/WPushButton> 9 9 10 GWt_soleno::GWt_soleno(abstractElement* elem ,GWt_elementLigneFaisceau* elemLigne) : GWt_abstractElement(elem, elemLigne)10 GWt_soleno::GWt_soleno(abstractElement* elem) : GWt_abstractElement(elem) 11 11 { 12 12 string* param = beginDialog();
Note: See TracChangeset
for help on using the changeset viewer.