Added a test for plotting in layout

src/gnupplus/gnuplot.hpp

@@ -46,8 +46,8 @@ namespace gnup {
                           throw (LayoutError);
 
         private:
-
             Layout *layout;
+
     };
 
 }

src/plots.cpp

@@ -100,6 +100,7 @@ namespace gnup {
 
     void Plot::reset (Comm *c)
     {
+        c->command("e\n");
     }
 
     void Plot::setTrigger (Trigger *t)

src/tests/Makefile.am

@@ -19,12 +19,13 @@
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/ -I./ -Wall -Werror -D_GNU_SOURCE
 
-check_PROGRAMS = example simpleplot
+check_PROGRAMS = example simpleplot layout0
 
 TESTS = $(check_PROGRAMS)
 AM_LDFLAGS = -L$(top_srcdir)/src/ -L./ -L../
 LDADD = -lgnupplus
 
 example_SOURCES = example.cpp test_environ.c test_environ.h
 simpleplot_SOURCES = simpleplot.cpp test_environ.c test_environ.h
+layout0_SOURCES = layout0.cpp test_environ.c test_environ.h
 

src/tests/layout0.cpp

@@ -0,0 +1,67 @@
+#include <gnupplus.hpp>
+#include <cstdio>
+#include <assert.h>
+#include "test_environ.h"
+
+static const char* tale[] = {
+    "set multiplot",
+    "set size 0.500000,0.500000",
+    "set origin 0.000000,0.000000",
+	"plot \"-\" with linespoints",
+    "1.000000",
+    "2.000000",
+    "3.000000",
+    "2.000000",
+    "1.000000",
+    "e",
+    "set origin 0.500000,0.500000",
+	"plot \"-\" with linespoints",
+    "1.000000",
+    "2.000000",
+    "3.000000",
+    "2.000000",
+    "1.000000",
+    "e",
+    "set size 1,1",
+    "unset multiplot",
+    NULL
+};
+
+int main (int argc, char **argv)
+{
+    inloop_t io;
+
+    build_environment();
+    assert(inloop_create(&io, "testecho", argv[0]) == 0);
+
+    gnup::Layout layout (2, 2);
+
+    /* VERY IMPORTANT NOTE! In order to ensure determinism, the object
+     * must be deallocated before the check, since you may accidentally
+     * check the file before it gets written!
+     *
+     * This operation must be achieved explicitly in the library test, but
+     * it's not necessary while using the library.
+     */
+    gnup::GnuPlot *gp = new gnup::GnuPlot("testecho", io.params);
+    gnup::Plot2D plot ("Test plot", gnup::AUTO, gnup::DATA);
+
+    gp->setLayout(layout);
+    gp->addPlot(plot, 0, 0);
+    gp->addPlot(plot, 1, 1);
+
+    plot.setStyle(gnup::Plot::LINESPOINTS);
+    plot.addVector(0, 1);
+    plot.addVector(0, 2);
+    plot.addVector(0, 3);
+    plot.addVector(0, 2);
+    plot.addVector(0, 1);
+    gp->trig();
+
+    delete gp;
+
+    assert(inloop_compare(&io, tale));
+    inloop_destroy(&io);
+
+    return 0;
+}

src/tests/simpleplot.cpp

@@ -11,6 +11,7 @@ static const char* tale[] = {
     "3.000000",
     "2.000000",
     "1.000000",
+    "e",
 	"plot \"-\" with linespoints",
     "1.000000",
     "2.000000",
@@ -20,6 +21,7 @@ static const char* tale[] = {
     "40.000000",
     "41.000000",
     "50.000000",
+    "e",
     NULL
 };