Changeset 370 in PSPA

Timestamp:

Mar 6, 2013, 2:19:58 PM (11 years ago)

Author:

garnier

Message:

Ajout des paramètres width et height à la méthode chartPlot2vec + ... (see History)

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• htdocs/pspa.css (modified) (2 diffs)
• sources/userInterface/include/GWt_pspaApplication.h (modified) (2 diffs)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (8 diffs)

Interface_Web/trunk/pspaWT/History

@@ -5 +5 @@
      PSPA - Plateforme de simulation en physique des accélérateurs
      =========================================================
+
+6 Mars : Laurent Garnier
+- pspa.css : Ajout de style pour les futurs graphiques
+- GWt_pspaApplication : Ajout des paramètres width et height à la méthode chartPlot2vec() 
+  afin de pouvoir la changer facilement. AJout également d'un paramètre "makeIcon" pour faire
+  des graphiques sans légende, sans bordures...
 
 5 Mars : Laurent Garnier

Interface_Web/trunk/pspaWT/htdocs/pspa.css

@@ -88 +88 @@
 }
 
+.Button.WhiteButton.ContrastButton.Graph {
+    display: inline;
+    padding-top: 0px;
+    padding-left: 0px;
+}
 .Button.WhiteButton.HiddenButton {
     visibility: hidden;
@@ -145 +150 @@
 }
 
+
 .Button {
     border: 1px solid transparent;

Interface_Web/trunk/pspaWT/sources/userInterface/include/GWt_pspaApplication.h

@@ -56 +56 @@
 
   WContainerWidget* toto_;
+
   GWt_softwarePanel* executeWidget_;
   WFileUpload* uploadFileSelectorWidget_;
@@ -84 +85 @@
   void faireDessinEnveloppe(WContainerWidget* toto, string type);
   //  void scatterPlot1D(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor);
-  void chartPlot2vec(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor, bool drawPoints);
+  void chartPlot2vec(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor, bool drawPoints, int width, int height, bool makeIcon=false);
   bool removePathFromConfigName(string& config);
   bool removeExtensionFromConfigName(string& config);

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

@@ -558 +558 @@
   // dtmanage_->donneesRmsEnveloppe(type,1, nbel, xcor,ycor);
     dtmanage_->donneesRmsEnveloppe(type,xcor,ycor);
-chartPlot2vec(envDialog->contents(), xcor, ycor, false);
+    chartPlot2vec(envDialog->contents(), xcor, ycor, false,500,300);
+
 }
 
@@ -576 +577 @@
   vector<double> ycor;
   beam->particlesPhaseSpaceData(xcor, ycor, indexAbs, indexOrd);
-  chartPlot2vec(pointsDialog->contents(), xcor, ycor, true);
+  chartPlot2vec(pointsDialog->contents(), xcor, ycor, true,400,400);
 
 
@@ -606 +607 @@
   //  beam->donneesDessinEllipseXxp(xcor,ycor);
   //  scatterPlot1D(ellipseDialog->contents(),xcor,ycor);  
-chartPlot2vec(ellipseDialog->contents(), xcor, ycor, false);
+chartPlot2vec(ellipseDialog->contents(), xcor, ycor, false,500,300);
+
 }
 
@@ -671 +673 @@
 
 // dernier parametre, drawPoints : true = on trace des points (phase space) ; false = on trace des lignes 'enveloppes...) 
-void PspaApplication::chartPlot2vec(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor, bool drawPoints)
+void PspaApplication::chartPlot2vec(WContainerWidget* toto, vector<double>& xcor, vector<double>& ycor, bool drawPoints,int width, int height, bool makeIcon)
 {
     int nbpts = xcor.size();
@@ -683 +685 @@
     
     WCartesianChart *chart = new WCartesianChart(toto);
-    chart->setTitle("titre");
-    
-    //  chart->initLayout();
+    if (!makeIcon) {
+        chart->setTitle("titre");
+    }
+    chart->initLayout();
     
     chart->setModel(model);        // set the model
     chart->setXSeriesColumn(0);    // set the column that holds the X data
-    chart->setLegendEnabled(true); // enable the legend
+    if (!makeIcon) {
+        chart->setLegendEnabled(true); // enable the legend
+    } else {
+        chart->setLegendEnabled(false); // enable the legend
+    }
     
     chart->setType(ScatterPlot);   // set type to ScatterPlot
@@ -697 +704 @@
     chart->axis(XAxis).setLocation(ZeroValue);
     chart->axis(YAxis).setLocation(ZeroValue);
-    
+
     // Provide space for the X and Y axis and title.
     if ( drawPoints ) {
@@ -704 +711 @@
       WDataSeries s(1, PointSeries, Y1Axis);
       chart->addSeries(s);
-      chart->resize(400, 400); // WPaintedWidget must be given explicit size
+      chart->resize(width, height); // WPaintedWidget must be given explicit size
      } else {
        WDataSeries s(1, LineSeries, Y1Axis);
        chart->addSeries(s);    
-       chart->resize(500, 300); // WPaintedWidget must be given explicit size
+       chart->resize(width, height); // WPaintedWidget must be given explicit size
      }
-    
+
+    if (makeIcon) {
+        chart->setPlotAreaPadding(0);
+        chart->setAxisPadding(0);
+        WFont xAxisFont = chart->axis(XAxis).labelFont();
+        xAxisFont.setSize(8);
+        WFont yAxisFont = chart->axis(YAxis).labelFont();
+        yAxisFont.setSize(8);
+        chart->axis(XAxis).setLabelFont(xAxisFont);
+        chart->axis(YAxis).setLabelFont(yAxisFont);
+    }
+
 #ifdef HAS_IMAGEMAGIC
     Wt::WRasterImage pngImage("png", 600, 600);
-    Wt::WPainter p(&pngImage);    
+    Wt::WPainter p(&pngImage);
     chart->paint(p);
     std::string name;
@@ -721 +739 @@
     new WText("<a href='workingArea/chart-"+sessionId ()+".png' target='_blank'>Afficher l'image</a>",toto);
     
-    /*
      Wt::WPdfImage pdfImage("30cm", "30cm");
      Wt::WPainter p1(&pdfImage);
-     chart->paint(p1);
-     std::ofstream f1("chart.pdf", std::ios::out | std::ios::binary);
+    pdfImage.init();
+    chart->paint(p1);
+     name = workingDir_ + "/chart-"+sessionId ()+".pdf";
+     std::ofstream f1(name.c_str(), std::ios::out |std::ios::trunc | std::ios::binary);
      pdfImage.write(f1);
-     */
 #endif
 }