Changeset 226 in PSPA for Interface_Web/trunk/pspaWT/src
- Timestamp:
- Dec 28, 2012, 7:50:58 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT/src
- Files:
-
- 1 added
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc
r225 r226 64 64 { 65 65 abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointer(k); 66 GWt_abstractElement* gw = GWt_abstractElement::ajoute(p spa_,ptr);66 GWt_abstractElement* gw = GWt_abstractElement::ajoute(ptr); 67 67 if(gw == NULL) { 68 68 cerr << "GWt_LigneFaisceau::restaure element type " << ptr->getNomdElement().getElementName() << " est inconnu " << endl; -
Interface_Web/trunk/pspaWT/src/GWt_abstractElement.cc
r225 r226 14 14 #include "mixedTools.h" 15 15 #include "nomdElements.h" 16 #include "GWt_tools.h" 16 17 17 18 #include <Wt/WText> 18 19 #include <Wt/WLineEdit> 20 #include <Wt/WBreak> 19 21 20 GWt_abstractElement::GWt_abstractElement( PspaApplication* ps,abstractElement* elem)22 GWt_abstractElement::GWt_abstractElement(abstractElement* elem) 21 23 { 22 pspa_ = ps;24 // pspa_ = ps; 23 25 element_ = elem; 24 26 … … 44 46 if ( param == NULL ) 45 47 { 46 pspa_->addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName());48 GWt_tools::addConsoleMessage(" GWt_abstractElement::beginDialog : empty parameter set for element " + element_->getNomdElement().getElementName()); 47 49 } 48 50 // int compteur = -1; … … 52 54 if ( nbparam != element_->getNbParams()) 53 55 { 54 pspa_->addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName());56 GWt_tools::addConsoleMessage(" element seems not to be a " + element_->getNomdElement().getElementName()); 55 57 } 56 58 … … 90 92 } 91 93 92 GWt_abstractElement* GWt_abstractElement::ajoute( PspaApplication* ps,abstractElement* ptr)94 GWt_abstractElement* GWt_abstractElement::ajoute(abstractElement* ptr) 93 95 { 94 96 typedElement eType = ptr->getNomdElement().getElementType(); 95 97 96 98 switch ( eType ) { 97 case RFgun : return new GWt_rfgun(p s,ptr);98 case drift : return new GWt_drift(p s,ptr);99 case cell : return new GWt_cell(p s,ptr);100 case bend : return new GWt_bend(p s,ptr);101 case soleno : return new GWt_soleno(p s,ptr);102 case beam : return new GWt_beam(p s,ptr);103 case fit : return new GWt_fit(p s,ptr);99 case RFgun : return new GWt_rfgun(ptr); 100 case drift : return new GWt_drift(ptr); 101 case cell : return new GWt_cell(ptr); 102 case bend : return new GWt_bend(ptr); 103 case soleno : return new GWt_soleno(ptr); 104 case beam : return new GWt_beam(ptr); 105 case fit : return new GWt_fit(ptr); 104 106 case inconnu : return NULL; 105 107 default : return NULL; -
Interface_Web/trunk/pspaWT/src/GWt_beam.cc
r225 r226 8 8 #include <Wt/WPushButton> 9 9 10 GWt_beam::GWt_beam( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem) {10 GWt_beam::GWt_beam(abstractElement* elem) : GWt_abstractElement(elem) { 11 11 12 12 -
Interface_Web/trunk/pspaWT/src/GWt_bend.cc
r225 r226 9 9 #include <Wt/WPushButton> 10 10 11 GWt_bend::GWt_bend( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)11 GWt_bend::GWt_bend(abstractElement* elem) : GWt_abstractElement(elem) 12 12 { 13 13 -
Interface_Web/trunk/pspaWT/src/GWt_cell.cc
r225 r226 10 10 #include <Wt/WPanel> 11 11 12 GWt_cell::GWt_cell( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)12 GWt_cell::GWt_cell(abstractElement* elem) : GWt_abstractElement(elem) 13 13 { 14 14 -
Interface_Web/trunk/pspaWT/src/GWt_drift.cc
r225 r226 9 9 #include <Wt/WPushButton> 10 10 11 GWt_drift::GWt_drift( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)11 GWt_drift::GWt_drift(abstractElement* elem) : GWt_abstractElement(elem) 12 12 { 13 13 -
Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc
r225 r226 3 3 #include "GWt_dropZoneLigneFaiseau.h" 4 4 #include "nomdElements.h" 5 #include "GWt_tools.h" 5 6 6 7 #include <Wt/WCssDecorationStyle> … … 74 75 75 76 #ifdef PSPA_DEBUG 76 pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver");77 GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOver"); 77 78 #endif 78 79 } … … 96 97 97 98 #ifdef PSPA_DEBUG 98 pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut");99 GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut"); 99 100 #endif 100 101 } … … 103 104 { 104 105 #ifdef PSPA_DEBUG 105 pspa_->addConsoleMessage(" GWt_dropZoneLigneFaiseau::mouseDragged");106 GWt_tools::addConsoleMessage(" GWt_dropZoneLigneFaiseau::mouseDragged"); 106 107 #endif 107 108 } … … 110 111 { 111 112 #ifdef PSPA_DEBUG 112 pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut up");113 GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseOut up"); 113 114 #endif 114 115 } … … 117 118 { 118 119 #ifdef PSPA_DEBUG 119 pspa_->addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseDown up");120 GWt_tools::addConsoleMessage("GWt_dropZoneLigneFaiseau::mouseDown up"); 120 121 #endif 121 122 } … … 124 125 { 125 126 #ifdef PSPA_DEBUG 126 pspa_->addConsoleMessage(" GWt_dropZoneLigneFaiseau::dropEvent");127 GWt_tools::addConsoleMessage(" GWt_dropZoneLigneFaiseau::dropEvent"); 127 128 #endif 128 129 … … 142 143 } 143 144 144 pspa_->addConsoleMessage(e.getElementName());145 GWt_tools::addConsoleMessage(e.getElementName()); 145 146 146 147 abstractElement* ptr = pspa_->getDataManager()->addElement(eType); … … 148 149 ptr->setLabel(getElementNumberInBeamLine(e)); 149 150 150 GWt_abstractElement* insertedAbstractElement = GWt_abstractElement::ajoute(p spa_,ptr);151 GWt_abstractElement* insertedAbstractElement = GWt_abstractElement::ajoute(ptr); 151 152 cout << " je vais ajouter l'element " << ptr->getNomdElement().getElementName() << " de type " << ptr->getNomdElement().getElementType() << "ID "<< insertedAbstractElement << endl; 152 153 … … 308 309 309 310 #ifdef PSPA_DEBUG 310 pspa_->addConsoleMessage("remove from drag Zone");311 GWt_tools::addConsoleMessage("remove from drag Zone"); 311 312 cout << "remove from drag Zone id" << layout->indexOf ((WLayoutItem*)(layout->findWidgetItem (other))) << " count:" << layout->count()<< endl; 312 313 #endif … … 316 317 layout->removeItem (layout->itemAt(2)); 317 318 #ifdef PSPA_DEBUG 318 pspa_->addConsoleMessage("remove first link");319 GWt_tools::addConsoleMessage("remove first link"); 319 320 #endif 320 321 } … … 325 326 layout->removeItem (layout->itemAt(layout->count()-3)); 326 327 #ifdef PSPA_DEBUG 327 pspa_->addConsoleMessage("remove last link");328 GWt_tools::addConsoleMessage("remove last link"); 328 329 #endif 329 330 } … … 334 335 layout->removeItem (layout->itemAt(layout->indexOf((WLayoutItem*)(layout->findWidgetItem (other))))); 335 336 #ifdef PSPA_DEBUG 336 pspa_->addConsoleMessage("remove drop zone");337 GWt_tools::addConsoleMessage("remove drop zone"); 337 338 #endif 338 339 } -
Interface_Web/trunk/pspaWT/src/GWt_fit.cc
r225 r226 7 7 #include <Wt/WDialog> 8 8 #include <Wt/WPushButton> 9 #include <Wt/WComboBox> 9 10 10 GWt_fit::GWt_fit( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)11 GWt_fit::GWt_fit(abstractElement* elem) : GWt_abstractElement(elem) 11 12 { 12 13 -
Interface_Web/trunk/pspaWT/src/GWt_globalParameters.cc
r58 r226 10 10 11 11 #include "mixedTools.h" 12 //#include "nomDeLogiciel.h" 12 #include "GWt_tools.h" 13 13 14 14 15 GWt_globalParameters::GWt_globalParameters(PspaApplication* ps) … … 107 108 if ( param == NULL ) 108 109 { 109 pspa_->addConsoleMessage(" GWt_globalParameters : empty parameter set");110 GWt_tools::addConsoleMessage(" GWt_globalParameters : empty parameter set"); 110 111 } 111 112 int nbparam = atoi(param[0].c_str()); 112 113 if ( nbparam != 4 ) 113 114 { 114 pspa_->addConsoleMessage(" GWt_globalParameters : wrong number of parameters");115 GWt_tools::addConsoleMessage(" GWt_globalParameters : wrong number of parameters"); 115 116 } 116 117 frequencyEdit_->setText(param[1].c_str()); -
Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc
r224 r226 14 14 #include "nomdElements.h" 15 15 #include "environmentVariables.h" 16 16 #include "GWt_tools.h" 17 17 18 18 #include <Wt/WLineEdit> … … 85 85 layout->addWidget(beamLine_, 2, 1, 1, 1); 86 86 87 console_ = new WContainerWidget(); 88 console_->decorationStyle().setBackgroundColor (WColor("lightgray")); 89 console_->setMaximumSize(600,200); 90 layout->addWidget(console_, 3, 1); 91 console_->setMinimumSize(300,100); 92 console_->setOverflow(WContainerWidget::OverflowAuto); 87 88 // console_ = new WContainerWidget(); 89 // console_->decorationStyle().setBackgroundColor (WColor("lightgray")); 90 // console_->setMaximumSize(600,200); 91 // layout->addWidget(console_, 3, 1); 92 // console_->setMinimumSize(300,100); 93 // console_->setOverflow(WContainerWidget::OverflowAuto); 94 95 GWt_tools::console_->clear(); 96 GWt_tools::console_->decorationStyle().setBackgroundColor (WColor("lightgray")); 97 GWt_tools::console_->setMaximumSize(600,200); 98 GWt_tools::console_->setMinimumSize(300,100); 99 GWt_tools::console_->setOverflow(WContainerWidget::OverflowAuto); 100 layout->addWidget(GWt_tools::console_, 3, 1); 101 102 103 104 93 105 94 106 //----------- … … 107 119 //----------- 108 120 121 122 109 123 layout->setColumnResizable(1); 110 124 layout->setRowResizable(2); … … 351 365 if ( current >= dtmanage_->beamLineSize() ) 352 366 { 353 addConsoleMessage(" bad section definition ! \n ");367 // GWt_tools::addConsoleMessage(" bad section definition ! \n "); 354 368 GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", GWt_dialog::Error,true,true); 355 369 warningDialog.exec(); … … 365 379 if ( numeroFin <= current || numeroFin > dtmanage_->beamLineSize()) 366 380 { 367 addConsoleMessage(" bad section definition ! \n ");381 // GWt_tools::addConsoleMessage(" bad section definition ! \n "); 368 382 GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", GWt_dialog::Error, true,true); 369 383 warningDialog.exec(); … … 408 422 { 409 423 caMarche = false; 410 addConsoleMessage(diagnostic.c_str());424 // GWt_tools::addConsoleMessage(diagnostic.c_str()); 411 425 GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic , GWt_dialog::Error,true,true); 412 426 calculDialog.exec(); … … 427 441 void PspaApplication::executer() 428 442 { 429 addConsoleMessage(string("on va peut etre y arriver"));443 GWt_tools::addConsoleMessage(string("on va peut etre y arriver")); 430 444 static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals(); 431 445 … … 441 455 } 442 456 // cout << " PspaApplication : retour d'execution resultat = " << resultat << endl; 443 addConsoleMessage(resultat);457 GWt_tools::addConsoleMessage(resultat); 444 458 // cout << " PspaApplication : affichage console termine " << endl; 445 459 … … 454 468 { 455 469 cout << " on sauve " << endl; 456 addConsoleMessage("sauvegarde");470 GWt_tools::addConsoleMessage("sauvegarde"); 457 471 458 472 dialogSave_ = new WDialog("save"); … … 469 483 void PspaApplication::dialogSaveDone(WDialog::DialogCode code) 470 484 { 471 if ( code != Wt::WDialog::Accepted ) { addConsoleMessage(" pas de sauvegarde"); return;}472 else { addConsoleMessage("sauvegarde sur repertoire : " + WORKINGAREA);}485 if ( code != Wt::WDialog::Accepted ) { GWt_tools::addConsoleMessage(" pas de sauvegarde"); return;} 486 else { GWt_tools::addConsoleMessage("sauvegarde sur repertoire : " + WORKINGAREA);} 473 487 nameOfCase_ = saveNameEdit_->text().toUTF8(); 474 488 cout << " PspaApplication::dialogSaveDone() nameOfCase_= " << nameOfCase_ << endl; … … 484 498 void PspaApplication::restaurer() 485 499 { 486 addConsoleMessage(string("on va recharger..."));500 GWt_tools::addConsoleMessage(string("on va recharger...")); 487 501 dialogOpen_ = new WDialog("open"); 488 502 new WText("name of case : ",dialogOpen_->contents()); … … 499 513 { 500 514 501 if ( code != Wt::WDialog::Accepted ) { addConsoleMessage(" pas de restauration"); return;}502 else { addConsoleMessage("restauration depuis le repertoire " + WORKINGAREA);}515 if ( code != Wt::WDialog::Accepted ) { GWt_tools::addConsoleMessage(" pas de restauration"); return;} 516 else { GWt_tools::addConsoleMessage("restauration depuis le repertoire " + WORKINGAREA);} 503 517 504 518 nameOfCase_ = openNameEdit_->text().toUTF8(); … … 506 520 delete dialogOpen_; 507 521 dialogSave_ = NULL; 508 509 522 510 523 bool test = dtmanage_->restoreElements(WORKINGAREA + nameOfCase_ +".save"); … … 520 533 bobo->restoreElementCollection(); 521 534 522 addConsoleMessage(string("...terminee"));535 GWt_tools::addConsoleMessage(string("...terminee")); 523 536 } 524 537 … … 567 580 { 568 581 nameOfCase_ = nomDuFichier; 569 addConsoleMessage(string("restauration..."));582 GWt_tools::addConsoleMessage(string("restauration...")); 570 583 571 584 if ( !dtmanage_->restoreElements(uploadFileSelectorWidget_->spoolFileName()) ) { … … 580 593 bobo->restoreElementCollection(); 581 594 582 addConsoleMessage(string("...terminee"));595 GWt_tools::addConsoleMessage(string("...terminee")); 583 596 message->show(); 584 597 } … … 641 654 if ( beam->particleRepresentationOk() ) faireDessinParmela(toto_, beam); 642 655 else { 643 addConsoleMessage("the beam state does not allow providing a drawing");644 656 GWt_dialog warningBeamState(" graphical analysis", "the beam state does not allow providing a drawing with macroparticles !", GWt_dialog::Error, false,true); 645 657 warningBeamState.exec(); … … 647 659 } 648 660 else { 649 addConsoleMessage("type of drawing not programmed");650 661 GWt_dialog warningTypeDrawing(" graphical analysis", "type of drawing not programmed !", GWt_dialog::Error, false,true); 651 662 warningTypeDrawing.exec(); … … 665 676 } 666 677 else { 667 addConsoleMessage("type of enveloppe drawing not programmed");668 678 GWt_dialog warningTypeEnveloppe(" graphical analysis", "type of enveloppe drawing not programmed !", GWt_dialog::Error, false,true); 669 679 warningTypeEnveloppe.exec(); … … 867 877 } 868 878 869 void PspaApplication::addConsoleMessage(WString msg) {870 WText *w = new WText(console_);871 w->setTextFormat(PlainText);872 w->setText(msg);873 w->setInline(false);874 875 /*876 * Little javascript trick to make sure we scroll along with new content877 */878 WApplication *app = WApplication::instance();879 app->doJavaScript(console_->jsRef() + ".scrollTop += "880 + console_->jsRef() + ".scrollHeight;");881 882 }879 // void PspaApplication::addConsoleMessage(WString msg) { 880 // WText *w = new WText(console_); 881 // w->setTextFormat(PlainText); 882 // w->setText(msg); 883 // w->setInline(false); 884 885 // /* 886 // * Little javascript trick to make sure we scroll along with new content 887 // */ 888 // WApplication *app = WApplication::instance(); 889 // app->doJavaScript(console_->jsRef() + ".scrollTop += " 890 // + console_->jsRef() + ".scrollHeight;"); 891 892 // } 883 893 884 894 -
Interface_Web/trunk/pspaWT/src/GWt_rfgun.cc
r225 r226 8 8 #include <Wt/WPushButton> 9 9 10 GWt_rfgun::GWt_rfgun( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)10 GWt_rfgun::GWt_rfgun(abstractElement* elem) : GWt_abstractElement(elem) 11 11 { 12 12 -
Interface_Web/trunk/pspaWT/src/GWt_soleno.cc
r225 r226 8 8 #include <Wt/WPushButton> 9 9 10 GWt_soleno::GWt_soleno( PspaApplication* ps,abstractElement* elem) : GWt_abstractElement(ps,elem)10 GWt_soleno::GWt_soleno(abstractElement* elem) : GWt_abstractElement(elem) 11 11 { 12 12 string* param = beginDialog(); -
Interface_Web/trunk/pspaWT/src/dataManager.cc
r225 r226 41 41 cout << "dataManager::checkExecute()" << endl; 42 42 43 intk,j;43 unsigned k,j; 44 44 string diagnostic; 45 intindexDeb, indexFin;45 unsigned indexDeb, indexFin; 46 46 cout << "controle execution : " << endl; 47 47 for(k = 0; k < jobList_.size(); k++) { … … 142 142 infile.open(nameOut.c_str(), ios::in); 143 143 144 intk;144 unsigned k; 145 145 for ( k= indexDeb; k <= indexFin; k++) 146 146 { … … 203 203 else 204 204 { 205 intk;205 unsigned k; 206 206 for ( k= indexDeb; k <= indexFin; k++) 207 207 { … … 227 227 { 228 228 unsigned int k; 229 if ( numeroDeb < 1 || numeroFin > elementsGallery_.size() ) { 230 cerr << " numero of element out of limits " << endl; 231 return false; 232 } 233 229 234 unsigned indexDeb = numeroDeb - 1; 230 235 unsigned indexFin = numeroFin - 1; 231 if ( indexDeb < 0 || indexFin >= elementsGallery_.size() ) {232 cerr << " index of element out of limits " << endl;233 return false;234 }235 236 236 237 abstractElement* premierEl = NULL; … … 311 312 { 312 313 unsigned int k; 314 315 if ( numeroDeb < 1 || numeroFin > elementsGallery_.size() ) { 316 cerr << " index of element out of limits " << endl; 317 return false; 318 } 319 320 313 321 unsigned indexDeb = numeroDeb - 1; 314 322 unsigned indexFin = numeroFin - 1; 315 if ( indexDeb < 0 || indexFin >= elementsGallery_.size() ) {316 cerr << " index of element out of limits " << endl;317 return false;318 }319 323 320 324 ofstream outfile; … … 417 421 418 422 outfile << globParam_.FileOutputFlow(); 419 intk;423 unsigned k; 420 424 abstractElement* elPtr; 421 425 for ( k=0 ; k < elementsGallery_.size() ; k++) … … 439 443 else cout << " successful opening input stream " << inputFileName << endl; 440 444 441 int ielem;442 445 string globalTitle; 443 446 if ( infile >> globalTitle ) { … … 473 476 474 477 // debug 475 intk;478 unsigned k; 476 479 for(k = 0; k < elementsGallery_.size(); k++) { 477 480 abstractElement* ptr= elementsGallery_.getElementPointer(k); … … 483 486 } 484 487 485 particleBeam* dataManager::getDiagnosticBeam( intindex)488 particleBeam* dataManager::getDiagnosticBeam(unsigned index) 486 489 { 487 490 cout << " particleBeam* dataManager je vais dessiner " << getLabelFromElementNumero(index+1) << endl; 488 491 489 492 490 if ( index < 0 ||index >= diagnosticBeam_.size() ) {493 if ( index >= diagnosticBeam_.size() ) { 491 494 return NULL; 492 495 } -
Interface_Web/trunk/pspaWT/src/elementsCollection.cc
r225 r226 28 28 } 29 29 30 intelementsCollection::size()30 unsigned elementsCollection::size() 31 31 { 32 32 return elements_.size(); … … 84 84 abstractElement* elementsCollection::getElementPointerFromNumero(int num) const 85 85 { 86 if ( num > elements_.size() || num <= 0)86 if ( num > (int)elements_.size() || num <= 0) 87 87 { 88 88 return NULL; -
Interface_Web/trunk/pspaWT/src/nomdElements.cc
r225 r226 186 186 eLabel_ = ne.eLabel_; 187 187 nbParam_ = ne.nbParam_; 188 return *this; 188 189 } -
Interface_Web/trunk/pspaWT/src/particleBeam.cc
r224 r226 165 165 166 166 while( partic.readFromParmelaFile(filefais) > 0 ) { 167 if ( partic.ne == indexElement )167 if ( partic.ne == (int)indexElement ) 168 168 { 169 169 faisceau.push_back(partic); … … 576 576 577 577 xcor= vector<double>(ihist); 578 for ( unsignedi = 0; i < ihist; ++i) {578 for (int i = 0; i < ihist; ++i) { 579 579 xcor[i]= vmin+i*hpas; 580 580 } … … 591 591 592 592 cnts= 0; 593 for ( unsignedi = 0; i < ihist; ++i) {593 for (int i = 0; i < ihist; ++i) { 594 594 if(hist.at(i) > 0) cnts++; 595 595 cout<<"("<<xcor.at(i)<<","<<hist.at(i)<<") "; -
Interface_Web/trunk/pspaWT/src/transportMoments.cc
r180 r226 113 113 transportMoments& transportMoments::operator= (const transportMoments& tpm) { 114 114 rij_transportMoments_ = tpm.rij_transportMoments_; 115 return *this; 115 116 }
Note: See TracChangeset
for help on using the changeset viewer.