Changeset 233 in PSPA
- Timestamp:
- Jan 9, 2013, 12:53:41 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h
r227 r233 17 17 #include <Wt/WLength> 18 18 19 #include "GWt_dialog.h" 19 20 #include "dataManager.h" 20 21 … … 48 49 WWidget* globalParam_; 49 50 WWidget* beamLine_; 50 WContainerWidget* leDessin_; 51 // WContainerWidget* leDessin_; 52 GWt_dialog* graphicsDialog_; 53 51 54 WPushButton *exec_go_; 52 55 WText* probleme_; … … 82 85 void disableSectionExecute(); 83 86 bool areDataCoherent(); 87 void dialogOnGraphics(); 84 88 void faireDessin(); 85 89 void faireDessinParmela(WContainerWidget* toto, particleBeam* beam); -
Interface_Web/trunk/pspaWT/include/GWt_soleno.h
r229 r233 24 24 GWt_soleno() {;} 25 25 26 void updateB(); 27 26 28 public : 27 29 -
Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc
r232 r233 6 6 #include "GWt_LigneFaisceau.h" 7 7 #include "GWt_globalParameters.h" 8 #include "GWt_dialog.h"8 // #include "GWt_dialog.h" 9 9 #include "GWt_draggableImage.h" 10 10 #include "particleBeam.h" … … 52 52 } 53 53 54 WContainerWidget *w = root();54 WContainerWidget *widroot = root(); 55 55 useStyleSheet (WApplication::appRoot()+"../include/pspa.css"); 56 56 dtmanage_ = new dataManager(); … … 66 66 WPushButton* boutonSauve = new WPushButton(" sauvegarder la config"); 67 67 WPushButton* boutonRestaure = new WPushButton(" restaurer la config"); 68 WPushButton* boutonLoadNew = new WPushButton(" charger une nouvelle config"); 68 WPushButton* boutonLoadNew = new WPushButton(" upload config"); 69 WPushButton* boutongraphicalAnalysis = new WPushButton("analyse graphique"); 69 70 boutonSauve->setMinimumSize(30,30); 70 71 boutonRestaure->setMinimumSize(30,30); 71 72 // boutonLoadNew->setMinimumSize(30,30); 72 73 74 boutonSauve->clicked().connect(this, &PspaApplication::sauver); 75 boutonRestaure->clicked().connect(this, &PspaApplication::restaurer); 73 76 // Upload when the button is clicked. 74 77 // React to a succesfull upload. 75 78 boutonLoadNew->clicked().connect(this, &PspaApplication::openFileSelector); 76 79 80 boutongraphicalAnalysis->clicked().connect(this, &PspaApplication::dialogOnGraphics); 77 81 78 82 … … 80 84 toolbarLayout->addWidget(boutonRestaure , 1); 81 85 toolbarLayout->addWidget(boutonLoadNew , 1); 82 boutonSauve->clicked().connect(this, &PspaApplication::sauver);83 boutonRestaure->clicked().connect(this, &PspaApplication::restaurer); 86 toolbarLayout->addWidget(boutongraphicalAnalysis , 1); 87 84 88 layout->addLayout(toolbarLayout, 1, 0, 1, 2); 85 89 layout->addWidget(createPalette(), 2, 0, 4, 1); … … 101 105 GWt_tools::console_->setMinimumSize(300,100); 102 106 GWt_tools::console_->setOverflow(WContainerWidget::OverflowAuto); 103 layout->addWidget(GWt_tools::console_, 3, 1);107 layout->addWidget(GWt_tools::console_, 3, 2); 104 108 105 109 … … 111 115 globalParam_ = createGlobalParamWidget(); 112 116 // leDessin_ = new WContainerWidget(); 113 leDessin_ = createDrawingWidget(); 117 // leDessin_ = createDrawingWidget(); 118 graphicsDialog_ = new GWt_dialog("graphical analysis",createDrawingWidget(),false); 119 graphicsDialog_->setMinimumSize(400,400); 120 graphicsDialog_->setClosable(true); 114 121 115 122 … … 117 124 WWidget* executeWidget = createExecuteWidget(); 118 125 119 layout->addWidget( globalParam_, 4, 1);120 layout->addWidget( leDessin_, 3, 2);121 layout->addWidget( executeWidget , 5, 1);126 layout->addWidget( globalParam_, 3, 1); 127 // layout->addWidget( leDessin_, 3, 2); 128 layout->addWidget( executeWidget , 4, 1); 122 129 //----------- 123 130 … … 132 139 layout->setColumnStretch(1, 1); 133 140 134 w ->setLayout(layout);141 widroot->setLayout(layout); 135 142 } 136 143 … … 230 237 } 231 238 239 void PspaApplication::dialogOnGraphics() 240 { 241 // GWt_dialog* graphicsDialog = new GWt_dialog("graphical analysis",createDrawingWidget(),false); 242 // graphicsDialog->setMinimumSize(400,400); 243 // graphicsDialog->setClosable(true); 244 245 246 graphicsDialog_->show(); 247 248 } 232 249 233 250 WContainerWidget* PspaApplication::createDrawingWidget() … … 236 253 237 254 238 dessin->addWidget(new WText("graphic analysis : ")); 255 256 257 choixEnveloppeDessin_ = new WComboBox(); 258 choixEnveloppeDessin_->addItem("x"); 259 // choixEnveloppeDessin_->addItem("y"); 260 WPushButton* okEnv = new WPushButton("draw enveloppe"); 261 okEnv->clicked().connect(this, &PspaApplication::dessinerEnveloppe); 262 263 264 dessin->addWidget(new WText(" enveloppe : ")); 265 dessin->addWidget(choixEnveloppeDessin_); 266 dessin->addWidget(okEnv); 267 239 268 dessin->addWidget(new WBreak()); 240 dessin->addWidget(new WText(" drawing after element : "));241 242 269 243 270 choixElementDessin_ = new WComboBox(); 271 272 244 273 245 274 choixTypeDessinFaisceau_ = new WComboBox(); 246 275 choixTypeDessinFaisceau_->addItem("courant_snyder"); 247 276 choixTypeDessinFaisceau_->addItem("macroparticles"); 248 277 WPushButton* caroule = new WPushButton("dessiner"); 278 caroule->clicked().connect(this, &PspaApplication::dessiner); 279 280 dessin->addWidget(new WText(" phase space after element : ")); 249 281 dessin->addWidget(choixElementDessin_); 250 282 dessin->addWidget(choixTypeDessinFaisceau_); 251 WPushButton* caroule = new WPushButton("dessiner");252 283 dessin->addWidget(caroule); 253 caroule->clicked().connect(this, &PspaApplication::dessiner);254 284 dessin->addWidget(new WBreak()); 255 285 256 WPushButton* okEnv = new WPushButton("draw enveloppe"); 257 258 dessin->addWidget(new WText(" drawing enveloppe : ")); 259 choixEnveloppeDessin_ = new WComboBox(); 260 choixEnveloppeDessin_->addItem("x"); 261 choixEnveloppeDessin_->addItem("y"); 262 263 dessin->addWidget(okEnv); 264 okEnv->clicked().connect(this, &PspaApplication::dessinerEnveloppe); 286 287 265 288 266 289 ///////////////////////////////////////////////////////////////////// -
Interface_Web/trunk/pspaWT/src/GWt_soleno.cc
r229 r233 29 29 } 30 30 31 31 32 void GWt_soleno::dialogDone() 32 33 {
Note: See TracChangeset
for help on using the changeset viewer.