Changeset 1330

Timestamp:

Jan 27, 2011, 2:49:35 AM (10 years ago)

Author:

Peter Johansson

Message:

change confusing function and variable from xticks to dates (the vector holds the date/time for each revision).

Location:

trunk/lib

Files:

• FilePrinter.cc (modified) (1 diff)
• Graph.cc (modified) (6 diffs)
• Graph.h (modified) (2 diffs)

trunk/lib/FilePrinter.cc

@@ -118 +118 @@
     }
     else {
-      first = Graph::xticks()[Graph::rev_min()];
-      assert(Graph::rev_max()<Graph::xticks().size());
-      last = Graph::xticks()[Graph::rev_max()];
+      first = Graph::dates()[Graph::rev_min()];
+      assert(Graph::rev_max()<Graph::dates().size());
+      last = Graph::dates()[Graph::rev_max()];
     }
     assert(last>first);

trunk/lib/Graph.cc

@@ -35 +35 @@
   svn_revnum_t Graph::rev_max_=0;
   svn_revnum_t Graph::rev_min_=0;
-  std::vector<time_t> Graph::xticks_;
+  std::vector<time_t> Graph::dates_;
 
   Graph::Graph(const std::string& filename, const std::string& format)
@@ -66 +66 @@
   bool Graph::date_xticks(void)
   {
-    return xticks_.size() != 0;
+    return dates_.size() != 0;
   }
 
@@ -93 +93 @@
 #ifdef HAVE_PLPLOT
     if (!plots_) {
-      assert(!date_xticks() || rev_min_<xticks_.size());
-      assert(!date_xticks() || xticks_[rev_min_]);
-      assert(rev_min_<xticks_.size() || !date_xticks());
-      xmin_= date_xticks() ? xticks_[rev_min_] : rev_min_;
-      assert(rev_max_<xticks_.size() || !date_xticks());
-      xmax_= date_xticks() ? xticks_[rev_max_] : rev_max_;
+      assert(!date_xticks() || rev_min_<dates_.size());
+      assert(!date_xticks() || dates_[rev_min_]);
+      assert(rev_min_<dates_.size() || !date_xticks());
+      xmin_= date_xticks() ? dates_[rev_min_] : rev_min_;
+      assert(rev_max_<dates_.size() || !date_xticks());
+      xmax_= date_xticks() ? dates_[rev_max_] : rev_max_;
       xrange_=xmax_-xmin_;
       yrange_=ymax_-ymin_;
@@ -192 +192 @@
   void Graph::set_dates(const std::vector<time_t>& date)
   {
-    xticks_=date;
+    dates_=date;
   }
 
@@ -202 +202 @@
     PLFLT x1 = rev1;
     if (date_xticks()) {
-      assert(rev0<xticks_.size());
-      assert(xticks_[rev0]);
-      x0 = xticks_[rev0];
-      assert(rev1<xticks_.size());
-      assert(xticks_[rev1]);
-      x1 = xticks_[rev1];
+      assert(rev0<dates_.size());
+      assert(dates_[rev0]);
+      x0 = dates_[rev0];
+      assert(rev1<dates_.size());
+      assert(dates_[rev1]);
+      x1 = dates_[rev1];
     }
 #ifdef HAVE_PLPLOT
@@ -231 +231 @@
 
 
-  const std::vector<time_t>& Graph::xticks(void)
-  {
-    return xticks_;
+  const std::vector<time_t>& Graph::dates(void)
+  {
+    return dates_;
   }
 

trunk/lib/Graph.h

@@ -128 +128 @@
     /**
     */
-    static const std::vector<time_t>& xticks(void);
+    static const std::vector<time_t>& dates(void);
 
     /**
@@ -165 +165 @@
     static svn_revnum_t rev_max_;
     std::string title_;
-    static std::vector<time_t> xticks_;
+    static std::vector<time_t> dates_;
     PLFLT xmin_, xmax_, xrange_, ymin_, ymax_, yrange_;
   };