Changeset 883

Timestamp:

Nov 24, 2009, 11:42:27 PM (11 years ago)

Author:

Jari Häkkinen

Message:

Addresses #402. Legend is right justified on numbers and left justified on label. The text should also move appropriately with number size.

Location:

trunk/lib

Files:

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

trunk/lib/Graph.cc

@@ -25 +25 @@
 
 #include <cmath>
+#include <iostream>
+#include <sstream>
 
 namespace theplu {
@@ -32 +34 @@
 
   Graph::Graph(const std::string& filename)
-    : plots_(0), pls_(1,1,"svg",filename.c_str()), title_(filename)
+    : plots_(0), pls_(1,1,"svg",filename.c_str()), timeformat_("%y-%b"),
+      title_(filename), xmin_(0.0), xmax_(0.0), ymin_(0.0), ymax_(0.0)
   {
+    legend_.reserve(20);
     // we use colour map 0 position 0 for background colour
     pls_.scolbga(230,230,230,1);
@@ -44 +48 @@
   Graph::~Graph(void)
   {
+    print_legend();
   }
 
@@ -53 +58 @@
 
 
+  void Graph::current_colour(const legend_data& legend)
+  {
+    // we use colour map 0 position 1 for current colour
+    pls_.scol0a(1,legend.r,legend.g,legend.b,1.0);
+  }
+
+
   void Graph::current_colour(unsigned char r, unsigned char g, unsigned char b)
   {
     // we use colour map 0 position 1 for current colour
     pls_.scol0a(1,r,g,b,1.0);
-    pls_.col0(1);
   }
 
 
-  void Graph::plot(const std::vector<unsigned int>& y, const std::string& legend,
-                   const std::string& timeformat)
+  void Graph::plot(const std::vector<unsigned int>& y, const std::string& label,
+                   unsigned int lines)
   {
-    unsigned int xmin= date_xticks() ? Date(xticks_.front()).seconds() : 0;
-    unsigned int xmax= date_xticks() ? Date(xticks_.back()).seconds() : y.size();
-    pls_.wind(xmin, xmax, 0, ymax_);
+    if (!plots_) {
+      xmin_= date_xticks() ? Date(xticks_.front()).seconds() : 0;
+      xmax_= date_xticks() ? Date(xticks_.back()).seconds() : y.size();
+      xrange_=xmax_-xmin_;
+      yrange_=ymax_-ymin_;
+      pls_.wind(xmin_, xmax_, ymin_, ymax_);
 
-    if (!plots_) {
       // draw plot frame, x and y ticks only for the first plot
       pls_.scol0a(2,0,0,0,1.0);
@@ -74 +87 @@
 
       if (date_xticks())
-        pls_.timefmt(timeformat.c_str());
+        pls_.timefmt(timeformat_.c_str());
 
-      unsigned int ytickspacing=tick_spacing(ymax_);
-      unsigned int xtickspacing=tick_spacing(xmax-xmin);
+      unsigned int ytickspacing=tick_spacing(ymax_-ymin_);
+      unsigned int xtickspacing=tick_spacing(xmax_-xmin_);
       pls_.box("bcnstd", xtickspacing, 1, "bcnstv", ytickspacing, 2);
       pls_.lab("Date", "Number of lines", title_.c_str());
@@ -83 +96 @@
     ++plots_;
 
-    print_legend(xmin,0,xmax,ymax_,legend);
     pls_.col0(1);
     for (unsigned int i=1; i<y.size(); ++i) {
@@ -95 +107 @@
       pls_.join(x0, y[i]  , x1, y[i]);
     }
+
+    legend_data legend;
+    legend.label=label;
+    legend.lines=lines;
+    pls_.gcol0(1,legend.r,legend.g,legend.b);
+    legend_.push_back(legend);
   }
 
 
-  void Graph::print_legend(PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax,
-                           const std::string& legend)
+  void Graph::print_legend(void)
   {
-    PLFLT xrange=(xmax-xmin);
-    PLFLT length=0.05*xrange;
-    PLFLT dx=0.01*xrange;
-    PLFLT x=4*dx+xmin+length;
-    PLFLT yrange=(ymax-ymin);
-    PLFLT dy=0.001*yrange;
-    PLFLT y=(1.-0.05*plots_)*yrange;
-    pls_.col0(1);
-    pls_.join(x-dx, y-3*dy, x-dx-length, y-3*dy);
-    pls_.col0(2);
-    pls_.ptex(x, y, 0, 0, 0, legend.c_str());
+    PLFLT line_length=0.05*xrange_;
+    PLFLT x=xmin_+1.7*line_length;
+    unsigned char characteristic=log10(ymax_);
+    PLFLT legend_lines_length=0.016*xrange_*(characteristic+1);
+    PLFLT dx=0.005*xrange_;
+    PLFLT dy=0.003*yrange_;
+    unsigned int row=0;
+    for (std::vector<legend_data>::const_iterator i=legend_.begin();
+         i!=legend_.end(); i++, ++row) {
+      PLFLT y=(0.95-0.04*row)*yrange_;
+      current_colour(*i);
+      pls_.col0(1);
+      pls_.join(x-line_length, y-dy, x, y-dy);
+      std::stringstream ss;
+      ss << i->lines;
+      pls_.col0(2);
+      pls_.ptex(x+legend_lines_length+dx*2, y, 0, 0, 0, i->label.c_str());
+      pls_.ptex(x+legend_lines_length+dx  , y, 0, 0, 1, ss.str().c_str());
+    }
   }
 
@@ -131 +156 @@
 
 
+  void Graph::timeformat(const std::string& format)
+  {
+    timeformat_=format;
+  }
+
+
   const std::vector<std::string>& Graph::xticks(void)
   {

trunk/lib/Graph.h

@@ -40 +40 @@
        \a filename to be defined depending on whether we'll support
        more output formats than SVG.
+
+       \note The plot legend is created in the destructioe, i.e., when
+       the graph object is destroyed.
     */
     explicit Graph(const std::string& filename);
@@ -59 +62 @@
        dates are used.
     */
-    void plot(const std::vector<unsigned int>& data, const std::string& legend,
-              const std::string& timeformat="%y-%b");
+    void plot(const std::vector<unsigned int>& data, const std::string& label,
+              unsigned int lines);
 
     /**
@@ -72 +75 @@
     static void set_dates(const std::vector<std::string>& date);
 
+    /**
+       \brief Set x-axis tick value format to \a format. The format is
+       only used when dates are used.
+    */
+    void timeformat(const std::string& format);
+
     static const std::vector<std::string>& xticks(void);
 
@@ -82 +91 @@
        xstart is 0 or the date of the first commit.
     */
-    double ymax(double ymax=0.0);
+    double ymax(double ymax);
 
   private:
-    void print_legend(PLFLT xmin, PLFLT ymin, PLFLT xmax, PLFLT ymax,
-                      const std::string& legend);
+
+    struct legend_data {
+      std::string label;
+      unsigned int lines;
+      PLINT r,g,b;
+    };
+
+    /**
+       \brief Set the pen colour to use in next drawing call
+    */
+    void current_colour(const legend_data&);
+    void print_legend(void);
     unsigned int tick_spacing(const double range) const;
 
+    std::vector<legend_data> legend_;
     unsigned int plots_; // keep track of number of plots drawn
     plstream pls_;
+    std::string timeformat_;
     std::string title_;
     static std::vector<std::string> xticks_;
-    double ymax_;
+    PLFLT xmin_, xmax_, xrange_, ymin_, ymax_, yrange_;
   };
 

trunk/lib/Stats.cc

@@ -387 +387 @@
 
     size_t plotno=author_cont.size();
-    std::stringstream ss;
     vec_type::iterator end(author_cont.end());
     for (vec_type::iterator i(author_cont.begin()); i!=end; ++i) {
-      ss.str("");
-      ss << get_back(*stat, i->first) << " " << i->first;
       // 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, ss.str());
-    }
-    ss.str("");
-    ss << get_back(*stat, "all") << " total";
+      gp.plot(i->second, i->first, get_back(*stat, i->first));
+    }
     gp.current_colour(255,0,0);
-    gp.plot(total, ss.str());
+    gp.plot(total, "total", get_back(*stat, "all"));
 
     return filename;
@@ -413 +408 @@
     double yrange_max=1.03*total.back()+1;
     gp.ymax(yrange_max);
-    std::stringstream ss;
     
-    ss.str("");
     std::vector<unsigned int> x(get_vector(code_stats(), "all"));
-    ss << x.back() << " code";
     gp.current_colour(255,255,0);
-    gp.plot(x, ss.str());
-
-    ss.str("");
+    gp.plot(x, "code", x.back());
+
     x = get_vector(comment_or_copy_stats(), "all");
-    ss << x.back() << " comment";
     gp.current_colour(0,0,255);
-    gp.plot(x, ss.str());
-
-    ss.str("");
+    gp.plot(x, "comment", x.back());
+
     x = get_vector(other_stats(), "all");
-    ss << x.back() << " other";
     gp.current_colour(0,255,0);
-    gp.plot(x, ss.str());
-
-    ss.str("");
-    ss << total.back() << " total";
+    gp.plot(x, "other", x.back());
+
     gp.current_colour(255,0,0);
-    gp.plot(total, ss.str());
+    gp.plot(total, "total", total.back());
   }