Changeset 73 for trunk/bin

Timestamp:

Mar 4, 2006, 7:10:07 PM (18 years ago)

Author:

Jari Häkkinen

Message:

Divided Gnuplot class into a basic gnuplot communication class
and a front end class specialized for svnstat.
Added option to plot stats against time or revision.
Removed gnuplot usage of temporary files.

Location:

trunk/bin

Files:

• Parameter.cc (modified) (4 diffs)
• Parameter.h (modified) (2 diffs)
• svnstat.cc (modified) (3 diffs)

trunk/bin/Parameter.cc

@@ -11 +11 @@
 
   Parameter::Parameter(const int argc,const char *argv[])
-    : force_(false), root_("."), targetdir_("svnstat_output"), verbose_(false)
   {
-  
+    defaults();
     for (int i=1; i<argc; i++) {
       bool ok=false;
@@ -30 +29 @@
           ok=true;
         }
+      }
+      else if (myargv=="-rev" || myargv=="--revisions") {
+          revisions_=true;
+          ok=true;
       }
       else if (myargv=="-t" || myargv=="--target"){
@@ -61 +64 @@
 
 
+  void Parameter::defaults(void)
+  {
+    force_=false;
+    revisions_=false;
+    root_=".";
+    targetdir_="svnstat_output";
+    verbose_=false;
+  }
+
+
   void Parameter::help(void)
   {
@@ -80 +93 @@
               << "  -r [--root] arg : svn controlled directory to perform\n"
               << "                    statistics calculation on [.]\n"
+              << "  -rev [--revisions]: Use revision numbers as time scale\n"
+              << "                      instead of dates [dates].\n"
               << "  -t [--target] arg : output directory [svnstat_output]\n"
               << "  -v [--verbose] : explain what is being done\n"

trunk/bin/Parameter.h

@@ -14 +14 @@
     Parameter(const int argc,const char *argv[]);
     inline bool force(void) const { return force_; }
+    inline bool revisions(void) const { return revisions_; }
     inline const std::string& root(void) const { return root_; }
     inline const std::string& targetdir(void) const { return targetdir_; }
@@ -20 +21 @@
   private:
     void analyse(void);
+    void defaults(void);
     void help(void);
     void version(void);
 
     bool force_;
+    bool revisions_;
     std::string root_;
     std::string targetdir_;
     bool verbose_;
-
   };
 

trunk/bin/svnstat.cc

@@ -4 +4 @@
 #include "CommitStat.h"
 #include "Directory.h"
-#include "Gnuplot.h"
+#include "GnuplotFE.h"
 #include "rmdirhier.h"
 
@@ -35 +35 @@
   }
 
-  if (option.verbose())
-    std::cout << "Parsing the log." << std::endl;
-  CommitStat cs;
-  cs.parse(option.root());
-  assert(cs.date()[0].size());
-  Stats::gnuplot_pipe_.set_dates(cs.date());
+  if (!option.revisions()) {
+    if (option.verbose())
+      std::cout << "Parsing the log." << std::endl;
+    CommitStat cs;
+    cs.parse(option.root());
+    GnuplotFE::instance()->set_dates(cs.date());
+  }
   
   string prefix("svnstat_");
@@ -47 +48 @@
   tree.parse(option.verbose());
 
-  Stats::gnuplot_pipe_.command(string("cd '")+option.targetdir()+"'");
+  GnuplotFE::instance()->command(string("cd '")+option.targetdir()+"'");
   chdir(option.targetdir().c_str());
   try {