adds plotarea (background) "color" attribute

multigraph · Oct 23, 2012 · a68d642 · a68d642
1 parent 61aec19
commit a68d642
Show file tree

Hide file tree

Showing 15 changed files with 701 additions and 6 deletions.
diff --git a/spec/graphics/canvas/mymugl-800x500.html b/spec/graphics/canvas/mymugl-800x500.html
@@ -153,7 +153,7 @@
 <tr>
 <td width="40%" align="left">Previous: <a href="legend-800x500.html">legend-800x500.html</a></td>
 <td width="20%" align="center"><a href="../index.html">All Graphics Tests</a></td>
-<td width="40%" align="right">Next: <a href="pointline_legend-800x500.html">pointline_legend-800x500.html</a></td>
+<td width="40%" align="right">Next: <a href="plotarea-background-color-800x500.html">plotarea-background-color-800x500.html</a></td>
 </tr>
 <tr><td align="center" colspan="3"><div class="multigraph" data-src="../../mugl/mymugl.xml" data-width="800" data-height="500" data-driver="canvas"/></td></tr>
 </table>

diff --git a/spec/graphics/canvas/plotarea-background-color-800x500.html b/spec/graphics/canvas/plotarea-background-color-800x500.html
@@ -0,0 +1,163 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!-- 
+  DO NOT EDIT THIS FILE BY HAND.  It is generated automatically by the script 'makegraphicstests'.
+  If you edit this file, your edits will be lost the next time this script is run.
+
+  This HTML in this file is contained in the source to the 'makegraphicstests' script.  If you need
+  to change the HTML that appears in this file, edit that script, then run "ant graphicstests" (which
+  in turn runs the 'makegraphicstests' script).
+-->
+<html>
+<head>
+  <title>canvas graphics test: <a href="../../mugl/plotarea-background-color.xml">plotarea-background-color.xml</a> (800 X 500)</title>
+  <script type="text/javascript" src="../../../lib/jermaine/build/jermaine.js"></script>
+  <script type="text/javascript" src="../../../lib/jquery/jquery.min.js"></script>
+  <script type="text/javascript" src="../../../lib/jquery/jquery.mousewheel.js"></script>
+  <script type="text/javascript" src="../../../lib/jquery/jquery-embed.js"></script>
+  <script type="text/javascript" src="../../../lib/util/util.js"></script>
+  <script type="text/javascript" src="../../../lib/sprintf/sprintf-0.7-beta1.js"></script>
+  <script type="text/javascript" src="../../../lib/requestanimationframe/requestanimationframe.js"></script>
+<!--BEGIN_ANT_LINES-->
+<script type="text/javascript" src="../../../src/utility_functions/parsing_functions.js"></script>
+<script type="text/javascript" src="../../../src/utility_functions/serializing_functions.js"></script>
+<script type="text/javascript" src="../../../src/utility_functions/validation_functions.js"></script>
+<script type="text/javascript" src="../../../src/core/data_value.js"></script>
+<script type="text/javascript" src="../../../src/core/data_measure.js"></script>
+<script type="text/javascript" src="../../../src/core/data_formatter.js"></script>
+<script type="text/javascript" src="../../../src/math/box.js"></script>
+<script type="text/javascript" src="../../../src/math/displacement.js"></script>
+<script type="text/javascript" src="../../../src/math/enum.js"></script>
+<script type="text/javascript" src="../../../src/math/insets.js"></script>
+<script type="text/javascript" src="../../../src/math/point.js"></script>
+<script type="text/javascript" src="../../../src/math/rgb_color.js"></script>
+<script type="text/javascript" src="../../../src/math/util.js"></script>
+<script type="text/javascript" src="../../../src/core/renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/data_variable.js"></script>
+<script type="text/javascript" src="../../../src/core/data.js"></script>
+<script type="text/javascript" src="../../../src/core/plot.js"></script>
+<script type="text/javascript" src="../../../src/core/array_data.js"></script>
+<script type="text/javascript" src="../../../src/core/axis.js"></script>
+<script type="text/javascript" src="../../../src/core/axis_title.js"></script>
+<script type="text/javascript" src="../../../src/core/background.js"></script>
+<script type="text/javascript" src="../../../src/core/binding.js"></script>
+<script type="text/javascript" src="../../../src/core/constant_plot.js"></script>
+<script type="text/javascript" src="../../../src/core/csv_data.js"></script>
+<script type="text/javascript" src="../../../src/core/data_plot.js"></script>
+<script type="text/javascript" src="../../../src/core/datatips.js"></script>
+<script type="text/javascript" src="../../../src/core/datatips_variable.js"></script>
+<script type="text/javascript" src="../../../src/core/datetime_formatter.js"></script>
+<script type="text/javascript" src="../../../src/core/datetime_measure.js"></script>
+<script type="text/javascript" src="../../../src/core/datetime_value.js"></script>
+<script type="text/javascript" src="../../../src/core/filter.js"></script>
+<script type="text/javascript" src="../../../src/core/filter_option.js"></script>
+<script type="text/javascript" src="../../../src/core/graph.js"></script>
+<script type="text/javascript" src="../../../src/core/graph_title.js"></script>
+<script type="text/javascript" src="../../../src/core/grid.js"></script>
+<script type="text/javascript" src="../../../src/core/icon.js"></script>
+<script type="text/javascript" src="../../../src/core/img.js"></script>
+<script type="text/javascript" src="../../../src/core/labeler.js"></script>
+<script type="text/javascript" src="../../../src/core/legend.js"></script>
+<script type="text/javascript" src="../../../src/core/mixin.js"></script>
+<script type="text/javascript" src="../../../src/core/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/core/number_formatter.js"></script>
+<script type="text/javascript" src="../../../src/core/number_measure.js"></script>
+<script type="text/javascript" src="../../../src/core/number_value.js"></script>
+<script type="text/javascript" src="../../../src/core/pan.js"></script>
+<script type="text/javascript" src="../../../src/core/plot_legend.js"></script>
+<script type="text/javascript" src="../../../src/core/plotarea.js"></script>
+<script type="text/javascript" src="../../../src/core/renderers/band_renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/renderers/bar_renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/renderers/fill_renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/renderers/pointline_renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/renderers/rangebar_renderer.js"></script>
+<script type="text/javascript" src="../../../src/core/service.js"></script>
+<script type="text/javascript" src="../../../src/core/text.js"></script>
+<script type="text/javascript" src="../../../src/core/variables.js"></script>
+<script type="text/javascript" src="../../../src/core/web_service_data.js"></script>
+<script type="text/javascript" src="../../../src/core/web_service_data_cache_node.js"></script>
+<script type="text/javascript" src="../../../src/core/web_service_data_iterator.js"></script>
+<script type="text/javascript" src="../../../src/core/window.js"></script>
+<script type="text/javascript" src="../../../src/core/zoom.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/jquery_mixin.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/array_data.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/axis.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/axis_title.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/background.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/binding.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/csv_data.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/data.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/data_variable.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/datatips.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/datatips_variable.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/filter.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/filter_option.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/graph.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/graph_title.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/grid.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/icon.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/img.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/labeler.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/legend.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/pan.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/parse_xml.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/plot.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/plot_legend.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/plotarea.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/renderer.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/service.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/variables.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/window.js"></script>
+<script type="text/javascript" src="../../../src/parser/jquery/zoom.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/normalizer_mixin.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/axis.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/data.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/graph.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/plot.js"></script>
+
+<script type="text/javascript" src="../../../src/graphics/canvas/canvas_mixin.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/axis.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/graph.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/icon.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/labeler.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/legend.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/renderers/band_renderer.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/renderers/bar_renderer.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/renderers/fill_renderer.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/renderers/pointline_renderer.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/renderers/rangebar_renderer.js"></script>
+<script type="text/javascript" src="../../../src/graphics/canvas/text.js"></script>
+<script type="text/javascript" src="../../../src/events/jquery/mouse/mixin.js"></script>
+<script type="text/javascript" src="../../../src/events/jquery/mouse/graph.js"></script>
+<script type="text/javascript" src="../../../src/events/jquery/mouse/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/events/jquery/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/normalizer_mixin.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/axis.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/data.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/graph.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/multigraph.js"></script>
+<script type="text/javascript" src="../../../src/normalizer/plot.js"></script>
+<!--END_ANT_LINES-->
+</head>
+<body>
+<center>
+<table>
+<tr>
+<td align="left"><h3>canvas graphics test: <a href="../../mugl/plotarea-background-color.xml">plotarea-background-color.xml</a> (800 X 500)</h3></td>
+<td align="right">Switch to: <a href="../raphael/plotarea-background-color-800x500.html">raphael</a></td>
+</tr>
+<tr><td colspan="2">
+<table>
+<tr>
+<td width="40%" align="left">Previous: <a href="mymugl-800x500.html">mymugl-800x500.html</a></td>
+<td width="20%" align="center"><a href="../index.html">All Graphics Tests</a></td>
+<td width="40%" align="right">Next: <a href="pointline_legend-800x500.html">pointline_legend-800x500.html</a></td>
+</tr>
+<tr><td align="center" colspan="3"><div class="multigraph" data-src="../../mugl/plotarea-background-color.xml" data-width="800" data-height="500" data-driver="canvas"/></td></tr>
+</table>
+</td></tr></table>
+</center>
+</body>
+</html>
diff --git a/spec/graphics/canvas/pointline_legend-800x500.html b/spec/graphics/canvas/pointline_legend-800x500.html
@@ -151,7 +151,7 @@
 <tr><td colspan="2">
 <table>
 <tr>
-<td width="40%" align="left">Previous: <a href="mymugl-800x500.html">mymugl-800x500.html</a></td>
+<td width="40%" align="left">Previous: <a href="plotarea-background-color-800x500.html">plotarea-background-color-800x500.html</a></td>
 <td width="20%" align="center"><a href="../index.html">All Graphics Tests</a></td>
 <td width="40%" align="right">Next: <a href="rangebar_graph-800x500.html">rangebar_graph-800x500.html</a></td>
 </tr>

diff --git a/spec/graphics/index.html b/spec/graphics/index.html
@@ -65,6 +65,8 @@ <h2>Multigraph Graphics Tests</h2>
 <tr>
 <td><a href="canvas/mymugl-800x500.html">mymugl-800x500</a></td><td><a href="raphael/mymugl-800x500.html">mymugl-800x500</a></td></tr>
 <tr>
+<td><a href="canvas/plotarea-background-color-800x500.html">plotarea-background-color-800x500</a></td><td><a href="raphael/plotarea-background-color-800x500.html">plotarea-background-color-800x500</a></td></tr>
+<tr>
 <td><a href="canvas/pointline_legend-800x500.html">pointline_legend-800x500</a></td><td><a href="raphael/pointline_legend-800x500.html">pointline_legend-800x500</a></td></tr>
 <tr>
 <td><a href="canvas/rangebar_graph-800x500.html">rangebar_graph-800x500</a></td><td><a href="raphael/rangebar_graph-800x500.html">rangebar_graph-800x500</a></td></tr>

diff --git a/spec/graphics/logger/graphicstests.js b/spec/graphics/logger/graphicstests.js
@@ -315,6 +315,16 @@ describe("Logger Graphics Tests", function () {
             expect(loggerOutput.contents).toEqual(savedOutput.contents);
         });
     });
+    xit("plotarea-background-color.xml should match with a width of '800' and a height of '500'", function () {
+        var loggerOutput = getLoggerOutput("./mugl/plotarea-background-color.xml", 800, 500);
+        var savedOutput = getFileContents("./graphics/logger/fixtures/plotarea-background-color-800x500.log");
+        waitsFor(function () {
+            return savedOutput.haveData && loggerOutput.haveData;
+        });
+        runs(function () {
+            expect(loggerOutput.contents).toEqual(savedOutput.contents);
+        });
+    });
     it("pointline_legend.xml should match with a width of '800' and a height of '500'", function () {
         var loggerOutput = getLoggerOutput("./mugl/pointline_legend.xml", 800, 500);
         var savedOutput = getFileContents("./graphics/logger/fixtures/pointline_legend-800x500.log");

diff --git a/spec/graphics/logger/mymugl-800x500.html b/spec/graphics/logger/mymugl-800x500.html
@@ -147,7 +147,7 @@
 <tr>
 <td width="40%" align="left">Previous: <a href="legend-800x500.html">legend-800x500.html</a></td>
 <td width="20%" align="center"><a href="../index.html">All Graphics Tests</a></td>
-<td width="40%" align="right">Next: <a href="pointline_legend-800x500.html">pointline_legend-800x500.html</a></td>
+<td width="40%" align="right">Next: <a href="plotarea-background-color-800x500.html">plotarea-background-color-800x500.html</a></td>
 </tr>
 <tr><td align="center" colspan="3"><div class="multigraph" data-src="../../mugl/mymugl.xml" data-width="800" data-height="500" data-driver="logger"/></td></tr>
 </table>