Changeset 1007

Timestamp:

Jan 3, 2010, 7:09:43 PM (13 years ago)

Author:

Peter Johansson

Message:

refs #405

Support for png images, which is now default. Using alhpa channel in
plstream for png did not work well in any straghtforward way so made
PNGs opaque.

Location:

trunk/lib

Files:

• Directory.cc (modified) (2 diffs)
• File.cc (modified) (2 diffs)
• Graph.cc (modified) (2 diffs)
• Graph.h (modified) (1 diff)
• Stats.cc (modified) (3 diffs)
• first_page.cc (modified) (1 diff)
• html_utility.cc (modified) (1 diff)

trunk/lib/Directory.cc

@@ -24 +24 @@
 
 #include "Alias.h"
+#include "Configuration.h"
 #include "File.h"
 #include "html_utility.h"
@@ -187 +188 @@
     ss << "../../../";
     if (user=="all")
-      ss << stats.plot(imagedir+"/index.svg", line_type);
+      ss << stats.plot(imagedir+"/index", line_type);
     else
-      ss << imagedir << "/index.svg";
+      ss << imagedir << "/index";
     os << "<p class=\"plot\">\n"; 
-    os << image("svg", ss.str());
+    os << image(Configuration::instance().image_format(), ss.str());
     os << "</p>\n";
 

trunk/lib/File.cc

@@ -368 +368 @@
       lpath = "index";
     std::string outpath = stats_type+"/"+user+"/"+line_type+"/"+lpath;
-    std::string imagefile = stats_type+"/"+"images/"+line_type+"/"+
-      lpath+".svg";
+    std::string imagefile = stats_type+"/"+"images/"+line_type+"/"+lpath;
     std::string html_name(outpath + ".html");
     std::ofstream os(html_name.c_str());
@@ -385 +384 @@
       ss << imagefile;
     os << "<p class=\"plot\">\n"; 
-    os << image("svg", ss.str());
+    os << image(Configuration::instance().image_format(), ss.str());
     os << "</p>\n";
 

trunk/lib/Graph.cc

@@ -33 +33 @@
   std::vector<std::string> Graph::xticks_;
 
-  Graph::Graph(const std::string& filename)
+  Graph::Graph(const std::string& filename, const std::string& format)
 #ifdef HAVE_PLPLOT
-    : plots_(0), pls_(1,1,"svg",filename.c_str()), timeformat_("%y-%b"),
+    : plots_(0), pls_(1,1,format.c_str(),filename.c_str()), timeformat_("%y-%b"),
       title_(filename), xmin_(0.0), xmax_(0.0), ymin_(0.0), ymax_(0.0)
   {
@@ -42 +42 @@
     legend_.reserve(10);
     // we use color map 0 position 0 for background color
-    pls_.scolbga(255,255,255,0);
+    if (format=="png")
+      pls_.scolbg(255,255,255);
+    else
+      pls_.scolbga(255,255,255,0);
     pls_.init();
     pls_.adv(0);

trunk/lib/Graph.h

@@ -64 +64 @@
        the graph object is destroyed.
     */
-    explicit Graph(const std::string& filename);
+    Graph(const std::string& filename, const std::string& format);
 
     /**

trunk/lib/Stats.cc

@@ -25 +25 @@
 
 #include "Colors.h"
+#include "Configuration.h"
 #include "Functor.h"
 #include "Graph.h"
@@ -364 +365 @@
   {
     assert(total_stats().size());
-    Graph gp(filename);
+    Graph gp(filename+"."+Configuration::instance().image_format(),
+             Configuration::instance().image_format());
     const Author2Vector* stat=NULL;
     if (linetype=="total")
@@ -431 +433 @@
   void Stats::plot_summary(const std::string& filename) const
   {
-    Graph gp(filename);
+    Graph gp(filename+"."+Configuration::instance().image_format(),
+             Configuration::instance().image_format());
     std::vector<unsigned int> total = get_vector(total_stats(), "all");
     double yrange_max=1.03*total.back()+1;

trunk/lib/first_page.cc

@@ -230 +230 @@
   void print_summary_plot(std::ostream& os, const Stats& stats)
   {
-    std::string name("summary_plot.svg");
+    std::string name("summary_plot");
     stats.plot_summary(name);
     os << "<div class=\"main\">\n";
-    os << image("svg", name);
+    os << image(Configuration::instance().image_format(), name);
     os << "</div>";
 

trunk/lib/html_utility.cc

@@ -66 +66 @@
     std::ostringstream os;
     if (format=="svg")
-      os << "<object data='" << name << "' type='image/svg+xml' width='600'>\n"
-         << "<embed src='" << name << "' type='image/svg+xml' width='600' />\n"
+      os << "<object data='" << name << ".svg' type='image/svg+xml'"
+         << " width='600'>\n"
+         << "<embed src='" << name << ".svg' type='image/svg+xml'"
+         << " width='600' />\n"
          << "</object>\n";
+    else if (format=="png")
+      os << "<img src='" << name << ".png' alt='[plot]'/>";
     else {
       assert(false);