Changeset 412 in PSPA for Interface_Web
- Timestamp:
- Mar 29, 2013, 6:19:53 PM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/History
r411 r412 11 11 - Ajout d'une bordure autour des icones de gauche 12 12 - GWt_console : Ajout d'une fonction de recherche 13 - Remplacement des "Bad section definition" par des messages dans la zone erreur des sections 14 - Passage en blanc des elements ignorés dans la beamLine 13 15 14 16 28 Mars : Laurent Garnier -
Interface_Web/trunk/pspaWT/sources/controler/src/abstractElement.cc
r401 r412 120 120 tb = TBoolOk; 121 121 } 122 123 if ((tb == TBoolOk) || (tb == TBoolIgnore)) {122 123 if ((tb == TBoolOk)/* || (tb == TBoolIgnore)*/) { 124 124 if (prog == nomDeLogiciel::parmela) { 125 125 abstractSoftware_ = new softwareParmela(); -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_softwarePanel.cc
r411 r412 271 271 if ( current > dtmanage_->getBeamLineSize() ) 272 272 { 273 GWt_dialog warningDialog("PSPA :: verification des sections", " bad section definition 1 !", GWt_dialog::Error,true,true);274 warningDialog.exec();275 273 sections_[a]->setErrors("This section element could not be after previous session last element"); 274 exec_go_->disable(); 275 return false; 276 276 } 277 277 … … 283 283 int numeroFin = dtmanage_->getNumeroFromElementLabel( finString); 284 284 285 if ( numeroFin < current || numeroFin > dtmanage_->getBeamLineSize()) 286 { 287 GWt_dialog warningDialog("PSPA : Checking of sections", " bad section definition 2 !", GWt_dialog::Error, true,true); 288 warningDialog.exec(); 289 return false; 290 } 285 if ( numeroFin < current) 286 { 287 sections_[a]->setErrors("Last section element should be after first section element"); 288 exec_go_->disable(); 289 return false; 290 } 291 292 if (numeroFin > dtmanage_->getBeamLineSize()) 293 { 294 sections_[a]->setErrors("Last section element number is greater than the beam line size"); 295 exec_go_->disable(); 296 return false; 297 } 291 298 292 299 // preparation de la ligne suivante
Note: See TracChangeset
for help on using the changeset viewer.