Changeset 107

Timestamp:

Jun 28, 2006, 11:12:38 AM (16 years ago)

Author:

Peter Johansson

Message:

Gnuplot functions returning int and utilizing that in the test. However the warning sent from Gnuplot ref #37 is not caught since there is no problem with the pipe there.

Location:

trunk

Files:

• lib/Gnuplot.cc (modified) (1 diff)
• lib/Gnuplot.h (modified) (6 diffs)
• lib/Parser.cc (modified) (1 diff)
• test/gnuplot_pipe.cc (modified) (2 diffs)

trunk/lib/Gnuplot.cc

@@ -79 +79 @@
   int Gnuplot::command(const std::string& cmdstr)
   {
+    std::cout << cmdstr << std::endl;
     int r = fputs(cmdstr.c_str(),pipe_);
-    if (*(cmdstr.rbegin())!='\n')
-      fputc('\n',pipe_);
-    fflush(pipe_);
-    return r;
+    if (!r && *(cmdstr.rbegin())!='\n')
+      r=fputc('\n',pipe_);
+    return (r ? r : fflush(pipe_));
   }
 

trunk/lib/Gnuplot.h

@@ -33 +33 @@
 #include <vector>
 
+
+#include <iostream>
 
 namespace theplu {
@@ -70 +72 @@
     /// Send arbitrary commands to Gnuplot.
     ///
+    /// @return 0 if fputs, fputc, and fflush are succesful
+    ///
     int command(const std::string&);
 
@@ -93 +97 @@
     /// Gnuplot usage.
     ///
+    /// @return whatever command() returns
+    ///
     template <class T1, class T2>
-    void plot(const std::vector<T1>& y, const std::vector<T2>& x)
-    { plot(y,x,"plot"); }
+    int plot(const std::vector<T1>& y, const std::vector<T2>& x)
+    { return plot(y,x,"plot"); }
 
     template <class T1>
-    void plot(const std::vector<T1>& y,
+    int plot(const std::vector<T1>& y,
               const std::vector<T1>& x=std::vector<T1>())
-    { plot(y,x,"plot"); }
+    { return plot(y,x,"plot"); }
 
     ///
@@ -107 +113 @@
     /// Gnuplot usage.
     ///
+    /// @return whatever command() returns
+    ///
     template <class T1, class T2>
-    void replot(const std::vector<T1>& y, const std::vector<T2>& x)
-    { plot(y,x,"replot"); }
+    int replot(const std::vector<T1>& y, const std::vector<T2>& x)
+    { return plot(y,x,"replot"); }
 
     template <class T1>
-    void replot(const std::vector<T1>& y,
+    int replot(const std::vector<T1>& y,
               const std::vector<T1>& x=std::vector<T1>())
-    { plot(y,x,"replot"); }
+    { return plot(y,x,"replot"); }
 
   private:
@@ -128 +136 @@
     ///
     template <class T1, class T2>
-    void plot(const std::vector<T1>& y, const std::vector<T2>& x,
+    int plot(const std::vector<T1>& y, const std::vector<T2>& x,
               const std::string& plotcmd)
     {
@@ -146 +154 @@
       cmdstring << "e\n";
 
-      command(cmdstring.str());
+      return command(cmdstring.str());
     }
 

trunk/lib/Parser.cc

@@ -41 +41 @@
       if (where==str.end())
         type_.push_back(empty);
-      else if (*where=='/' && *(where+1)=='/')
+      else if (*where=='/' && ((where++)!=str.end()) && *where=='/')
         type_.push_back(comment);
       else

trunk/test/gnuplot_pipe.cc

@@ -24 +24 @@
 #include "Gnuplot.h"
 
+#include <iostream>
 #include <vector>
 
@@ -39 +40 @@
 
   svnstat::Gnuplot gnuplot1;
-  gnuplot1.command("set output 'test1.png'; set term png ; set title 'sine'");
-  gnuplot1.command("plot sin(x) title 'sine of x' with lines");
+  //if (gnuplot1.command("set output 'test1.png'; set term png ; set title 'sine'"))
+  //ok = false;
+    //if (gnuplot1.command("plot sin(x) title 'sine of x' with lines"))
+    //ok = false;
 
   svnstat::Gnuplot gnuplot2;
-  gnuplot2.command("set output 'test2.png'; set term png");
-  gnuplot2.plot(x);
+  //if (gnuplot2.command("set output 'test2.png'; set term png"))
+  //gnuplot2.plot(x);
 
   svnstat::Gnuplot gnuplot3;
-  gnuplot3.command("set output 'test3.png'; set term png");
+  if (gnuplot3.command("set output 'test3.png'; set term png"))
+    ok=false;
   gnuplot3.linetitle("parabola");
-  gnuplot3.plot(x,y);
-
-  gnuplot3.command("set output 'test4.png'; set title 'composite'");
+  if (gnuplot3.plot(x,y))
+    ok=false;
+  if (gnuplot3.command("set output 'test4.png'; set title 'composite'"))
+    ok=false;
   gnuplot3.linestyle("linespoints");
   gnuplot3.linetitle("");
-  gnuplot3.replot(x);
+  if (gnuplot3.replot(x))
+    ok=false;
 
   /*