Changeset 386 in PSPA for Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

Timestamp:

Mar 12, 2013, 1:54:41 PM (11 years ago)

Author:

lemeur

Message:

amélioration fiabilité graphique

File:

• Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc (modified) (5 diffs)

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -500 +500 @@
   for(int i = 1; i <= nombre; i++) {
     abstractElement* elPtr = dtmanage_->getElementPointerFromNumero(i);
-    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
+    //    if(elPtr->getNomdElement().getElementType() == snapshot) continue;
 
     choixElementDessin_->addItem(elPtr->getLabel());
@@ -511 +511 @@
     
   int typeFaisceau = choixTypeDessinFaisceau_->currentIndex();
-  int index = choixElementDessin_->currentIndex();
+  //  int index = choixElementDessin_->currentIndex();
   string nameAbs = choixAbsPhase_->currentText().toUTF8();
   string nameOrd = choixOrdPhase_->currentText().toUTF8();
@@ -519 +519 @@
         return;
   }
-
-  particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
+  string elementLabel = choixElementDessin_->currentText().toUTF8();
+  particleBeam* beam = dtmanage_->getDiagnosticBeam(elementLabel);
+  //  particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
     
   if ( beam == NULL ) {
@@ -626 +627 @@
 
 
-void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam, string namex, string namey )
-{
-  cout << " faireDessinParmela " << endl;
-  GWt_dialog* pointsDialog = new GWt_dialog("space phase",toto,false);
-  eDialog_.push_back(pointsDialog);
-  pointsDialog->setMinimumSize(400,400);
-  pointsDialog->setClosable(true);
-  // pointsDialog->show();
+// void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam, string namex, string namey )
+// {
+//   cout << " faireDessinParmela " << endl;
+//   GWt_dialog* pointsDialog = new GWt_dialog("space phase",toto,false);
+//   eDialog_.push_back(pointsDialog);
+//   pointsDialog->setMinimumSize(400,400);
+//   pointsDialog->setClosable(true);
+//   // pointsDialog->show();
       
-  new WText(nameOfCase_, pointsDialog->contents());
-
-
-  vector<double> xcor;
-  vector<double> ycor;
-  vector<string> legende;
-  beam->particlesPhaseSpaceData(xcor, ycor, legende, namex, namey);
-  for (int k=0 ; k < legende.size(); k++) {
-    new WBreak(pointsDialog->contents());
-    new WText(legende.at(k), pointsDialog->contents());
-  }
-  string titre = " phase space ";
-  chartPlot2vec(pointsDialog->contents(), xcor, ycor, true,titre,namex, namey,400,400);
-
-
-    
-  pointsDialog->show();
-    
-  //  chart->setMargin(10, Top | Bottom);            // add margin vertically
-  //  chart->setMargin(WLength::Auto, Left | Right); // center horizontally
-}
-
-void PspaApplication::faireDessinTransport(WContainerWidget* toto, particleBeam* beam, string namex, string namey)
-{
-  GWt_dialog* ellipseDialog = new GWt_dialog("ellipse",toto,false);
-  eDialog_.push_back(ellipseDialog);
-  ellipseDialog->setMinimumSize(400,400);
-  ellipseDialog->setClosable(true);
-  ellipseDialog->show();
-  new WText(nameOfCase_, ellipseDialog->contents());
-  
-  vector<double> xcor;
-  vector<double> ycor;
-  vector<string> legende;
-  beam->donneesDessinEllipse(xcor,ycor,legende, namex, namey);
-
-  for (int k=0 ; k < legende.size(); k++) {
-    new WBreak(ellipseDialog->contents());
-    new WText(legende.at(k), ellipseDialog->contents());
-  }
-  string titre = "phase space rms";
-  chartPlot2vec(ellipseDialog->contents(), xcor, ycor, false,titre, namex, namey,500,300);
-}
+//   new WText(nameOfCase_, pointsDialog->contents());
+
+
+//   vector<double> xcor;
+//   vector<double> ycor;
+//   vector<string> legende;
+//   beam->particlesPhaseSpaceData(xcor, ycor, legende, namex, namey);
+//   for (int k=0 ; k < legende.size(); k++) {
+//     new WBreak(pointsDialog->contents());
+//     new WText(legende.at(k), pointsDialog->contents());
+//   }
+//   string titre = " phase space ";
+//   chartPlot2vec(pointsDialog->contents(), xcor, ycor, true,titre,namex, namey,400,400);
+
+
+    
+//   pointsDialog->show();
+    
+//   //  chart->setMargin(10, Top | Bottom);            // add margin vertically
+//   //  chart->setMargin(WLength::Auto, Left | Right); // center horizontally
+// }
+
+// void PspaApplication::faireDessinTransport(WContainerWidget* toto, particleBeam* beam, string namex, string namey)
+// {
+//   GWt_dialog* ellipseDialog = new GWt_dialog("ellipse",toto,false);
+//   eDialog_.push_back(ellipseDialog);
+//   ellipseDialog->setMinimumSize(400,400);
+//   ellipseDialog->setClosable(true);
+//   ellipseDialog->show();
+//   new WText(nameOfCase_, ellipseDialog->contents());
+  
+//   vector<double> xcor;
+//   vector<double> ycor;
+//   vector<string> legende;
+//   beam->donneesDessinEllipse(xcor,ycor,legende, namex, namey);
+
+//   for (int k=0 ; k < legende.size(); k++) {
+//     new WBreak(ellipseDialog->contents());
+//     new WText(legende.at(k), ellipseDialog->contents());
+//   }
+//   string titre = "phase space rms";
+//   chartPlot2vec(ellipseDialog->contents(), xcor, ycor, false,titre, namex, namey,500,300);
+// }
 
 
@@ -848 +849 @@
   histoDialog->setClosable(true);
   
-  int index = choixHistoDessin_->currentIndex();    
-  particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
+  // int index = choixHistoDessin_->currentIndex();    
+  // particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
+   string elementLabel = choixHistoDessin_->currentText().toUTF8();    
+   particleBeam* beam = dtmanage_->getDiagnosticBeam(elementLabel);
   if (beam == NULL) {
     GWt_dialog warningBeamState("histogram","the beam does not exist at the end of this element !", GWt_dialog::Error, false,true);