|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r50924 - in sandbox/SOC/2007/visualization/boost/svg_plot: . detail
From: pbristow_at_[hidden]
Date: 2009-01-31 06:41:24
Author: pbristow
Date: 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
New Revision: 50924
URL: http://svn.boost.org/trac/boost/changeset/50924
Log:
Further changes to produce a warning free html except for
"Cannot handle sectiondef with kind=private-attrib"
(but pdf does not work at all)
Text files modified:
sandbox/SOC/2007/visualization/boost/svg_plot/detail/FP_compare.hpp | 28 +-
sandbox/SOC/2007/visualization/boost/svg_plot/show_2d_settings.hpp | 6
sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp | 8
sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp | 2
sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp | 322 +++++++++++++++++++--------------------
sandbox/SOC/2007/visualization/boost/svg_plot/svg_fwd.hpp | 10
sandbox/SOC/2007/visualization/boost/svg_plot/svg_style.hpp | 29 +-
7 files changed, 199 insertions(+), 206 deletions(-)
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/detail/FP_compare.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/detail/FP_compare.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/detail/FP_compare.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -49,7 +49,7 @@
// www.boost.org/libs/test/doc/components/test_tools/floating_point_comparison.html
// Comparison of Floating Point Numbers, Matthias Ruppwww.mrupp.info/Data/2007floatingcomp.pdf, July 2007.
// The pitfalls of verifying floating-point computations, David Monniaux
-// CNRS Ecole normale sup´erieure, 1 Feb 2008, http://arxiv.org/abs/cs/0701192v4
+// CNRS Ecole normale superieure, 1 Feb 2008, http://arxiv.org/abs/cs/0701192v4
// submitted to ACM TOPLAS.
// FPT is Floating-Point Type: float, double, long double, or User-Defined like NTL quad_float or RR.
@@ -146,19 +146,19 @@
template<typename FPT = double>
class smallest
{ /*! \class smallest
- \brief Check floating-point value is smaller than a chosen small value,
- default std::numeric_limits<FPT>::min_value().
- \details
- David Monniaux, http://arxiv.org/abs/cs/0701192v4,
- It is somewhat common for beginners to add a comparison check to 0 before
- computing a division, in order to avoid possible division-by-zero exceptions or
- the generation of infinite results. A first objection to this practise is that, anyway,
- computing 1/x for x very close to zero will generate very large numbers
- that will most probably result in overflows later.
- Another objection, which few programmers know about and that we wish to draw attention
- to, is that it may actually fail to work, depending on what the compiler
- does that is, the program may actually test that x == 0, then, further down,
- find that x = 0 without any apparent change to x!
+ \brief Check floating-point value is smaller than a chosen small value,
+ default std::numeric_limits<FPT>::min_value().
+ \details
+ David Monniaux, http://arxiv.org/abs/cs/0701192v4,
+ It is somewhat common for beginners to add a comparison check to 0 before
+ computing a division, in order to avoid possible division-by-zero exceptions or
+ the generation of infinite results. A first objection to this practise is that, anyway,
+ computing 1/x for x very close to zero will generate very large numbers
+ that will most probably result in overflows later.
+ Another objection, which few programmers know about and that we wish to draw attention
+ to, is that it may actually fail to work, depending on what the compiler
+ does, that is, the program may actually test that x == 0, then, further down,
+ find that x = 0 without any apparent change to x!
*/
public:
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/show_2d_settings.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/show_2d_settings.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/show_2d_settings.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -11,8 +11,6 @@
// Copyright Jacob Voytko 2007
// Copyright Paul A. Bristow 2007
-
-
// Use, modification and distribution are subject to the
// Boost Software License, Version 1.0.
// (See accompanying file LICENSE_1_0.txt
@@ -149,8 +147,8 @@
}
void show_2d_plot_settings(svg_2d_plot& plot)
-{ //! Diagnostic display of all of a 2D plot's settings.
- /*! Outputs to cout, a long list of about hundred of plot parameter settings,
+{ /*! Diagnostic display of all of a 2D plot's settings.
+ Outputs to cout, a long list of about hundred of plot parameter settings,
invaluable if the plot does not look as expected.
\warning This creates about 100 lines of output, so should be used sparingly!
*/
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -135,10 +135,10 @@
// http://www.adobe.com/svg/basics/intro.html SVG Workflow on optimising SVG
// Gzip compression - can give files that are 1/10th size of gif or jpeg.
// Use default values whenever possible rather than defining all attributes and properties explicitly.
-// Take advantage of the path data compaction facilities use relative coordinates;
-// use h and v for horizontal and vertical lines;
-// use s or t for cubic and quadratic Bezier segments whenever possible;
-// eliminate extraneous white space and separators.
+// Take advantage of the path data compaction facilities so use relative coordinates.
+// Use h and v for horizontal and vertical lines.
+// Use s or t for cubic and quadratic Bezier segments whenever possible.
+// Eliminate extraneous white space and separators.
// Use symbols if the same graphic appears multiple times in the document.
// Use CSS property inheritance and selectors to consolidate commonly used properties into named styles
// or to assign the properties to a parent group element.
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_2d_plot.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -1422,7 +1422,7 @@
back_vtr.second = ((n_minus_1.second - n.second) + // y
(n_minus_2.second - n_minus_1.second)) * control;
- // 8.3.6 The cubic Bézier curve commands path.S(x, y).
+ // 8.3.6 The cubic Bezier curve commands path.S(x, y).
// Start point, end point, & two control points.
// Example: S378.5,519.3 381,519.3 ...
// S end_control_point, end point
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_color.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -30,6 +30,13 @@
http://www.w3.org/TR/SVG/types.html#ColorKeywords
tan is also renamed to tanned to avoid clash with function tan in math.h.
*/
+
+ // Forward declarations in this module (see also svg_fwd).
+
+ struct svg_color;
+ void constant_to_rgb(svg_color_constant c, unsigned char& r, unsigned char& g, unsigned char& b);
+ std::ostream& operator<< (std::ostream&, const svg_color&);
+
enum svg_color_constant
{ //! \enum svg_color_constant SVG standard names for some colors.
//! See http://www.w3.org/TR/SVG/types.html#ColorKeywords
@@ -66,16 +73,157 @@
blank // 'NotAColor' == 147
}; // enum svg_color_constant
- // Forward declarations in this module (see svg_fwd):
- struct svg_color;
- void constant_to_rgb(svg_color_constant c,
- unsigned char& r, unsigned char& g, unsigned char& b);
- std::ostream& operator<< (std::ostream&, const svg_color&);
-
- // For the constructor, the SVG standard specifies that numbers
- // outside the normal rgb range are to be accepted,
- // but are constrained to acceptable range of integer values [0, 255].
- // --------------------------------------------------------------------
+ svg_color color_array[] =
+ { //! SVG standard colors, see also enum svg_color_constant.
+ svg_color(240, 248, 255), // aliceblue
+ svg_color(250, 235, 215), // antiquewhite
+ svg_color(0 , 255, 255), // aqua
+ svg_color(127, 255, 212), // aquamarine
+ svg_color(240, 255, 255), // azure
+ svg_color(245, 245, 220), // beige
+ svg_color(255, 228, 196), // bisque
+ svg_color(0 , 0 , 0 ), // black
+ svg_color(255, 235, 205), // blanchedalmond
+ svg_color(0 , 0 , 255), // blue
+ svg_color(138, 43 , 226), // blueviolet
+ svg_color(165, 42 , 42 ), // brown
+ svg_color(222, 184, 135), // burlywood
+ svg_color(95 , 158, 160), // cadetblue
+ svg_color(127, 255, 0 ), // chartreuse
+ svg_color(210, 105, 30 ), // chocolate
+ svg_color(255, 127, 80 ), // coral
+ svg_color(100, 149, 237), // cornflowerblue
+ svg_color(255, 248, 220), // cornsilk
+ svg_color(220, 20 , 60 ), // crimson
+ svg_color(0 , 255, 255), // cyan
+ svg_color(0 , 0 , 139), // darkblue
+ svg_color(0 , 139, 139), // darkcyan
+ svg_color(184, 134, 11 ), // darkgoldenrod
+ svg_color(169, 169, 169), // darkgray
+ svg_color(0 , 100, 0 ), // darkgreen
+ svg_color(169, 169, 169), // darkgrey
+ svg_color(189, 183, 107), // darkkhaki
+ svg_color(139, 0 , 139), // darkmagenta
+ svg_color(85 , 107, 47 ), // darkolivegreen
+ svg_color(255, 140, 0 ), // darkorange
+ svg_color(153, 50 , 204), // darkorchid
+ svg_color(139, 0 , 0 ), // darkred
+ svg_color(233, 150, 122), // darksalmon
+ svg_color(143, 188, 143), // darkseagreen
+ svg_color(72 , 61 , 139), // darkslateblue
+ svg_color(47 , 79 , 79 ), // darkslategray
+ svg_color(47 , 79 , 79 ), // darkslategrey
+ svg_color(0 , 206, 209), // darkturquoise
+ svg_color(148, 0 , 211), // darkviolet
+ svg_color(255, 20 , 147), // deeppink
+ svg_color(0 , 191, 255), // deepskyblue
+ svg_color(105, 105, 105), // dimgray
+ svg_color(105, 105, 105), // dimgrey
+ svg_color(30 , 144, 255), // dodgerblue
+ svg_color(178, 34 , 34 ), // firebrick
+ svg_color(255, 250, 240), // floralwhite
+ svg_color(34 , 139, 34 ), // forestgreen
+ svg_color(255, 0 , 255), // fuchsia
+ svg_color(220, 220, 220), // gainsboro
+ svg_color(248, 248, 255), // ghostwhite
+ svg_color(255, 215, 0 ), // gold
+ svg_color(218, 165, 32 ), // goldenrod
+ svg_color(128, 128, 128), // gray
+ svg_color(128, 128, 128), // grey
+ svg_color(0 , 128, 0 ), // green
+ svg_color(173, 255, 47 ), // greenyellow
+ svg_color(240, 255, 240), // honeydew
+ svg_color(255, 105, 180), // hotpink
+ svg_color(205, 92 , 92 ), // indianred
+ svg_color(75 , 0 , 130), // indigo
+ svg_color(255, 255, 240), // ivory
+ svg_color(240, 230, 140), // khaki
+ svg_color(230, 230, 250), // lavender
+ svg_color(255, 240, 245), // lavenderblush
+ svg_color(124, 252, 0 ), // lawngreen
+ svg_color(255, 250, 205), // lemonchiffon
+ svg_color(173, 216, 230), // lightblue
+ svg_color(240, 128, 128), // lightcoral
+ svg_color(224, 255, 255), // lightcyan
+ svg_color(250, 250, 210), // lightgoldenrodyellow
+ svg_color(211, 211, 211), // lightgray
+ svg_color(144, 238, 144), // lightgreen
+ svg_color(211, 211, 211), // lightgrey
+ svg_color(255, 182, 193), // lightpink
+ svg_color(255, 160, 122), // lightsalmon
+ svg_color(32 , 178, 170), // lightseagreen
+ svg_color(135, 206, 250), // lightskyblue
+ svg_color(119, 136, 153), // lightslategray
+ svg_color(119, 136, 153), // lightslategrey
+ svg_color(176, 196, 222), // lightsteelblue
+ svg_color(255, 255, 224), // lightyellow
+ svg_color(0 , 255, 0 ), // lime
+ svg_color(50 , 205, 50 ), // limegreen
+ svg_color(250, 240, 230), // linen
+ svg_color(255, 0 , 255), // magenta
+ svg_color(128, 0 , 0 ), // maroon
+ svg_color(102, 205, 170), // mediumaquamarine
+ svg_color(0 , 0 , 205), // mediumblue
+ svg_color(186, 85 , 211), // mediumorchid
+ svg_color(147, 112, 219), // mediumpurple
+ svg_color(60 , 179, 113), // mediumseagreen
+ svg_color(123, 104, 238), // mediumslateblue
+ svg_color(0 , 250, 154), // mediumspringgreen
+ svg_color(72 , 209, 204), // mediumturquoise
+ svg_color(199, 21 , 133), // mediumvioletred
+ svg_color(25 , 25 , 112), // midnightblue
+ svg_color(245, 255, 250), // mintcream
+ svg_color(255, 228, 225), // mistyrose
+ svg_color(255, 228, 181), // moccasin
+ svg_color(255, 222, 173), // navajowhite
+ svg_color(0 , 0 , 128), // navy
+ svg_color(253, 245, 230), // oldlace
+ svg_color(128, 128, 0 ), // olive
+ svg_color(107, 142, 35 ), // olivedrab
+ svg_color(255, 165, 0 ), // orange
+ svg_color(255, 69 , 0 ), // orangered
+ svg_color(218, 112, 214), // orchid
+ svg_color(238, 232, 170), // palegoldenrod
+ svg_color(152, 251, 152), // palegreen
+ svg_color(175, 238, 238), // paleturquose
+ svg_color(219, 112, 147), // palevioletred
+ svg_color(255, 239, 213), // papayawhip
+ svg_color(255, 218, 185), // peachpuff
+ svg_color(205, 133, 63 ), // peru
+ svg_color(255, 192, 203), // pink
+ svg_color(221, 160, 221), // plum
+ svg_color(176, 224, 230), // powderblue
+ svg_color(128, 0 , 128), // purple
+ svg_color(255, 0 , 0 ), // red
+ svg_color(188, 143, 143), // rosybrown
+ svg_color(65 , 105, 225), // royalblue
+ svg_color(139, 69 , 19 ), // saddlebrown
+ svg_color(250, 128, 114), // salmon
+ svg_color(244, 164, 96 ), // sandybrown
+ svg_color(46 , 139, 87 ), // seagreen
+ svg_color(255, 245, 238), // seashell
+ svg_color(160, 82 , 45 ), // sienna
+ svg_color(192, 192, 192), // silver
+ svg_color(135, 206, 235), // skyblue
+ svg_color(106, 90 , 205), // slateblue
+ svg_color(112, 128, 144), // slategray
+ svg_color(112, 128, 144), // slategrey
+ svg_color(255, 250, 250), // snow
+ svg_color(0 , 255, 127), // springgreen
+ svg_color(70 , 130, 180), // steelblue
+ svg_color(210, 180, 140), // tanned
+ svg_color(0 , 128, 128), // teal
+ svg_color(216, 191, 216), // thistle
+ svg_color(255, 99 , 71 ), // tomato
+ svg_color(64 , 224, 208), // turquoise
+ svg_color(238, 130, 238), // violet
+ svg_color(245, 222, 179), // wheat
+ svg_color(255, 255, 255), // white
+ svg_color(245, 245, 245), // whitesmoke
+ svg_color(255, 255, 0 ), // yellow
+ svg_color(154, 205, 50 ), // yellowgreen
+ svg_color(true) // blank - "Not to be displayed" pseudo-color.
+ }; // svg_color color_array[]
struct svg_color
{ /*! \struct boost::svg::svg_color
@@ -83,7 +231,6 @@
\details For the constructor, the SVG standard specifies that numbers
outside the normal rgb range are to be accepted,
but are constrained to acceptable range of integer values [0, 255].
-
*/
friend std::ostream& operator<< (std::ostream& os, const svg_color& rhs);
@@ -230,159 +377,6 @@
*/
return os;
} // std::ostream& operator<<
-
- svg_color color_array[] =
- { //! SVG standard colors, see also enum svg_color_constant.
- svg_color(240, 248, 255), // aliceblue
- svg_color(250, 235, 215), // antiquewhite
- svg_color(0 , 255, 255), // aqua
- svg_color(127, 255, 212), // aquamarine
- svg_color(240, 255, 255), // azure
- svg_color(245, 245, 220), // beige
- svg_color(255, 228, 196), // bisque
- svg_color(0 , 0 , 0 ), // black
- svg_color(255, 235, 205), // blanchedalmond
- svg_color(0 , 0 , 255), // blue
- svg_color(138, 43 , 226), // blueviolet
- svg_color(165, 42 , 42 ), // brown
- svg_color(222, 184, 135), // burlywood
- svg_color(95 , 158, 160), // cadetblue
- svg_color(127, 255, 0 ), // chartreuse
- svg_color(210, 105, 30 ), // chocolate
- svg_color(255, 127, 80 ), // coral
- svg_color(100, 149, 237), // cornflowerblue
- svg_color(255, 248, 220), // cornsilk
- svg_color(220, 20 , 60 ), // crimson
- svg_color(0 , 255, 255), // cyan
- svg_color(0 , 0 , 139), // darkblue
- svg_color(0 , 139, 139), // darkcyan
- svg_color(184, 134, 11 ), // darkgoldenrod
- svg_color(169, 169, 169), // darkgray
- svg_color(0 , 100, 0 ), // darkgreen
- svg_color(169, 169, 169), // darkgrey
- svg_color(189, 183, 107), // darkkhaki
- svg_color(139, 0 , 139), // darkmagenta
- svg_color(85 , 107, 47 ), // darkolivegreen
- svg_color(255, 140, 0 ), // darkorange
- svg_color(153, 50 , 204), // darkorchid
- svg_color(139, 0 , 0 ), // darkred
- svg_color(233, 150, 122), // darksalmon
- svg_color(143, 188, 143), // darkseagreen
- svg_color(72 , 61 , 139), // darkslateblue
- svg_color(47 , 79 , 79 ), // darkslategray
- svg_color(47 , 79 , 79 ), // darkslategrey
- svg_color(0 , 206, 209), // darkturquoise
- svg_color(148, 0 , 211), // darkviolet
- svg_color(255, 20 , 147), // deeppink
- svg_color(0 , 191, 255), // deepskyblue
- svg_color(105, 105, 105), // dimgray
- svg_color(105, 105, 105), // dimgrey
- svg_color(30 , 144, 255), // dodgerblue
- svg_color(178, 34 , 34 ), // firebrick
- svg_color(255, 250, 240), // floralwhite
- svg_color(34 , 139, 34 ), // forestgreen
- svg_color(255, 0 , 255), // fuchsia
- svg_color(220, 220, 220), // gainsboro
- svg_color(248, 248, 255), // ghostwhite
- svg_color(255, 215, 0 ), // gold
- svg_color(218, 165, 32 ), // goldenrod
- svg_color(128, 128, 128), // gray
- svg_color(128, 128, 128), // grey
- svg_color(0 , 128, 0 ), // green
- svg_color(173, 255, 47 ), // greenyellow
- svg_color(240, 255, 240), // honeydew
- svg_color(255, 105, 180), // hotpink
- svg_color(205, 92 , 92 ), // indianred
- svg_color(75 , 0 , 130), // indigo
- svg_color(255, 255, 240), // ivory
- svg_color(240, 230, 140), // khaki
- svg_color(230, 230, 250), // lavender
- svg_color(255, 240, 245), // lavenderblush
- svg_color(124, 252, 0 ), // lawngreen
- svg_color(255, 250, 205), // lemonchiffon
- svg_color(173, 216, 230), // lightblue
- svg_color(240, 128, 128), // lightcoral
- svg_color(224, 255, 255), // lightcyan
- svg_color(250, 250, 210), // lightgoldenrodyellow
- svg_color(211, 211, 211), // lightgray
- svg_color(144, 238, 144), // lightgreen
- svg_color(211, 211, 211), // lightgrey
- svg_color(255, 182, 193), // lightpink
- svg_color(255, 160, 122), // lightsalmon
- svg_color(32 , 178, 170), // lightseagreen
- svg_color(135, 206, 250), // lightskyblue
- svg_color(119, 136, 153), // lightslategray
- svg_color(119, 136, 153), // lightslategrey
- svg_color(176, 196, 222), // lightsteelblue
- svg_color(255, 255, 224), // lightyellow
- svg_color(0 , 255, 0 ), // lime
- svg_color(50 , 205, 50 ), // limegreen
- svg_color(250, 240, 230), // linen
- svg_color(255, 0 , 255), // magenta
- svg_color(128, 0 , 0 ), // maroon
- svg_color(102, 205, 170), // mediumaquamarine
- svg_color(0 , 0 , 205), // mediumblue
- svg_color(186, 85 , 211), // mediumorchid
- svg_color(147, 112, 219), // mediumpurple
- svg_color(60 , 179, 113), // mediumseagreen
- svg_color(123, 104, 238), // mediumslateblue
- svg_color(0 , 250, 154), // mediumspringgreen
- svg_color(72 , 209, 204), // mediumturquoise
- svg_color(199, 21 , 133), // mediumvioletred
- svg_color(25 , 25 , 112), // midnightblue
- svg_color(245, 255, 250), // mintcream
- svg_color(255, 228, 225), // mistyrose
- svg_color(255, 228, 181), // moccasin
- svg_color(255, 222, 173), // navajowhite
- svg_color(0 , 0 , 128), // navy
- svg_color(253, 245, 230), // oldlace
- svg_color(128, 128, 0 ), // olive
- svg_color(107, 142, 35 ), // olivedrab
- svg_color(255, 165, 0 ), // orange
- svg_color(255, 69 , 0 ), // orangered
- svg_color(218, 112, 214), // orchid
- svg_color(238, 232, 170), // palegoldenrod
- svg_color(152, 251, 152), // palegreen
- svg_color(175, 238, 238), // paleturquose
- svg_color(219, 112, 147), // palevioletred
- svg_color(255, 239, 213), // papayawhip
- svg_color(255, 218, 185), // peachpuff
- svg_color(205, 133, 63 ), // peru
- svg_color(255, 192, 203), // pink
- svg_color(221, 160, 221), // plum
- svg_color(176, 224, 230), // powderblue
- svg_color(128, 0 , 128), // purple
- svg_color(255, 0 , 0 ), // red
- svg_color(188, 143, 143), // rosybrown
- svg_color(65 , 105, 225), // royalblue
- svg_color(139, 69 , 19 ), // saddlebrown
- svg_color(250, 128, 114), // salmon
- svg_color(244, 164, 96 ), // sandybrown
- svg_color(46 , 139, 87 ), // seagreen
- svg_color(255, 245, 238), // seashell
- svg_color(160, 82 , 45 ), // sienna
- svg_color(192, 192, 192), // silver
- svg_color(135, 206, 235), // skyblue
- svg_color(106, 90 , 205), // slateblue
- svg_color(112, 128, 144), // slategray
- svg_color(112, 128, 144), // slategrey
- svg_color(255, 250, 250), // snow
- svg_color(0 , 255, 127), // springgreen
- svg_color(70 , 130, 180), // steelblue
- svg_color(210, 180, 140), // tanned
- svg_color(0 , 128, 128), // teal
- svg_color(216, 191, 216), // thistle
- svg_color(255, 99 , 71 ), // tomato
- svg_color(64 , 224, 208), // turquoise
- svg_color(238, 130, 238), // violet
- svg_color(245, 222, 179), // wheat
- svg_color(255, 255, 255), // white
- svg_color(245, 245, 245), // whitesmoke
- svg_color(255, 255, 0 ), // yellow
- svg_color(154, 205, 50 ), // yellowgreen
- svg_color(true) // blank - "Not to be displayed" pseudo-color.
- }; // svg_color color_array[]
-
void constant_to_rgb(svg_color_constant c,
unsigned char& r, unsigned char& g, unsigned char& b)
{ //! Convert a named SVG standard color to update three rgb variables.
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_fwd.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_fwd.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_fwd.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -148,13 +148,15 @@
struct z_path; // z indicates a closepath.
struct h_path; // Draws a horizontal line from the current point (cpx, cpy) to (x, cpy).
struct v_path; // Draws a vertical line from the current point (cpx, cpy) to (cpx, y).
-struct c_path; // Draws a cubic Bézier curve from the current point to (x,y) using (x1,y1).
-struct q_path; // Draws a quadratic Bézier curve from the current point to (x,y).
-struct s_path; // Draws a cubic Bézier curve from the current point to (x,y).
-struct t_path; // Draws a quadratic Bézier curve from the current point to (x,y).
+struct c_path; // Draws a cubic Bezier curve from the current point to (x,y) using (x1,y1).
+struct q_path; // Draws a quadratic Bezier curve from the current point to (x,y).
+struct s_path; // Draws a cubic Bezier curve from the current point to (x,y).
+struct t_path; // Draws a quadratic Bezier curve from the current point to (x,y).
struct a_path; // Draws a elliptical arc from the current point to (x,y).
class g_element; // 'g' element is a container element for grouping together related graphics elements.
+// Note don't try to use accent in Bezier - causes failure in autodoc .xml files - not UTF-8.
+
// svg_1d_plot.hpp
struct svg_plot_series;
class svg_1d_plot;
Modified: sandbox/SOC/2007/visualization/boost/svg_plot/svg_style.hpp
==============================================================================
--- sandbox/SOC/2007/visualization/boost/svg_plot/svg_style.hpp (original)
+++ sandbox/SOC/2007/visualization/boost/svg_plot/svg_style.hpp 2009-01-31 06:41:24 EST (Sat, 31 Jan 2009)
@@ -881,8 +881,8 @@
class axis_line_style
{ /*! \class boost::svg::axis_line_style
- \brief Style of the x and/or y axes lines.
- \details (But NOT the ticks and value labels because different styles for x and y are possible).
+ \brief Style of the X and/or Y axes lines.
+ \details (But NOT the ticks and value labels because different styles for X and Y are possible).
*/
public:
dim dim_; //!< X, Y or none.
@@ -892,7 +892,6 @@
// but they might have different uses, so are left pro tem.
// TODO reconsider the implications of this (largely accidental) decision.
// double interval_; does NOT duplicate major_interval_ in ticks_label_style.
- double axis_; //!< Depending on value of dim, either X-axis (y = 0) transformed into SVG Y coordinates or Y-axis (x = 0) transformed into SVG X coordinates (-1 if not calculated yet).
svg_color color_; //!< Axis line (stroke) color.
double axis_width_; //!< Axis line width.
int axis_position_; /*!< How the axes intersect with values as below:\n
@@ -904,7 +903,8 @@
bool label_on_; //!< Label axis with text - example: "length".
bool label_units_on_; //!< Label axis units, example: "cm".
bool axis_line_on_; //!< Draw an X horizontal or Y vertical axis line.
-
+ double axis_; //!< Depending on value of dim, either X-axis (y = 0) transformed into SVG Y coordinates or Y-axis (x = 0) transformed into SVG X coordinates (-1 if not calculated yet).
+ // Used in axis_plot_frame.hpp
axis_line_style( // class axis_line_style default constructor, sets all member data items.
dim d = X,
double min = -10.,
@@ -913,10 +913,10 @@
const svg_color col = black,
double width = 1,
int axis_position = 0,
- double axis = -1,
bool label_on = true,
bool label_units_on = false,
- bool axis_lines_on = true);
+ bool axis_lines_on = true,
+ double axis = -1); // -1 means not calculated yet.
// class axis_line_style member functions Declarations:
// Set and get member functions.
@@ -934,28 +934,26 @@
}; // class axis_line_style
// class axis_line_style Member Functions Definitions:
-
- axis_line_style::axis_line_style( // Default constructor. Sets all member data items with defaults for all.
+ // Default constructor.
+ axis_line_style::axis_line_style( // Sets all member data items with defaults for all.
dim d, //!< Dimension (zero if boxplot)
- double min, //! Minimum of axis line.
- double max, //! Maximum of axis line.
+ double min, //!< Minimum of axis line.
+ double max, //!< Maximum of axis line.
// See also default in ticks_labels_style.
const svg_color col, //!< Line color
double width, //!< Line width.
int axis_position, //!< Intersection of axis, if any.
- double axis_, // // double axis_, not referenced - but there is confusion about order of parameter in different constructors.
- // TODO find where used and resolve.
-
bool label_on,//!< If to include axis label (default true).
bool label_units_on, //!< If to include units after axis label (default true).
- bool axis_lines_on)
+ bool axis_lines_on, //!< If to draw an axis line.
+ double axis) // Depending on value of dim, either X-axis (y = 0) transformed into SVG Y coordinates or Y-axis (x = 0) transformed into SVG X coordinates (-1 if not calculated yet).
:
dim_(d), min_(min), max_(max), color_(col), axis_width_(width),
axis_position_(axis_position),
label_on_(label_on), // default is to include axis label.
label_units_on_(label_units_on), // default is to include units after axis label.
axis_line_on_(axis_lines_on),
- axis_(-1) // -1 means not calculated yet.
+ axis_(axis) // -1 means not calculated yet.
{ // Initialize all private data.
if(max_ <= min_)
{ // max_ <= min_.
@@ -965,6 +963,7 @@
{ // Range too small to display.
throw std::runtime_error("Axis range too small!" );
}
+ axis_ = -1; // means not calculated yet - see axis_plot_frame.
} // axis_line_style constructor
axis_line_style& axis_line_style::color(const svg_color& color)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk