Changeset 63 for trunk

Timestamp:

Jan 20, 2006, 12:07:36 AM (17 years ago)

Author:

Peter Johansson

Message:

Fixed problem with mapping revison to date. Removed mkstemps. name of
png files are now in line with their html file name. Binary works on
svnstat, but is asserted on c++_tools.

Location:

trunk

Files:

• bin/svnstat.cc (modified) (1 diff)
• lib/CommitStat.cc (modified) (4 diffs)
• lib/CommitStat.h (modified) (2 diffs)
• lib/Directory.cc (modified) (1 diff)
• lib/File.cc (modified) (1 diff)
• lib/Gnuplot.cc (modified) (1 diff)
• lib/Gnuplot.h (modified) (3 diffs)
• lib/Stats.cc (modified) (4 diffs)
• lib/Stats.h (modified) (2 diffs)

trunk/bin/svnstat.cc

@@ -39 +39 @@
   CommitStat cs;
   cs.parse(option.root());
+  assert(cs.date()[0].size());
   Stats::gnuplot_pipe_.set_dates(cs.date());
   

trunk/lib/CommitStat.cc

@@ -33 +33 @@
     typedef std::vector<std::string>::iterator DateIter;
     size_t rev_last_iteration=0;
+    std::string date;
     while (getline(is,line, '\n')){
       if (!line.size()) // skip empty line
@@ -42 +43 @@
         ss >> revision;
         assert(revision);
-          
         std::string tmp;
         ss >> tmp;
@@ -48 +48 @@
         ss >> user;
         ss >> tmp;
-        std::string date;
         ss >> date; 
         std::string time;
@@ -55 +54 @@
         if (revision+1 > date_.size()){
           date_.resize(revision+1);
-          rev_last_iteration=revision;
+          rev_last_iteration=revision+1;
         }
         assert(revision<=rev_last_iteration);
-        std::copy(date_.begin()+revision,
+        std::fill(date_.begin()+revision,
                   date_.begin()+rev_last_iteration,
-                  date_.begin()+revision);
+                  date);
         rev_last_iteration=revision;
       }
-      std::copy(date_.begin(),
+      std::fill(date_.begin(),
                 date_.begin()+rev_last_iteration,
-                date_.begin());
+                date);
     }
     is.close();
-    
+
     return system_return;
   }
 
 
+  void CommitStat::reset(void)
+  {
+    date_.clear();
+  }
+
 }} // end of namespace svnstat and namespace theplu

trunk/lib/CommitStat.h

@@ -21 +21 @@
     inline CommitStat(void) {}
 
+    inline const std::vector<std::string>& dates(void) { return date_; }
+
     ///
     /// Function parsing output from log() \a path'.
@@ -36 +38 @@
     int log(const std::string& path) const;
 
-    inline void reset(void) {};
+    void reset(void);
 
     std::vector<std::string> date_;
+
   };
 }}

trunk/lib/Directory.cc

@@ -83 +83 @@
     print_header(os);
     os << std::endl;
-    stats_.print(os);
+    stats_.print(os,output_name()+".png");
     os << std::endl;
 

trunk/lib/File.cc

@@ -38 +38 @@
     print_header(os);
     os << std::endl;
-    stats_.print(os);
+    stats_.print(os,output_name()+".png");
     os << std::endl;
     print_footer(os);

trunk/lib/Gnuplot.cc

@@ -64 +64 @@
     command("set timefmt '" + date_input_format_ + "'");
     command("set format x '" + format + "'");
+    assert(date_[0].size());
+    assert(y.back());
     plot(y,date_,"plot"); 
   }

trunk/lib/Gnuplot.h

@@ -10 +10 @@
 #include <string>
 #include <vector>
+
 
 namespace theplu {
@@ -65 +66 @@
     ///
     void date_plot(const std::vector<double>& y, 
-                   const std::string& format="%y-%b");
+                   const std::string& format="%y-%b-%d");
     ///
     ///
     ///
     void date_replot(const std::vector<double>& y,
-                     const std::string& format="%y-%b");
+                     const std::string& format="%y-%b-%d");
 
     ///
@@ -157 +158 @@
       tmp.close();
       std::string cmdstring(plotcmd + " '" + name + "' u 1:2 title '" + 
-                            linetitle_ + "' with " + linestyle_ + "\n");
+                              linetitle_ + "' with " + linestyle_ + "\n");
+      if (x.empty())
+        cmdstring = plotcmd + " '" + name + "' u 1 title '" + 
+          linetitle_ + "' with " + linestyle_ + "\n";
+       
       command(cmdstring);
-      
       // need to keep track of created files since the gnuplot command
       // is not executed until pclose on MacOSX, shouldn't the fflush

trunk/lib/Stats.cc

@@ -6 +6 @@
 
 #include <algorithm>
+#include <cstdlib>
 #include <iostream>
 #include <map>
@@ -14 +15 @@
 #include <utility>
 #include <vector>
+
 
 namespace theplu{
@@ -31 +33 @@
     std::vector<double> accum(sum.size());
     std::partial_sum(sum.begin(),sum.end(),accum.begin());
+    assert(sum.size()==accum.size());
     return accum;
   }
@@ -106 +109 @@
 
 
-  std::string Stats::plot(void) const
+  std::string Stats::plot(const std::string& name) const
   {
-    char name[]="svnstat_XXXXXX.png";
-    if (mkstemps(name,4)==-1){
-      throw std::runtime_error(std::string("Failed to get unique filename: ") +
-                             name);
-    }
     std::string cmd=std::string("set term png; set output '")+name+"'";
     gnuplot_pipe_.command(cmd);

trunk/lib/Stats.h

@@ -34 +34 @@
     /// @brief Print statistics
     ///
-    void inline print(std::ostream& s) const
-    { s << "<p><img src='" << plot() << "' alt='[plot]' border=0></p>\n"; }
+    void inline print(std::ostream& s, const std::string& name) const
+    { s << "<p><img src='" << plot(name) << "' alt='[plot]' border=0></p>\n"; }
 
     ///
@@ -78 +78 @@
     void add(const std::string& user, const u_int& revision); 
 
-    std::string plot(void) const;
+    std::string plot(const std::string&) const;
 
     static u_int latest_revision_; // latest rev. for whole project