Changeset 1024

Timestamp:

Jan 11, 2010, 12:33:34 AM (11 years ago)

Author:

Peter Johansson

Message:

extracting format from Configuration inside function 'image' rather than passing Configuration::instance().image_format() every single time. refs #279

Location:

trunk/lib

Files:

• Directory.cc (modified) (1 diff)
• File.cc (modified) (1 diff)
• first_page.cc (modified) (1 diff)
• html_utility.cc (modified) (1 diff)
• html_utility.h (modified) (1 diff)

trunk/lib/Directory.cc

@@ -192 +192 @@
       ss << imagedir << "/index";
     os << "<p class=\"plot\">\n"; 
-    os << image(Configuration::instance().image_format(), ss.str());
+    os << image(ss.str());
     os << "</p>\n";
 

trunk/lib/File.cc

@@ -384 +384 @@
       ss << imagefile;
     os << "<p class=\"plot\">\n"; 
-    os << image(Configuration::instance().image_format(), ss.str());
+    os << image(ss.str());
     os << "</p>\n";
 

trunk/lib/first_page.cc

@@ -233 +233 @@
     stats.plot_summary(name);
     os << "<div class=\"main\">\n";
-    os << image(Configuration::instance().image_format(), name);
+    os << image(name);
     os << "</div>";
 

trunk/lib/html_utility.cc

@@ -62 +62 @@
 
   
-  std::string image(const std::string& format, const std::string& name)
+  std::string image(const std::string& name)
   {
     std::ostringstream os;
+    const std::string& format = Configuration::instance().image_format();
     if (format=="svg")
       os << "<object data='" << name << ".svg' type='image/svg+xml'"

trunk/lib/html_utility.h

@@ -50 +50 @@
   /**
    */
-  std::string image(const std::string& format, const std::string& name);
+  std::string image(const std::string& name);
 
   ///