Olena-patches April 2013

olena-patches@lrde.epita.fr

7 participants
363 discussions

Start a nNew thread

branch unstable/scribo updated: olena-2.0-455-g7d16170

by git＠lrde.epita.fr

11 years, 8 months

olena-2.0-455-g7d16170 mln/value/builtin/symbolics.hh: Add min() and max() for Boolean.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/value/builtin/symbolics.hh | 6 +++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a7bb97c..89ce238 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2013-04-03 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/value/builtin/symbolics.hh: Add min() and max() for Boolean. + 2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> * mln/io/svg/simple_svg_1.0.0.hh: Remove. diff --git a/milena/mln/value/builtin/symbolics.hh b/milena/mln/value/builtin/symbolics.hh index fd266ad..6d160d1 100644 --- a/milena/mln/value/builtin/symbolics.hh +++ b/milena/mln/value/builtin/symbolics.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2013 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -63,6 +64,9 @@ namespace mln }; typedef value::quant::low quant; + static const int min() { return 0; } + static const int max() { return 1; } + static const char* name() { return "bool"; } }; -- 1.7.2.5

11 years, 8 months

branch unstable/scribo updated: olena-2.0-454-g1a77aaa

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated discards 326ec084f399a6defec31665ec54042225b32c51 (commit) via 1a77aaae579961af4febf45e7210595753a1d155 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (326ec084f399a6defec31665ec54042225b32c51) \ N -- N -- N (1a77aaae579961af4febf45e7210595753a1d155) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 1a77aaa Fix component_set comparison. ----------------------------------------------------------------------- Summary of changes: scribo/scribo/core/component_set.hh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena-2.0-454-g1a77aaa Fix component_set comparison.

by Guillaume Lazzara

* scribo/core/component_info.hh, * scribo/core/component_set.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/core/component_info.hh | 7 +++++-- scribo/scribo/core/component_set.hh | 10 +++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d7e7547..ebf34aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix component_set comparison. + + * scribo/core/component_info.hh, + * scribo/core/component_set.hh: Here. + 2013-04-02 Guillaume Lazzara <lazzara(a)caroussel.lrde.epita.fr> Improve time logging in Scribo. diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index d8e3381..384a2db 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -268,7 +268,10 @@ namespace scribo && lhs.bbox() == rhs.bbox() && lhs.mass_center() == rhs.mass_center() && lhs.card() == rhs.card() - && lhs.features() == rhs.features() + && (lhs.has_features() == rhs.has_features() + || (lhs.has_features() + && rhs.has_features() + && lhs.features() == rhs.features())) && lhs.tag() == rhs.tag() && lhs.type() == rhs.type(); } diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index 789c752..eea385b 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -619,11 +619,14 @@ namespace scribo bool operator==(const component_set<L>& lhs, const component_set<L>& rhs) { + if (lhs.id_() == rhs.id_()) + return true; + if (! (lhs.labeled_image() == rhs.labeled_image())) - std::cout << "comp.lbl" << std::endl; + return false; if (! (lhs.separators() == rhs.separators())) - std::cout << "comp.seps" << std::endl; + return false; if (! (lhs.nelements() == rhs.nelements() && lhs.labeled_image() == rhs.labeled_image() @@ -632,10 +635,7 @@ namespace scribo for_all_comps(c, lhs) if (! (lhs(c) == rhs(c))) - { - std::cout << "comp.info" << std::endl; return false; - } return true; } -- 1.7.2.5

11 years, 8 months

branch unstable/scribo updated: olena-2.0-454-g326ec08

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated discards 85091d280b511b3083eacca08f7616ec3c0aa983 (commit) via 326ec084f399a6defec31665ec54042225b32c51 (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (85091d280b511b3083eacca08f7616ec3c0aa983) \ N -- N -- N (326ec084f399a6defec31665ec54042225b32c51) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 326ec08 Fix component_set comparison. ----------------------------------------------------------------------- Summary of changes: scribo/scribo/core/component_set.hh | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena-2.0-454-g326ec08 Fix component_set comparison.

by Guillaume Lazzara

* scribo/core/component_info.hh, * scribo/core/component_set.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/core/component_info.hh | 7 +++++-- scribo/scribo/core/component_set.hh | 10 +++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d7e7547..ebf34aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix component_set comparison. + + * scribo/core/component_info.hh, + * scribo/core/component_set.hh: Here. + 2013-04-02 Guillaume Lazzara <lazzara(a)caroussel.lrde.epita.fr> Improve time logging in Scribo. diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index d8e3381..384a2db 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -268,7 +268,10 @@ namespace scribo && lhs.bbox() == rhs.bbox() && lhs.mass_center() == rhs.mass_center() && lhs.card() == rhs.card() - && lhs.features() == rhs.features() + && (lhs.has_features() == rhs.has_features() + || (lhs.has_features() + && rhs.has_features() + && lhs.features() == rhs.features())) && lhs.tag() == rhs.tag() && lhs.type() == rhs.type(); } diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index 789c752..c4d3acf 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -619,11 +619,14 @@ namespace scribo bool operator==(const component_set<L>& lhs, const component_set<L>& rhs) { + if (lhs.id_() == rhs.id_()) + return true; + if (! (lhs.labeled_image() == rhs.labeled_image())) - std::cout << "comp.lbl" << std::endl; + return false; if (! (lhs.separators() == rhs.separators())) - std::cout << "comp.seps" << std::endl; + return false if (! (lhs.nelements() == rhs.nelements() && lhs.labeled_image() == rhs.labeled_image() @@ -632,10 +635,7 @@ namespace scribo for_all_comps(c, lhs) if (! (lhs(c) == rhs(c))) - { - std::cout << "comp.info" << std::endl; return false; - } return true; } -- 1.7.2.5

11 years, 8 months

branch unstable/scribo updated: olena-2.0-454-g85091d2

by git＠lrde.epita.fr

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch unstable/scribo has been updated via 85091d280b511b3083eacca08f7616ec3c0aa983 (commit) via 66f08d0c354d1d55afd75438f6a0b1a4552b5ad2 (commit) from 22dd51887a8e6df6a74c5e3249a815265e974572 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 85091d2 Fix component_set comparison. 66f08d0 mln/io/svg/simple_svg_1.0.0.hh: Remove. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 4 + milena/mln/io/svg/simple_svg_1.0.0.hh | 642 --------------------------------- scribo/ChangeLog | 7 + scribo/scribo/core/component_info.hh | 7 +- scribo/scribo/core/component_set.hh | 6 +- 5 files changed, 19 insertions(+), 647 deletions(-) delete mode 100644 milena/mln/io/svg/simple_svg_1.0.0.hh hooks/post-receive -- Olena, a generic and efficient image processing platform

11 years, 8 months

olena-2.0-454-g85091d2 Fix component_set comparison.

by Guillaume Lazzara

* scribo/core/component_info.hh, * scribo/core/component_set.hh: Here. --- scribo/ChangeLog | 7 +++++++ scribo/scribo/core/component_info.hh | 7 +++++-- scribo/scribo/core/component_set.hh | 6 +++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index d7e7547..ebf34aa 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,10 @@ +2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix component_set comparison. + + * scribo/core/component_info.hh, + * scribo/core/component_set.hh: Here. + 2013-04-02 Guillaume Lazzara <lazzara(a)caroussel.lrde.epita.fr> Improve time logging in Scribo. diff --git a/scribo/scribo/core/component_info.hh b/scribo/scribo/core/component_info.hh index d8e3381..384a2db 100644 --- a/scribo/scribo/core/component_info.hh +++ b/scribo/scribo/core/component_info.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -268,7 +268,10 @@ namespace scribo && lhs.bbox() == rhs.bbox() && lhs.mass_center() == rhs.mass_center() && lhs.card() == rhs.card() - && lhs.features() == rhs.features() + && (lhs.has_features() == rhs.has_features() + || (lhs.has_features() + && rhs.has_features() + && lhs.features() == rhs.features())) && lhs.tag() == rhs.tag() && lhs.type() == rhs.type(); } diff --git a/scribo/scribo/core/component_set.hh b/scribo/scribo/core/component_set.hh index 789c752..f1c8292 100644 --- a/scribo/scribo/core/component_set.hh +++ b/scribo/scribo/core/component_set.hh @@ -619,6 +619,9 @@ namespace scribo bool operator==(const component_set<L>& lhs, const component_set<L>& rhs) { + if (lhs.id_() == rhs.id_()) + return true; + if (! (lhs.labeled_image() == rhs.labeled_image())) std::cout << "comp.lbl" << std::endl; @@ -632,10 +635,7 @@ namespace scribo for_all_comps(c, lhs) if (! (lhs(c) == rhs(c))) - { - std::cout << "comp.info" << std::endl; return false; - } return true; } -- 1.7.2.5

11 years, 8 months

olena-2.0-453-g66f08d0 mln/io/svg/simple_svg_1.0.0.hh: Remove.

by Guillaume Lazzara

--- milena/ChangeLog | 4 + milena/mln/io/svg/simple_svg_1.0.0.hh | 642 --------------------------------- 2 files changed, 4 insertions(+), 642 deletions(-) delete mode 100644 milena/mln/io/svg/simple_svg_1.0.0.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 001a73e..a7bb97c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/io/svg/simple_svg_1.0.0.hh: Remove. + +2013-04-02 Guillaume Lazzara <z(a)lrde.epita.fr> + * headers.mk: Regen. 2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/mln/io/svg/simple_svg_1.0.0.hh b/milena/mln/io/svg/simple_svg_1.0.0.hh deleted file mode 100644 index 5aabba4..0000000 --- a/milena/mln/io/svg/simple_svg_1.0.0.hh +++ /dev/null @@ -1,642 +0,0 @@ - -/******************************************************************************* -* The "New BSD License" : http://www.opensource.org/licenses/bsd-license.php * -******************************************************************************** - -Copyright (c) 2010, Mark Turney -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of the <organization> nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY -DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -******************************************************************************/ - -#ifndef SIMPLE_SVG_HPP -#define SIMPLE_SVG_HPP - -#include <vector> -#include <string> -#include <sstream> -#include <fstream> - -#include <iostream> - -namespace svg -{ - // Utility XML/String Functions. - template <typename T> - std::string attribute(std::string const & attribute_name, - T const & value, std::string const & unit = "") - { - std::stringstream ss; - ss << attribute_name << "=\"" << value << unit << "\" "; - return ss.str(); - } - std::string elemStart(std::string const & element_name) - { - return "\t<" + element_name + " "; - } - std::string elemEnd(std::string const & element_name) - { - return "</" + element_name + ">\n"; - } - std::string emptyElemEnd() - { - return "/>\n"; - } - - // Quick optional return type. This allows functions to return an invalid - // value if no good return is possible. The user checks for validity - // before using the returned value. - template <typename T> - class optional - { - public: - optional<T>(T const & type) - : valid(true), type(type) { } - optional<T>() : valid(false), type(T()) { } - T * operator->() - { - // If we try to access an invalid value, an exception is thrown. - if (!valid) - throw std::exception(); - - return &type; - } - // Test for validity. - bool operator!() const { return !valid; } - private: - bool valid; - T type; - }; - - struct Dimensions - { - Dimensions(double width, double height) : width(width), height(height) { } - Dimensions(double combined = 0) : width(combined), height(combined) { } - double width; - double height; - }; - - struct Point - { - Point(double x = 0, double y = 0) : x(x), y(y) { } - double x; - double y; - }; - optional<Point> getMinPoint(std::vector<Point> const & points) - { - if (points.empty()) - return optional<Point>(); - - Point min = points[0]; - for (unsigned i = 0; i < points.size(); ++i) { - if (points[i].x < min.x) - min.x = points[i].x; - if (points[i].y < min.y) - min.y = points[i].y; - } - return optional<Point>(min); - } - optional<Point> getMaxPoint(std::vector<Point> const & points) - { - if (points.empty()) - return optional<Point>(); - - Point max = points[0]; - for (unsigned i = 0; i < points.size(); ++i) { - if (points[i].x > max.x) - max.x = points[i].x; - if (points[i].y > max.y) - max.y = points[i].y; - } - return optional<Point>(max); - } - - // Defines the dimensions, scale, origin, and origin offset of the document. - struct Layout - { - enum Origin { TopLeft, BottomLeft, TopRight, BottomRight }; - - Layout(Dimensions const & dimensions = Dimensions(400, 300), Origin origin = BottomLeft, - double scale = 1, Point const & origin_offset = Point(0, 0)) - : dimensions(dimensions), scale(scale), origin(origin), origin_offset(origin_offset) { } - Dimensions dimensions; - double scale; - Origin origin; - Point origin_offset; - }; - - // Convert coordinates in user space to SVG native space. - double translateX(double x, Layout const & layout) - { - if (layout.origin == Layout::BottomRight || layout.origin == Layout::TopRight) - return layout.dimensions.width - ((x + layout.origin_offset.x) * layout.scale); - else - return (layout.origin_offset.x + x) * layout.scale; - } - - double translateY(double y, Layout const & layout) - { - if (layout.origin == Layout::BottomLeft || layout.origin == Layout::BottomRight) - return layout.dimensions.height - ((y + layout.origin_offset.y) * layout.scale); - else - return (layout.origin_offset.y + y) * layout.scale; - } - double translateScale(double dimension, Layout const & layout) - { - return dimension * layout.scale; - } - - class Serializeable - { - public: - Serializeable() { } - virtual ~Serializeable() { }; - virtual std::string toString(Layout const & layout) const = 0; - }; - - class Color : public Serializeable - { - public: - enum Defaults { Transparent = -1, Aqua, Black, Blue, Brown, Cyan, Fuchsia, - Green, Lime, Magenta, Orange, Purple, Red, Silver, White, Yellow }; - - Color(int r, int g, int b) : transparent(false), red(r), green(g), blue(b) { } - Color(Defaults color) - : transparent(false), red(0), green(0), blue(0) - { - switch (color) - { - case Aqua: assign(0, 255, 255); break; - case Black: assign(0, 0, 0); break; - case Blue: assign(0, 0, 255); break; - case Brown: assign(165, 42, 42); break; - case Cyan: assign(0, 255, 255); break; - case Fuchsia: assign(255, 0, 255); break; - case Green: assign(0, 128, 0); break; - case Lime: assign(0, 255, 0); break; - case Magenta: assign(255, 0, 255); break; - case Orange: assign(255, 165, 0); break; - case Purple: assign(128, 0, 128); break; - case Red: assign(255, 0, 0); break; - case Silver: assign(192, 192, 192); break; - case White: assign(255, 255, 255); break; - case Yellow: assign(255, 255, 0); break; - default: transparent = true; break; - } - } - virtual ~Color() { } - std::string toString(Layout const &) const - { - std::stringstream ss; - if (transparent) - ss << "transparent"; - else - ss << "rgb(" << red << "," << green << "," << blue << ")"; - return ss.str(); - } - private: - bool transparent; - int red; - int green; - int blue; - - void assign(int r, int g, int b) - { - red = r; - green = g; - blue = b; - } - }; - - class Fill : public Serializeable - { - public: - Fill(Color::Defaults color) : color(color) { } - Fill(Color color = Color::Transparent) - : color(color) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << attribute("fill", color.toString(layout)); - return ss.str(); - } - private: - Color color; - }; - - class Stroke : public Serializeable - { - public: - Stroke(double width = -1, Color color = Color::Transparent) - : width(width), color(color) { } - std::string toString(Layout const & layout) const - { - // If stroke width is invalid. - if (width < 0) - return std::string(); - - std::stringstream ss; - ss << attribute("stroke-width", translateScale(width, layout)) << attribute("stroke", color.toString(layout)); - return ss.str(); - } - private: - double width; - Color color; - }; - - class Font : public Serializeable - { - public: - Font(double size = 12, std::string const & family = "Verdana") : size(size), family(family) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << attribute("font-size", translateScale(size, layout)) << attribute("font-family", family); - return ss.str(); - } - private: - double size; - std::string family; - }; - - class Shape : public Serializeable - { - public: - Shape(Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : fill(fill), stroke(stroke) { } - virtual ~Shape() { } - virtual std::string toString(Layout const & layout) const = 0; - virtual void offset(Point const & offset) = 0; - protected: - Fill fill; - Stroke stroke; - }; - template <typename T> - std::string vectorToString(std::vector<T> collection, Layout const & layout) - { - std::string combination_str; - for (unsigned i = 0; i < collection.size(); ++i) - combination_str += collection[i].toString(layout); - - return combination_str; - } - - class Circle : public Shape - { - public: - Circle(Point const & center, double diameter, Fill const & fill, - Stroke const & stroke = Stroke()) - : Shape(fill, stroke), center(center), radius(diameter / 2) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("circle") << attribute("cx", translateX(center.x, layout)) - << attribute("cy", translateY(center.y, layout)) - << attribute("r", translateScale(radius, layout)) << fill.toString(layout) - << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - center.x += offset.x; - center.y += offset.y; - } - private: - Point center; - double radius; - }; - - class Elipse : public Shape - { - public: - Elipse(Point const & center, double width, double height, - Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke), center(center), radius_width(width / 2), - radius_height(height / 2) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("ellipse") << attribute("cx", translateX(center.x, layout)) - << attribute("cy", translateY(center.y, layout)) - << attribute("rx", translateScale(radius_width, layout)) - << attribute("ry", translateScale(radius_height, layout)) - << fill.toString(layout) << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - center.x += offset.x; - center.y += offset.y; - } - private: - Point center; - double radius_width; - double radius_height; - }; - - class Rectangle : public Shape - { - public: - Rectangle(Point const & edge, double width, double height, - Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke), edge(edge), width(width), - height(height) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("rect") << attribute("x", translateX(edge.x, layout)) - << attribute("y", translateY(edge.y, layout)) - << attribute("width", translateScale(width, layout)) - << attribute("height", translateScale(height, layout)) - << fill.toString(layout) << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - edge.x += offset.x; - edge.y += offset.y; - } - private: - Point edge; - double width; - double height; - }; - - class Line : public Shape - { - public: - Line(Point const & start_point, Point const & end_point, - Stroke const & stroke = Stroke()) - : Shape(Fill(), stroke), start_point(start_point), - end_point(end_point) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("line") << attribute("x1", translateX(start_point.x, layout)) - << attribute("y1", translateY(start_point.y, layout)) - << attribute("x2", translateX(end_point.x, layout)) - << attribute("y2", translateY(end_point.y, layout)) - << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - start_point.x += offset.x; - start_point.y += offset.y; - - end_point.x += offset.x; - end_point.y += offset.y; - } - private: - Point start_point; - Point end_point; - }; - - class Polygon : public Shape - { - public: - Polygon(Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke) { } - Polygon(Stroke const & stroke = Stroke()) : Shape(Color::Transparent, stroke) { } - Polygon & operator<<(Point const & point) - { - points.push_back(point); - return *this; - } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("polygon"); - - ss << "points=\""; - for (unsigned i = 0; i < points.size(); ++i) - ss << translateX(points[i].x, layout) << "," << translateY(points[i].y, layout) << " "; - ss << "\" "; - - ss << fill.toString(layout) << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - for (unsigned i = 0; i < points.size(); ++i) { - points[i].x += offset.x; - points[i].y += offset.y; - } - } - private: - std::vector<Point> points; - }; - - class Polyline : public Shape - { - public: - Polyline(Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke) { } - Polyline(Stroke const & stroke = Stroke()) : Shape(Color::Transparent, stroke) { } - Polyline(std::vector<Point> const & points, - Fill const & fill = Fill(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke), points(points) { } - Polyline & operator<<(Point const & point) - { - points.push_back(point); - return *this; - } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("polyline"); - - ss << "points=\""; - for (unsigned i = 0; i < points.size(); ++i) - ss << translateX(points[i].x, layout) << "," << translateY(points[i].y, layout) << " "; - ss << "\" "; - - ss << fill.toString(layout) << stroke.toString(layout) << emptyElemEnd(); - return ss.str(); - } - void offset(Point const & offset) - { - for (unsigned i = 0; i < points.size(); ++i) { - points[i].x += offset.x; - points[i].y += offset.y; - } - } - std::vector<Point> points; - }; - - class Text : public Shape - { - public: - Text(Point const & origin, std::string const & content, Fill const & fill = Fill(), - Font const & font = Font(), Stroke const & stroke = Stroke()) - : Shape(fill, stroke), origin(origin), content(content), font(font) { } - std::string toString(Layout const & layout) const - { - std::stringstream ss; - ss << elemStart("text") << attribute("x", translateX(origin.x, layout)) - << attribute("y", translateY(origin.y, layout)) - << fill.toString(layout) << stroke.toString(layout) << font.toString(layout) - << ">" << content << elemEnd("text"); - return ss.str(); - } - void offset(Point const & offset) - { - origin.x += offset.x; - origin.y += offset.y; - } - private: - Point origin; - std::string content; - Font font; - }; - - // Sample charting class. - class LineChart : public Shape - { - public: - LineChart(Dimensions margin = Dimensions(), double scale = 1, - Stroke const & axis_stroke = Stroke(.5, Color::Purple)) - : axis_stroke(axis_stroke), margin(margin), scale(scale) { } - LineChart & operator<<(Polyline const & polyline) - { - if (polyline.points.empty()) - return *this; - - polylines.push_back(polyline); - return *this; - } - std::string toString(Layout const & layout) const - { - if (polylines.empty()) - return ""; - - std::string ret; - for (unsigned i = 0; i < polylines.size(); ++i) - ret += polylineToString(polylines[i], layout); - - return ret + axisString(layout); - } - void offset(Point const & offset) - { - for (unsigned i = 0; i < polylines.size(); ++i) - polylines[i].offset(offset); - } - private: - Stroke axis_stroke; - Dimensions margin; - double scale; - std::vector<Polyline> polylines; - - optional<Dimensions> getDimensions() const - { - if (polylines.empty()) - return optional<Dimensions>(); - - optional<Point> min = getMinPoint(polylines[0].points); - optional<Point> max = getMaxPoint(polylines[0].points); - for (unsigned i = 0; i < polylines.size(); ++i) { - if (getMinPoint(polylines[i].points)->x < min->x) - min->x = getMinPoint(polylines[i].points)->x; - if (getMinPoint(polylines[i].points)->y < min->y) - min->y = getMinPoint(polylines[i].points)->y; - if (getMaxPoint(polylines[i].points)->x > max->x) - max->x = getMaxPoint(polylines[i].points)->x; - if (getMaxPoint(polylines[i].points)->y > max->y) - max->y = getMaxPoint(polylines[i].points)->y; - } - - return optional<Dimensions>(Dimensions(max->x - min->x, max->y - min->y)); - } - std::string axisString(Layout const & layout) const - { - optional<Dimensions> dimensions = getDimensions(); - if (!dimensions) - return ""; - - // Make the axis 10% wider and higher than the data points. - double width = dimensions->width * 1.1; - double height = dimensions->height * 1.1; - - // Draw the axis. - Polyline axis(Color::Transparent, axis_stroke); - axis << Point(margin.width, margin.height + height) << Point(margin.width, margin.height) - << Point(margin.width + width, margin.height); - - return axis.toString(layout); - } - std::string polylineToString(Polyline const & polyline, Layout const & layout) const - { - Polyline shifted_polyline = polyline; - shifted_polyline.offset(Point(margin.width, margin.height)); - - std::vector<Circle> vertices; - for (unsigned i = 0; i < shifted_polyline.points.size(); ++i) - vertices.push_back(Circle(shifted_polyline.points[i], getDimensions()->height / 30.0, Color::Black)); - - return shifted_polyline.toString(layout) + vectorToString(vertices, layout); - } - }; - - class Document - { - public: - Document(std::string const & file_name, Layout layout = Layout()) - : file_name(file_name), layout(layout) { } - - Document & operator<<(Shape const & shape) - { - body_nodes_str += shape.toString(layout); - return *this; - } - std::string toString() const - { - std::stringstream ss; - ss << "<?xml " << attribute("version", "1.0") << attribute("standalone", "no") - << "?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" " - << "\"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n<svg " - << attribute("width", layout.dimensions.width, "px") - << attribute("height", layout.dimensions.height, "px") - << attribute("xmlns", "http://www.w3.org/2000/svg") - << attribute("version", "1.1") << ">\n" << body_nodes_str << elemEnd("svg"); - return ss.str(); - } - bool save() const - { - std::ofstream ofs(file_name.c_str()); - if (!ofs.good()) - return false; - - ofs << toString(); - ofs.close(); - return true; - } - private: - std::string file_name; - Layout layout; - - std::string body_nodes_str; - }; -} - -#endif -- 1.7.2.5

11 years, 8 months

branch unstable/scribo updated: olena-2.0-452-g22dd518

by git＠lrde.epita.fr

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2013