Changeset 902

Timestamp:

Nov 27, 2009, 5:12:46 AM (14 years ago)

Author:

Peter Johansson

Message:

fixes #401

It is now possible to build without plplot. It is even possible to
generate reports, which obviously will be without images. If compiling
and HAVE_PLPLOT is not defined, the Graph class becomes a lame empty
class doing nothing (but existing). Needs some revision on README.

Location:

trunk

Files:

• lib/Graph.cc (modified) (9 diffs)
• lib/Graph.h (modified) (2 diffs)
• lib/OptionVersion.cc (modified) (3 diffs)
• test/Makefile.am (modified) (1 diff)

trunk/lib/Graph.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2009 Jari Häkkinen
+  Copyright (C) 2009 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -34 +34 @@
 
   Graph::Graph(const std::string& filename)
+#ifdef HAVE_PLPLOT
     : plots_(0), pls_(1,1,"svg",filename.c_str()), timeformat_("%y-%b"),
       title_(filename), xmin_(0.0), xmax_(0.0), ymin_(0.0), ymax_(0.0)
@@ -44 +45 @@
     pls_.vsta();
   }
+#else
+{}
+#endif
 
 
@@ -61 +65 @@
   {
     // we use colour map 0 position 1 for current colour
+#ifdef HAVE_PLPLOT
     pls_.scol0a(1,legend.r,legend.g,legend.b,1.0);
+#endif
   }
 
@@ -68 +74 @@
   {
     // we use colour map 0 position 1 for current colour
+#ifdef HAVE_PLPLOT
     pls_.scol0a(1,r,g,b,1.0);
+#endif
   }
 
@@ -75 +83 @@
                    unsigned int lines)
   {
+#ifdef HAVE_PLPLOT
     if (!plots_) {
       xmin_= date_xticks() ? Date(xticks_.front()).seconds() : 0;
@@ -116 +125 @@
     pls_.gcol0(1,legend.r,legend.g,legend.b);
     legend_.push_back(legend);
+#endif
   }
 
@@ -121 +131 @@
   void Graph::print_legend(void)
   {
+#ifdef HAVE_PLPLOT
     PLFLT line_length=0.05*xrange_;
     PLFLT x=xmin_+1.7*line_length;
@@ -141 +152 @@
       pls_.ptex(x+legend_lines_length+dx  , y, 0, 0, 1, ss.str().c_str());
     }
+#endif
   }
 

trunk/lib/Graph.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2009 Jari Häkkinen
+  Copyright (C) 2009 Jari Häkkinen, Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -23 +23 @@
 */
 
+#include <config.h>
+
 #include <string>
 #include <vector>
 
+#ifdef HAVE_PLPLOT
 #include <plplot/plstream.h>
+#else
+typedef int PLINT;
+typedef double PLFLT;
+typedef double plstream;
+#endif
 
 namespace theplu {

trunk/lib/OptionVersion.cc

@@ -34 +34 @@
 #include <apr_version.h>
 
+#ifdef HAVE_LIB
 #include <plplot/plstream.h>
+#endif
 
 #include <sstream>
@@ -80 +82 @@
       cs << apr_version_string();
       cs << "\n";
+#ifdef HAVE_LIB
       cs << "using libplplot ";
       plstream pls;
@@ -85 +88 @@
       pls.gver(plplot_version);
       cs << plplot_version << "\n";
+#endif
     }
     exit(0);

trunk/test/Makefile.am

@@ -40 +40 @@
   $(top_builddir)/lib/yat/libyat.a \
   $(SVN_LIBS) $(APR_LIBS) $(PLPLOT_LIBS)
-AM_LDFLAGS = $(SVNDIGEST_LDFLAGS) $(PLPLOT_LDFLAGS)
+AM_LDFLAGS = $(APR_LDFLAGS) $(SVN_LDFLAGS) $(PLPLOT_LDFLAGS)
 
 AM_CPPFLAGS = -I$(top_srcdir)/lib $(APR_CPPFLAGS) $(SVN_CPPFLAGS) \