Changeset 345

Timestamp:

May 19, 2007, 6:59:16 PM (14 years ago)

Author:

Peter Johansson

Message:

fixes #192

Location:

trunk/lib

Files:

• File.cc (modified) (1 diff)
• Node.cc (modified) (2 diffs)
• Stats.cc (modified) (3 diffs)
• Stats.h (modified) (2 diffs)
• first_page.cc (modified) (2 diffs)
• first_page.h (modified) (1 diff)

trunk/lib/File.cc

@@ -60 +60 @@
   {
     return std::string("file");
-  }
-
-
-  std::string File::output_dir(void) const
-  {
-    return std::string();
   }
 

trunk/lib/Node.cc

@@ -169 +169 @@
                                   const SVNlog& log) const
   { 
-    os << "<h4>Author Summary</h4>";
+    os << "<h3>Author Summary</h3>";
     os << "<table class=\"listings\">\n";
     os << "<thead>";
@@ -200 +200 @@
         color="dark";
       os << "<tr class=\"" << color << "\"><td>"; 
-      if (dir())
-        if (local_path().empty())
-          os << anchor(*i+"/"+line_type+"/index.html"
-                       ,*i, level_+2, "View statistics for "+*i); 
-        else
-          os << anchor(*i+"/"+line_type+"/"+local_path()+"/index.html"
-                       ,*i, level_+2, "View statistics for "+*i); 
-      else
-        os << anchor(*i+"/"+line_type+"/"+local_path()+".html"
-                     ,*i, level_+2, "View statistics for "+*i); 
+      os << anchor(*i+"/"+line_type+output_path()
+                   ,*i, level_+2, "View statistics for "+*i); 
       os << "</td><td>" << stats_.lines(*i)
          << "</td><td>" << stats_.code(*i)

trunk/lib/Stats.cc

@@ -162 +162 @@
 
 
-  std::string Stats::plot(const std::string& filename,
-                          const std::string& linetype) const
+  void Stats::plot_init(const std::string& filename) const
   {
     GnuplotFE* gp=GnuplotFE::instance();
@@ -173 +172 @@
     gp->command("set key left Left reverse");
     gp->command("set multiplot");
+  }
+
+  std::string Stats::plot(const std::string& filename,
+                          const std::string& linetype) const
+  {
+    plot_init(filename);
+    GnuplotFE* gp=GnuplotFE::instance();
     const Map_* stat=NULL;
     if (linetype=="total")
@@ -216 +222 @@
 
 
+  void Stats::plot_summary(const std::string& filename) const
+  {
+    plot_init(filename);
+    GnuplotFE* gp=GnuplotFE::instance();
+    std::vector<u_int> total=accumulated(total_);   
+    double yrange_max=1.03*total.back()+1;
+    gp->yrange(yrange_max);
+    std::stringstream ss;
+    
+    ss.str("");
+    std::vector<u_int> x=accumulated(code_);    
+    ss << x.back() << " code";
+    gp->command("set key height 2");
+    gp->linetitle(ss.str());
+    gp->linestyle("steps 2");
+    gp->plot(x);
+
+    ss.str("");
+    x=accumulated(comments_);   
+    ss << x.back() << " comment";
+    gp->command("set key height 4");
+    gp->linetitle(ss.str());
+    gp->linestyle("steps 3");
+    gp->plot(x);
+
+    ss.str("");
+    x=accumulated(empty_);    
+    ss << x.back() << " other";
+    gp->command("set key height 6");
+    gp->linetitle(ss.str());
+    gp->linestyle("steps 4");
+    gp->plot(x);
+
+    ss.str("");
+    ss << total.back() << " total";
+    gp->command("set key height 0");
+    gp->linetitle(ss.str());
+    gp->linestyle("steps 1");
+    gp->plot(total);
+
+    gp->command("unset multiplot");
+    gp->yrange();
+    
+  }
+
+
   Stats& Stats::operator+=(const Stats& other)
   {

trunk/lib/Stats.h

@@ -92 +92 @@
     inline u_int last_changed_rev(void) const { return last_changed_rev_; }
 
-    void parse(const std::string&);
-
-    ///
-    /// Create statistics graph.
-    ///
-    std::string plot(const std::string&, const std::string&) const;
-
-    ///
-    /// @brief Clear all statistics
-    ///
-    inline void reset(void) 
-    { 
-      code_.clear(); comments_.clear(); empty_.clear(); total_.clear(); 
-      authors_.clear();}
-
-    ///
-    ///
-    ///
-    inline u_int revision(void) const { return revision_; }
-
     ///
     /// 
@@ -122 +102 @@
     inline u_int lines(const std::string& user) const 
     { return accumulated(total_, user).back(); }
+
+    void parse(const std::string&);
+
+    ///
+    /// Create statistics graph.
+    ///
+    std::string plot(const std::string&, const std::string&) const;
+
+    ///
+    /// Create statistics graph.
+    ///
+    void plot_init(const std::string& output) const;
+
+    ///
+    /// Summary plot for the first page
+    ///
+    void plot_summary(const std::string& output) const;
+
+    ///
+    /// @brief Clear all statistics
+    ///
+    inline void reset(void) 
+    { 
+      code_.clear(); comments_.clear(); empty_.clear(); total_.clear(); 
+      authors_.clear();
+    }
+
+    ///
+    ///
+    ///
+    inline u_int revision(void) const { return revision_; }
 
     ///

trunk/lib/first_page.cc

@@ -69 +69 @@
       latest_commit.push_back(log.latest_commit(*i));
 
+    print_summary_plot(os, stats);
     print_general_information(os, log, authors.size(), url);
     sort(latest_commit.begin(), latest_commit.end(), GreaterRevision());
@@ -204 +205 @@
 
 
+  void print_summary_plot(std::ostream& os, const Stats& stats)
+  {
+    std::string name("summary_plot.png");
+    stats.plot_summary(name);
+    os << "<div class=\"main\">\n";
+    os << "<img src='" << name << "' alt='[plot]'>"; 
+    os << "</div>";
+  }
+
 }} // end of namespace svndigest and namespace theplu

trunk/lib/first_page.h

@@ -54 +54 @@
   void print_recent_logs(std::ostream&, const SVNlog& log);
     
+  void print_summary_plot(std::ostream&, const Stats& stats);
+    
 }} // end of namespace svndigest end of namespace theplu