Changeset 271 in PSPA
- Timestamp:
- Jan 23, 2013, 7:24:57 PM (11 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 1 added
- 1 deleted
- 16 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/cmt/requirements
r270 r271 48 48 49 49 50 macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC -DPSPA_DEBUG" 50 #macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC -DPSPA_DEBUG" 51 macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DPSPA_DEBUG" 51 52 52 53 macro PSPSLib_shlibflags " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}" -
Interface_Web/trunk/pspaWT/sources/controler/include/abstractElement.h
r257 r271 16 16 protected : 17 17 18 /* bool parmelaOk_; */19 /* bool parmelaIgnored_; */20 /* bool transportOk_; */21 18 int nbParam_; 22 19 string* parametersString_; … … 26 23 double defaultLength_; 27 24 double defaultAperture_; 25 string defaultLabel_; 28 26 29 27 string label_; -
Interface_Web/trunk/pspaWT/sources/controler/include/elementDrift.h
r257 r271 10 10 { 11 11 12 void setDefaultValues(); 13 14 void setDefaults(); 12 15 13 16 public: -
Interface_Web/trunk/pspaWT/sources/controler/include/nomdElements.h
r260 r271 15 15 unsigned nbParam_; // nombre de parametres a saisir 16 16 17 static typedElement from Image(std::string s);17 static typedElement fromString(std::string s); 18 18 static typedElement fromLabel(std::string s); 19 19 static std::string toName(typedElement eType); … … 37 37 std::string getElementName() const; 38 38 std::string getElementLabel() const; 39 std::string getElementImage() const;40 39 unsigned getElementNbParameters() const; 41 40 -
Interface_Web/trunk/pspaWT/sources/controler/src/abstractElement.cc
r257 r271 5 5 abstractElement::abstractElement() 6 6 { 7 label_ = string("");8 7 setDefaultValues(); 9 8 setDefaults(); … … 26 25 void abstractElement::setDefaultValues() 27 26 { 27 defaultLabel_ = string("XXXXXX"); 28 28 defaultLength_ = 0.0; 29 29 defaultAperture_ = 1.e+6; … … 33 33 void abstractElement::setDefaults() 34 34 { 35 label_ = "";35 label_ = defaultLabel_; 36 36 nbParam_ = 2; 37 37 lenghtElem_ = defaultLength_; 38 38 aperture_ = defaultAperture_; 39 // parmelaOk_ = false;40 // parmelaIgnored_ = false;41 // transportOk_ = false;42 39 } 43 40 -
Interface_Web/trunk/pspaWT/sources/controler/src/elementBeam.cc
r257 r271 17 17 18 18 void elementBeam::setDefaultValues() { 19 defaultLabel_ = "beam999"; 19 20 xDef_ = 0.0; 20 21 xpDef_ = 0.0; … … 27 28 28 29 void elementBeam::setDefaults() { 30 label_ = defaultLabel_; 29 31 x_ = xDef_; 30 32 xp_ = xpDef_; -
Interface_Web/trunk/pspaWT/sources/controler/src/elementBend.cc
r257 r271 16 16 void elementBend::setDefaultValues() 17 17 { 18 defaultLabel_ = "bend999"; 18 19 angleDegDef_ = 0.0; 19 20 radiusDef_ = 1.0; … … 25 26 void elementBend::setDefaults() 26 27 { 28 label_ = defaultLabel_; 27 29 angleDeg_ = angleDegDef_; 28 30 radius_ = radiusDef_; -
Interface_Web/trunk/pspaWT/sources/controler/src/elementCell.cc
r257 r271 20 20 void elementCell::setDefaultValues() 21 21 { 22 defaultLabel_ = "cell999"; 22 23 initialPhaseDef_ = 0.0; 23 24 acceleratingFieldDef_ = 1.0; 24 acceleratingShapeFileDef_ = string(" ");25 focusingMagFileDef_ = string(" ");25 acceleratingShapeFileDef_ = "xxxxxxx"; 26 focusingMagFileDef_ = "xxxxxx"; 26 27 offsetMagDef_ = 0.0; 27 28 scaleFactorDef_ = 1.0; … … 30 31 void elementCell::setDefaults() 31 32 { 33 label_ = defaultLabel_; 32 34 initialPhase_ = initialPhaseDef_; 33 35 acceleratingField_ = acceleratingFieldDef_; -
Interface_Web/trunk/pspaWT/sources/controler/src/elementDrift.cc
r257 r271 8 8 elementDrift::elementDrift() : abstractElement() 9 9 { 10 setDefaultValues(); 11 setDefaults(); 10 12 elementName_ = nomdElements("drift"); 11 13 nbParam_ = elementName_.getElementNbParameters(); 12 14 parametersString_ = new string[nbParam_+1]; 13 // parmelaOk_ = true;14 // transportOk_ = true;15 // transportElementName_ = "*DRIFT*";16 15 } 16 17 void elementDrift::setDefaultValues() 18 { 19 defaultLabel_ = "drift999"; 20 } 21 void elementDrift::setDefaults() 22 { 23 label_ = defaultLabel_; 24 } 25 17 26 18 27 trivaluedBool elementDrift::is_accepted_by_software(nomDeLogiciel soft) const { -
Interface_Web/trunk/pspaWT/sources/controler/src/elementFit.cc
r257 r271 15 15 void elementFit::setDefaultValues() 16 16 { 17 defaultLabel_ = "fit999"; 17 18 variableNameDef_ = ""; 18 19 variableValueDef_ = 0.0; … … 22 23 void elementFit::setDefaults() 23 24 { 25 label_ = defaultLabel_; 24 26 variableName_ = variableNameDef_; 25 27 variableValue_ = variableValueDef_; -
Interface_Web/trunk/pspaWT/sources/controler/src/elementRfgun.cc
r257 r271 19 19 void elementRfgun::setDefaultValues() 20 20 { 21 defaultLabel_ = "rfgun999"; 21 22 defaultPhaseStep_ = 1.0; 22 23 defaultNmacrop_ = 0; … … 30 31 void elementRfgun::setDefaults() 31 32 { 33 label_ = defaultLabel_; 32 34 phaseStep_ = defaultPhaseStep_; 33 35 nmacrop_ = defaultNmacrop_; -
Interface_Web/trunk/pspaWT/sources/controler/src/elementSoleno.cc
r257 r271 9 9 setDefaultValues(); 10 10 setDefaults(); 11 elementName_ = nomdElements(" lens");11 elementName_ = nomdElements("soleno"); 12 12 nbParam_ = elementName_.getElementNbParameters(); 13 13 parametersString_ = new string[nbParam_+1]; 14 // transportOk_ = true;15 // parmelaOk_ = true;16 // transportElementName_ = "*SOLE*";17 14 } 18 15 … … 20 17 void elementSoleno::setDefaultValues() 21 18 { 19 defaultLabel_ = "solnd999"; 22 20 B0Def_ = 0.0; 23 21 varyB0Def_ = false; … … 26 24 void elementSoleno::setDefaults() 27 25 { 26 label_ = defaultLabel_; 28 27 B0_ = B0Def_; 29 28 varyB0_ = varyB0Def_; -
Interface_Web/trunk/pspaWT/sources/controler/src/nomdElements.cc
r260 r271 4 4 #include "nomdElements.h" 5 5 6 typedElement nomdElements::from Image(std::string s)6 typedElement nomdElements::fromString(std::string s) 7 7 { 8 8 if( strstr(s.c_str(),"beam") ) return beam; … … 11 11 else if( strstr(s.c_str(),"cell") ) return cell; 12 12 else if( strstr(s.c_str(),"bend") ) return bend; 13 else if( strstr(s.c_str()," lens") ) return soleno;13 else if( strstr(s.c_str(),"soleno") ) return soleno; 14 14 else if( strstr(s.c_str(),"fit") ) return fit; 15 15 return inconnu; … … 76 76 nomdElements::nomdElements() 77 77 { 78 e_= from Image("");78 e_= fromString(""); 79 79 eName_ = toName(e_); 80 80 eLabel_ = toLabel(e_); … … 101 101 nomdElements::nomdElements(const std::string& s) 102 102 { 103 e_= from Image(s);103 e_= fromString(s); 104 104 eName_ = toName(e_); 105 105 eLabel_ = toLabel(e_); … … 138 138 } 139 139 140 std::string nomdElements::getElementLabel() const 141 { 140 std::string nomdElements::getElementLabel() const { 142 141 return eLabel_; 143 142 } -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_dropZoneLigneFaisceau.cc
r267 r271 26 26 27 27 // accept drops 28 acceptDrops("htdocs/beam.j og");28 acceptDrops("htdocs/beam.jpg"); 29 29 acceptDrops("htdocs/rfgun.jpg"); 30 30 acceptDrops("htdocs/drift.jpg"); 31 31 acceptDrops("htdocs/cell.jpg"); 32 32 acceptDrops("htdocs/bend.jpg"); 33 acceptDrops("htdocs/ lens.jpg");33 acceptDrops("htdocs/soleno.jpg"); 34 34 acceptDrops("htdocs/fit.jpg"); 35 35 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc
r267 r271 94 94 95 95 void GWt_LigneFaisceau::addElement(typedElement eType){ 96 96 cout << " Entree addElement element " << nomdElements::getLabelFromType(eType) << endl; 97 97 // if it is the first element 98 98 if (eType == inconnu) { … … 101 101 abstractElement* ptr = pspa_->getDataManager()->addElement(eType); 102 102 103 if(eType == inconnu) {104 cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl;105 return;106 }103 // if(eType == inconnu) { 104 // cout << "GWt_LigneFaisceau::element type " << eType << " inconnu " << endl; 105 // return; 106 // } 107 107 108 108 -
Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc
r261 r271 190 190 createDragImage("htdocs/bend.jpg","htdocs/bend.jpg","htdocs/bend.jpg",palette,"bend"); 191 191 new WBreak(palette); 192 createDragImage("htdocs/ lens.jpg","htdocs/lens.jpg","htdocs/lens.jpg",palette,"lens");192 createDragImage("htdocs/soleno.jpg","htdocs/soleno.jpg","htdocs/soleno.jpg",palette,"soleno"); 193 193 new WBreak(palette); 194 194 createDragImage("htdocs/fit.jpg","htdocs/fit.jpg","htdocs/fit.jpg",palette,"fit");
Note: See TracChangeset
for help on using the changeset viewer.