Changeset 54 in PSPA

Timestamp:

Nov 6, 2012, 11:58:50 AM (12 years ago)

Author:

lemeur

Message:

reorganisation des widgets et essai dessin

Location:

Interface_Web/trunk/pspaWT

Files:

• cmt/requirements (modified) (1 diff)
• include/GWt_globalParameters.h (modified) (1 diff)
• include/GWt_pspaApplication.h (modified) (1 diff)
• include/MathematicalConstants.h (modified) (1 diff)
• include/bareParticle.h (added)
• include/dataManager.h (modified) (2 diffs)
• include/particleBeam.h (added)
• src/GWt_LigneFaisceau.cc (modified) (4 diffs)
• src/GWt_globalParameters.cc (modified) (2 diffs)
• src/GWt_pspaApplication.cc (modified) (5 diffs)
• src/bareParticle.cc (added)
• src/dataManager.cc (modified) (1 diff)
• src/particleBeam.cc (added)
• workingArea (added)
• workingArea/Pois_I_120.psfld (added)
• workingArea/alphaXchamp.sffld (added)
• workingArea/parmdesz (added)
• workingArea/parmela (added)
• workingArea/parmela.input (added)
• workingArea/parmimp (added)
• workingArea/parmin (added)
• workingArea/parmout (added)
• workingArea/pmbfield (added)
• workingArea/pspa.save (added)

Interface_Web/trunk/pspaWT/cmt/requirements

@@ -22 +22 @@
 #macro PSPSLib_linkopts     " -L${PSPAWTROOT}/$(Platform_bin) -lPSPSLib "
 
-application pspaWt GWt_cell.cc GWt_initialBeam.cc GWt_globalParameters.cc GWt_drift.cc dataManager.cc elementDrift.cc elementCell.cc elementInitialBeam.cc globalParameters.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
+application pspaWt bareParticle.cc particleBeam.cc GWt_cell.cc GWt_initialBeam.cc GWt_globalParameters.cc GWt_drift.cc dataManager.cc elementDrift.cc elementCell.cc elementInitialBeam.cc globalParameters.cc GWt_LigneFaisceau.cc GWt_pspaApplication.cc main.cc use_cppflags='" ${lib_PSPSLib_cppflags} "'
 
 macro DrawWt_linkopts " ${PSPSLib_linkopts} ${Wt_linkopts} ${boost_linkopts} ${dld_linkopts}"

Interface_Web/trunk/pspaWT/include/GWt_globalParameters.h

@@ -37 +37 @@
     void renew();
 
-  void lancerCalcul();
+    //  void lancerCalcul();
 
 };

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -35 +35 @@
     return dtmanage_;
   }
+  void executer();
   void sauver();
   void restaurer();

Interface_Web/trunk/pspaWT/include/MathematicalConstants.h

@@ -7 +7 @@
 #define PETIT 0.5e-38
 #define GRAND 0.5e+38
+#define EPSILON 1.e-10
 #endif

Interface_Web/trunk/pspaWT/include/dataManager.h

@@ -6 +6 @@
 #include "globalParameters.h"
 #include "nomdElements.h"
+#include "particleBeam.h"
+
 //using namespace std;
 
@@ -13 +15 @@
   elementsCollection elementsGallery_;
   globalParameters globParam_;
-
+  particleBeam currentBeam_;
 
   void createInputFileParmela( unsigned int indexDeb, unsigned int indexFin);

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -135 +135 @@
       nomdElement nom = ptr->getName();
       cout << "  GWt_LigneFaisceau:: je restaure element type " << nom << endl;
-      WPushButton* dropped = NULL;
+      //      WPushButton* dropped = NULL;
       switch (nom)
         {
@@ -141 +141 @@
           {
             GWt_initialBeam* gwInitialBeam = new GWt_initialBeam(pspa_,ptr, string("icons/beam.jpg"));
-            dropped = gwInitialBeam->getButton();
-            beamLayout_->addWidget(dropped);
+            //      dropped = gwInitialBeam->getButton();
+            beamLayout_->addWidget(gwInitialBeam->getButton());
             break;
           }
@@ -148 +148 @@
           {
             GWt_drift* gdrift = new GWt_drift(pspa_,ptr, string("icons/drift.jpg"));      
-            dropped = gdrift->getButton();
-            beamLayout_->addWidget(dropped);
+            //      dropped = gdrift->getButton();
+            beamLayout_->addWidget(gdrift->getButton());
             break;
           }
@@ -155 +155 @@
           {
               GWt_cell* gwCell = new GWt_cell(pspa_,ptr, string("icons/cell.jpg"));
-              dropped = gwCell->getButton();
-              beamLayout_->addWidget(dropped);
+              //              dropped = gwCell->getButton();
+              beamLayout_->addWidget(gwCell->getButton());
               break;
           }

Interface_Web/trunk/pspaWT/src/GWt_globalParameters.cc

@@ -76 +76 @@
     globLayout->addWidget(result);
 
-    WPushButton *buttonGo2 = new WPushButton("go!");
-    buttonGo2->setMaximumSize(100,50);
-    globLayout->addWidget(buttonGo2);
+    // WPushButton *buttonGo2 = new WPushButton("go!");
+    // buttonGo2->setMaximumSize(100,50);
+    // globLayout->addWidget(buttonGo2);
 
 
-    buttonGo2->clicked().connect(this, &GWt_globalParameters::lancerCalcul);
+    // buttonGo2->clicked().connect(this, &GWt_globalParameters::lancerCalcul);
 
 
@@ -117 +117 @@
   }
 
-void GWt_globalParameters::lancerCalcul()
-  {
-    pspa_->addConsoleMessage("on va peut etre y arriver");
-    updateGlobals();
-    string resultat = pspa_->getDataManager()->executeAll();
-    pspa_->addConsoleMessage(resultat);
-  }
+// void GWt_globalParameters::lancerCalcul()
+//   {
+//     pspa_->addConsoleMessage("on va peut etre y arriver");
+//     updateGlobals();
+//     string resultat = pspa_->getDataManager()->executeAll();
+//     pspa_->addConsoleMessage(resultat);
+//   }
 
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -7 +7 @@
 #include <Wt/WGridLayout>
 #include <Wt/WVBoxLayout>
+#include <Wt/WHBoxLayout>
 #include <Wt/WImage>
 #include <Wt/WTextArea>
 #include <Wt/WBreak>
 #include <Wt/WPushButton>
+#include <Wt/WStandardItemModel>
+#include <Wt/Chart/WCartesianChart>
 
 #include "GWt_pspaApplication.h"
@@ -16 +19 @@
 #include "GWt_globalParameters.h"
 
+using namespace Wt::Chart;
 
 
@@ -104 +108 @@
 
     WGridLayout* toolbarLayout = new WGridLayout();
-
-    WPushButton* boutonSauve = new WPushButton(" sauvegarder");
-    WPushButton* boutonRestaure = new WPushButton(" restaurer");
-    toolbarLayout->addWidget(boutonSauve , 0, 0);
-    toolbarLayout->addWidget(boutonRestaure , 0, 1);
-
+    WPushButton *buttonGo2 = new WPushButton("go!");
+    buttonGo2->setMaximumSize(100,50);
+
+    WPushButton *boutonGo = new WPushButton("execute!");
+    WPushButton* boutonSauve = new WPushButton(" sauvegarder la config");
+    WPushButton* boutonRestaure = new WPushButton(" restaurer la config");
+    toolbarLayout->addWidget(boutonGo , 0, 0);
+    toolbarLayout->addWidget(boutonSauve , 0, 1);
+    toolbarLayout->addWidget(boutonRestaure , 0, 2);
+
+    boutonGo->clicked().connect(this, &PspaApplication::executer);
     boutonSauve->clicked().connect(this, &PspaApplication::sauver);
     boutonRestaure->clicked().connect(this, &PspaApplication::restaurer);
@@ -116 +125 @@
   calculLayout->addWidget(beamLine_ , 0, 0);
   globalParam_ = createGlobalParamWidget();
-  calculLayout->addWidget(globalParam_,1,0);
+
+
+  WGridLayout* globLayout = new WGridLayout();
+  //&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
+
+  WContainerWidget* toto = new WContainerWidget();
+    new WText("scatter plot 2", toto);
+  WStandardItemModel *model = new WStandardItemModel(40, 2, toto);
+  model->setHeaderData(0, WString("X"));
+  model->setHeaderData(1, WString("Y = sin(X)"));
+
+  for (unsigned i = 0; i < 40; ++i) {
+    double x = (static_cast<double>(i) - 20) / 4;
+
+    model->setData(i, 0, x);
+    model->setData(i, 1, sin(x));
+  }
+  WCartesianChart *chart = new WCartesianChart(toto);
+  chart->setModel(model);        // set the model
+  chart->setXSeriesColumn(0);    // set the column that holds the X data
+  chart->setLegendEnabled(true); // enable the legend
+
+  chart->setType(ScatterPlot);   // set type to ScatterPlot
+
+  // Typically, for mathematical functions, you want the axes to cross
+  // at the 0 mark:
+  chart->axis(XAxis).setLocation(ZeroValue);
+  chart->axis(YAxis).setLocation(ZeroValue);
+
+  // Provide space for the X and Y axis and title. 
+  chart->setPlotAreaPadding(80, Left);
+  chart->setPlotAreaPadding(40, Top | Bottom);
+  // Add the curves
+  WDataSeries s(1, CurveSeries);
+  s.setShadow(WShadow(3, 3, WColor(0, 0, 0, 127), 3));
+  chart->addSeries(s);
+
+  chart->resize(400, 150); // WPaintedWidget must be given explicit size
+
+  chart->setMargin(10, Top | Bottom);            // add margin vertically
+  chart->setMargin(WLength::Auto, Left | Right); // center horizontally
+
+  //  ChartConfig *config = new ChartConfig(chart, this);
+  //  config->setValueFill(ZeroValueFill);
+
+  //  WPushButton* bidon = new WPushButton(" pourvoir");
+  //&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
+  globLayout->addWidget(globalParam_,0,0);
+  globLayout->addWidget(toto,0,1);
+  calculLayout->addLayout(globLayout,1,0);
+
+  //  calculLayout->addWidget(globalParam_,1,0);
+
+
   calculLayout->addLayout(toolbarLayout  ,2,0);
   iconAndBeamLineLayout->addWidget(createPalette() , 0, 0);
@@ -155 +217 @@
 }
 
+
+void PspaApplication::executer()
+{
+  addConsoleMessage(string("on va peut etre y arriver"));
+    static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals();
+    string resultat = dtmanage_->executeAll();
+    addConsoleMessage(resultat);
+}
+
+
 void PspaApplication::sauver()
 {

Interface_Web/trunk/pspaWT/src/dataManager.cc

@@ -63 +63 @@
           sortie << buf << endl;
         }
+
+      currentBeam_.setFromParmela(globParam_.getFrequency());
+
+      cout << " le faisceau a " << currentBeam_.getNbParticles() << " particules, les voici : " << endl;
+ 
+      currentBeam_.printAllXYZ();
+
       return sortie.str();
     }