Changeset 267 in PSPA
- Timestamp:
- Jan 23, 2013, 11:35:47 AM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 12 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r266 r267 5 5 PSPA - Plateforme de simulation en physique des accélérateurs 6 6 ========================================================= 7 8 23 Janvier 2012 Laurent Garnier 9 - quelques renommages et améliorations sur la drop zone 7 10 8 11 22 Janvier 2012 Laurent Garnier -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElement.h
r266 r267 20 20 protected : 21 21 22 // PspaApplication* pspa_;23 22 abstractElement* abstractElement_; 24 23 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_bend.h
r266 r267 2 2 #define GWT_BEND_SEEN 3 3 4 //#include "GWt_pspaApplication.h"5 4 #include "GWt_abstractElement.h" 6 5 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_drift.h
r266 r267 2 2 #define GRAPHDRIFTELEMENT_SEEN 3 3 4 //#include "GWt_pspaApplication.h"5 4 #include "GWt_abstractElement.h" 6 5 #include "abstractElement.h" -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementLigneFaisceau.h
r265 r267 3 3 4 4 #include "GWt_dialog.h" 5 #include "GWt_pspaApplication.h"6 5 #include "abstractElement.h" 7 6 #include "GWt_abstractElement.h" … … 31 30 32 31 At first time, the ELEM element is replace by a message. 33 34 @param pspa : application name35 @param linkImage : true/false if the drop zone have to display the link image36 @param showInsertMessage : true/false if it has to display the insertMessage at first step37 32 */ 38 33 … … 60 55 void removeOtherDropZone(GWt_elementLigneFaisceau*); 61 56 void initialize_ligneFaisceau(abstractElement*); 62 PspaApplication* pspa_;63 57 GWt_dialog* messageDropZone_; 64 58 WText* firstTimeInsertMessage_; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_fit.h
r266 r267 2 2 #define GWT_FIT_SEEN 3 3 4 //#include "GWt_pspaApplication.h"5 4 #include "GWt_abstractElement.h" 6 5 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_rfgun.h
r266 r267 2 2 #define GWT_RFGUN_SEEN 3 3 4 //#include "GWt_pspaApplication.h"5 4 #include "GWt_abstractElement.h" 6 5 #include "abstractElement.h" -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_soleno.h
r266 r267 4 4 #include <Wt/WCheckBox> 5 5 6 //#include "GWt_pspaApplication.h"7 6 #include "GWt_abstractElement.h" 8 7 #include "abstractElement.h" -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc
r266 r267 24 24 : WContainerWidget() 25 25 { 26 // pspa_ = ps;27 26 abstractElement_ = elem; 28 27 elementLigneFaiseauContainer_ = elemLigne; … … 113 112 } 114 113 */ 114 return NULL; 115 115 } 116 116 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_dropZoneLigneFaisceau.cc
r261 r267 23 23 mouseDragged().connect(this, &GWt_dropZoneLigneFaisceau::mouseIsDragged); 24 24 25 decorationStyle().setBorder (WBorder (WBorder::Dotted));25 // decorationStyle().setBorder (WBorder (WBorder::Dotted)); 26 26 27 27 // accept drops -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r265 r267 22 22 #include <Wt/WLength> 23 23 #include <Wt/WVBoxLayout> 24 25 #define PSPA_DEBUG 1 24 #include <Wt/WApplication> 25 26 // #define PSPA_DEBUG 1 26 27 27 28 GWt_elementLigneFaisceau::GWt_elementLigneFaisceau() … … 32 33 abstractElement_(NULL) 33 34 { 34 initialize_ligneFaisceau(NULL); 35 // set the css name 36 setObjectName("elementLigneFaisceau"); 37 38 initialize_ligneFaisceau(NULL); 35 39 } 36 40 … … 62 66 WGridLayout *gridLayout = new WGridLayout(); 63 67 68 gridLayout->setContentsMargins(0,0,0,0); 69 gridLayout->setHorizontalSpacing (0); 70 gridLayout->setVerticalSpacing (0); 71 64 72 // add first line : initialize arrow and link images 65 73 arrowImage_ = new GWt_dropZoneLigneFaisceau(); … … 70 78 arrowImage_->setStyleClass("elementLigneFaiseau_line"); 71 79 lineImage_->setStyleClass("elementLigneFaiseau_line"); 80 lineImage_->resize(10,30); 72 81 73 82 74 83 WContainerWidget* arrow = new WContainerWidget(); 75 84 new WImage(arrow); 76 arrow->resize(1 1,30);85 arrow->resize(10,30); 77 86 78 87 arrow->setStyleClass("elementLigneFaiseau_arrow"); … … 127 136 gridLayout->addWidget (elementName_,1,0,1,3); 128 137 129 decorationStyle().setBorder (WBorder (WBorder::Dotted));138 // decorationStyle().setBorder (WBorder (WBorder::Dotted)); 130 139 131 140 // first insert message … … 230 239 231 240 232 // FIXME ne mas passer par un label mais par un abstrastElement241 // FIXME ne pas passer par un label mais par un abstrastElement 233 242 // pspa_->getDataManager()->getCollection()->eraseElement(label); 234 pspa_->updateSelections();243 // pspa_->updateSelections(); 235 244 } 236 245 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r266 r267 25 25 ligneFaisceauLayout_ = new WHBoxLayout(); 26 26 // decorationStyle().setBackgroundColor (WColor(245,245,245)); 27 setStyleClass("ligneFaisceau");28 27 setLayout(ligneFaisceauLayout_); 28 ligneFaisceauLayout_->setContentsMargins(0,0,0,0); 29 ligneFaisceauLayout_->setSpacing (0); 29 30 30 31 int nElts= nomdElements::getNumberOfElements(); … … 35 36 36 37 // add the first drop zone 37 ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau()); 38 38 addElement(inconnu); 39 39 // add a last element to push everything 40 40 ligneFaisceauLayout_->addWidget(new WText("") , 1,Wt::AlignMiddle); … … 95 95 void GWt_LigneFaisceau::addElement(typedElement eType){ 96 96 97 97 // if it is the first element 98 if (eType == inconnu) { 99 ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaisceau()); 100 } else { 98 101 abstractElement* ptr = pspa_->getDataManager()->addElement(eType); 99 102 … … 106 109 // ligneFaisceauLayout_->addWidget(new GWt_elementLigneFaiseau(ptr),0); 107 110 ligneFaisceauLayout_->insertWidget(ligneFaisceauLayout_->count()-1,new GWt_elementLigneFaisceau(ptr),0); 111 } 108 112 } 109 113
Note: See TracChangeset
for help on using the changeset viewer.