Changeset 230 in PSPA for Interface_Web/trunk/pspaWT/src
- Timestamp:
- Jan 3, 2013, 6:35:36 PM (12 years ago)
- Location:
- Interface_Web/trunk/pspaWT/src
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc
r229 r230 63 63 for(k = 0; k < (unsigned)nbElem; k++) 64 64 { 65 abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointer (k);65 abstractElement* ptr = pspa_->getDataManager()->getCollection()->getElementPointerFromIndex(k); 66 66 GWt_abstractElement* gw = GWt_abstractElement::ajoute(ptr); 67 67 if(gw == NULL) { -
Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc
r229 r230 15 15 #include "environmentVariables.h" 16 16 #include "GWt_tools.h" 17 #include "trivaluedBool.h" 17 18 18 19 #include <Wt/WLineEdit> … … 420 421 } 421 422 422 string diagnostic = dtmanage_->checkExecute(); 423 if ( !diagnostic.empty() ) 424 { 425 caMarche = false; 426 // GWt_tools::addConsoleMessage(diagnostic.c_str()); 427 GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic , GWt_dialog::Error,true,true); 428 calculDialog.exec(); 429 } 423 string diagnostic; 424 trivaluedBool essai = dtmanage_->checkExecute(diagnostic); 425 cout << " retour verif , essai = " << essai << endl; 426 if ( essai == error ) { 427 cout << " appli : erreur " << endl; 428 caMarche = false; 429 GWt_dialog calculDialog("PSPA check execute : ERROR", diagnostic , GWt_dialog::Error,true,true); 430 calculDialog.exec(); 431 } else if ( essai == warning ) { 432 cout << " appli : warnig " << endl; 433 caMarche = true; 434 GWt_dialog calculDialog("PSPA check execute : warning ", diagnostic , GWt_dialog::Warning, false,true); 435 calculDialog.exec(); 436 } 430 437 431 438 return caMarche; … … 904 911 // chart->setPlotAreaPadding(40, Top | Bottom); 905 912 // Add the curves 906 WDataSeries s(1, CurveSeries, Y1Axis);913 WDataSeries s(1, LineSeries, Y1Axis); 907 914 chart->addSeries(s); 908 915 -
Interface_Web/trunk/pspaWT/src/dataManager.cc
r227 r230 37 37 } 38 38 39 string dataManager::checkExecute()39 trivaluedBool dataManager::checkExecute(string& diagnostic) 40 40 { 41 41 cout << "dataManager::checkExecute()" << endl; 42 42 trivaluedBool resul = ok; 43 43 unsigned k,j; 44 string diagnostic;44 diagnostic.clear(); 45 45 unsigned indexDeb, indexFin; 46 46 cout << "controle execution : " << endl; … … 50 50 if ( indexFin <= indexDeb ) 51 51 { 52 diagnostic += " first ans last elements are the same \n"; 53 break; 52 diagnostic += " first and last elements are the same \n"; 53 resul = error; 54 break; 54 55 } 55 56 cout << " indexDeb= " << indexDeb << " indexFin= " << indexFin << endl; … … 57 58 indexFin--; 58 59 abstractElement* elPtr; 59 if(jobList_[k]->software == nomDeLogiciel::parmela ) 60 { 61 for(j = indexDeb; j <= indexFin; j++) { 62 elPtr = elementsGallery_.getElementPointer(j); 63 64 cout << "elPtr parmela: " << elPtr->getLabel() << endl; 65 66 if(!elPtr->is_parmela_element()) { 60 if(jobList_[k]->software == nomDeLogiciel::parmela ) { 61 for(j = indexDeb; j <= indexFin; j++) { 62 elPtr = elementsGallery_.getElementPointerFromIndex(j); 63 64 cout << "elPtr parmela: " << elPtr->getLabel() << endl; 65 66 if(!elPtr->is_parmela_element()) { 67 cout << " el non parmela : " << elPtr->getLabel() << " ignored ? " << elPtr->is_parmela_ignored() << endl; 68 if ( elPtr->is_parmela_ignored() ) { 69 cout << " element ignore " << elPtr->getLabel() << endl; 70 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is ignored by PARMELA \n"; 71 resul = warning; 72 } else { 67 73 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for PARMELA \n"; 74 resul =error; 68 75 } 69 76 } 70 77 } 71 else if (jobList_[k]->software == nomDeLogiciel::transport) 72 { 73 for(j = indexDeb; j <= indexFin; j++) { 74 elPtr = elementsGallery_.getElementPointer(j); 75 76 cout << "elPtr transp: " << elPtr->getLabel() << endl; 77 78 if (!elPtr->is_transport_element()) { 79 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n"; 80 } 81 } 82 } 78 } 79 else if (jobList_[k]->software == nomDeLogiciel::transport) { 80 for(j = indexDeb; j <= indexFin; j++) { 81 elPtr = elementsGallery_.getElementPointerFromIndex(j); 82 83 cout << "elPtr transp: " << elPtr->getLabel() << endl; 84 85 if (!elPtr->is_transport_element()) { 86 diagnostic += " the element " + elPtr->getNomdElement().getElementName() + " is not allowed for TRANSPORT \n"; 87 resul = error; 88 } 89 } 90 } 83 91 else 84 92 { 85 diagnostic += (jobList_[k]->software).getString() + " : unknown software \n "; 86 } 87 } 88 89 return diagnostic; 90 } 91 92 bool dataManager::executeTransport( unsigned int indexDeb, unsigned int indexFin, string workingDir, string& resul) 93 diagnostic += (jobList_[k]->software).getString() + " : unknown software \n "; 94 resul = error; 95 } 96 } 97 cout << " data manager renvoie resul = " << resul << endl; 98 return resul; 99 } 100 101 bool dataManager::executeTransport( unsigned int numeroDeb, unsigned int numeroFin, string workingDir, string& resul) 93 102 { 94 103 ostringstream sortie; 95 104 resul.clear(); 96 sortie << " EXECUTION DE TRANSPORT DE " << indexDeb << " a " << indexFin << endl;97 if ( !createInputFileTransport( indexDeb, indexFin, workingDir) )105 sortie << " EXECUTION DE TRANSPORT DE " << numeroDeb << " a " << numeroFin << endl; 106 if ( !createInputFileTransport( numeroDeb, numeroFin, workingDir) ) 98 107 { 99 108 sortie << " error creating transport input file " << endl; … … 143 152 144 153 unsigned k; 145 for ( k= indexDeb; k <= indexFin; k++)154 for ( k= numeroDeb; k <= numeroFin; k++) 146 155 { 147 156 diagnosticBeam_.push_back(particleBeam()); … … 164 173 } 165 174 166 bool dataManager::executeParmela(unsigned int indexDeb,unsigned int indexFin,string workingDir,string& resul)175 bool dataManager::executeParmela(unsigned int numeroDeb,unsigned int numeroFin,string workingDir,string& resul) 167 176 { 168 177 ostringstream sortie; 169 178 bool ExecuteStatus = true; 170 179 resul.clear(); 171 if ( !createInputFileParmela( indexDeb,indexFin, workingDir) )180 if ( !createInputFileParmela(numeroDeb,numeroFin, workingDir) ) 172 181 { 173 182 sortie << " error creating parmela input file " << endl; … … 176 185 } 177 186 178 sortie << " EXECUTION DE PARMELA DE l'ELEMENT " << indexDeb << " A L'ELEMENT " << indexFin << endl;187 sortie << " EXECUTION DE PARMELA DE l'ELEMENT " << numeroDeb << " A L'ELEMENT " << numeroFin << endl; 179 188 180 189 char buf[132]; … … 204 213 { 205 214 unsigned k; 206 for ( k= indexDeb; k <= indexFin; k++)215 for ( k= numeroDeb; k <= numeroFin; k++) 207 216 { 208 217 diagnosticBeam_.push_back(particleBeam()); 209 218 if (! diagnosticBeam_.back().setFromParmela(workingDir, k, globParam_.getFrequency()) ) 210 219 { 211 sortie << " reading parmdesz failed " << endl; 212 ExecuteStatus = false; 213 break; 220 abstractElement* elem = elementsGallery_.getElementPointerFromNumero(k); 221 if ( elem->is_parmela_ignored() ) { 222 int avantDernier = diagnosticBeam_.size() -2; 223 diagnosticBeam_.back() = diagnosticBeam_.at(avantDernier); 224 } else { 225 sortie << " reading parmdesz failed " << endl; 226 ExecuteStatus = false; 227 break; 228 } 214 229 } 215 230 } 231 216 232 if ( ExecuteStatus ) currentBeam_ = &diagnosticBeam_.back(); 217 233 else currentBeam_ = NULL; … … 236 252 237 253 abstractElement* premierEl = NULL; 238 premierEl = elementsGallery_.getElementPointer (indexDeb);254 premierEl = elementsGallery_.getElementPointerFromIndex(indexDeb); 239 255 240 256 // ceinture et bretelles … … 298 314 for ( k=indexDeb; k <= indexFin; k++) 299 315 { 300 elPtr = elementsGallery_.getElementPointer (k);316 elPtr = elementsGallery_.getElementPointerFromIndex(k); 301 317 outfile << elPtr->transportOutputFlow() << endl; 302 318 } … … 332 348 abstractElement* elPtr; 333 349 double initalKineticEnergy = 0.0; 334 elPtr = elementsGallery_.getElementPointer (indexDeb);350 elPtr = elementsGallery_.getElementPointerFromIndex(indexDeb); 335 351 if ( elPtr->getNomdElement().getElementType() != RFgun ) { 336 352 cerr << " dataManager::createInputFileParmela : the first element should be rfgun" << endl; … … 350 366 for ( k = indexDeb; k <= indexFin; k++) 351 367 { 352 elPtr = elementsGallery_.getElementPointer (k);368 elPtr = elementsGallery_.getElementPointerFromIndex(k); 353 369 outfile << elPtr->parmelaOutputFlow() << endl; 354 370 } … … 424 440 for ( k=0 ; k < elementsGallery_.size() ; k++) 425 441 { 426 elPtr = elementsGallery_.getElementPointer (k);442 elPtr = elementsGallery_.getElementPointerFromIndex(k); 427 443 outfile << elPtr->FileOutputFlow(); 428 444 } … … 477 493 unsigned k; 478 494 for(k = 0; k < elementsGallery_.size(); k++) { 479 abstractElement* ptr= elementsGallery_.getElementPointer (k);495 abstractElement* ptr= elementsGallery_.getElementPointerFromIndex(k); 480 496 cout << "reupere " << ptr->getLabel() << endl; 481 497 } … … 516 532 { 517 533 if ( !diagnosticBeam_.at(k).momentRepresentationOk() ) diagnosticBeam_.at(k).buildMomentRepresentation(); 518 longueur += elementsGallery_.getElementPointer (k)->getLenghtOfElement();534 longueur += elementsGallery_.getElementPointerFromIndex(k)->getLenghtOfElement(); 519 535 valeur = diagnosticBeam_.at(k).getXmaxRms(); 520 536 xcor.push_back(longueur); -
Interface_Web/trunk/pspaWT/src/elementFit.cc
r225 r230 10 10 parametersString_ = new string[nbParam_+1]; 11 11 transportOk_ = true; 12 parmelaIgnored_ = true; 12 13 } 13 14 … … 73 74 ostringstream sortie; 74 75 sortie << label_ << ":" << " FIT," << variableName_ << " = " << variableValue_ << ", TOLER = " << tolerance_ << " ;" << endl; 76 if ( variableName_ == "R11" || variableName_ == "R22" || variableName_ == "R12" || variableName_ == "R21" ) { 77 sortie << " PRINT, TRANS;" << endl; 78 } 75 79 return sortie.str(); 76 80 } -
Interface_Web/trunk/pspaWT/src/elementsCollection.cc
r226 r230 94 94 } 95 95 96 abstractElement* elementsCollection::getElementPointer (unsigned int index) const96 abstractElement* elementsCollection::getElementPointerFromIndex(unsigned int index) const 97 97 { 98 98 if ( index >= elements_.size() ) return NULL;
Note: See TracChangeset
for help on using the changeset viewer.