Changeset 1197

Timestamp:

Oct 4, 2010, 6:32:09 AM (13 years ago)

Author:

Peter Johansson

Message:

convert date strings to int once in main rather than once for every plot

Location:

trunk

Files:

• bin/svndigest.cc (modified) (3 diffs)
• lib/File.cc (modified) (1 diff)
• lib/Graph.cc (modified) (5 diffs)
• lib/Graph.h (modified) (4 diffs)

trunk/bin/svndigest.cc

@@ -24 +24 @@
 #include "lib/Configuration.h"
 #include "lib/css.h"
+#include "lib/Date.h"
 #include "lib/Directory.h"
 #include "lib/first_page.h"
@@ -42 +43 @@
 #include <cassert>
 #include <cstdlib>
+#include <ctime>
 #include <iostream>
 #include <fstream>
@@ -198 +200 @@
     std::cout << "Retrieving dates" << std::endl;
   SVNlog log(repo);
-  std::vector<std::string> dates;
+  std::vector<time_t> dates;
   dates.reserve(log.commits().size());
   for (SVNlog::container::const_iterator iter=log.commits().begin();
        iter!=log.commits().end(); ++iter) {
     assert(static_cast<svn_revnum_t>(dates.size())==iter->revision());
-    dates.push_back(iter->date());
+    dates.push_back(Date(iter->date()).seconds());
   }
   // all plots uses the same dates

trunk/lib/File.cc

@@ -268 +268 @@
     }
     else {
-      last = Date(Graph::xticks().back()).seconds();
+      last = Graph::xticks().back();
       // earliest date corresponds either to revision 0 or revision 1 
-      first = std::min(Date(Graph::xticks()[0]).seconds(),
-                       Date(Graph::xticks()[1]).seconds());
+      first = std::min(Graph::xticks()[0],Graph::xticks()[1]);
     }
     // color is calculated linearly on time, c = kt + m

trunk/lib/Graph.cc

@@ -32 +32 @@
 namespace svndigest {
 
-  std::vector<std::string> Graph::xticks_;
+  std::vector<time_t> Graph::xticks_;
 
   Graph::Graph(const std::string& filename, const std::string& format)
@@ -91 +91 @@
     if (!plots_) {
       // date[0] is not the oldest when repo is imported with cvs2svn
-      xmin_= date_xticks() ? 
-        std::min( Date(xticks_[0]), Date(xticks_[1]) ).seconds() : 0;
-      xmax_= date_xticks() ? Date(xticks_.back()).seconds() : y.size();
+      xmin_= date_xticks() ? std::min(xticks_[0], xticks_[1]) : 0;
+      xmax_= date_xticks() ? xticks_.back() : y.size();
       xrange_=xmax_-xmin_;
       yrange_=ymax_-ymin_;
@@ -121 +120 @@
       PLFLT x1=i;
       if (date_xticks()) {
-        x0=Date(xticks_[i-1]).seconds();
-        x1=Date(xticks_[i]).seconds();
+        x0=xticks_[i-1];
+        x1=xticks_[i];
       }
       pls_.join(x0, y[i-1], x0, y[i]);
@@ -164 +163 @@
 
 
-  void Graph::set_dates(const std::vector<std::string>& date)
+  void Graph::set_dates(const std::vector<time_t>& date)
   {
     xticks_=date;
@@ -186 +185 @@
 
 
-  const std::vector<std::string>& Graph::xticks(void)
+  const std::vector<time_t>& Graph::xticks(void)
   {
     return xticks_;

trunk/lib/Graph.h

@@ -28 +28 @@
 #include "Vector.h"
 
+#include <ctime>
 #include <string>
 #include <vector>
@@ -99 +100 @@
        \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)
+       The date is given in seconds (since 1/1 1970)
     */
-    static void set_dates(const std::vector<std::string>& date);
+    static void set_dates(const std::vector<time_t>& date);
 
     /**
@@ -112 +110 @@
     void timeformat(const std::string& format);
 
-    static const std::vector<std::string>& xticks(void);
+    static const std::vector<time_t>& xticks(void);
 
     /**
@@ -147 +145 @@
     std::string timeformat_;
     std::string title_;
-    static std::vector<std::string> xticks_;
+    static std::vector<time_t> xticks_;
     PLFLT xmin_, xmax_, xrange_, ymin_, ymax_, yrange_;
   };