Changeset 418 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
- Timestamp:
- Jun 21, 2013, 10:16:56 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r401 r418 51 51 52 52 53 GWt_abstractElement* GWt_LigneFaisceau::addElement( typedElement eType){53 GWt_abstractElement* GWt_LigneFaisceau::addElement(nomdElements::typedElement eType){ 54 54 return addElement(eType,NULL); 55 55 } 56 56 57 GWt_abstractElement* GWt_LigneFaisceau::addElement( typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer )57 GWt_abstractElement* GWt_LigneFaisceau::addElement(nomdElements::typedElement eType, GWt_dropZoneLigneFaisceau* dropContainer ) 58 58 { 59 59 … … 66 66 // -dropContainer is NULL, insert in the last element 67 67 68 if(eType == inconnu) {68 if(eType == nomdElements::inconnu) { 69 69 cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl; 70 70 return NULL; … … 222 222 223 223 224 int GWt_LigneFaisceau::getAbstractElementIndexFromLabel(std::string txt){ 225 int index = 0; 224 225 int GWt_LigneFaisceau::getAbstractElementNumeroFromLabel(std::string txt){ 226 int index = 1; 226 227 if (txt == "") { 227 228 return NULL; … … 246 247 247 248 249 250 248 251 int GWt_LigneFaisceau::getBeamLineSize() { 249 252 int count = 0; … … 289 292 vector <abstractElement*> elems = getAllAbstractElements(); 290 293 for (int a=0; a< elems.size(); a++) { 291 elems[a]->setSoftware(nomDeLogiciel::unknownSoftware); 292 } 293 } 294 295 294 // elems[a]->setSoftware(nomDeLogiciel::unknownSoftware); 295 elems[a]->setSoftware( NULL ); 296 } 297 } 298 299
Note: See TracChangeset
for help on using the changeset viewer.