Changeset 365 in PSPA for Interface_Web/trunk
- Timestamp:
- Mar 5, 2013, 4:54:27 PM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 1 added
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r364 r365 6 6 ========================================================= 7 7 8 5 Mars : Laurent Garnier 9 - pspa.css : ameliorations dans le style des elements 10 - GWt_elementLigneFaisceau : Ajout d'actions sur les icones dans les elements 11 - GWt_abstractElement : suppression des actions sur l'image d'un element 12 - ajoute de l'icone trash.png 13 8 14 5 mars : Francois Touze 9 15 -GWt_pspaApplication, particleBeam : ajouté le tracé des histogrammes en x,y ou z -
Interface_Web/trunk/pspaWT/htdocs/pspa.css
r359 r365 87 87 box-shadow: 0 1px rgba(255, 255, 255, 0.35) inset, 0 0 0 1px rgba(140, 126, 126, 0.5); 88 88 } 89 90 .Button.WhiteButton.HiddenButton { 91 visibility: hidden; 92 } 93 89 94 .pin .WhiteButton.Button11 { 90 95 border-radius: 6px 6px 6px 6px; … … 127 132 border-radius: 3px 3px 3px 3px; 128 133 } 129 .beamLineElementActions .likebutton, .beamLineElementActions .comment, .beamLineElementActions .repin_link, .beamLineElementActions .editbutton, .beamLineElementActions .software {130 display: none;131 }132 134 133 135 .beamLineElementActions .parameters { 134 136 background-image: url("advanced.png"); 135 137 background-repeat: no; 138 display: inline; 139 } 140 141 .beamLineElementActions .trash { 142 background-image: url("trash.png"); 143 background-repeat: no; 144 display: inline; 136 145 } 137 146 -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_abstractElement.h
r343 r365 33 33 class GWt_abstractElement : public WContainerWidget 34 34 { 35 protected :35 protected : 36 36 37 abstractElement* abstractElement_;37 abstractElement* abstractElement_; 38 38 39 WDialog* dialog_; 40 GWt_draggableImage* dropped_; 41 WContainerWidget* wc_; 42 WText* wc_item_; 43 WLineEdit* labelEdit_; 44 45 GWt_abstractElement() {;} 46 string* beginDialog(); 39 WDialog* dialog_; 40 GWt_draggableImage* dropped_; 41 WContainerWidget* wc_; 42 WText* wc_item_; 43 WLineEdit* labelEdit_; 44 45 GWt_abstractElement() {;} 46 string* beginDialog(); 47 48 public : 49 50 GWt_abstractElement(abstractElement*); 51 52 void initialize(); 53 void showParameters(); 54 void deleteElement(); 47 55 48 public : 49 50 GWt_abstractElement(abstractElement*); 51 52 void initialize(); 53 void clicked(); 54 void doubleClicked(); 55 void updateLabelAndToolTipWidget(); 56 void FileInput(ifstream& ifs); 57 58 // GWt_draggableImage* getImage(); 59 WContainerWidget* getWidget(); 60 abstractElement* getAbstractElement(); 61 62 virtual void dialogDone(WDialog::DialogCode code) = 0; 63 64 inline WString print() { 65 return abstractElement_->print(); 66 } 67 68 virtual string getMimeType() = 0; 69 virtual string getSmallImageURL() = 0; 70 virtual string getBigImageURL() = 0; 71 virtual string getName() = 0; 72 virtual void initilializeDialog() = 0; 73 74 void createDragImage(WContainerWidget*); 75 WImage* getImage(); 56 void updateLabelAndToolTipWidget(); 57 void FileInput(ifstream& ifs); 76 58 77 protected: 78 79 WImage* image_; 80 GWt_elementLigneFaisceau* elementLigneFaiseauContainer_; 59 // GWt_draggableImage* getImage(); 60 WContainerWidget* getWidget(); 61 abstractElement* getAbstractElement(); 81 62 82 // Nom, type de parametre 83 std::map<std::string, variant<int, string, bool, float, NullType> > parameterMapValue; 84 std::map<std::string, std::string > parameterMapDescription; 85 86 inline void registerParam(string name, variant<int, string, bool, float, NullType> value, string desc) { 87 parameterMapValue[name] = value; 88 parameterMapDescription[name] = desc; 89 } 90 91 variant<int, string, bool, float, NullType> getParamValue(string elem); 92 string getParamDescription(string elem); 63 virtual void dialogDone(WDialog::DialogCode code) = 0; 64 65 inline WString print() { 66 return abstractElement_->print(); 67 } 68 69 virtual string getMimeType() = 0; 70 virtual string getSmallImageURL() = 0; 71 virtual string getBigImageURL() = 0; 72 virtual string getName() = 0; 73 virtual void initilializeDialog() = 0; 74 75 void createDragImage(WContainerWidget*); 76 WImage* getImage(); 77 78 protected: 79 80 WImage* image_; 81 GWt_elementLigneFaisceau* elementLigneFaiseauContainer_; 82 83 // Nom, type de parametre 84 std::map<std::string, variant<int, string, bool, float, NullType> > parameterMapValue; 85 std::map<std::string, std::string > parameterMapDescription; 86 87 inline void registerParam(string name, variant<int, string, bool, float, NullType> value, string desc) { 88 parameterMapValue[name] = value; 89 parameterMapDescription[name] = desc; 90 } 91 92 variant<int, string, bool, float, NullType> getParamValue(string elem); 93 string getParamDescription(string elem); 93 94 }; 94 95 #endif -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_elementLigneFaisceau.h
r359 r365 66 66 std::string getElementNumberInBeamLine(nomdElements el); 67 67 void initialize_ligneFaisceau(typedElement eType); 68 void mouseWentOut(); 69 void mouseWentOver(); 70 68 71 GWt_dialog* messageDropZone_; 69 72 WText* firstTimeInsertMessage_; … … 75 78 GWt_abstractElement* GWt_abstractElement_; 76 79 WContainerWidget* elementContainer_; 80 WText* actionParameters_; 81 WText* actionTrash_; 77 82 }; 78 83 #endif -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_abstractElement.cc
r359 r365 40 40 image_ = new WImage(getBigImageURL(),this); 41 41 42 // activate slots43 image_->doubleClicked().connect(this,&GWt_abstractElement::doubleClicked);44 image_->clicked().connect(this,&GWt_abstractElement::clicked);45 42 addWidget(image_); 46 43 updateLabelAndToolTipWidget(); … … 88 85 } 89 86 90 void GWt_abstractElement:: clicked()87 void GWt_abstractElement::showParameters() 91 88 { 92 89 initilializeDialog(); … … 95 92 96 93 97 void GWt_abstractElement::d oubleClicked()94 void GWt_abstractElement::deleteElement() 98 95 { 99 96 StandardButton result = WMessageBox::show("PSPA : Delete element", WString("Delete '")+WString(getAbstractElement()->getLabel())+"' ?", Ok | Cancel); … … 206 203 } 207 204 } 205 206 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r359 r365 149 149 actions->setLayout(vLayoutActions); 150 150 151 WText* actionParameters = new WText(" "); 152 WText* actionSoftware = new WText("Software"); 153 151 actionParameters_ = new WText(" "); 152 actionTrash_ = new WText(" "); 153 154 // set tooltips 155 actionParameters_->setToolTip("change parameters"); 156 actionTrash_->setToolTip("delete"); 157 154 158 // Set class for actions elements 155 actionParameters->setStyleClass("Button WhiteButton ContrastButton parameters"); 156 actionParameters->setMaximumSize(32,32); 157 actionParameters->setMinimumSize(32,32); 158 159 actionSoftware->setStyleClass("Button WhiteButton ContrastButton software"); 160 actionParameters->setPositionScheme(Wt::Static); 159 actionParameters_->setStyleClass("Button WhiteButton HiddenButton parameters"); 160 actionParameters_->setMaximumSize(32,32); 161 actionParameters_->setMinimumSize(32,32); 162 actionParameters_->setPositionScheme(Wt::Static); 163 164 actionTrash_->setStyleClass("Button WhiteButton HiddenButton trash"); 165 actionTrash_->setMaximumSize(32,32); 166 actionTrash_->setMinimumSize(32,32); 167 actionTrash_->setPositionScheme(Wt::Static); 161 168 162 169 // Set the global action class … … 165 172 actions->setOffsets(0); 166 173 167 vLayoutActions->addWidget(actionParameters );168 vLayoutActions->addWidget(action Software);174 vLayoutActions->addWidget(actionParameters_); 175 vLayoutActions->addWidget(actionTrash_); 169 176 vLayoutElementContainer->addWidget(actions); 170 177 … … 177 184 setLayout(gridLayout); 178 185 186 // enable signals 187 elementContainer_->mouseWentOut().connect(this,&GWt_elementLigneFaisceau::mouseWentOut); 188 elementContainer_->mouseWentOver().connect(this,&GWt_elementLigneFaisceau::mouseWentOver); 189 190 actionParameters_->clicked().connect(GWt_abstractElement_,&GWt_abstractElement::showParameters); 191 actionTrash_->clicked().connect(GWt_abstractElement_,&GWt_abstractElement::deleteElement); 179 192 } 180 193 … … 262 275 } 263 276 } 277 278 279 void GWt_elementLigneFaisceau::mouseWentOut() { 280 actionParameters_->setStyleClass("Button WhiteButton HiddenButton parameters"); 281 actionTrash_->setStyleClass("Button WhiteButton HiddenButton trash"); 282 } 283 284 285 void GWt_elementLigneFaisceau::mouseWentOver() { 286 actionParameters_->setStyleClass("Button WhiteButton ContrastButton parameters"); 287 actionTrash_->setStyleClass("Button WhiteButton ContrastButton trash"); 288 }
Note: See TracChangeset
for help on using the changeset viewer.