From 6202ed4518bd53c8f3e417236c540421c1ba7a29 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Tue, 7 Jul 2015 18:50:36 +0100
Subject: [PATCH] Plot: more ways to plot data

---
 lib/Plot.cpp | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/Plot.hpp |  3 +++
 2 files changed, 58 insertions(+)

diff --git a/lib/Plot.cpp b/lib/Plot.cpp
index 7191bae..6a5db37 100644
--- a/lib/Plot.cpp
+++ b/lib/Plot.cpp
@@ -112,6 +112,61 @@ PlotHeadCommand::PlotHeadCommand(const string &command)
 }
 
 // PlotData constructor ////////////////////////////////////////////////////////
+PlotData::PlotData(const DMatSample &x, const DMatSample &y)
+{
+    if (x[central].rows() != y[central].rows())
+    {
+        LATAN_ERROR(Size, "x and y vector does not have the same size");
+    }
+
+    DMat d(x[central].rows(), 4);
+    string usingCmd, tmpFileName;
+
+    d.col(0)    = x[central];
+    d.col(2)    = y[central];
+    d.col(1)    = x.variance().cwiseSqrt();
+    d.col(3)    = y.variance().cwiseSqrt();
+    tmpFileName = dumpToTmpFile(d);
+    pushTmpFile(tmpFileName);
+    setCommand("'" + tmpFileName + "' u 1:3:2:4 w xyerr");
+}
+
+PlotData::PlotData(const DVec &x, const DMatSample &y)
+{
+    if (x.rows() != y[central].rows())
+    {
+        LATAN_ERROR(Size, "x and y vector does not have the same size");
+    }
+
+    DMat d(x.rows(), 3);
+    string usingCmd, tmpFileName;
+
+    d.col(0)    = x;
+    d.col(1)    = y[central];
+    d.col(2)    = y.variance().cwiseSqrt();
+    tmpFileName = dumpToTmpFile(d);
+    pushTmpFile(tmpFileName);
+    setCommand("'" + tmpFileName + "' u 1:2:3 w yerr");
+}
+
+PlotData::PlotData(const DMatSample &x, const DVec &y)
+{
+    if (x[central].rows() != y.rows())
+    {
+        LATAN_ERROR(Size, "x and y vector does not have the same size");
+    }
+
+    DMat d(x[central].rows(), 3), xerr, yerr;
+    string usingCmd, tmpFileName;
+
+    d.col(0)    = x[central];
+    d.col(2)    = y;
+    d.col(1)    = x.variance().cwiseSqrt();
+    tmpFileName = dumpToTmpFile(d);
+    pushTmpFile(tmpFileName);
+    setCommand("'" + tmpFileName + "' u 1:3:2 w xerr");
+}
+
 PlotData::PlotData(const XYStatData &data, const Index i, const Index j)
 {
     DMat d(data.getNData(), 4);
diff --git a/lib/Plot.hpp b/lib/Plot.hpp
index f4b44f1..096ca0a 100644
--- a/lib/Plot.hpp
+++ b/lib/Plot.hpp
@@ -88,6 +88,9 @@ class PlotData: public PlotObject
 {
 public:
     // constructor
+    PlotData(const DMatSample &x, const DMatSample &y);
+    PlotData(const DVec       &x, const DMatSample &y);
+    PlotData(const DMatSample &x, const DVec       &y);
     PlotData(const XYStatData &data, const Index i = 0, const Index j = 0);
     // destructor
     virtual ~PlotData(void) = default;