Changeset 875 for trunk/lib

Timestamp:

Nov 23, 2009, 7:49:49 PM (12 years ago)

Author:

Jari Häkkinen

Message:

Fixes #403. Dates or revisions are used for x-axis.

Location:

trunk/lib

Files:

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

trunk/lib/Graph.cc

@@ -22 +22 @@
 #include "Graph.h"
 
+#include "Date.h"
+
 #include <cmath>
 
@@ -30 +32 @@
 
   Graph::Graph(const std::string& filename)
-    : plots_(0), pls_(1,1,"svg",filename.c_str())
+    : plots_(0), pls_(1,1,"svg",filename.c_str()), title_(filename)
   {
     // we use colour map 0 position 0 for background colour
@@ -59 +61 @@
 
 
-  void Graph::plot(const std::vector<unsigned int>& x)
+  void Graph::plot(const std::vector<unsigned int>& y, const std::string& format)
   {
-    pls_.wind(0, x.size(), 0, yrange_);
+    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, yrange_);
+
     if (!plots_) {
       // draw plot frame, x and y ticks only for the first plot
       pls_.scol0a(2,0,0,0,1.0);
       pls_.col0(2);
+
+      if (date_xticks())
+        pls_.timefmt(format.c_str());
+
       unsigned int ytickspacing=tick_spacing(yrange_);
-      unsigned int xtickspacing=tick_spacing(x.size());
-      pls_.box("bcnstv", xtickspacing, 1, "bcnstv", ytickspacing, 1);
+      unsigned int xtickspacing=tick_spacing(xmax-xmin);
+      pls_.box("bcnstd", xtickspacing, 1, "bcnstv", ytickspacing, 2);
+      pls_.lab("Date", "Number of lines", title_.c_str());
+
       pls_.col0(1);
     }
     ++plots_;
-    for (unsigned int i=1; i<x.size(); ++i) {
-      pls_.join(i-1,x[i-1],i-1,x[i]);
-      pls_.join(i-1,x[i],i,x[i]);
+    for (unsigned int i=1; i<y.size(); ++i) {
+      PLFLT x0=i-1;
+      PLFLT x1=i;
+      if (date_xticks()) {
+        x0=Date(xticks_[i-1]).seconds();
+        x1=Date(xticks_[i]).seconds();
+      }
+      pls_.join(x0, y[i-1], x0, y[i]);
+      pls_.join(x0, y[i]  , x1, y[i]);
     }
+  }
+
+
+  void Graph::set_dates(const std::vector<std::string>& date)
+  {
+    xticks_=date;
   }
 

trunk/lib/Graph.h

@@ -56 +56 @@
 
     /**
-       \brief Plot \a data
+       \brief Plot \a data using \a format for x-axis values when
+       dates are used.
     */
-    void plot(const std::vector<unsigned int>& data);
+    void plot(const std::vector<unsigned int>& data,
+              const std::string& format="%y-%b");
+
+
+    /**
+       \brief Function setting the dates.
+
+       The date strings must be in svn format since underlying time
+       conversion are done with the Date class.
+
+       \see Date::svntime(std::string)
+    */
+    static void set_dates(const std::vector<std::string>& date);
 
     static const std::vector<std::string>& xticks(void);
@@ -77 +90 @@
     unsigned int plots_; // keep track of number of plots drawn
     plstream pls_;
+    std::string title_;
     static std::vector<std::string> xticks_;
     double yrange_;