Changeset 1198

Timestamp:

Oct 4, 2010, 2:17:57 PM (13 years ago)

Author:

Peter Johansson

Message:

plot stairs only when count changes in a revision. refs #475

Location:

trunk/lib

Files:

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

trunk/lib/Graph.cc

@@ -115 +115 @@
 
     pls_.col0(1);
-    // FIXME: loop over segments instead of revs, i.e., use Vector::iterator
-    for (unsigned int i=1; i<y.size(); ++i) {
-      PLFLT x0=i-1;
-      PLFLT x1=i;
-      if (date_xticks()) {
-        x0=xticks_[i-1];
-        x1=xticks_[i];
-      }
-      pls_.join(x0, y[i-1], x0, y[i]);
-      pls_.join(x0, y[i]  , x1, y[i]);
-    }
+
+    SumVector::const_iterator iter = y.begin();
+    svn_revnum_t x0=0;
+    PLFLT y0=0;
+    for (; iter!=y.end(); ++iter) {
+      staircase(x0, y0, iter->first, iter->second);
+      x0 = iter->first;
+      y0 = iter->second;
+    }
+    staircase(x0, y0, y.size()-1, y0);
 
     legend_data legend;
@@ -169 +168 @@
 
 
+  void Graph::staircase(svn_revnum_t rev0, PLFLT y0, 
+                        svn_revnum_t rev1, PLFLT y1)
+  {
+    PLFLT x0 = rev0;
+    PLFLT x1 = rev1;
+    if (date_xticks()) {
+      x0 = xticks_[rev0];
+      x1 = xticks_[rev1];
+    }
+#ifdef HAVE_PLPLOT
+    // join {x0,x0} with {x1,y1} via {x1,y0}
+    pls_.join(x0,y0,x1,y0);
+    pls_.join(x1,y0,x1,y1);
+#endif
+  }
+
+
   unsigned int Graph::tick_spacing(const double range) const
   {

trunk/lib/Graph.h

@@ -138 +138 @@
     void current_color(const legend_data&);
     void print_legend(void);
+    void staircase(svn_revnum_t rev0, PLFLT y0, svn_revnum_t rev1, PLFLT y1);
     unsigned int tick_spacing(const double range) const;