Changeset 855

Timestamp:

Nov 19, 2009, 2:56:28 PM (14 years ago)

Author:

Jari Häkkinen

Message:

Addresses #97. One summary plot is generated with plplot ... much more to do.

Location:

branches/replacing_gnuplot

Files:

• bin/Makefile.am (modified) (1 diff)
• bin/svndigest.cc (modified) (3 diffs)
• lib/Graph.cc (modified) (1 diff)
• lib/Graph.h (modified) (2 diffs)
• lib/Stats.cc (modified) (6 diffs)
• lib/Stats.h (modified) (1 diff)
• lib/first_page.cc (modified) (1 diff)

branches/replacing_gnuplot/bin/Makefile.am

@@ -31 +31 @@
 LDADD = $(top_builddir)/lib/libsvndigest.a \
   $(top_builddir)/lib/yat/libyat.a $(SVNDIGEST_LIBS)
-AM_LDFLAGS = $(SVNDIGEST_LDFLAGS)
+AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) $(PLPLOT_LDFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib $(SVNDIGEST_CPPFLAGS)

branches/replacing_gnuplot/bin/svndigest.cc

@@ -27 +27 @@
 #include "Directory.h"
 #include "first_page.h"
-#include "GnuplotFE.h"
 #include "html_utility.h"
 #include "rmdirhier.h"
@@ -179 +178 @@
         dates.push_back(iter->date());
       }
-      GnuplotFE::instance()->set_dates(dates); 
+//      GnuplotFE::instance()->set_dates(dates); 
     }
     if (chdir(option->targetdir().c_str()) ) {
@@ -190 +189 @@
       exit(-1);
     }
-    GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"/"
-                                   +tree->name()+"'");
+//    GnuplotFE::instance()->command(std::string("cd '")+option->targetdir()+"/"
+//                                   +tree->name()+"'");
     print_css("svndigest.css");
     print_main_page(tree->name(), tree->log(), stats, tree->url());

branches/replacing_gnuplot/lib/Graph.cc

@@ -25 +25 @@
 namespace svndigest {
 
-  Graph::Graph(void)
+  std::vector<std::string> Graph::xticks_;
+
+  Graph::Graph(const std::string& filename)
+  {
+    pls_.sdev("svg");
+    pls_.sfnam((filename+".svg").c_str());
+    pls_.init();
+    pls_.adv(0);
+    pls_.scolbg(0,100,0);
+    pls_.rgb(255,0,0);
+    pls_.vsta();
+  }
+
+  Graph::~Graph(void)
   {
   }
 
+  bool Graph::date_xticks(void)
+  {
+    return xticks_.size() != 0;
+  }
+
+
+  void Graph::plot(const std::vector<unsigned int>& x)
+  {
+    pls_.wind(0, x.size(), 0, x.back());
+    pls_.box("bcnstd", 100, 5, "bcnstv", 100, 5);
+    for (unsigned int i=1; i<x.size(); ++i) {
+      pls_.join(i-1,x[i-1],i-1,x[i]);
+      pls_.join(i-1,x[i],i,x[i]);
+    }
+  }
+
+
+  const std::vector<std::string>& Graph::xticks(void)
+  {
+    return xticks_;
+  }
+
+
+  double Graph::yrange(double ymax)
+  {
+    return ymax;
+  }
+
 }} // end of namespace svndigest and namespace theplu

branches/replacing_gnuplot/lib/Graph.h

@@ -26 +26 @@
 #include <vector>
 
+#include <plplot/plstream.h>
+
 namespace theplu {
 namespace svndigest {
@@ -36 +38 @@
        \brief Constructor
     */
-    Graph(void);
+    Graph(const std::string& filename);
+
+    /**
+       \brief Destructor
+    */
+    ~Graph(void);
 
     static bool date_xticks(void);
+
+    void plot(const std::vector<unsigned int>&);
+
     static const std::vector<std::string>& xticks(void);
+
+    double yrange(double ymax=0.0);
+
+  private:
+    plstream pls_;
+    static std::vector<std::string> xticks_;
   };
 

branches/replacing_gnuplot/lib/Stats.cc

@@ -25 +25 @@
 
 #include "Functor.h"
-#include "GnuplotFE.h"
+#include "Graph.h"
 #include "SVNblame.h"
 #include "SVNinfo.h"
@@ -352 +352 @@
                           const std::string& linetype) const
   {
+    return filename;
     assert(total_stats().size());
-    plot_init(filename);
-    GnuplotFE* gp=GnuplotFE::instance();
+    Graph gp(filename);
     const Author2Vector* stat=NULL;
     if (linetype=="total")
@@ -369 +369 @@
     std::vector<unsigned int> total=get_vector(*stat, "all");   
     double yrange_max=1.03*total.back()+1;
-    gp->yrange(yrange_max);
+    gp.yrange(yrange_max);
 
     typedef std::vector<std::pair<std::string, std::vector<unsigned int> > > vec_type;
@@ -393 +393 @@
       ss.str("");
       ss << "set key height " << 2*plotno;
-      gp->command(ss.str());
+//      gp->command(ss.str());
       ss.str("");
       ss << get_back(*stat, i->first) << " " << i->first;
-      gp->yrange(yrange_max);
-      gp->linetitle(ss.str());
+      gp.yrange(yrange_max);
+//      gp->linetitle(ss.str());
       ss.str("");
       ss << "steps " << --plotno+2;
-      gp->linestyle(ss.str());
-      gp->plot(i->second);
+//      gp->linestyle(ss.str());
+//      gp->plot(i->second);
     }
     ss.str("");
     ss << get_back(*stat, "all") << " total";
-    gp->command("set key height 0");
-    gp->linetitle(ss.str());
-    gp->linestyle("steps 1");
-    gp->plot(total);
-
-    gp->command("unset multiplot");
-    gp->yrange();
+//    gp->command("set key height 0");
+//    gp->linetitle(ss.str());
+//    gp->linestyle("steps 1");
+//    gp->plot(total);
+
+//    gp->command("unset multiplot");
 
     return filename;
@@ -417 +416 @@
 
 
-  void Stats::plot_init(const std::string& filename) const
-  {
-    GnuplotFE* gp=GnuplotFE::instance();
-    gp->command("set term png");
-    gp->command("set output '"+filename+"'");
-    gp->command("set xtics nomirror");
-    gp->command("set ytics nomirror");
-    gp->command("set key default");
-    gp->command("set key left Left reverse");
-    gp->command("set multiplot");
-  }
-
-
   void Stats::plot_summary(const std::string& filename) const
   {
-    plot_init(filename);
-    GnuplotFE* gp=GnuplotFE::instance();
+    Graph gp(filename);
     std::vector<unsigned int> total = get_vector(total_stats(), "all");
     double yrange_max=1.03*total.back()+1;
-    gp->yrange(yrange_max);
+    gp.yrange(yrange_max);
     std::stringstream ss;
     
@@ -442 +427 @@
     std::vector<unsigned int> x(get_vector(code_stats(), "all"));
     ss << x.back() << " code";
-    gp->command("set key height 2");
-    gp->linetitle(ss.str());
-    gp->linestyle("steps 2");
-    gp->plot(x);
+//    gp->command("set key height 2");
+//    gp->linetitle(ss.str());
+//    gp->linestyle("steps 2");
+//    gp->plot(x);
 
     ss.str("");
     x = get_vector(comment_or_copy_stats(), "all");
     ss << x.back() << " comment";
-    gp->command("set key height 4");
-    gp->linetitle(ss.str());
-    gp->linestyle("steps 3");
-    gp->plot(x);
+//    gp->command("set key height 4");
+//    gp->linetitle(ss.str());
+//    gp->linestyle("steps 3");
+//    gp->plot(x);
 
     ss.str("");
     x = get_vector(other_stats(), "all");
     ss << x.back() << " other";
-    gp->command("set key height 6");
-    gp->linetitle(ss.str());
-    gp->linestyle("steps 4");
-    gp->plot(x);
+//    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();
+//    gp->command("set key height 0");
+//    gp->linetitle(ss.str());
+//    gp->linestyle("steps 1");
+    gp.plot(total);
+
+//    gp->command("unset multiplot");
   }
 

branches/replacing_gnuplot/lib/Stats.h

@@ -192 +192 @@
                  Author2Vector& map);
 
-    ///
-    /// Init statistics graph.
-    ///
-    void plot_init(const std::string& output) const;
-
     std::set<std::string> authors_;
 

branches/replacing_gnuplot/lib/first_page.cc

@@ -226 +226 @@
   void print_summary_plot(std::ostream& os, const Stats& stats)
   {
-    std::string name("summary_plot.png");
+    std::string name("summary_plot");
     stats.plot_summary(name);
     os << "<div class=\"main\">\n";