Changeset 138 in PSPA for Interface_Web/trunk/pspaWT/src

Timestamp:

Dec 4, 2012, 7:46:42 PM (12 years ago)

Author:

lemeur

Message:

dessins

Location:

Interface_Web/trunk/pspaWT/src

Files:

• GWt_pspaApplication.cc (modified) (9 diffs)
• GWt_soleno.cc (modified) (1 diff)
• dataManager.cc (modified) (1 diff)
• elementSoleno.cc (modified) (1 diff)
• particleBeam.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -19 +19 @@
 #include "GWt_LigneFaisceau.h"
 #include "GWt_globalParameters.h"
+#include "particleBeam.h"
 #include "bareParticle.h"
 #include "nomDeLogiciel.h"
@@ -187 +188 @@
   probleme_->setHidden(true);
 
+  // signal de calcul en cours
+  encours_ = new WText();
+  encours_->decorationStyle().setBackgroundColor (WColor("green"));
+  encours_->setHidden(true);
+
   // le panel 
   WPanel *panelLogiciels = new WPanel(executeW);
@@ -197 +203 @@
   contenuSections_->addWidget(exec_go_);
   contenuSections_->addWidget(probleme_);
+  contenuSections_->addWidget(encours_);
   contenuSections_->addWidget(new WBreak());
   contenuSections_->addWidget(new WBreak());
@@ -206 +213 @@
 
 
-WWidget* PspaApplication::createDrawingWidget()
+WContainerWidget* PspaApplication::createDrawingWidget()
 {
   WContainerWidget* dessin = new WContainerWidget();
 
+  dessin->addWidget(new WText(" graphic analysis :  "));
+  dessin->addWidget(new WBreak());
   dessin->addWidget(new WText(" drawing after element :  "));
+
+
+  choixElementDessin_ = new WComboBox();
+  dessin->addWidget(choixElementDessin_);
+  WPushButton* caroule = new WPushButton("dessiner");
+ dessin->addWidget(caroule);
+ caroule->clicked().connect(this, &PspaApplication::dessiner);
+
+  dessin->addWidget(new WBreak());
+
+  toto_ = new WContainerWidget();
+  dessin->addWidget(toto_);
   return dessin;
 }
@@ -378 +399 @@
   addConsoleMessage(string("on va peut etre y arriver"));
   static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals();
-
+  encours_->decorationStyle().setBackgroundColor (WColor("green"));
+  encours_->setText("calcul en cours");
+  encours_->setHidden(false);
   string resultat;
   if ( !dtmanage_->executeAll(resultat)) probleme_->setHidden(false);
@@ -384 +407 @@
   addConsoleMessage(resultat);
   //  cout << " PspaApplication : affichage console termine  " << endl; 
+
+  encours_->setText("c'est fini");
+  encours_->decorationStyle().setBackgroundColor (WColor("orange"));
+
   faireDessin();
 }
@@ -414 +441 @@
 void PspaApplication::faireDessin()
 {
-
-  //  leDessin_.clear();
-
-
-  if ( dtmanage_->getCurrentBeam()->momentRepresentationOk() ) faireDessinTransport();
-  else if ( dtmanage_->getCurrentBeam()->particleRepresentationOk() ) faireDessinParmela();
+  choixElementDessin_->clear();
+  int nombre = dtmanage_->beamLineSize();
+  for ( int numero =1; numero <= nombre; numero++)
+    {
+      choixElementDessin_->addItem(dtmanage_->getLabelFromElementNumero(numero));
+    }
+
+}
+
+void PspaApplication::dessiner()
+{
+  
+  toto_->clear();
+
+  int index = choixElementDessin_->currentIndex();
+  particleBeam* beam = dtmanage_->getDiagnosticBeam(index);
+
+  if ( beam->momentRepresentationOk() ) faireDessinTransport(toto_, beam);
+  else if ( beam->particleRepresentationOk() ) faireDessinParmela(toto_, beam);
   else addConsoleMessage("the beam state does not allow providing a drawing"); 
-}
-
-void PspaApplication::faireDessinParmela()
-{
-  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
-  //  toto->clear();
-       new WText("emittance", toto);
-  vector<bareParticle>& partic = dtmanage_->getCurrentBeam()->getParticleVector();
-
-
+  //////////////////////////////////////////
+}
+
+
+void PspaApplication::faireDessinParmela(WContainerWidget* toto, particleBeam* beam)
+{
+  // WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
+  // //  toto->clear();
+  //      new WText("emittance", toto);
+  // vector<bareParticle>& partic = dtmanage_->getCurrentBeam()->getParticleVector();
+       new WText("emittance parmela", toto);
+  vector<bareParticle>& partic = beam->getParticleVector();
   WStandardItemModel *model = new WStandardItemModel(partic.size(), 3, toto);
   //    model->setHeaderData(0, WString("X"));
@@ -481 +523 @@
 // }
 
-void PspaApplication::faireDessinTransport()
-{
-  //  WContainerWidget* toto = leDessin_;
-  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
+void PspaApplication::faireDessinTransport(WContainerWidget* toto, particleBeam* beam)
+{
+  //  WContainerWidget* toto = static_cast<WContainerWidget*>(leDessin_);
   //  toto->clear();
   new WText("emittance transport", toto);
@@ -490 +531 @@
   vector<double> xcor;
   vector<double> ycor;
-  dtmanage_->getCurrentBeam()->donneesDessinEllipseXxp(xcor,ycor);
+  //  dtmanage_->getCurrentBeam()->donneesDessinEllipseXxp(xcor,ycor);
+  beam->donneesDessinEllipseXxp(xcor,ycor);
   int nbpts = xcor.size();
   cout << " PspaApplication::faireDessinTransport() nbpts = " << nbpts << endl;

Interface_Web/trunk/pspaWT/src/GWt_soleno.cc

@@ -22 +22 @@
   dialog_ = new WDialog("element SOLENOID");
 
-  new WText("length : ",dialog_->contents());
+  new WText("length (cm) : ",dialog_->contents());
   xlengthEdit_ = new WLineEdit(param[1].c_str(), dialog_->contents());
   new WBreak(dialog_->contents());
-  new WText("aperture : ",dialog_->contents());
+  new WText("aperture (cm) : ",dialog_->contents());
   apertureEdit_ = new WLineEdit(param[2].c_str(), dialog_->contents());
   new WBreak(dialog_->contents());

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -467 +467 @@
 }
 
+  particleBeam* dataManager::getDiagnosticBeam(int index) 
+  {
+    cout << " particleBeam* dataManager je vais dessiner " << getLabelFromElementNumero(index+1) << endl;
+    return &diagnosticBeam_.at(index);
+  }

Interface_Web/trunk/pspaWT/src/elementSoleno.cc

@@ -68 +68 @@
   {
     ostringstream sortie;
-    sortie << label_ << ":" << "  SOLENOID, L=" << lenghtElem_ << ", B=" << B0_ << ";";
+    // on passe la longueur en metres 
+    sortie << label_ << ":" << "  SOLENOID, L=" << 0.01*lenghtElem_ << ", B=" << B0_ << ";";
     return sortie.str();
   }

Interface_Web/trunk/pspaWT/src/particleBeam.cc

@@ -446 +446 @@
 void particleBeam::donneesDessinEllipseXxp(vector<double>& xcor, vector<double>& ycor)
 {
+      int k;
+      double x,y;
+
   if ( !momentRepresentationOk_ ) return;
 
@@ -455 +458 @@
   double r  = ( rij_transportMoments_.at(1) ).at(0);
 
+  int nbintv = 50;
+  if ( xm == 0.0 ) return;
+  double pas = 2.0 * xm / nbintv;
+
   //  cout << " r= " << r << endl;
-
-  double rac = sqrt(1 - r*r);
-  double alpha = -r / rac;
-  double beta = xm / ( ym * rac);
-  //  double gamma = ym / ( xm * rac );
-  double epsil = xm * ym * rac;
-
-
-  int nbintv = 50;
-  double pas = 2.0 * xm / nbintv;
-  double fac1 = -1.0 / ( beta * beta);
-  double fac2 = epsil/beta;
-  double fac3 = -alpha/beta;
-  int k;
-  double x,y;
-  double aux;
-  for ( k=0; k < nbintv; k++)
-    {
-      x = -xm + k*pas;
-      aux = fac1 * x * x + fac2;
-      //     cout << " aux2= " << aux << endl;
-      if ( aux <= 0.0 )
-        {
-          aux = 0.0;
-        }
-      else aux = sqrt(aux);
+  double rac = (1 - r*r);
+  if ( rac > 0.0 ) 
+    {
+      rac = sqrt(1 - r*r);
+      double alpha = -r / rac;
+      double beta = xm / ( ym * rac);
+      //  double gamma = ym / ( xm * rac );
+      double epsil = xm * ym * rac;
+      double fac1 = -1.0 / ( beta * beta);
+      double fac2 = epsil/beta;
+      double fac3 = -alpha/beta;
+      double aux;
+      for ( k=0; k < nbintv; k++)
+        {
+          x = -xm + k*pas;
+          aux = fac1 * x * x + fac2;
+          //     cout << " aux2= " << aux << endl;
+          if ( aux <= 0.0 )
+            {
+              aux = 0.0;
+            }
+          else aux = sqrt(aux);
       
-      //        y = fac3*x;
-            y = fac3*x + aux;
-      xcor.push_back(x);
-      ycor.push_back(y);
-    }
-
-  for ( k=0; k <= nbintv; k++)
-    {
-      x = xm - k*pas;
-      aux =  fac1 * x * x + fac2;
-      if ( aux <= 0.0 ) 
-        {
-          aux = 0.0;
-        }
-      else aux = sqrt(aux);
-      //   y = fac3*x;
-            y = fac3*x - aux;
-      xcor.push_back(x);
-      ycor.push_back(y);
-    }
-}
+          //        y = fac3*x;
+          y = fac3*x + aux;
+          xcor.push_back(x);
+          ycor.push_back(y);
+        }
+
+      for ( k=0; k <= nbintv; k++)
+        {
+          x = xm - k*pas;
+          aux =  fac1 * x * x + fac2;
+          if ( aux <= 0.0 ) 
+            {
+              aux = 0.0;
+            }
+          else aux = sqrt(aux);
+          //   y = fac3*x;
+          y = fac3*x - aux;
+          xcor.push_back(x);
+          ycor.push_back(y);
+        }
+    }
+  else
+    // cas degenere
+    {
+      double fac = -ym/xm;
+      for ( k=0; k < nbintv; k++)
+        {
+          x = -xm + k*pas;
+          y = fac*x;
+          xcor.push_back(x);
+          ycor.push_back(y);
+        }
+        
+    }
+}