Changeset 878

Timestamp:

Nov 23, 2009, 11:40:49 PM (11 years ago)

Author:

Jari Häkkinen

Message:

Addresses #402. Legends in place. Not the same order as wih gnuplot.

Location:

trunk/lib

Files:

• Graph.cc (modified) (4 diffs)
• Graph.h (modified) (3 diffs)
• Stats.cc (modified) (2 diffs)

trunk/lib/Graph.cc

@@ -61 +61 @@
 
 
-  void Graph::plot(const std::vector<unsigned int>& y, const std::string& format)
+  void Graph::plot(const std::vector<unsigned int>& y, const std::string& legend,
+                   const std::string& timeformat)
   {
     unsigned int xmin= date_xticks() ? Date(xticks_.front()).seconds() : 0;
@@ -73 +74 @@
 
       if (date_xticks())
-        pls_.timefmt(format.c_str());
+        pls_.timefmt(timeformat.c_str());
 
       unsigned int ytickspacing=tick_spacing(yrange_);
@@ -79 +80 @@
       pls_.box("bcnstd", xtickspacing, 1, "bcnstv", ytickspacing, 2);
       pls_.lab("Date", "Number of lines", title_.c_str());
-
-      pls_.col0(1);
     }
     ++plots_;
+
+    print_legend(xmin,0,xmax,yrange_,legend);
+    pls_.col0(1);
     for (unsigned int i=1; i<y.size(); ++i) {
       PLFLT x0=i-1;
@@ -93 +95 @@
       pls_.join(x0, y[i]  , x1, y[i]);
     }
+  }
+
+
+  void Graph::print_legend(PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax,
+                           const std::string& legend)
+  {
+    PLFLT xrange=(xmax-xmin);
+    PLFLT length=0.05*xrange;
+    PLFLT dx=0.01*xrange;
+    PLFLT x=4*dx+xmin+length;
+    PLFLT y=(1.-0.05*plots_)*ymax;
+    pls_.col0(1);
+    pls_.join(x-dx, y, x-dx-length, y);
+    pls_.col0(2);
+    pls_.ptex(x, y, 0, 0, 0, legend.c_str());
   }
 

trunk/lib/Graph.h

@@ -41 +41 @@
        more output formats than SVG.
     */
-    Graph(const std::string& filename);
+    explicit Graph(const std::string& filename);
 
     /**
@@ -56 +56 @@
 
     /**
-       \brief Plot \a data using \a format for x-axis values when
+       \brief Plot \a data using \a timeformat for x-axis values when
        dates are used.
     */
-    void plot(const std::vector<unsigned int>& data,
-              const std::string& format="%y-%b");
-
+    void plot(const std::vector<unsigned int>& data, const std::string& legend,
+              const std::string& timeformat="%y-%b");
 
     /**
@@ -86 +85 @@
 
   private:
+    void print_legend(PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax,
+                      const std::string& legend);
     unsigned int tick_spacing(const double range) const;
 

trunk/lib/Stats.cc

@@ -391 +391 @@
     for (vec_type::iterator i(author_cont.begin()); i!=end; ++i) {
       ss.str("");
-      ss << "set key height " << 2*plotno;
-//      gp->command(ss.str());
-      ss.str("");
       ss << get_back(*stat, i->first) << " " << i->first;
-      gp.yrange(yrange_max);
-//      gp->linetitle(ss.str());
-      ss.str("");
-      ss << "steps " << --plotno+2;
-//      gp->linestyle(ss.str());
-      // the RGB values below must be replaced ... seg fault will happen!
+      // the RGB values below must be replaced ... seg fault will
+      // happen! plotno will probably become unused when below row is
+      // removed or fixed.
       gp.current_colour(25*plotno,255-25*plotno,75);
-      gp.plot(i->second);
+      gp.plot(i->second, ss.str());
     }
     ss.str("");
     ss << get_back(*stat, "all") << " total";
-//    gp->command("set key height 0");
-//    gp->linetitle(ss.str());
     gp.current_colour(255,0,0);
-    gp.plot(total);
+    gp.plot(total, ss.str());
 
     return filename;
@@ -426 +418 @@
     std::vector<unsigned int> x(get_vector(code_stats(), "all"));
     ss << x.back() << " code";
-//    gp->command("set key height 2");
-//    gp->linetitle(ss.str());
     gp.current_colour(255,255,0);
-    gp.plot(x);
+    gp.plot(x, ss.str());
 
     ss.str("");
     x = get_vector(comment_or_copy_stats(), "all");
     ss << x.back() << " comment";
-//    gp->command("set key height 4");
-//    gp->linetitle(ss.str());
     gp.current_colour(0,0,255);
-    gp.plot(x);
+    gp.plot(x, ss.str());
 
     ss.str("");
     x = get_vector(other_stats(), "all");
     ss << x.back() << " other";
-//    gp->command("set key height 6");
-//    gp->linetitle(ss.str());
     gp.current_colour(0,255,0);
-    gp.plot(x);
+    gp.plot(x, ss.str());
 
     ss.str("");
     ss << total.back() << " total";
-//    gp->command("set key height 0");
-//    gp->linetitle(ss.str());
     gp.current_colour(255,0,0);
-    gp.plot(total);
+    gp.plot(total, ss.str());
   }