Changeset 1327

Timestamp:

Jan 27, 2011, 2:23:15 AM (10 years ago)

Author:

Peter Johansson

Message:

refs #489 and #490. Use default tickspacing provided by plplot. With
current implementation, v6.9.6, it means range 6-15 -> spacing=2;
range 15-30 -> spacing=5; range 30-60 -> spacing=10 and similarly for
other order of magnitudes. For dates it is similar, but the unit
changes dynamically depending on the range. Basically they choose the
largest unit of seconds, minutes, hours, days, weeks, and years, such
that range is at least 3 in that unit. So when the range is more than
3 years we're counting in years and when the range is between 3 weeks
and 3 years we're counting in weeks.

Location:

trunk/lib

Files:

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

trunk/lib/Graph.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2009, 2010 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -38 +39 @@
   Graph::Graph(const std::string& filename, const std::string& format)
 #ifdef HAVE_PLPLOT
-    : plots_(0), pls_(1,1,format.c_str(),filename.c_str()), timeformat_("%y-%b"),
+    : plots_(0), pls_(1,1,format.c_str(),filename.c_str()),
       title_(filename), xmin_(0.0), xmax_(0.0), ymin_(0.0), ymax_(0.0)
   {
@@ -108 +109 @@
       std::string xopt("bcnstv");
       if (date_xticks()) {
-        pls_.timefmt(timeformat_.c_str());
+        pls_.timefmt("%y-%b");
         xopt="bcnstd";
       }
 
-      unsigned int ytickspacing=tick_spacing(yrange_);
-      unsigned int xtickspacing=tick_spacing(xrange_);
-      pls_.box(xopt.c_str(), xtickspacing, 1, "bcnstv", ytickspacing, 2);
+      pls_.box(xopt.c_str(), 0, 1, "bcnstv", 0, 2);
       pls_.lab("Date", "Number of lines", title_.c_str());
     }
@@ -232 +231 @@
 
 
-  void Graph::timeformat(const std::string& format)
-  {
-    timeformat_=format;
-  }
-
-
   const std::vector<time_t>& Graph::xticks(void)
   {

trunk/lib/Graph.h

@@ -127 +127 @@
 
     /**
-       \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<time_t>& xticks(void);
 
@@ -168 +164 @@
     static svn_revnum_t rev_min_;
     static svn_revnum_t rev_max_;
-    std::string timeformat_;
     std::string title_;
     static std::vector<time_t> xticks_;