Changeset 376 in PSPA
- Timestamp:
- Mar 8, 2013, 9:29:14 AM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r375 r376 5 5 PSPA - Plateforme de simulation en physique des accélérateurs 6 6 ========================================================= 7 8 7 Mars : Laurent Garnier 9 - pspa.css : Ajout de l'icone poubelle 10 - GWt_elementLigneFaisceau : Réduction de la taille des éléments de la beamLine 11 - GWt_pspaApplication : Ajout de l'icone poubelle et de la méthode removeBeamLine 7 12 8 13 6 Mars : Laurent Garnier -
Interface_Web/trunk/pspaWT/htdocs/pspa.css
r375 r376 45 45 .histoButton { 46 46 background-image : url("histo.png"); 47 background-repeat : no-repeat; 48 background-size : 100% 100%; 49 } 50 51 .trashButton { 52 background-image : url("trash.png"); 47 53 background-repeat : no-repeat; 48 54 background-size : 100% 100%; … … 105 111 element.style.div { 106 112 left: -8px; 107 position: static;108 113 top: -8px; 109 114 z-index: 3; 110 top: auto;115 top: 0px; 111 116 } 112 117 113 .beamLineElementActions element.style .div{118 .beamLineElementActions element.style{ 114 119 left: -8px; 115 position: static;116 120 top: -8px; 117 121 z-index: 3; 118 top: auto;122 top: 0px; 119 123 } 120 124 121 125 .beamLineElementActions { 122 126 left: -8px; 123 position: static;124 127 top: -8px; 125 128 z-index: 3; 126 top: auto; 129 top: 0px; 130 // -moz-box-sizing: border...ight: 88px; top: 120px; 127 131 } 128 132 … … 137 141 border-radius: 3px 3px 3px 3px; 138 142 } 143 139 144 140 145 .beamLineElementActions .parameters { … … 166 171 } 167 172 173 168 174 .softwareElementLigneFaisceauName { 169 175 text-align: right; -
Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h
r375 r376 89 89 bool removePathFromConfigName(string& config); 90 90 bool removeExtensionFromConfigName(string& config); 91 91 void removeBeamLine(); 92 92 93 void dessiner(); 93 94 void dessinerEnveloppe(); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_elementLigneFaisceau.cc
r375 r376 126 126 elementContainer_ = new WContainerWidget(); 127 127 WVBoxLayout* vLayoutElementContainer = new WVBoxLayout(); 128 vLayoutElementContainer->setContentsMargins(0,0,0,0); 129 elementContainer_->setPadding (4); 128 130 129 131 elementContainer_->setStyleClass("beamLineIcon"); … … 134 136 if (GWt_abstractElement_ != NULL) { 135 137 vLayoutElementContainer->addWidget(GWt_abstractElement_); 136 GWt_abstractElement_->setMaximumSize( 80,80);137 GWt_abstractElement_->setMinimumSize( 80,80);138 GWt_abstractElement_->setMaximumSize(64,40); 139 GWt_abstractElement_->setMinimumSize(64,40); 138 140 } 139 141 … … 150 152 WContainerWidget* actions = new WContainerWidget(); 151 153 WVBoxLayout* vLayoutActions = new WVBoxLayout(); 154 actions->setStyleClass("beamLineElementActions"); 155 actions->setPositionScheme(Wt::Static); 156 152 157 actions->setLayout(vLayoutActions); 158 vLayoutActions->setContentsMargins(0,0,0,0); 153 159 154 160 actionParameters_ = new WText(" "); … … 163 169 actionParameters_->setMaximumSize(32,32); 164 170 actionParameters_->setMinimumSize(32,32); 165 actionParameters_->setPositionScheme(Wt::Static);166 171 167 172 actionTrash_->setStyleClass("Button WhiteButton HiddenButton trash"); 168 173 actionTrash_->setMaximumSize(32,32); 169 174 actionTrash_->setMinimumSize(32,32); 170 actionTrash_->setPositionScheme(Wt::Static);171 175 172 176 // Set the global action class 173 actions->setStyleClass("beamLineElementActions");174 actions->setPositionScheme(Wt::Static);175 177 actions->setOffsets(0); 176 178 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc
r375 r376 47 47 PspaApplication::PspaApplication(const WEnvironment& env) : WApplication(env) 48 48 ,applicationDefaultTitle_("portail PSPA") 49 ,beamLine_(NULL) 49 50 { 50 51 … … 87 88 WPushButton* boutonLoadNew = new WPushButton(); 88 89 WPushButton* boutongraphicalAnalysis = new WPushButton(); 90 WPushButton* boutonTrash = new WPushButton(); 89 91 90 92 boutonSauve->setStyleClass("saveButton"); … … 92 94 boutonLoadNew->setStyleClass("loadNewButton"); 93 95 boutongraphicalAnalysis->setStyleClass("histoButton"); 96 boutonTrash->setStyleClass("trashButton"); 94 97 95 98 boutonSauve->setToolTip ("sauvegarder votre configuration"); … … 97 100 boutonLoadNew->setToolTip ("charger une configuration"); 98 101 boutongraphicalAnalysis->setToolTip ("analyse graphique"); 102 boutonTrash->setToolTip ("tout effacer"); 99 103 100 104 boutonSauve->setMaximumSize(38,38); … … 106 110 boutongraphicalAnalysis->setMaximumSize(38,38); 107 111 boutongraphicalAnalysis->setMinimumSize(38,38); 112 boutonTrash->setMaximumSize(38,38); 113 boutonTrash->setMinimumSize(38,38); 108 114 109 115 boutonSauve->clicked().connect(this, &PspaApplication::sauver); … … 115 121 boutongraphicalAnalysis->clicked().connect(this, &PspaApplication::dialogOnGraphics); 116 122 123 boutonTrash->clicked().connect(this, &PspaApplication::removeBeamLine); 124 117 125 toolbarLayout->addWidget(boutonSauve , 0,Wt::AlignMiddle); 118 126 toolbarLayout->addWidget(boutonRestaure , 0,Wt::AlignMiddle); 119 127 toolbarLayout->addWidget(boutonLoadNew , 0,Wt::AlignMiddle); 120 128 toolbarLayout->addWidget(boutongraphicalAnalysis , 0,Wt::AlignMiddle); 129 toolbarLayout->addWidget(boutonTrash , 0,Wt::AlignMiddle); 121 130 toolbarLayout->addWidget(new WText("") , 1,Wt::AlignMiddle); 122 131 … … 202 211 void PspaApplication::createBeamLine() 203 212 { 204 beamLine_ = new GWt_LigneFaisceau(this); 205 beamLine_->setMinimumSize(300,100); 213 if (!beamLine_) { 214 beamLine_ = new GWt_LigneFaisceau(this); 215 } else { 216 beamLine_->clear(); 217 } 218 beamLine_->setMinimumSize(300,100); 219 setTitle(applicationDefaultTitle_); 206 220 } 207 221 … … 987 1001 } 988 1002 989 1003 void PspaApplication::removeBeamLine() { 1004 createBeamLine(); 1005 } -
Interface_Web/trunk/pspaWT/workingArea/philFit.save
r361 r376 3 3 rfgun 4 4 rfgun01 5 500 10.15 1500 5 0.1 6 6 0 0 7 7 1e-06 1e-12 … … 20 20 solnd 21 21 solnd01 22 3 1e+61 1.0199 3022 3 1e+61 1.0199 0 23 23 drift 24 24 drift02
Note: See TracChangeset
for help on using the changeset viewer.