Changeset 74

Timestamp:

Mar 7, 2006, 4:46:59 PM (18 years ago)

Author:

Jari Häkkinen

Message:

Improved web presentation. Y axises normalized, ticket ticket:15 resolved.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• lib/Directory.cc (modified) (1 diff)
• lib/File.cc (modified) (1 diff)
• lib/Gnuplot.cc (modified) (2 diffs)
• lib/GnuplotFE.cc (modified) (4 diffs)
• lib/GnuplotFE.h (modified) (2 diffs)
• lib/Node.cc (modified) (2 diffs)
• lib/Node.h (modified) (3 diffs)
• lib/Stats.cc (modified) (5 diffs)
• lib/Stats.h (modified) (4 diffs)

trunk/ChangeLog

@@ -2 +2 @@
 
 version 0.2:
+  - Improved web page presentation.
   - Removed usage of temporary files.
   - Added option to plot changes against time or revision.

trunk/lib/Directory.cc

@@ -79 +79 @@
     std::ofstream os(output.c_str());
     print_header(os);
-    os << std::endl;
-    stats_.print(os,output_name()+".png");
-    os << std::endl;
-
+    os << "<p align=center>\n<img src='" << stats_.plot(output_name()+".png")
+       << "' alt='[plot]' border=0><br>\n";
+    os << "<table>\n";
+    os << "<tr><td><strong>Node</strong></td>\n";
+    os << "<td><strong>Count</strong></td></tr>\n";
+    os << "<tr><td>Total</td>\n";
+    os << "<td align=right>" << stats_.rows() << "</td></tr>\n";
     // print html links to daughter nodes
     transform(daughters_.begin(), daughters_.end(), 
-              std::ostream_iterator<std::string>(os,"\n"), 
-              std::mem_fun(&Node::html_link));
-
+              std::ostream_iterator<std::string>(os," "), 
+              std::mem_fun(&Node::html_tablerow));
+    os << "</table>\n";
+    os << "</p>";
     print_footer(os);
     os.close(); 

trunk/lib/File.cc

@@ -37 +37 @@
     std::ofstream os(output.c_str());
     print_header(os);
-    os << std::endl;
-    stats_.print(os,output_name()+".png");
-    os << std::endl;
+    os << "<p align=center>\n<img src='" << stats_.plot(output_name()+".png")
+       << "' alt='[plot]' border=0>\n</p>";
     print_footer(os);
     os.close(); 

trunk/lib/Gnuplot.cc

@@ -56 +56 @@
 
   
+  void Gnuplot::command(const std::string& cmdstr)
+  {
+    fputs(cmdstr.c_str(),pipe_);
+    if (*(cmdstr.rbegin())!='\n')
+      fputc('\n',pipe_);
+    fflush(pipe_);
+  }
+
+
   void Gnuplot::tokenizer(const std::string& in,
                           std::list<std::string>& tokens,
@@ -70 +79 @@
 
 
-  void Gnuplot::command(const std::string& cmdstr)
-  {
-    fputs(cmdstr.c_str(),pipe_);
-    if (*(cmdstr.rbegin())!='\n')
-      fputc('\n',pipe_);
-    fflush(pipe_);
-  }
-
-
 }} // end of namespace svnstat and namespace theplu

trunk/lib/GnuplotFE.cc

@@ -5 +5 @@
 
 #include <string>
+#include <sstream>
 
 
@@ -14 +15 @@
 
 
-  void GnuplotFE::plot(const std::vector<double>& y, const std::string& format)
+  void GnuplotFE::plot(const std::vector<u_int>& y, const std::string& format)
   {
     if (!date_.empty()) {
@@ -28 +29 @@
 
 
-  void GnuplotFE::replot(const std::vector<double>& y)
+  void GnuplotFE::replot(const std::vector<u_int>& y)
   {
     if (!date_.empty()) {
@@ -40 +41 @@
 
 
+  double GnuplotFE::yrange(double ymax)
+  {
+    if (ymax<0)
+      ymax=0;
+    std::ostringstream cmd;
+    cmd << "set yrang[0:";
+    if (ymax)
+      cmd << ymax;
+    cmd << "]";
+
+    command(cmd.str());
+    return ymax;
+  }
+
+
 }} // end of namespace svnstat and namespace theplu

trunk/lib/GnuplotFE.h

@@ -40 +40 @@
     ///
     ///
-    void plot(const std::vector<double>& y,const std::string& format="%y-%b-%d");
+    void plot(const std::vector<u_int>& y,const std::string& format="%y-%b-%d");
 
     ///
     ///
     ///
-    void replot(const std::vector<double>& y);
+    void replot(const std::vector<u_int>& y);
 
     ///
@@ -67 +67 @@
     { date_=date; date_input_format_=format; }
 
+    ///
+    /// Set the upper value for the y axis, the lower values is always
+    /// zero. Call this function with an argument 0 (or without an
+    /// argument) to cancel the current setting. Negative argument
+    /// values are treated as zero value.
+    ///
+    /// @return Returns the actual set upper value. A zero value is
+    /// returned if the current setting was cancelled.
+    ///
+    /// @see Gnuplot documentation for yrange
+    ///
+    double yrange(double ymax=0.0);
+
   private:
     ///

trunk/lib/Node.cc

@@ -34 +34 @@
     time ( &rawtime );
     timeinfo = localtime ( &rawtime );
-    os << "<p><font size=1>Generated on "
+    os << "<p align=center><font size=-2>Generated on "
        << asctime (timeinfo) 
-       << "by svnstat</font></p></body>\n" 
-       << "</html>";
+       << "by <a href=http://lev.thep.lu.se/trac/svnstat/>svnstat</a>"
+       << "</font></p></body>\n</html>\n";
   }
 
@@ -45 +45 @@
     os << "<html>\n"
        << "<head>\n"
-       << "<title> svnstat " << name() << "\n"
+       << "<title> svnstat " << name() << "</title>\n"
        << "</head>\n"
-       << "<body bgcolor='FFFBFB'\n";
+       << "<body bgcolor='FFFBFB'>\n";
   }
 
 
-  std::string Node::html_link(void) const
-  { 
-    return "<a href=\"" + output_name() + ".html\">" + name() + "</a><br/>"; 
-  }
- 
   bool Node::subversion_controlled(void) const
   {

trunk/lib/Node.h

@@ -7 +7 @@
 
 #include <ostream>
+#include <sstream>
 #include <string>
-#include <sstream>
 
 namespace theplu{
@@ -29 +29 @@
     virtual inline ~Node(void) {};
 
+    ///
+    /// @return A properly formatted html link to this node.
+    ///
+    inline std::string html_link(void) const
+    { return "<a href=\"" + output_name() + ".html\">" + name() + "</a>"; }
+
+    inline std::string html_tablerow(void) const
+    {
+      std::stringstream ss;
+      ss << "<tr><td>" << html_link() << "</td><td align=right>" << stats_.rows()
+         << "</td></tr>\n";
+      return ss.str();
+    }
+
     inline const std::string& output_name(void) const { return output_name_; }
 
@@ -41 +55 @@
     virtual void print(const bool verbose=false) const=0;
 
-    ///
-    /// @return html link.
-    ///
-    std::string html_link(void) const;
- 
     ///
     ///

trunk/lib/Stats.cc

@@ -24 +24 @@
   u_int Stats::latest_revision_=0;
 
-  std::vector<double> Stats::accumulated(void) const
+  std::vector<u_int> Stats::accumulated(void) const
   {
     // sum of all users
@@ -32 +32 @@
 
     // calculate accumulated sum
-    std::vector<double> accum(sum.size());
+    std::vector<u_int> accum(sum.size());
     std::partial_sum(sum.begin(),sum.end(),accum.begin());
     assert(sum.size()==accum.size());
@@ -38 +38 @@
   }
 
-  std::vector<double> Stats::accumulated(const std::string& user) const
+  std::vector<u_int> Stats::accumulated(const std::string& user) const
   {
     if (!map_.count(user))
-      return std::vector<double>();
+      return std::vector<u_int>();
     std::vector<u_int> vec=(map_.find(user))->second;
   
@@ -47 +47 @@
       vec.insert(vec.end(), latest_revision_+1-vec.size(), 0);
 
-    std::vector<double> accum(vec.size());
+    std::vector<u_int> accum(vec.size());
     std::partial_sum(vec.begin(),vec.end(),accum.begin());
     return accum;
@@ -109 +109 @@
     gp->command("set key left Left reverse");
     gp->command("set multiplot");
-    std::vector<double> x=accumulated();    
+    std::vector<u_int> x=accumulated();   
     std::stringstream sa;
     sa << x.back() << " total";
+    double yrange_max=1.03*x.back()+1;
+    gp->yrange(yrange_max);
     gp->linetitle(sa.str());
     gp->linestyle("steps 1");
     gp->plot(x);
-    size_t plotno=2;
+    size_t plotno=1;
     for (MapConstIter_ i= map_.begin(); i != map_.end(); i++) {
       std::stringstream s0;
-      s0 << "set key height " << plotno;
+      s0 << "set key height " << 2*plotno;
       gp->command(s0.str());
       x=accumulated(i->first);
       std::stringstream s;
       s << x.back() << " " << i->first;
+      gp->yrange(yrange_max);
       gp->linetitle(s.str());
       // Jari, reuse the stream above
       std::stringstream s2;
-      s2 << "steps " << plotno++;
+      s2 << "steps " << ++plotno;
       gp->linestyle(s2.str());
       gp->plot(x);
     }
     gp->command("unset multiplot");
+    gp->yrange();
 
     return name;

trunk/lib/Stats.h

@@ -30 +30 @@
 
     ///
-    /// @brief Print statistics
+    /// Create statistics graph.
     ///
-    void inline print(std::ostream& s, const std::string& name) const
-    { s << "<p><img src='" << plot(name) << "' alt='[plot]' border=0></p>\n"; }
+    std::string plot(const std::string&) const;
 
     ///
@@ -39 +38 @@
     ///
     inline void reset(void) { map_.clear(); }
+
+    ///
+    ///
+    ///
+    inline u_int rows(void) const { return accumulated().back(); }
 
     ///
@@ -54 +58 @@
     /// @return accumulated vector of total
     ///
-    std::vector<double> accumulated(void) const;
+    std::vector<u_int> accumulated(void) const;
 
     ///
     /// @return accumulated vector of stats_[user]
     ///
-    std::vector<double> accumulated(const std::string& user) const;
+    std::vector<u_int> accumulated(const std::string& user) const;
 
     ///
@@ -65 +69 @@
     ///
     void add(const std::string& user, const u_int& revision); 
-
-    std::string plot(const std::string&) const;
 
     static u_int latest_revision_; // latest revision for whole project