Almost all PS formatting moved to static fcts in anonymous namespace.

pub/lib/plot.cpp

@@ -14,6 +14,7 @@
 #include "../plot/dualplot.hpp"
 #include "../trivia/vector_ops.hpp"
 
+#include "config.hpp"
 #include "curve.hpp"
 #include "fsel.hpp"
 #include "jsel.hpp"
@@ -437,8 +438,7 @@ void NPlot::plot(class CPlot* plot, bool add, const string& mode)
         CCoord yCo = SFSel::instance()->sel_first()->yco;
 
         // draw new frame:
-        plot->clear_frame();
-        plot->plot_frame(xCo.str_ps(), yCo.str_ps());
+        plot->start_frame("Frida version " VERSION, xCo.str_ps(), yCo.str_ps());
     }
 
     // plot:

pub/plot/dualplot.cpp

@@ -35,15 +35,6 @@ CPlot::CPlot(int _iPlot, bool _logx, bool _logy)
 {}
 
 
-//! Clear plot frame and buffer.
-
-void CPlot::clear_frame()
-{
-    gnuPlotter->clear();
-    ps_Plotter->clear();
-}
-
-
 //! Change one setup parameter per command.
 
 void CPlot::set_aux(const string& cmd)
@@ -89,10 +80,10 @@ void CPlot::set_aux(const string& cmd)
 
 //! Plot coordinate frame (axes, ticks, labels).
 
-void CPlot::plot_frame(const string& xlabel, const string& ylabel)
+void CPlot::start_frame(const string& caller, const string& xlabel, const string& ylabel)
 {
-    gnuPlotter->plot_frame(X, Y);
-    ps_Plotter->plot_frame(X, Y, xlabel, ylabel);
+    gnuPlotter->start_frame(X, Y);
+    ps_Plotter->start_frame(caller, X, Y, xlabel, ylabel);
 }
 
 

pub/plot/dualplot.hpp

@@ -31,8 +31,8 @@ public:
 
 
     void gp_write(const std::string& in);
-    void clear_frame();
-    void plot_frame(const std::string& xlabel, const std::string& ylabel);
+    void start_frame(const std::string& caller,
+                     const std::string& xlabel, const std::string& ylabel);
     void add_spec(
         bool as_line, bool new_slice, int style_no, const std::vector<double>& xp,
         const std::vector<double>& yp, const std::vector<double>& dyp,

pub/plot/gnuplotter.cpp

@@ -55,12 +55,6 @@ CGnuPlotter::CGnuPlotter(int _iPlot)
     write("set terminal x11");
 }
 
-void CGnuPlotter::clear()
-{
-    gp_fno = 0;
-    gp_fnames = "";
-}
-
 //! Send one line to gnuplot fifo.
 
 void CGnuPlotter::write(const string& in)
@@ -70,10 +64,12 @@ void CGnuPlotter::write(const string& in)
         throw S("could not write to gp_fifo");
 }
 
-void CGnuPlotter::plot_frame(const CAxis& _X, const CAxis& _Y)
+void CGnuPlotter::start_frame(const CAxis& _X, const CAxis& _Y)
 {
     X = &_X;
     Y = &_Y;
+    gp_fno = 0;
+    gp_fnames = "";
     write("set nologscale");
     string whichlog = "";
     if (X->logflag)

pub/plot/gnuplotter.hpp

@@ -17,9 +17,8 @@ public:
     CGnuPlotter(int _iPlot);
     CGnuPlotter(CGnuPlotter const&) = delete;
     CGnuPlotter& operator=(CGnuPlotter const&) = delete;
-    void clear();
     void write(const std::string& in);
-    void plot_frame(const CAxis& _X, const CAxis& _Y);
+    void start_frame(const CAxis& _X, const CAxis& _Y);
     void add_spec(
         bool as_line, bool new_slice, bool plot_errorbars, int style_no,
         const std::vector<double>& xp, const std::vector<double>& yp,

pub/plot/ps_plotter.cpp

@@ -21,18 +21,30 @@ using std::string;
 using std::vector;
 using boost::format;
 
-void CPS_Plotter::clear()
-{
-    ps_accu = "\n%% output created by frida2\n\n";
-    ps_snum = 0;
-    ps_Doc = "";
+namespace {
+    string ps_ticktack(
+        const vector<double>& Tacks, const int ntpt, const double* ticklim, const CAxis* A);
+    string ps_frame(
+        const CAxis* X, const CAxis* Y, const string& xlabel, const string& ylabel);
+    string ps_slice_header(
+        bool as_line, int slice_no, int style_no, const vector<string>& zentries,
+        const string& xco, const string& yco);
+    string ps_data_block(
+        const CAxis* X, const CAxis* Y,
+        const vector<double>& xp, const vector<double>& yp, const vector<double>& dyp);
+    string ps_footer(
+        const string& fname, const string& doc_lines);
 }
 
-void CPS_Plotter::plot_frame(
-    const CAxis& _X, const CAxis& _Y, const string& xlabel, const string& ylabel)
+void CPS_Plotter::start_frame(
+    const string& caller, const CAxis& _X, const CAxis& _Y,
+    const string& xlabel, const string& ylabel)
 {
     X = &_X;
     Y = &_Y;
+    ps_snum = 0;
+    ps_Doc = "";
+    ps_accu = "\n%% output created by " + caller + "\n\n";
     ps_accu += ps_frame(X, Y, xlabel, ylabel);
 }
 
@@ -44,28 +56,12 @@ void CPS_Plotter::add_spec(
 {
 
     // Postscript copy:
-    if (new_slice) {
-        ps_accu += str(format("\n%3u [") % ++ps_snum);
-        for (string zentry: zentries)
-            ps_accu += " " + zentry;
-        ps_accu += " ] zValues\n";
-        ps_accu += str(format("%2i %cstyle %% (%s -> %s)\n")
-                       % style_no
-                       % (as_line ? 'c' : 'p')
-                       % xco
-                       % yco);
-    } else {
+    if (new_slice)
+        ps_accu += ps_slice_header(as_line, ++ps_snum, style_no, zentries, xco, yco);
+    else
         ps_accu += "\n";
-    }
-    int np = xp.size();
-    for (int i = 0; i < np; i++)
-        ps_accu += str(format("%8.5f %8.5f %8.5f t%c %% %13.7g wx %13.7g wy\n")
-                       % X->pc(xp[i])
-                       % Y->pc(yp[i])
-                       % (dyp.size() ? Y->pcerr(yp[i], dyp[i]) : 0)
-                       % (i == 0 ? 'i' : i == np - 1 ? 'f' : ' ')
-                       % xp[i]
-                       % yp[i]);
+
+    ps_accu += ps_data_block(X, Y, xp, yp, dyp);
 }
 
 void CPS_Plotter::doc_line(const string& line)
@@ -100,11 +96,7 @@ void CPS_Plotter::write_postscript(
         throw "BUG: after copying headers, graphic output file " + fname + " still doesn't exist";
     std::fstream fs(fname, std::fstream::out | std::fstream::app);
     fs << ps_accu;
-    fs << "\n{ black 0 -4 13 1.65 NewList\n";
-    fs << ps_Doc;
-    fs << "} oooinfo 1 eq { exec } { pop } ifelse\n";
-    fs << "\n{(" << fname << ")}  /filename exch def 10 -2.8 18 showfilename\n\n";
-    fs << " EndFrame\n",
+    fs << ps_footer(fname, ps_Doc);
     fs.close();
 }
 
@@ -112,9 +104,10 @@ void CPS_Plotter::write_postscript(
 //  static functions
 //**************************************************************************************************
 
-//! Format ticks and tacks for postscript file.
+namespace {
 
-string CPS_Plotter::ps_ticktack(
+    //! Format ticks and tacks for postscript file.
+    string ps_ticktack(
         const vector<double>& Tacks, const int ntpt, const double* ticklim, const CAxis* A)
     {
         string ret;
@@ -144,7 +137,7 @@ string CPS_Plotter::ps_ticktack(
         return ret;
     }
 
-string CPS_Plotter::ps_frame(
+    string ps_frame(
         const CAxis* X, const CAxis* Y, const string& xlabel, const string& ylabel)
     {
         string ret;
@@ -181,3 +174,48 @@ string CPS_Plotter::ps_frame(
             "plotbefore\n\n";
         return ret;
     }
+
+    string ps_slice_header(
+        bool as_line, int slice_no, int style_no, const vector<string>& zentries,
+        const string& xco, const string& yco)
+    {
+        string ret;
+        ret += str(format("\n%3u [") % slice_no);
+        for (string zentry: zentries)
+            ret += " " + zentry;
+        ret += " ] zValues\n";
+        ret += str(format("%2i %cstyle %% (%s -> %s)\n")
+                   % style_no
+                   % (as_line ? 'c' : 'p')
+                   % xco
+                   % yco);
+        return ret;
+    }
+
+    string ps_data_block(
+        const CAxis* X, const CAxis* Y,
+        const vector<double>& xp, const vector<double>& yp, const vector<double>& dyp)
+    {
+        string ret;
+        int np = xp.size();
+        for (int i = 0; i < np; i++)
+            ret += str(format("%8.5f %8.5f %8.5f t%c %% %13.7g wx %13.7g wy\n")
+                       % X->pc(xp[i])
+                       % Y->pc(yp[i])
+                       % (dyp.size() ? Y->pcerr(yp[i], dyp[i]) : 0)
+                       % (i == 0 ? 'i' : i == np - 1 ? 'f' : ' ')
+                       % xp[i]
+                       % yp[i]);
+        return ret;
+    }
+
+    string ps_footer(const string& fname, const string& doc_lines)
+    {
+        return "\n{ black 0 -4 13 1.65 NewList\n"
+            + doc_lines
+            + "} oooinfo 1 eq { exec } { pop } ifelse\n"
+            + "\n{(" + fname + ")}  /filename exch def 10 -2.8 18 showfilename\n\n"
+            + " EndFrame\n";
+    }
+
+} // anonymous namespace

pub/plot/ps_plotter.hpp

@@ -17,8 +17,7 @@ public:
     CPS_Plotter() {}
     CPS_Plotter(CPS_Plotter const&) = delete;
     CPS_Plotter& operator=(CPS_Plotter const&) = delete;
-    void clear();
-    void plot_frame(const CAxis& _X, const CAxis& _Y,
+    void start_frame(const std::string& caller, const CAxis& _X, const CAxis& _Y,
                     const std::string& xlabel, const std::string& ylabel);
     void add_spec(
         bool as_line, bool new_slice, int style_no,
@@ -33,10 +32,6 @@ private:
     const CAxis* X;
     const CAxis* Y;
     int ps_snum; //!< Slice number in Postscript file.
-    static std::string ps_ticktack(
-        const std::vector<double>& Tacks, const int ntpt, const double* ticklim, const CAxis* A);
-    static std::string ps_frame(
-        const CAxis* X, const CAxis* Y, const std::string& xlabel, const std::string& ylabel);
     std::string ps_accu; //!< Main Postscript cache.
     std::string ps_Doc; //!< Special Postscript cache for doc lines ?.
 };