Changeset 308 in PSPA
- Timestamp:
- Feb 4, 2013, 6:03:51 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 21 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r306 r308 8 8 4 Février 2013 Laurent Garnier 9 9 - Suppression de la classe "elementsCollection" 10 10 - dataManager : Suppresion de commentaires 11 - GWt_elementLigneFaisceau.cc 12 - GWt_bend, GWt_drift, GWt_beam 13 GWt_soleno, GWt_fit, GWt_rfgun 14 GWt_cell : Ajout d'une methode initializeElement() et passage de print() dans la classe mère 15 - GWt_abstractElement : 16 o renommage de updateLabelWidget() en updateLabelAndToolTipWidget() 17 o Ajoute de FileInput() 18 - GWt_LigneFaisceau : addElement retourne désormais un GWt_abstractElement et non un abstractElement, ce qui permet de manipuler presque partout le même type d'éléments (GWt_abstractElement) 19 11 20 1er Février 2013 Laurent Garnier 12 21 - Suppression de la classe "elementsCollection", celle-ci stockait le contenu de -
Interface_Web/trunk/pspaWT/sources/controler/src/dataManager.cc
r305 r308 28 28 } 29 29 30 31 /*32 abstractElement* dataManager::addElement(typedElement elemType)33 {34 return elementsGallery_.addElement(elemType);35 }36 37 38 void dataManager::removeElement(string elem) {39 elementsGallery_.eraseElement(elem);40 }41 */42 30 43 31 string dataManager::getLabelFromElementNumero(int numero) … … 271 259 pspa_->getBeamLine()->clear(); 272 260 273 // typedElement elem;274 261 typedElement elementType; 275 262 string elementLabel; 276 // while (infile >> ielem) {277 263 while (infile >> elementLabel) { 278 // elem = (typedElement)ielem;279 // abstractElement* nouveau = addElement(elem);280 264 elementType = nomdElements::getTypeFromLabel(elementLabel); 281 // abstractElement* nouveau = addElement( elementType);282 265 283 abstractElement* nouveau = pspa_->getBeamLine()->addElement(elementType);266 GWt_abstractElement* nouveau = pspa_->getBeamLine()->addElement(elementType); 284 267 285 268 if ( nouveau == NULL ) { … … 291 274 infile.close(); 292 275 293 // after adding, set the good label on GUI294 pspa_->getBeamLine()->update();295 296 276 // debug 297 277 unsigned k; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElement.h
r305 r308 40 40 41 41 string* beginDialog(); 42 void initialize();43 42 public : 44 43 … … 48 47 static GWt_abstractElement *ajoute(abstractElement* ptr); 49 48 49 void initialize(); 50 50 void clicked(); 51 51 void doubleClicked(); 52 void updateLabelWidget(); 52 void updateLabelAndToolTipWidget(); 53 void FileInput(ifstream& ifs); 54 53 55 // GWt_draggableImage* getImage(); 54 56 WContainerWidget* getWidget(); … … 56 58 57 59 virtual void dialogDone() = 0; 58 virtual WString print() = 0; 60 inline WString print() { 61 return abstractElement_->print(); 62 } 63 59 64 virtual string getMimeType()= 0; 60 65 virtual string getSmallImageURL()= 0; 61 66 virtual string getBigImageURL()= 0; 62 67 virtual string getName()= 0; 68 virtual void initializeElement() = 0; 63 69 64 70 void createDragImage(WContainerWidget*); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_beam.h
r305 r308 23 23 virtual void dialogDone(); 24 24 25 WString print();26 27 25 inline string getMimeType() {return "htdocs/beam.jpg"; } 28 26 inline string getSmallImageURL() {return "htdocs/beam.jpg"; } … … 30 28 inline string getName() {return "beam"; } 31 29 30 private : 31 void initializeElement(); 32 32 }; 33 33 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_bend.h
r305 r308 23 23 24 24 WImage* getImage(); 25 WString print();26 25 27 26 inline string getMimeType() {return "htdocs/bend.jpg"; } … … 29 28 inline string getBigImageURL() {return "htdocs/bend.jpg"; } 30 29 inline string getName() {return "bend"; } 30 31 private : 32 void initializeElement(); 31 33 32 34 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_cell.h
r305 r308 34 34 35 35 WImage* getImage(); 36 WString print();37 36 38 37 inline string getMimeType() {return "htdocs/cell.jpg"; } … … 40 39 inline string getBigImageURL() {return "htdocs/cell.jpg"; } 41 40 inline string getName() {return "cell"; } 41 42 private : 43 void initializeElement(); 42 44 43 45 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_drift.h
r305 r308 25 25 virtual void dialogDone(); 26 26 WImage* getImage(); 27 WString print();28 27 29 28 inline string getMimeType() {return "htdocs/drift.jpg"; } … … 31 30 inline string getBigImageURL() {return "htdocs/drift.jpg"; } 32 31 inline string getName() {return "drift"; } 32 33 private : 34 void initializeElement(); 33 35 34 36 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_fit.h
r305 r308 20 20 21 21 WImage* getImage(); 22 WString print();23 22 24 23 inline string getMimeType() {return "htdocs/fit.jpg"; } … … 26 25 inline string getBigImageURL() {return "htdocs/fit.jpg"; } 27 26 inline string getName() {return "fit"; } 27 28 private : 29 void initializeElement(); 28 30 29 31 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_ligneFaisceau.h
r305 r308 3 3 4 4 #include "dataManager.h" 5 #include "abstractElement.h"6 5 #include "nomdElements.h" 7 6 #include "GWt_pspaApplication.h" … … 45 44 and we center everything 46 45 */ 47 abstractElement* addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer);48 abstractElement* addElement(typedElement eType);46 GWt_abstractElement* addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer); 47 GWt_abstractElement* addElement(typedElement eType); 49 48 50 49 void removeElement(GWt_abstractElement*); 51 50 52 51 ~GWt_LigneFaisceau() { 53 52 if(nObjets_ != NULL) delete[] nObjets_; … … 58 57 */ 59 58 abstractElement* getAbstractElement(int i); 60 // void restoreElementCollectionFromDataManager();59 // void restoreElementCollectionFromDataManager(); 61 60 void clickEvent(WContainerWidget*); 62 61 void deleteElement(WContainerWidget*); 63 62 int getBeamLineSize(); 64 63 65 64 /** 66 65 remove all elements from beam line … … 74 73 75 74 void update(); 76 75 77 76 private : 78 77 void manageLineFaisceauLayout(); -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_rfgun.h
r305 r308 33 33 34 34 WImage* getImage(); 35 WString print();36 35 37 36 inline string getMimeType() {return "htdocs/rfgun.jpg"; } … … 39 38 inline string getBigImageURL() {return "htdocs/rfgun.jpg"; } 40 39 inline string getName() {return "rfgun"; } 40 41 private : 42 void initializeElement(); 41 43 42 44 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_soleno.h
r305 r308 32 32 33 33 WImage* getImage(); 34 WString print();35 34 36 35 inline string getMimeType() {return "htdocs/soleno.jpg"; } … … 38 37 inline string getBigImageURL() {return "htdocs/soleno.jpg"; } 39 38 inline string getName() {return "soleno"; } 39 40 private : 41 void initializeElement(); 40 42 41 43 }; -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc
r305 r308 42 42 image_->clicked().connect(this,&GWt_abstractElement::clicked); 43 43 addWidget(image_); 44 initializeElement(); 45 updateLabelAndToolTipWidget(); 44 46 } 45 47 … … 77 79 } 78 80 79 void GWt_abstractElement::updateLabel Widget()81 void GWt_abstractElement::updateLabelAndToolTipWidget() 80 82 { 81 83 elementLigneFaiseauContainer_->setElementLabel(abstractElement_->getLabel()); 84 setToolTip(print()); 82 85 } 83 86 … … 150 153 return image_; 151 154 } 155 156 157 void GWt_abstractElement::FileInput(ifstream& ifs){ 158 getAbstractElement()->FileInput(ifs); 159 initialize(); 160 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_beam.cc
r305 r308 13 13 elementLigneFaiseauContainer_ = elemLigne; 14 14 15 } 16 17 18 void GWt_beam::initializeElement() { 15 19 string* param = beginDialog(); 16 20 … … 46 50 submit->clicked().connect(dialog_, &Wt::WDialog::accept); 47 51 dialog_->finished().connect(this, &GWt_beam::dialogDone); 48 49 initialize(); 52 50 53 } 54 51 55 52 56 void GWt_beam::dialogDone() … … 69 73 } 70 74 abstractElement_->setParametersString(envoi); 71 updateLabel Widget();75 updateLabelAndToolTipWidget(); 72 76 delete [] envoi; 73 77 } 74 75 76 WString GWt_beam::print(){77 return WString(abstractElement_->print());78 }79 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_bend.cc
r305 r308 13 13 { 14 14 elementLigneFaiseauContainer_ = elemLigne; 15 } 16 17 18 void GWt_bend::initializeElement() { 15 19 string* param = beginDialog(); 16 20 … … 46 50 submit->clicked().connect(dialog_, &Wt::WDialog::accept); 47 51 dialog_->finished().connect(this, &GWt_bend::dialogDone); 48 49 initialize();50 52 } 53 51 54 52 55 void GWt_bend::dialogDone() … … 70 73 } 71 74 abstractElement_->setParametersString(envoi); 72 updateLabelWidget();73 75 delete [] envoi; 74 76 } … … 79 81 } 80 82 81 82 WString GWt_bend::print(){83 return WString(abstractElement_->print());84 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_cell.cc
r305 r308 14 14 { 15 15 elementLigneFaiseauContainer_ = elemLigne; 16 } 17 18 void GWt_cell::initializeElement() { 19 16 20 string* param = beginDialog(); 17 21 … … 69 73 dialog_->finished().connect(this, &GWt_cell::dialogDone); 70 74 71 initialize();72 75 } 73 76 … … 94 97 } 95 98 abstractElement_->setParametersString(envoi); 96 updateLabelWidget();97 99 delete [] envoi; 98 100 } … … 102 104 return image_; 103 105 } 104 105 106 WString GWt_cell::print(){107 return WString(abstractElement_->print());108 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_drift.cc
r305 r308 13 13 { 14 14 elementLigneFaiseauContainer_ = elemLigne; 15 } 16 17 18 void GWt_drift::initializeElement() { 15 19 string* param = beginDialog(); 16 20 … … 25 29 dialog_->finished().connect(this, &GWt_drift::dialogDone); 26 30 27 initialize();28 31 } 29 32 … … 42 45 } 43 46 abstractElement_->setParametersString(envoi); 44 updateLabelWidget();45 47 delete [] envoi; 46 48 } … … 50 52 return image_; 51 53 } 52 53 54 WString GWt_drift::print(){55 return WString(abstractElement_->print());56 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r305 r308 118 118 GWt_abstractElement_->setMaximumSize(32,32); 119 119 GWt_abstractElement_->setMinimumSize(32,32); 120 GWt_abstractElement_->setToolTip(GWt_abstractElement_->print());121 120 } 122 121 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_fit.cc
r305 r308 13 13 { 14 14 elementLigneFaiseauContainer_ = elemLigne; 15 } 16 17 18 void GWt_fit::initializeElement() { 19 15 20 string* param = beginDialog(); 16 21 … … 48 53 dialog_->finished().connect(this, &GWt_fit::dialogDone); 49 54 50 initialize();51 55 } 56 52 57 53 58 void GWt_fit::dialogDone() … … 70 75 } 71 76 abstractElement_->setParametersString(envoi); 72 updateLabelWidget();73 77 delete [] envoi; 74 78 } … … 78 82 return image_; 79 83 } 80 81 82 WString GWt_fit::print(){83 return WString(abstractElement_->print());84 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r305 r308 53 53 54 54 55 abstractElement* GWt_LigneFaisceau::addElement(typedElement eType){55 GWt_abstractElement* GWt_LigneFaisceau::addElement(typedElement eType){ 56 56 return addElement(eType,NULL); 57 57 } … … 59 59 60 60 61 abstractElement* GWt_LigneFaisceau::addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer ){62 63 abstractElement* abstractElem = NULL;61 GWt_abstractElement* GWt_LigneFaisceau::addElement(typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer ){ 62 63 GWt_abstractElement* GWtAbstractElem = NULL; 64 64 65 65 cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl; … … 79 79 80 80 // add the element to the datamanager 81 // abstractElement* ptr = pspa_->getDataManager()->addElement(eType);82 81 83 82 // first time we insert an element : … … 91 90 // add first element 92 91 GWt_elementLigneFaisceau* elemLigneFaisceau = new GWt_elementLigneFaisceau(eType, pspa_); 93 abstractElem = elemLigneFaisceau->getGWt_AbstractElement()->getAbstractElement();94 95 ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau(eType, pspa_),1);92 93 ligneFaisceauLayout_->addWidget(elemLigneFaisceau,1); 94 GWtAbstractElem = elemLigneFaisceau->getGWt_AbstractElement(); 96 95 // remove arrow from begin and end 97 96 … … 120 119 // nObjets_[ptr->getNomdElement().getElementType()].incr(); 121 120 ligneFaisceauLayout_->insertWidget(index,elemLigneFaisceau,1); 122 abstractElem = elemLigneFaisceau->getGWt_AbstractElement()->getAbstractElement();121 GWtAbstractElem = elemLigneFaisceau->getGWt_AbstractElement(); 123 122 } else { 124 123 ligneFaisceauLayout_->addWidget(elemLigneFaisceau,1); 125 abstractElem = elemLigneFaisceau->getGWt_AbstractElement()->getAbstractElement();124 GWtAbstractElem = elemLigneFaisceau->getGWt_AbstractElement(); 126 125 } 127 126 } 128 127 manageLineFaisceauLayout(); 129 128 130 return abstractElem;129 return GWtAbstractElem; 131 130 } 132 131 … … 138 137 139 138 // update labels 140 elem->getGWt_AbstractElement()->updateLabel Widget();139 elem->getGWt_AbstractElement()->updateLabelAndToolTipWidget(); 141 140 142 141 // one element -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_rfgun.cc
r305 r308 12 12 { 13 13 elementLigneFaiseauContainer_ = elemLigne; 14 14 } 15 16 17 void GWt_rfgun::initializeElement() { 18 15 19 string* param = beginDialog(); 16 20 … … 51 55 dialog_->finished().connect(this, &GWt_rfgun::dialogDone); 52 56 53 initialize();54 57 } 58 59 55 60 56 61 void GWt_rfgun::dialogDone() … … 76 81 } 77 82 abstractElement_->setParametersString(envoi); 78 updateLabelWidget();79 83 delete [] envoi; 80 84 } … … 84 88 return image_; 85 89 } 86 87 88 WString GWt_rfgun::print(){89 return WString(abstractElement_->print());90 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_soleno.cc
r305 r308 12 12 { 13 13 elementLigneFaiseauContainer_ = elemLigne; 14 } 15 16 17 void GWt_soleno::initializeElement() { 18 14 19 string* param = beginDialog(); 15 20 … … 30 35 dialog_->finished().connect(this, &GWt_soleno::dialogDone); 31 36 32 initialize();33 37 } 38 34 39 35 40 … … 53 58 } 54 59 abstractElement_->setParametersString(envoi); 55 updateLabelWidget();56 60 delete [] envoi; 57 61 } … … 61 65 return image_; 62 66 } 63 64 65 WString GWt_soleno::print(){66 return WString(abstractElement_->print());67 }
Note: See TracChangeset
for help on using the changeset viewer.