Changeset 225 in PSPA for Interface_Web/trunk
- Timestamp:
- Dec 27, 2012, 5:18:50 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT
- Files:
-
- 5 added
- 1 deleted
- 23 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/cmt/requirements
r223 r225 17 17 18 18 19 macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC -DPSPA_DEBUG" Linux-x86_64 " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC" 19 #macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC -DPSPA_DEBUG" Linux-x86_64 " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DHAS_IMAGEMAGIC" 20 21 macro lib_PSPSLib_cppflags " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD -DPSPA_DEBUG" Linux-x86_64 " ${Wt_cflags} ${boost_cflags} -DTHREADED -DDRAWWT_BUILD " 22 23 24 25 20 26 #macro PSPSLib_shlibflags " ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts} -F/System/Library/Frameworks " 21 27 22 28 #macro PSPSLib_linkopts " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib " 23 24 application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc transportMoments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"' 29 application pspaWT bareParticle.cc particleBeam.cc GWt_cell.cc GWt_rfgun.cc GWt_soleno.cc GWt_bend.cc GWt_beam.cc GWt_globalParameters.cc GWt_drift.cc GWt_fit.cc GWt_abstractElement.cc dataManager.cc elementsCollection.cc elementDrift.cc elementCell.cc elementRfgun.cc elementSoleno.cc elementBend.cc elementBeam.cc elementFit.cc globalParameters.cc abstractElement.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc GWt_dropZoneLigneFaiseau.cc GWt_draggableImage.cc GWt_dialog.cc nomdElements.cc nomDeLogiciel.cc transportMoments.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags}"' 25 30 26 31 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}" -
Interface_Web/trunk/pspaWT/include/GWt_abstractElement.h
r169 r225 23 23 WContainerWidget* wc_; 24 24 25 WLineEdit* labelEdit_; 26 25 27 GWt_abstractElement() {;} 26 28 29 string* beginDialog(); 27 30 public : 28 31 -
Interface_Web/trunk/pspaWT/include/abstractElement.h
r153 r225 46 46 string getLabel() const; 47 47 // typedElement getName() const; 48 nomdElements getN ame() const;48 nomdElements getNomdElement() const; 49 49 50 // string getNameOfElement(); 51 // string getNameString() const; 50 /* string getElementImage() const; */ 51 52 /* string getElementName() const; */ 52 53 53 54 double getLenghtOfElement() const; -
Interface_Web/trunk/pspaWT/include/nomdElements.h
r181 r225 4 4 using namespace std; 5 5 6 enum typedElement {beam, RFgun, drift, cell, bend, soleno, inconnu};6 enum typedElement {beam, RFgun, drift, cell, bend, soleno, fit, inconnu}; 7 7 8 8 -
Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc
r223 r225 66 66 GWt_abstractElement* gw = GWt_abstractElement::ajoute(pspa_,ptr); 67 67 if(gw == NULL) { 68 cerr << "GWt_LigneFaisceau::restaure element type " << ptr->getN ame().getElementName() << " est inconnu " << endl;68 cerr << "GWt_LigneFaisceau::restaure element type " << ptr->getNomdElement().getElementName() << " est inconnu " << endl; 69 69 } 70 70 71 71 gw->updateLabelWidget(); 72 nObjets_[ptr->getN ame().getElementType()].incr();72 nObjets_[ptr->getNomdElement().getElementType()].incr(); 73 73 GWt_dropZoneLigneFaiseau* dropZone = new GWt_dropZoneLigneFaiseau(pspa_); 74 74 dropZone->addElement(gw->getWidget()); -
Interface_Web/trunk/pspaWT/src/GWt_abstractElement.cc
r198 r225 10 10 #include "GWt_soleno.h" 11 11 #include "GWt_beam.h" 12 #include "GWt_fit.h" 12 13 13 14 #include "mixedTools.h" … … 15 16 16 17 #include <Wt/WText> 18 #include <Wt/WLineEdit> 17 19 18 20 GWt_abstractElement::GWt_abstractElement(PspaApplication* ps,abstractElement* elem) … … 23 25 dropped_ = new WPushButton(); 24 26 dropped_->setObjectName("aPushButton"); 25 dropped_->setIcon(element_->getN ame().getElementImage());27 dropped_->setIcon(element_->getNomdElement().getElementImage()); 26 28 dropped_->setMaximumSize(50,37); 27 29 dropped_->clicked().connect(this,&GWt_abstractElement::clicked); … … 35 37 wc_->addWidget(bk); 36 38 //wc_->addWidget(new WBreak()); 39 } 40 41 string* GWt_abstractElement::beginDialog() 42 { 43 string* param = element_-> getParametersString(); 44 if ( param == NULL ) 45 { 46 pspa_->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName()); 47 } 48 // int compteur = -1; 49 50 // int nbparam = atoi(param[++compteur].c_str()); 51 int nbparam = atoi(param->c_str()); 52 if ( nbparam != element_->getNbParams()) 53 { 54 pspa_->addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName()); 55 } 56 57 dialog_ = new WDialog("element " + element_->getNomdElement().getElementName()); 58 new WText(" label of the element : ",dialog_->contents()); 59 // labelEdit_ = new WLineEdit(param[++compteur].c_str(), dialog_->contents()); 60 61 labelEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 62 new WBreak(dialog_->contents()); 63 return ++param; 37 64 } 38 65 … … 65 92 GWt_abstractElement* GWt_abstractElement::ajoute(PspaApplication* ps,abstractElement* ptr) 66 93 { 67 typedElement eType = ptr->getN ame().getElementType();94 typedElement eType = ptr->getNomdElement().getElementType(); 68 95 69 96 switch ( eType ) { … … 74 101 case soleno : return new GWt_soleno(ps,ptr); 75 102 case beam : return new GWt_beam(ps,ptr); 103 case fit : return new GWt_fit(ps,ptr); 76 104 case inconnu : return NULL; 77 105 default : return NULL; -
Interface_Web/trunk/pspaWT/src/GWt_beam.cc
r202 r225 10 10 GWt_beam::GWt_beam(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) { 11 11 12 string* param = element_-> getParametersString();13 if ( param == NULL )14 {15 pspa_->addConsoleMessage(" GWt_beam : empty parameter set");16 }17 int nbparam = atoi(param[0].c_str());18 if ( nbparam != element_->getNbParams() )19 {20 pspa_->addConsoleMessage(WString(" element uncoherently programmed for number of parameters: beam "));21 }22 12 23 dialog_ = new WDialog("element : beam");13 string* param = beginDialog(); 24 14 25 15 new WText(" 1/2 horizontal beam extend rms (cm) : ",dialog_->contents()); 26 xEdit_ = new WLineEdit(param [1].c_str(), dialog_->contents());16 xEdit_ = new WLineEdit(param->c_str(), dialog_->contents()); 27 17 // new WBreak(dialog_->contents()); 28 18 29 19 new WText("1/2 horizontal beam divergence rms (mrad) : ",dialog_->contents()); 30 xpEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());20 xpEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 31 21 new WBreak(dialog_->contents()); 32 22 33 23 new WText("1/2 vertical beam extend rms (cm) : ",dialog_->contents()); 34 yEdit_ = new WLineEdit( param[3].c_str(), dialog_->contents());24 yEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 35 25 // new WBreak(dialog_->contents()); 36 26 37 27 new WText("1/2 horizontal beam divergence rms (mrad) : ",dialog_->contents()); 38 ypEdit_ = new WLineEdit( param[4].c_str(), dialog_->contents());28 ypEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 39 29 new WBreak(dialog_->contents()); 40 30 41 31 new WText("1/2 longitudinal beam extend rms (cm) : ",dialog_->contents()); 42 dlEdit_ = new WLineEdit( param[5].c_str(), dialog_->contents());32 dlEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 43 33 // new WBreak(dialog_->contents()); 44 34 45 35 new WText("1/2 momentum spread rms (mrad) : ",dialog_->contents()); 46 delEdit_ = new WLineEdit( param[6].c_str(), dialog_->contents());36 delEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 47 37 new WBreak(dialog_->contents()); 48 38 49 39 new WText("momentum of the central trajectory (GeV/c) : ",dialog_->contents()); 50 p0Edit_ = new WLineEdit( param[7].c_str(), dialog_->contents());40 p0Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 51 41 new WBreak(dialog_->contents()); 52 42 … … 62 52 int compteur = -1; 63 53 envoi[++compteur] = mixedTools::intToString(nbParam); 54 envoi[++compteur] = labelEdit_->text().toUTF8(); 64 55 envoi[++compteur] = xEdit_->text().toUTF8(); 65 56 envoi[++compteur] = xpEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/GWt_bend.cc
r202 r225 11 11 GWt_bend::GWt_bend(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) 12 12 { 13 string* param = element_-> getParametersString();14 if ( param == NULL )15 {16 pspa_->addConsoleMessage(" GWt_bend : empty parameter set");17 }18 int nbparam = atoi(param[0].c_str());19 if ( nbparam != element_->getNbParams() )20 {21 pspa_->addConsoleMessage(WString(" element uncoherently programmed for munmber of parameters: bend "));22 }23 13 24 dialog_ = new WDialog("element : bend");25 14 string* param = beginDialog(); 15 26 16 new WText("angle (deg.) : ",dialog_->contents()); 27 angleEdit_ = new WLineEdit( param[1].c_str(), dialog_->contents());17 angleEdit_ = new WLineEdit( param->c_str(), dialog_->contents()); 28 18 new WBreak(dialog_->contents()); 29 19 30 20 new WText("radius (m) : ",dialog_->contents()); 31 radiusEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());21 radiusEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 32 22 new WBreak(dialog_->contents()); 33 23 34 24 new WText("momentum (MeV/c) : ",dialog_->contents()); 35 momentumEdit_ = new WLineEdit( param[6].c_str(), dialog_->contents());25 momentumEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 36 26 new WBreak(dialog_->contents()); 37 27 … … 42 32 43 33 new WText("aperture (cm) : ",dialog_->contents()); 44 apertureEdit_ = new WLineEdit( param[3].c_str(), dialog_->contents());34 apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 45 35 apertureEdit_->setDisabled(true); 46 36 new WBreak(dialog_->contents()); 47 37 48 38 new WText("pole face rotations (deg.) entrance : ",dialog_->contents()); 49 beta1Edit_ = new WLineEdit( param[4].c_str(), dialog_->contents());39 beta1Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 50 40 new WText("exit : ",dialog_->contents()); 51 beta2Edit_ = new WLineEdit( param[5].c_str(), dialog_->contents());41 beta2Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 52 42 new WBreak(dialog_->contents()); 53 43 … … 63 53 int compteur = -1; 64 54 envoi[++compteur] = string(mixedTools::intToString(nbParam) ); 55 envoi[++compteur] = labelEdit_->text().toUTF8(); 56 cout << " GWt_bend::dialogDone() j'envoie " << envoi[compteur] << endl; 65 57 envoi[++compteur] = angleEdit_->text().toUTF8(); 66 58 envoi[++compteur] = radiusEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/GWt_cell.cc
r202 r225 12 12 GWt_cell::GWt_cell(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) 13 13 { 14 string* param = element_-> getParametersString(); 15 if ( param == NULL ) { 16 pspa_->addConsoleMessage(" GWt_cell : empty parameter set"); 17 } 18 int nbparam = atoi(param[0].c_str()); 19 if ( nbparam != 9 ) { 20 pspa_->addConsoleMessage(" element seems not to be a CELL"); 21 } 22 23 dialog_ = new WDialog("element CELL"); 14 15 string* param = beginDialog(); 24 16 25 17 new WText("length (cm) : ",dialog_->contents()); 26 lenghtElemEdit_ = new WLineEdit(param [1].c_str(), dialog_->contents());18 lenghtElemEdit_ = new WLineEdit(param->c_str(), dialog_->contents()); 27 19 new WBreak(dialog_->contents()); 28 20 29 21 new WText("aperture (cm) : ",dialog_->contents()); 30 apertureEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());22 apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 31 23 new WBreak(dialog_->contents()); 32 24 33 25 new WText("initial phase (deg.) : ",dialog_->contents()); 34 initialPhaseEdit_ = new WLineEdit( param[3].c_str(), dialog_->contents());26 initialPhaseEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 35 27 new WBreak(dialog_->contents()); 36 28 37 29 new WText("max phase step (deg.) : ",dialog_->contents()); 38 phaseStepMaxEdit_ = new WLineEdit( param[4].c_str(), dialog_->contents());30 phaseStepMaxEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 39 31 new WBreak(dialog_->contents()); 40 32 41 33 new WText("max accelerating field (MV/m) : ",dialog_->contents()); 42 acceleratingFieldEdit_ = new WLineEdit( param[5].c_str(), dialog_->contents());34 acceleratingFieldEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 43 35 new WBreak(dialog_->contents()); 44 36 45 37 new WText("name of file for field shape : ",dialog_->contents()); 46 acceleratingShapeFileEdit_ = new WLineEdit( param[6].c_str(), dialog_->contents());38 acceleratingShapeFileEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 47 39 new WBreak(dialog_->contents()); 48 40 … … 51 43 52 44 WText* t1 = new WText("name of file for focusing mag. field : ",dialog_->contents()); 53 focusingMagFileEdit_ = new WLineEdit( param[7].c_str(), dialog_->contents());45 focusingMagFileEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 54 46 new WBreak(dialog_->contents()); 55 47 56 48 WText* t2 = new WText(" z-offset for mag. field : ",dialog_->contents()); 57 offsetMagEdit_ = new WLineEdit( param[8].c_str(), dialog_->contents());49 offsetMagEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 58 50 59 51 WText* t3 = new WText(" scaling factor for mag. field : ",dialog_->contents()); 60 scaleFactorEdit_ = new WLineEdit( param[9].c_str(), dialog_->contents());52 scaleFactorEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 61 53 62 54 WContainerWidget* contenu = new WContainerWidget(); … … 84 76 85 77 envoi[++compteur] = mixedTools::intToString(nbParam); 78 envoi[++compteur] = labelEdit_->text().toUTF8(); 86 79 envoi[++compteur] = lenghtElemEdit_->text().toUTF8(); 87 80 envoi[++compteur] = apertureEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/GWt_drift.cc
r202 r225 11 11 GWt_drift::GWt_drift(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) 12 12 { 13 string* param = element_-> getParametersString(); 14 if ( param == NULL ) { 15 pspa_->addConsoleMessage("GWt_Drift : empty parameter set"); 16 } 17 int nbparam = atoi(param[0].c_str()); 18 if ( nbparam != element_->getNbParams() ) { 19 pspa_->addConsoleMessage("element seems not to be a DRIFT"); 20 } 21 22 dialog_ = new WDialog("element DRIFT"); 13 14 string* param = beginDialog(); 15 23 16 new WText("length (cm) : ",dialog_->contents()); 24 xlengthEdit_ = new WLineEdit(param [1].c_str(), dialog_->contents());17 xlengthEdit_ = new WLineEdit(param->c_str(), dialog_->contents()); 25 18 new WBreak(dialog_->contents()); 26 19 new WText("aperture (cm) : ",dialog_->contents()); 27 apertureEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());20 apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 28 21 new WBreak(dialog_->contents()); 29 22 WPushButton *submit = new WPushButton("OK",dialog_->contents()); … … 38 31 int compteur = -1; 39 32 envoi[++compteur] = mixedTools::intToString(nbParam); 33 envoi[++compteur] = labelEdit_->text().toUTF8(); 40 34 envoi[++compteur] = xlengthEdit_->text().toUTF8(); 41 35 envoi[++compteur] = apertureEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc
r223 r225 149 149 150 150 GWt_abstractElement* insertedAbstractElement = GWt_abstractElement::ajoute(pspa_,ptr); 151 cout << " je vais ajouter l'element " << ptr->getN ame().getElementName() << " de type " << ptr->getName().getElementType() << "ID "<< insertedAbstractElement << endl;151 cout << " je vais ajouter l'element " << ptr->getNomdElement().getElementName() << " de type " << ptr->getNomdElement().getElementType() << "ID "<< insertedAbstractElement << endl; 152 152 153 153 if(insertedAbstractElement == NULL) return; -
Interface_Web/trunk/pspaWT/src/GWt_rfgun.cc
r202 r225 10 10 GWt_rfgun::GWt_rfgun(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) 11 11 { 12 string* param = element_-> getParametersString();13 if ( param == NULL )14 {15 pspa_->addConsoleMessage(" GWt_rfgun : empty parameter set");16 }17 int nbparam = atoi(param[0].c_str());18 if ( nbparam != 6 )19 {20 pspa_->addConsoleMessage(" element seems not to be a initialBeam");21 }22 12 23 dialog_ = new WDialog("element initialBeam");13 string* param = beginDialog(); 24 14 25 15 new WText("nr of macroparticles : ",dialog_->contents()); 26 nmacropEdit_ = new WLineEdit(param [1].c_str(), dialog_->contents());16 nmacropEdit_ = new WLineEdit(param->c_str(), dialog_->contents()); 27 17 new WBreak(dialog_->contents()); 28 18 29 19 new WText("sigma_t (ps) : ",dialog_->contents()); 30 sigma_tEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());20 sigma_tEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 31 21 new WBreak(dialog_->contents()); 32 22 33 23 new WText("sigma_r (cm) : ",dialog_->contents()); 34 sigma_rEdit_ = new WLineEdit( param[3].c_str(), dialog_->contents());24 sigma_rEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 35 25 new WBreak(dialog_->contents()); 36 26 37 27 new WText("initial kinetic energy (MeV) : ",dialog_->contents()); 38 E_cinEdit_ = new WLineEdit( param[4].c_str(), dialog_->contents());28 E_cinEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 39 29 new WBreak(dialog_->contents()); 40 30 41 31 new WText("sigma_Ecin (MeV) : ",dialog_->contents()); 42 sigma_EEdit_ = new WLineEdit( param[5].c_str(), dialog_->contents());32 sigma_EEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 43 33 new WBreak(dialog_->contents()); 44 34 45 35 new WText("true number of part. in beam : ",dialog_->contents()); 46 nb_true_particlesEdit_ = new WLineEdit(param[6].c_str(), dialog_->contents()); 36 nb_true_particlesEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 37 new WBreak(dialog_->contents()); 47 38 48 39 // Submit … … 58 49 int compteur = -1; 59 50 envoi[++compteur] = mixedTools::intToString(nbParam); 51 envoi[++compteur] = labelEdit_->text().toUTF8(); 60 52 envoi[++compteur] = nmacropEdit_->text().toUTF8(); 61 53 envoi[++compteur] = sigma_tEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/GWt_soleno.cc
r202 r225 10 10 GWt_soleno::GWt_soleno(PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) 11 11 { 12 string* param = element_-> getParametersString(); 13 if ( param == NULL ) 14 { 15 pspa_->addConsoleMessage(" GWt_soleno : empty parameter set"); 16 } 17 int nbparam = atoi(param[0].c_str()); 18 if ( nbparam != 3 ) 19 { 20 pspa_->addConsoleMessage(" element seems not to be a SOLENOID"); 21 } 22 23 dialog_ = new WDialog("element SOLENOID"); 12 string* param = beginDialog(); 24 13 25 14 new WText("length (cm) : ",dialog_->contents()); 26 xlengthEdit_ = new WLineEdit( param[1].c_str(), dialog_->contents());15 xlengthEdit_ = new WLineEdit( param->c_str(), dialog_->contents()); 27 16 new WBreak(dialog_->contents()); 28 17 new WText("aperture (cm) : ",dialog_->contents()); 29 apertureEdit_ = new WLineEdit( param[2].c_str(), dialog_->contents());18 apertureEdit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 30 19 new WBreak(dialog_->contents()); 31 20 new WText("fielg (kG) : ",dialog_->contents()); 32 B0Edit_ = new WLineEdit( param[3].c_str(), dialog_->contents());21 B0Edit_ = new WLineEdit( (++param)->c_str(), dialog_->contents()); 33 22 new WBreak(dialog_->contents()); 34 23 … … 45 34 int compteur = -1; 46 35 envoi[++compteur] = mixedTools::intToString(nbParam); 36 envoi[++compteur] = labelEdit_->text().toUTF8(); 47 37 envoi[++compteur] = xlengthEdit_->text().toUTF8(); 48 38 envoi[++compteur] = apertureEdit_->text().toUTF8(); -
Interface_Web/trunk/pspaWT/src/abstractElement.cc
r153 r225 67 67 // } 68 68 69 nomdElements abstractElement::getN ame() const69 nomdElements abstractElement::getNomdElement() const 70 70 { 71 71 return elementName_; 72 72 } 73 73 74 75 // string abstractElement::getNameOfElement() 74 // string abstractElement::getElementImage() const 76 75 // { 77 // switch(elementName_) { 78 // case 0 : return "beam"; break; 79 // case 1 : return "drift"; break; 80 // case 2 : return "cell"; break; 81 // case 3 : return "bend"; break; 82 // case 4 : return "solnd"; break; 83 // default : return ""; 84 // } 76 // return elementName_.getElementImage(); 85 77 // } 86 78 87 79 88 // // provisoire, pour suppleer une future classe nomdElement 89 // // analogue a nomDeLogiciel 90 // string abstractElement::getNameString() const 80 81 // string abstractElement::getElementImage() const 91 82 // { 92 // switch ( elementName_ ) 93 // { 94 // case RFgun : 95 // { 96 // return string("RF GUN"); 97 // } 98 // case drift : 99 // { 100 // return string("DRIFT"); 101 // } 102 // case cell : 103 // { 104 // return string("CELL"); 105 // } 106 // case soleno : 107 // { 108 // return string("SOLENO"); 109 // } 110 // case bend : 111 // { 112 // return string("BEND"); 113 // } 114 // default : 115 // { 116 // return string("UNKNOWN"); 117 // } 118 // } 83 // return elementName_.getElementImage(); 119 84 // } 85 86 87 88 // string abstractElement::getElementName() const 89 // { 90 // return elementName_.getElementName(); 91 // } 92 93 120 94 121 95 double abstractElement::getLenghtOfElement() const { -
Interface_Web/trunk/pspaWT/src/dataManager.cc
r196 r225 65 65 66 66 if(!elPtr->is_parmela_element()) { 67 diagnostic += " the element " + elPtr->getN ame().getElementName() + " is not allowed for PARMELA \n";67 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for PARMELA \n"; 68 68 } 69 69 } … … 77 77 78 78 if (!elPtr->is_transport_element()) { 79 diagnostic += " the element " + elPtr->getN ame().getElementName() + " is not allowed for TRANSPORT \n";79 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n"; 80 80 } 81 81 } … … 148 148 string elemLabel = getLabelFromElementNumero (k); 149 149 abstractElement* ptr = elementsGallery_.getElementPointerFromNumero(k); 150 if (!diagnosticBeam_.back().setFromTransport(elemLabel, ptr->getN ame() ) )150 if (!diagnosticBeam_.back().setFromTransport(elemLabel, ptr->getNomdElement() ) ) 151 151 { 152 152 sortie << " reading transport output failed " << endl; … … 262 262 263 263 // Dans le cas où le premier element n'est pas beam 264 if ( premierEl->getN ame().getElementType() != beam ) {264 if ( premierEl->getNomdElement().getElementType() != beam ) { 265 265 // s'il n'y a pas faisceau courant, erreur 266 266 if ( currentBeam_ == NULL ) { … … 329 329 double initalKineticEnergy = 0.0; 330 330 elPtr = elementsGallery_.getElementPointer(indexDeb); 331 if ( elPtr->getN ame().getElementType() != RFgun ) {331 if ( elPtr->getNomdElement().getElementType() != RFgun ) { 332 332 cerr << " dataManager::createInputFileParmela : the first element should be rfgun" << endl; 333 333 return false; -
Interface_Web/trunk/pspaWT/src/elementBeam.cc
r185 r225 37 37 38 38 string* elementBeam::getParametersString() const { 39 parametersString_[0] = mixedTools::intToString(nbParam_); 40 parametersString_[1] = mixedTools::doubleToString(x_); 41 parametersString_[2] = mixedTools::doubleToString(xp_); 42 parametersString_[3] = mixedTools::doubleToString(y_); 43 parametersString_[4] = mixedTools::doubleToString(yp_); 44 parametersString_[5] = mixedTools::doubleToString(dl_); 45 parametersString_[6] = mixedTools::doubleToString(del_); 46 parametersString_[7] = mixedTools::doubleToString(p0_); 47 cout << " elementBeam::getParametersString() on renvoie : " << parametersString_[7] << endl; 39 int compteur = -1; 40 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 41 parametersString_[++compteur] = label_; 42 parametersString_[++compteur] = mixedTools::doubleToString(x_); 43 parametersString_[++compteur] = mixedTools::doubleToString(xp_); 44 parametersString_[++compteur] = mixedTools::doubleToString(y_); 45 parametersString_[++compteur] = mixedTools::doubleToString(yp_); 46 parametersString_[++compteur] = mixedTools::doubleToString(dl_); 47 parametersString_[++compteur] = mixedTools::doubleToString(del_); 48 parametersString_[++compteur] = mixedTools::doubleToString(p0_); 49 if ( compteur != nbParam_ ) { 50 cerr << " elementBeam::getParametersString() : ERROR nr pf parameters dosnt match " << endl; 51 return NULL; 52 } 48 53 return parametersString_; 49 54 } … … 55 60 return; 56 61 } 57 int nbparam = atoi(param[0].c_str()); 62 int compteur = -1; 63 int nbparam = atoi(param[++compteur].c_str()); 58 64 if ( nbparam != nbParam_ ) 59 65 { … … 62 68 } 63 69 64 x_ = atof(param[1].c_str());65 x p_ = atof(param[2].c_str());66 y_ = atof(param[3].c_str());67 y p_ = atof(param[4].c_str());68 dl_ = atof(param[5].c_str());69 d el_ = atof(param[6].c_str());70 p0_ = atof(param[7].c_str());71 cout << " elementBeam::setParametersString p0 vaut " << p0_ << endl;70 label_ = param[++compteur]; 71 x_ = atof(param[++compteur].c_str()); 72 xp_ = atof(param[++compteur].c_str()); 73 y_ = atof(param[++compteur].c_str()); 74 yp_ = atof(param[++compteur].c_str()); 75 dl_ = atof(param[++compteur].c_str()); 76 del_ = atof(param[++compteur].c_str()); 77 p0_ = atof(param[++compteur].c_str()); 72 78 } 73 79 -
Interface_Web/trunk/pspaWT/src/elementBend.cc
r204 r225 34 34 string* elementBend::getParametersString() const 35 35 { 36 parametersString_[0] = mixedTools::intToString(nbParam_); 37 parametersString_[1] = mixedTools::doubleToString( angleDeg_); 38 parametersString_[2] = mixedTools::doubleToString(radius_); 39 parametersString_[3] = mixedTools::doubleToString(aperture_); 40 parametersString_[4] = mixedTools::doubleToString(beta1_); 41 parametersString_[5] = mixedTools::doubleToString(beta2_); 42 parametersString_[6] = mixedTools::doubleToString(momentum_); 36 int compteur = -1; 37 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 38 parametersString_[++compteur] = label_; 39 parametersString_[++compteur] = mixedTools::doubleToString( angleDeg_); 40 parametersString_[++compteur] = mixedTools::doubleToString(radius_); 41 parametersString_[++compteur] = mixedTools::doubleToString(momentum_); 42 parametersString_[++compteur] = mixedTools::doubleToString(aperture_); 43 parametersString_[++compteur] = mixedTools::doubleToString(beta1_); 44 parametersString_[++compteur] = mixedTools::doubleToString(beta2_); 45 if ( compteur != nbParam_ ) { 46 cerr << " elementBend::getParametersString() : ERROR nr pf parameters dosnt match " << endl; 47 return NULL; 48 } 43 49 return parametersString_; 44 50 } … … 58 64 return; 59 65 } 60 int nbparam = atoi(param[0].c_str()); 66 67 int compteur = -1; 68 int nbparam = atoi(param[++compteur].c_str()); 61 69 if ( nbparam != nbParam_ ) 62 70 { … … 64 72 return; 65 73 } 66 angleDeg_ = atof(param[1].c_str()); 67 radius_ = atof(param[2].c_str()); 68 aperture_ = atof(param[3].c_str()); 69 beta1_ = atof(param[4].c_str()); 70 beta2_ = atof(param[5].c_str()); 71 momentum_ = atof(param[6].c_str()); 74 label_ = param[++compteur]; 75 angleDeg_ = atof(param[++compteur].c_str()); 76 radius_ = atof(param[++compteur].c_str()); 77 momentum_ = atof(param[++compteur].c_str()); 78 aperture_ = atof(param[++compteur].c_str()); 79 beta1_ = atof(param[++compteur].c_str()); 80 beta2_ = atof(param[++compteur].c_str()); 72 81 // calcul de la longueur : rayon en m ; longueur en cm 73 82 lenghtElem_ = getLenghtOfElement(); -
Interface_Web/trunk/pspaWT/src/elementCell.cc
r190 r225 40 40 string* elementCell::getParametersString() const 41 41 { 42 parametersString_[0] = mixedTools::intToString(nbParam_); 43 parametersString_[1] = mixedTools::doubleToString(lenghtElem_); 44 parametersString_[2] = mixedTools::doubleToString(aperture_); 45 parametersString_[3] = mixedTools::doubleToString(initialPhase_); 46 parametersString_[4] = mixedTools::doubleToString( phaseStepMax_); 47 parametersString_[5] = mixedTools::doubleToString(acceleratingField_); 48 parametersString_[6] = acceleratingShapeFile_; 49 parametersString_[7] = focusingMagFile_; 50 parametersString_[8] = mixedTools::doubleToString(offsetMag_); 51 parametersString_[9] = mixedTools::doubleToString(scaleFactor_); 42 int compteur = -1; 43 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 44 parametersString_[++compteur] = label_; 45 parametersString_[++compteur] = mixedTools::doubleToString(lenghtElem_); 46 parametersString_[++compteur] = mixedTools::doubleToString(aperture_); 47 parametersString_[++compteur] = mixedTools::doubleToString(initialPhase_); 48 parametersString_[++compteur] = mixedTools::doubleToString( phaseStepMax_); 49 parametersString_[++compteur] = mixedTools::doubleToString(acceleratingField_); 50 parametersString_[++compteur] = acceleratingShapeFile_; 51 parametersString_[++compteur] = focusingMagFile_; 52 parametersString_[++compteur] = mixedTools::doubleToString(offsetMag_); 53 parametersString_[++compteur] = mixedTools::doubleToString(scaleFactor_); 54 if ( compteur != nbParam_ ) { 55 cerr << " elementCell::getParametersString() : ERROR nr pf parameters dosnt match " << endl; 56 return NULL; 57 } 52 58 return parametersString_; 53 59 } … … 61 67 return; 62 68 } 63 int nbparam = atoi(param[0].c_str()); 69 int compteur = -1; 70 int nbparam = atoi(param[++compteur].c_str()); 64 71 if ( nbparam != nbParam_ ) 65 72 { … … 68 75 } 69 76 70 lenghtElem_ = atof(param[1].c_str()); 71 aperture_ = atof(param[2].c_str()); 72 initialPhase_ = atof(param[3].c_str()); 73 phaseStepMax_ = atof(param[4].c_str()); 74 acceleratingField_ = atof(param[5].c_str()); 75 acceleratingShapeFile_ = param[6]; 76 focusingMagFile_ = param[7]; 77 offsetMag_ = atof(param[8].c_str()); 78 scaleFactor_ = atof(param[9].c_str()); 77 label_ = param[++compteur]; 78 lenghtElem_ = atof(param[++compteur].c_str()); 79 aperture_ = atof(param[++compteur].c_str()); 80 initialPhase_ = atof(param[++compteur].c_str()); 81 phaseStepMax_ = atof(param[++compteur].c_str()); 82 acceleratingField_ = atof(param[++compteur].c_str()); 83 acceleratingShapeFile_ = param[++compteur]; 84 focusingMagFile_ = param[++compteur]; 85 offsetMag_ = atof(param[++compteur].c_str()); 86 scaleFactor_ = atof(param[++compteur].c_str()); 79 87 } 80 88 -
Interface_Web/trunk/pspaWT/src/elementDrift.cc
r181 r225 18 18 string* elementDrift::getParametersString() const 19 19 { 20 parametersString_[0] = mixedTools::intToString(nbParam_); 21 parametersString_[1] = mixedTools::doubleToString(lenghtElem_); 22 parametersString_[2] = mixedTools::doubleToString(aperture_); 20 int compteur = -1; 21 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 22 parametersString_[++compteur] = label_; 23 parametersString_[++compteur] = mixedTools::doubleToString(lenghtElem_); 24 parametersString_[++compteur] = mixedTools::doubleToString(aperture_); 25 if ( compteur != nbParam_ ) { 26 cerr << " elementDrift::getParametersString() : ERROR nr pf parameters dosnt match " << endl; 27 return NULL; 28 } 23 29 return parametersString_; 24 30 } … … 31 37 return; 32 38 } 33 int nbparam = atoi(param[0].c_str()); 39 int compteur = -1; 40 int nbparam = atoi(param[++compteur].c_str()); 34 41 if ( nbparam != nbParam_ ) 35 42 { … … 37 44 return; 38 45 } 39 lenghtElem_ = atof(param[1].c_str()); 40 aperture_ = atof(param[2].c_str()); 46 label_ = param[++compteur]; 47 lenghtElem_ = atof(param[++compteur].c_str()); 48 aperture_ = atof(param[++compteur].c_str()); 41 49 } 42 50 -
Interface_Web/trunk/pspaWT/src/elementRfgun.cc
r181 r225 41 41 string* elementRfgun::getParametersString() const 42 42 { 43 parametersString_[0] = mixedTools::intToString(nbParam_); 44 parametersString_[1] = mixedTools::intToString(nmacrop_); 45 parametersString_[2] = mixedTools::doubleToString(sigma_t_); 46 parametersString_[3] = mixedTools::doubleToString(sigma_r_); 47 parametersString_[4] = mixedTools::doubleToString(E_cin_); 48 parametersString_[5] = mixedTools::doubleToString(sigma_E_); 49 parametersString_[6] = mixedTools::doubleToString(nb_true_particles_); 43 int compteur = -1; 44 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 45 parametersString_[++compteur] = label_; 46 parametersString_[++compteur] = mixedTools::intToString(nmacrop_); 47 parametersString_[++compteur] = mixedTools::doubleToString(sigma_t_); 48 parametersString_[++compteur] = mixedTools::doubleToString(sigma_r_); 49 parametersString_[++compteur] = mixedTools::doubleToString(E_cin_); 50 parametersString_[++compteur] = mixedTools::doubleToString(sigma_E_); 51 parametersString_[++compteur] = mixedTools::doubleToString(nb_true_particles_); 50 52 return parametersString_; 51 53 } … … 58 60 return; 59 61 } 60 int nbparam = atoi(param[0].c_str()); 62 int compteur = -1; 63 int nbparam = atoi(param[++compteur].c_str()); 61 64 if ( nbparam != nbParam_ ) 62 65 { … … 65 68 } 66 69 67 nmacrop_ = atoi(param[1].c_str()); 68 sigma_t_ = atof(param[2].c_str()); 69 sigma_r_ = atof(param[3].c_str()); 70 E_cin_ = atof(param[4].c_str()); 71 sigma_E_ = atof(param[5].c_str()); 72 nb_true_particles_ = atof(param[6].c_str()); 70 label_ = param[++compteur]; 71 nmacrop_ = atoi(param[++compteur].c_str()); 72 sigma_t_ = atof(param[++compteur].c_str()); 73 sigma_r_ = atof(param[++compteur].c_str()); 74 E_cin_ = atof(param[++compteur].c_str()); 75 sigma_E_ = atof(param[++compteur].c_str()); 76 nb_true_particles_ = atof(param[++compteur].c_str()); 73 77 74 78 } -
Interface_Web/trunk/pspaWT/src/elementSoleno.cc
r189 r225 33 33 { 34 34 cout << " passage elementSoleno::getParametersString() B0_= " << B0_ << endl; 35 parametersString_[0] = mixedTools::intToString(nbParam_); 36 parametersString_[1] = mixedTools::doubleToString(lenghtElem_); 37 parametersString_[2] = mixedTools::doubleToString(aperture_); 38 parametersString_[3] = mixedTools::doubleToString(B0_); 35 int compteur = -1; 36 parametersString_[++compteur] = mixedTools::intToString(nbParam_); 37 parametersString_[++compteur] = label_; 38 parametersString_[++compteur] = mixedTools::doubleToString(lenghtElem_); 39 parametersString_[++compteur] = mixedTools::doubleToString(aperture_); 40 parametersString_[++compteur] = mixedTools::doubleToString(B0_); 41 if ( compteur != nbParam_ ) { 42 cerr << " elementSoleno::getParametersString() : ERROR nr pf parameters dosnt match " << endl; 43 return NULL; 44 } 39 45 return parametersString_; 40 46 } … … 48 54 return; 49 55 } 50 int nbparam = atoi(param[0].c_str()); 56 int compteur = -1; 57 int nbparam = atoi(param[++compteur].c_str()); 51 58 if ( nbparam != nbParam_ ) 52 59 { … … 54 61 return; 55 62 } 56 lenghtElem_ = atof(param[1].c_str()); 57 aperture_ = atof(param[2].c_str()); 58 B0_ = atof(param[3].c_str()); 63 label_ = param[++compteur]; 64 lenghtElem_ = atof(param[++compteur].c_str()); 65 aperture_ = atof(param[++compteur].c_str()); 66 B0_ = atof(param[++compteur].c_str()); 59 67 } 60 68 -
Interface_Web/trunk/pspaWT/src/elementsCollection.cc
r179 r225 9 9 #include "elementBend.h" 10 10 #include "elementBeam.h" 11 #include "elementFit.h" 11 12 12 13 elementsCollection::~elementsCollection() … … 56 57 case beam : { 57 58 elements_.push_back(new elementBeam()); 59 break; 60 } 61 case fit : { 62 elements_.push_back(new elementFit()); 58 63 break; 59 64 } -
Interface_Web/trunk/pspaWT/src/nomdElements.cc
r202 r225 12 12 else if( strstr(s.c_str(),"bend") ) return bend; 13 13 else if( strstr(s.c_str(),"lens") ) return soleno; 14 else if( strstr(s.c_str(),"fit") ) return fit; 14 15 return inconnu; 15 16 } … … 23 24 else if( s == "bend" ) return bend; 24 25 else if( s == "solnd" ) return soleno; 26 else if( s == "fit" ) return fit; 25 27 return inconnu; 26 28 } … … 37 39 case bend : return "BENDING MAGNET"; break; 38 40 case soleno : return "SOLENOID"; break; 41 case fit : return "FIT"; break; 39 42 default : return "UNKNOWN"; 40 43 } … … 50 53 case bend : return string("icons/bend.jpg"); break; 51 54 case soleno : return string("icons/lens.jpg"); break; 55 case fit : return string("icons/fit.jpg"); break; 52 56 default : return string(""); 53 57 } … … 63 67 case bend : return "bend"; 64 68 case soleno : return "solnd"; 69 case fit : return "fit"; 65 70 default : return string(""); 66 71 } … … 70 75 { 71 76 switch(eType) { 72 case beam : return 7; 73 case RFgun : return 6; 74 case drift : return 2; 75 case cell : return 9; 76 case bend : return 6; 77 case soleno : return 3; 77 case beam : return 8; 78 case RFgun : return 7; 79 case drift : return 3; 80 case cell : return 10; 81 case bend : return 7; 82 case soleno : return 4; 83 case fit : return 4; 78 84 default : return 0; 79 85 }
Note: See TracChangeset
for help on using the changeset viewer.