From ce05b596afbc485c55071f4fd7b162e932c3f410 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Fri, 4 Oct 2013 21:43:29 +0200 Subject: [PATCH] [DEV] coding style ended --- esvg/Base.cpp | 60 ++++----- esvg/Base.h | 16 +-- esvg/Circle.cpp | 16 +-- esvg/Circle.h | 10 +- esvg/Ellipse.cpp | 19 +-- esvg/Ellipse.h | 14 +- esvg/Group.cpp | 28 ++-- esvg/Group.h | 10 +- esvg/Line.cpp | 18 +-- esvg/Line.h | 18 ++- esvg/Path.cpp | 324 +++++++++++++++++++++------------------------ esvg/Path.h | 72 +++++----- esvg/Polygon.cpp | 17 +-- esvg/Polygon.h | 22 ++- esvg/Polyline.cpp | 17 +-- esvg/Polyline.h | 10 +- esvg/Rectangle.cpp | 17 +-- esvg/Rectangle.h | 10 +- esvg/Renderer.cpp | 13 +- esvg/Renderer.h | 29 ++-- esvg/Stroking.h | 3 +- esvg/Text.cpp | 14 +- esvg/Text.h | 10 +- esvg/esvg.cpp | 73 +++++----- esvg/esvg.h | 11 +- 25 files changed, 377 insertions(+), 474 deletions(-) diff --git a/esvg/Base.cpp b/esvg/Base.cpp index 0383192..b289d44 100644 --- a/esvg/Base.cpp +++ b/esvg/Base.cpp @@ -15,18 +15,15 @@ #undef __class__ #define __class__ "Base" -esvg::Base::Base(PaintState _parentPaintState) -{ +esvg::Base::Base(PaintState _parentPaintState) { // copy the parent painting properties ... m_paint = _parentPaintState; } -void esvg::Base::parseTransform(exml::Element* _element) -{ +void esvg::Base::parseTransform(exml::Element* _element) { if (NULL == _element) { return; } - etk::UString inputString = _element->getAttribute("transform"); if (inputString.size() == 0) { return; @@ -89,8 +86,7 @@ void esvg::Base::parseTransform(exml::Element* _element) * @param[out] _pos parsed position * @param[out] _size parsed dimention */ -void esvg::Base::parsePosition(const exml::Element *_element, etk::Vector2D &_pos, etk::Vector2D &_size) -{ +void esvg::Base::parsePosition(const exml::Element *_element, etk::Vector2D &_pos, etk::Vector2D &_size) { _pos.setValue(0,0); _size.setValue(0,0); @@ -121,8 +117,7 @@ void esvg::Base::parsePosition(const exml::Element *_element, etk::Vector2DgetAttribute("stroke-linecap"); if (content.size()!=0) { if (content == "butt" ) { - m_paint.lineCap = esvg::LINECAP_BUTT; + m_paint.lineCap = esvg::lineCapButt; } else if (content == "round" ) { - m_paint.lineCap = esvg::LINECAP_ROUND; + m_paint.lineCap = esvg::lineCapRound; } else if (content == "square" ) { - m_paint.lineCap = esvg::LINECAP_SQUARE; + m_paint.lineCap = esvg::lineCapSquare; } else { - m_paint.lineCap = esvg::LINECAP_BUTT; + m_paint.lineCap = esvg::lineCapButt; SVG_ERROR("not know stroke-linecap value : \"" << content << "\", not in [butt,round,square]"); } } content = _element->getAttribute("stroke-linejoin"); if (content.size()!=0) { if (content == "miter" ) { - m_paint.lineJoin = esvg::LINEJOIN_MITER; + m_paint.lineJoin = esvg::lineJoinMiter; } else if (content == "round" ) { - m_paint.lineJoin = esvg::LINEJOIN_ROUND; + m_paint.lineJoin = esvg::lineJoinRound; } else if (content == "bevel" ) { - m_paint.lineJoin = esvg::LINEJOIN_BEVEL; + m_paint.lineJoin = esvg::lineJoinBevel; } else { - m_paint.lineJoin = esvg::LINEJOIN_MITER; + m_paint.lineJoin = esvg::lineJoinMiter; SVG_ERROR("not know stroke-linejoin value : \"" << content << "\", not in [miter,round,bevel]"); } } @@ -335,24 +328,24 @@ void esvg::Base::parsePaintAttr(const exml::Element *_element) } } else if (outputType == "stroke-linecap") { if (outputValue == "butt") { - m_paint.lineCap = esvg::LINECAP_BUTT; + m_paint.lineCap = esvg::lineCapButt; } else if (outputValue == "round") { - m_paint.lineCap = esvg::LINECAP_ROUND; + m_paint.lineCap = esvg::lineCapRound; } else if (outputValue == "square") { - m_paint.lineCap = esvg::LINECAP_SQUARE; + m_paint.lineCap = esvg::lineCapSquare; } else { - m_paint.lineCap = esvg::LINECAP_BUTT; + m_paint.lineCap = esvg::lineCapButt; SVG_ERROR("not know " << outputType << " value : \"" << outputValue << "\", not in [butt,round,square]"); } } else if (outputType == "stroke-linejoin") { if (outputValue == "miter") { - m_paint.lineJoin = esvg::LINEJOIN_MITER; + m_paint.lineJoin = esvg::lineJoinMiter; } else if (outputValue == "round") { - m_paint.lineJoin = esvg::LINEJOIN_ROUND; + m_paint.lineJoin = esvg::lineJoinRound; } else if (outputValue == "bevel") { - m_paint.lineJoin = esvg::LINEJOIN_BEVEL; + m_paint.lineJoin = esvg::lineJoinBevel; } else { - m_paint.lineJoin = esvg::LINEJOIN_MITER; + m_paint.lineJoin = esvg::lineJoinMiter; SVG_ERROR("not know " << outputType << " value : \"" << outputValue << "\", not in [miter,round,bevel]"); } } else if (outputType == "marker-start") { @@ -376,8 +369,7 @@ void esvg::Base::parsePaintAttr(const exml::Element *_element) * @param[in] _inputData Data C String with the xml definition * @return the parsed color */ -draw::Color esvg::Base::parseColor(const etk::UString& _inputData) -{ +draw::Color esvg::Base::parseColor(const etk::UString& _inputData) { draw::Color localColor = draw::color::white; if( _inputData.size() > 4 @@ -402,16 +394,14 @@ draw::Color esvg::Base::parseColor(const etk::UString& _inputData) * @param[in] _element standart XML node * @return true if no problem arrived */ -bool esvg::Base::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Base::parse(exml::Element* _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { SVG_ERROR("NOT IMPLEMENTED"); _sizeMax.setValue(0,0); return false; } -const char * esvg::Base::SpacingDist(int32_t _spacing) -{ +const char * esvg::Base::spacingDist(int32_t _spacing) { static const char *tmpValue = " "; if (_spacing>20) { _spacing = 20; diff --git a/esvg/Base.h b/esvg/Base.h index c4ba3cf..dd7901d 100644 --- a/esvg/Base.h +++ b/esvg/Base.h @@ -28,23 +28,21 @@ #include #include -namespace esvg -{ - class Base - { +namespace esvg { + class Base { protected: - PaintState m_paint; - agg::trans_affine m_transformMatrix; //!< specific render of the curent element - const char * SpacingDist(int32_t _spacing); + PaintState m_paint; + agg::trans_affine m_transformMatrix; //!< specific render of the curent element + const char * spacingDist(int32_t _spacing); public: Base(void) {}; Base(PaintState _parentPaintState); virtual ~Base(void) { }; virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); //specific drawing for AAG librairy ... - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { }; + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { }; - virtual void Display(int32_t _spacing) { }; + virtual void display(int32_t _spacing) { }; void parseTransform(exml::Element *_element); void parsePosition(const exml::Element *_element, etk::Vector2D &_pos, etk::Vector2D &_size); float parseLength(const etk::UString& _dataInput); diff --git a/esvg/Circle.cpp b/esvg/Circle.cpp index 55724a7..0d6c61d 100644 --- a/esvg/Circle.cpp +++ b/esvg/Circle.cpp @@ -14,18 +14,15 @@ #undef __class__ #define __class__ "Circle" -esvg::Circle::Circle(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Circle::Circle(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Circle::~Circle(void) -{ +esvg::Circle::~Circle(void) { } -bool esvg::Circle::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Circle::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { m_radius = 0.0; m_position.setValue(0,0); if (NULL == _element) { @@ -52,7 +49,6 @@ bool esvg::Circle::parse(exml::Element * _element, agg::trans_affine& _parentTra SVG_ERROR("(l "<<_element->getPos()<<") Circle \"r\" is not present"); return false; } - if (0 > m_radius) { m_radius = 0; SVG_ERROR("(l "<<_element->getPos()<<") Circle \"r\" is negative"); @@ -62,13 +58,13 @@ bool esvg::Circle::parse(exml::Element * _element, agg::trans_affine& _parentTra return true; } -void esvg::Circle::Display(int32_t _spacing) +void esvg::Circle::display(int32_t _spacing) { - SVG_DEBUG(SpacingDist(_spacing) << "Circle " << m_position << " radius=" << m_radius); + SVG_DEBUG(spacingDist(_spacing) << "Circle " << m_position << " radius=" << m_radius); } -void esvg::Circle::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) +void esvg::Circle::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { _myRenderer.m_renderArea->color(agg::rgba8(m_paint.fill.r, m_paint.fill.g, m_paint.fill.b, m_paint.fill.a)); // Creating an ellipse diff --git a/esvg/Circle.h b/esvg/Circle.h index f46ac34..1225161 100644 --- a/esvg/Circle.h +++ b/esvg/Circle.h @@ -11,10 +11,8 @@ #include -namespace esvg -{ - class Circle : public esvg::Base - { +namespace esvg { + class Circle : public esvg::Base { private: etk::Vector2D m_position; //!< Position of the Circle float m_radius; //!< Radius of the Circle @@ -22,8 +20,8 @@ namespace esvg Circle(PaintState _parentPaintState); ~Circle(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Ellipse.cpp b/esvg/Ellipse.cpp index b6e74e6..093fba3 100644 --- a/esvg/Ellipse.cpp +++ b/esvg/Ellipse.cpp @@ -14,18 +14,15 @@ #undef __class__ #define __class__ "Ellipse" -esvg::Ellipse::Ellipse(PaintState parentPaintState) : esvg::Base(parentPaintState) -{ +esvg::Ellipse::Ellipse(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Ellipse::~Ellipse(void) -{ +esvg::Ellipse::~Ellipse(void) { } -bool esvg::Ellipse::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Ellipse::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { if (NULL == _element) { return false; } @@ -65,14 +62,12 @@ bool esvg::Ellipse::parse(exml::Element * _element, agg::trans_affine& _parentTr return true; } -void esvg::Ellipse::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Ellipse c=" << m_c << " r=" << m_r); +void esvg::Ellipse::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Ellipse c=" << m_c << " r=" << m_r); } -void esvg::Ellipse::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) -{ +void esvg::Ellipse::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { _myRenderer.m_renderArea->color(agg::rgba8(m_paint.fill.r, m_paint.fill.g, m_paint.fill.b, m_paint.fill.a)); // Creating an ellipse agg::ellipse myEllipse(m_c.x(), m_c.y(), m_r.x(), m_r.y(), 0); @@ -89,7 +84,6 @@ void esvg::Ellipse::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _bas _myRenderer.m_rasterizer.add_path(trans); agg::render_scanlines(_myRenderer.m_rasterizer, _myRenderer.m_scanLine, *_myRenderer.m_renderArea); } - if (m_paint.strokeWidth > 0 && m_paint.stroke.a!=0x00 ) { _myRenderer.m_renderArea->color(agg::rgba8(m_paint.stroke.r, m_paint.stroke.g, m_paint.stroke.b, m_paint.stroke.a)); // drawing as an outline @@ -101,7 +95,6 @@ void esvg::Ellipse::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _bas _myRenderer.m_rasterizer.add_path(transStroke); agg::render_scanlines(_myRenderer.m_rasterizer, _myRenderer.m_scanLine, *_myRenderer.m_renderArea); } - } diff --git a/esvg/Ellipse.h b/esvg/Ellipse.h index d4a3e43..340a049 100644 --- a/esvg/Ellipse.h +++ b/esvg/Ellipse.h @@ -11,19 +11,17 @@ #include -namespace esvg -{ - class Ellipse : public esvg::Base - { +namespace esvg { + class Ellipse : public esvg::Base { private: - etk::Vector2D m_c; //!< Center property of the ellipse - etk::Vector2D m_r; //!< Radius property of the ellipse + etk::Vector2D m_c; //!< Center property of the ellipse + etk::Vector2D m_r; //!< Radius property of the ellipse public: Ellipse(PaintState _parentPaintState); ~Ellipse(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Group.cpp b/esvg/Group.cpp index ae8cb8b..9ba8c30 100644 --- a/esvg/Group.cpp +++ b/esvg/Group.cpp @@ -23,18 +23,15 @@ #undef __class__ #define __class__ "Group" -esvg::Group::Group(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Group::Group(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Group::~Group(void) -{ +esvg::Group::~Group(void) { } -bool esvg::Group::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Group::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { if (NULL == _element) { return false; } @@ -82,13 +79,13 @@ bool esvg::Group::parse(exml::Element * _element, agg::trans_affine& _parentTran } else if (child->getValue() == "text") { elementParser = new esvg::Text(m_paint); } else { - SVG_ERROR("(l "<getPos()<<") node not suported : \""<GetValue()<<"\" must be [g,a,path,rect,circle,ellipse,line,polyline,polygon,text]"); + SVG_ERROR("(l "<getPos()<<") node not suported : \""<getValue()<<"\" must be [g,a,path,rect,circle,ellipse,line,polyline,polygon,text]"); } if (NULL == elementParser) { - SVG_ERROR("(l "<getPos()<<") error on node: \""<GetValue()<<"\" allocation error or not supported ..."); + SVG_ERROR("(l "<getPos()<<") error on node: \""<getValue()<<"\" allocation error or not supported ..."); } else { if (false == elementParser->parse(child, m_transformMatrix, tmpPos)) { - SVG_ERROR("(l "<getPos()<<") error on node: \""<GetValue()<<"\" Sub Parsing ERROR"); + SVG_ERROR("(l "<getPos()<<") error on node: \""<getValue()<<"\" Sub Parsing ERROR"); delete(elementParser); elementParser = NULL; } else { @@ -102,22 +99,21 @@ bool esvg::Group::parse(exml::Element * _element, agg::trans_affine& _parentTran return true; } -void esvg::Group::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Group (START) fill=" << m_paint.fill << " stroke=" << m_paint.stroke << " stroke-width=" << m_paint.strokeWidth ); +void esvg::Group::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Group (START) fill=" << m_paint.fill << " stroke=" << m_paint.stroke << " stroke-width=" << m_paint.strokeWidth ); for (int32_t iii=0; iiiDisplay(_spacing+1); + m_subElementList[iii]->display(_spacing+1); } } - SVG_DEBUG(SpacingDist(_spacing) << "Group (STOP)"); + SVG_DEBUG(spacingDist(_spacing) << "Group (STOP)"); } -void esvg::Group::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) +void esvg::Group::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { for (int32_t iii=0; iiiAggDraw(_myRenderer, _basicTrans); + m_subElementList[iii]->aggDraw(_myRenderer, _basicTrans); } } } diff --git a/esvg/Group.h b/esvg/Group.h index 2015dec..1b89426 100644 --- a/esvg/Group.h +++ b/esvg/Group.h @@ -12,18 +12,16 @@ #include #include -namespace esvg -{ - class Group : public esvg::Base - { +namespace esvg { + class Group : public esvg::Base { private: etk::Vector m_subElementList; //!< group sub elements ... public: Group(PaintState _parentPaintState); ~Group(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Line.cpp b/esvg/Line.cpp index acad6c0..cf2ff88 100644 --- a/esvg/Line.cpp +++ b/esvg/Line.cpp @@ -14,19 +14,16 @@ #undef __class__ #define __class__ "Line" -esvg::Line::Line(PaintState parentPaintState) : esvg::Base(parentPaintState) -{ +esvg::Line::Line(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { m_startPos.setValue(0,0); m_stopPos.setValue(0,0); } -esvg::Line::~Line(void) -{ +esvg::Line::~Line(void) { } -bool esvg::Line::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Line::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { // line must have a minimum size... m_paint.strokeWidth = 1; if (NULL == _element) { @@ -59,14 +56,11 @@ bool esvg::Line::parse(exml::Element * _element, agg::trans_affine& _parentTrans return true; } -void esvg::Line::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Line " << m_startPos << " to " << m_stopPos); +void esvg::Line::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Line " << m_startPos << " to " << m_stopPos); } - -void esvg::Line::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) -{ +void esvg::Line::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { agg::path_storage path; path.start_new_path(); path.move_to(m_startPos.x(), m_startPos.y()); diff --git a/esvg/Line.h b/esvg/Line.h index af32d81..919796f 100644 --- a/esvg/Line.h +++ b/esvg/Line.h @@ -11,19 +11,17 @@ #include -namespace esvg -{ - class Line : public esvg::Base - { +namespace esvg { + class Line : public esvg::Base { private: - etk::Vector2D m_startPos; //!< Start line position - etk::Vector2D m_stopPos; //!< Stop line position + etk::Vector2D m_startPos; //!< Start line position + etk::Vector2D m_stopPos; //!< Stop line position public: - Line(PaintState parentPaintState); + Line(PaintState _parentPaintState); ~Line(void); - virtual bool parse(exml::Element * _element, agg::trans_affine& parentTrans, etk::Vector2D& sizeMax); - virtual void Display(int32_t spacing); - virtual void AggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans); + virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Path.cpp b/esvg/Path.cpp index 6b309a7..52b1518 100644 --- a/esvg/Path.cpp +++ b/esvg/Path.cpp @@ -17,47 +17,44 @@ #undef __class__ #define __class__ "Path" -esvg::Path::Path(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Path::Path(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Path::~Path(void) -{ +esvg::Path::~Path(void) { } // return the next char position ... (after 'X' or NULL) -const char * extractCmd(const char* input, char& cmd, etk::Vector& outputList) -{ - if (*input == '\0') { +const char * extractCmd(const char* _input, char& _cmd, etk::Vector& _outputList) { + if (*_input == '\0') { return NULL; } - outputList.clear(); - cmd = '\0'; + _outputList.clear(); + _cmd = '\0'; const char * outputPointer = NULL; - if (!( (input[0] <= 'Z' && input[0] >= 'A') || (input[0] <= 'z' && input[0] >= 'a') ) ) { - SVG_ERROR("Error in the SVG Path : \"" << input << "\""); + if (!( (_input[0] <= 'Z' && _input[0] >= 'A') || (_input[0] <= 'z' && _input[0] >= 'a') ) ) { + SVG_ERROR("Error in the SVG Path : \"" << _input << "\""); return NULL; } - cmd = input[0]; - SVG_VERBOSE("Find command : " << cmd); - if (input[1] == '\0') { - return &input[1]; + _cmd = _input[0]; + SVG_VERBOSE("Find command : " << _cmd); + if (_input[1] == '\0') { + return &_input[1]; } int32_t iii=1; // extract every float separated by a ' ' or a ',' float element; char spacer[10]; int32_t nbElementRead; - while( sscanf(&input[iii], "%1[, ]%f%n", spacer, &element, &nbElementRead) == 2 - || sscanf(&input[iii], "%f%n", &element, &nbElementRead) == 1) { + while( sscanf(&_input[iii], "%1[, ]%f%n", spacer, &element, &nbElementRead) == 2 + || sscanf(&_input[iii], "%f%n", &element, &nbElementRead) == 1) { SVG_VERBOSE("Find element : " << element); - outputList.pushBack(element); + _outputList.pushBack(element); iii += nbElementRead; } - outputPointer = &input[iii]; + outputPointer = &_input[iii]; while(*outputPointer!= '\0' && *outputPointer == ' ') { outputPointer++; } @@ -65,8 +62,7 @@ const char * extractCmd(const char* input, char& cmd, etk::Vector& output return outputPointer; } -bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { if (NULL == _element) { return false; } @@ -93,8 +89,7 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans for( const char *sss=extractCmd(elementXML, command, listDot); NULL != sss; sss=extractCmd(sss, command, listDot) ) { - pathBasic_ts pathElement; - memset(&pathElement, 0, 1*sizeof(pathBasic_ts)); + PathBasic pathElement; switch(command) { case 'M': // Move to (absolute) case 'L': // Line to (absolute) @@ -106,10 +101,10 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans case 'S': // smooth curve to (absolute) case 'A': // elliptical Arc (absolute) case 'Z': // closepath (absolute) - pathElement.relative = false; + pathElement.m_relative = false; break; default : // else (relative) - pathElement.relative = true; + pathElement.m_relative = true; break; } switch(command) { @@ -120,16 +115,16 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans SVG_WARNING("the PATH command "<< command << " has not the good number of element = " << listDot.size() ); break; } - pathElement.cmd = esvg::PATH_ENUM_MOVETO; + pathElement.m_cmd = esvg::pathMoveTo; if (listDot.size() >= 2) { - pathElement.element[0] = listDot[0]; - pathElement.element[1] = listDot[1]; + pathElement.m_element[0] = listDot[0]; + pathElement.m_element[1] = listDot[1]; m_listElement.pushBack(pathElement); } - pathElement.cmd = esvg::PATH_ENUM_LINETO; + pathElement.m_cmd = esvg::pathLineTo; for(int32_t iii=2; iiicolor(agg::rgba8(m_paint.fill.r, m_paint.fill.g, m_paint.fill.b, m_paint.fill.a)); agg::path_storage path; @@ -347,61 +338,61 @@ void esvg::Path::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicT for(int32_t iii=0; iii #include -namespace esvg -{ - typedef enum { - PATH_ENUM_STOP, - PATH_ENUM_MOVETO, - PATH_ENUM_LINETO, - PATH_ENUM_LINETO_H, - PATH_ENUM_LINETO_V, - PATH_ENUM_CURVETO, - PATH_ENUM_SMOTH_CURVETO, - PATH_ENUM_BEZIER_CURVETO, - PATH_ENUM_BEZIER_SMOTH_CURVETO, - PATH_ENUM_ELLIPTIC, - } pathEnum_te; - - typedef struct { - pathEnum_te cmd; - bool relative; - float element[7]; - }pathBasic_ts; - - class Path : public esvg::Base - { +namespace esvg { + enum pathProperty{ + pathStop, + pathMoveTo, + pathLineTo, + pathLineToH, + pathLineToV, + pathCurveTo, + pathSmothCurveTo, + pathBesizeCurveTo, + pathBesizeSmothCurveTo, + pathElliptic + }; + class PathBasic { + public: + PathBasic(void) : m_cmd(esvg::pathStop), m_relative(false) { + for(int32_t iii=0; iii<7; ++iii) { + m_element[iii] = 0; + } + } + enum pathProperty m_cmd; + bool m_relative; + float m_element[7]; + }; + class Path : public esvg::Base { private: - etk::Vector m_listElement; + etk::Vector m_listElement; public: Path(PaintState _parentPaintState); ~Path(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); private: - void AbstractMoveTo(agg::path_storage& _path, bool _rel, double _x, double _y); - void AbstractLineTo(agg::path_storage& _path, bool _rel, double _x, double _y); - void AbstractHLineTo(agg::path_storage& _path, bool _rel, double _x); - void AbstractVLineTo(agg::path_storage& _path, bool _rel, double _y); - void AbstractCurve3(agg::path_storage& _path, bool _rel, double _x1, double _y1, double _x, double _y); - void AbstractCurve3(agg::path_storage& _path, bool _rel, double _x, double _y); - void AbstractCurve4(agg::path_storage& _path, bool _rel, double _x1, double _y1, double _x2, double _y2, double _x, double _y); - void AbstractCurve4(agg::path_storage& _path, bool _rel, double _x2, double _y2, double _x, double _y); - void AbstractCloseSubpath(agg::path_storage& _path); + void abstractMoveTo(agg::path_storage& _path, bool _rel, double _x, double _y); + void abstractLineTo(agg::path_storage& _path, bool _rel, double _x, double _y); + void abstractHLineTo(agg::path_storage& _path, bool _rel, double _x); + void abstractVLineTo(agg::path_storage& _path, bool _rel, double _y); + void abstractCurve3(agg::path_storage& _path, bool _rel, double _x1, double _y1, double _x, double _y); + void abstractCurve3(agg::path_storage& _path, bool _rel, double _x, double _y); + void abstractCurve4(agg::path_storage& _path, bool _rel, double _x1, double _y1, double _x2, double _y2, double _x, double _y); + void abstractCurve4(agg::path_storage& _path, bool _rel, double _x2, double _y2, double _x, double _y); + void abstractCloseSubpath(agg::path_storage& _path); }; }; diff --git a/esvg/Polygon.cpp b/esvg/Polygon.cpp index 40bbade..a8d6151 100644 --- a/esvg/Polygon.cpp +++ b/esvg/Polygon.cpp @@ -14,18 +14,15 @@ #undef __class__ #define __class__ "Polygon" -esvg::Polygon::Polygon(PaintState parentPaintState) : esvg::Base(parentPaintState) -{ +esvg::Polygon::Polygon(PaintState parentPaintState) : esvg::Base(parentPaintState) { } -esvg::Polygon::~Polygon(void) -{ +esvg::Polygon::~Polygon(void) { } -bool esvg::Polygon::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Polygon::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { if (NULL == _element) { return false; } @@ -66,13 +63,11 @@ bool esvg::Polygon::parse(exml::Element * _element, agg::trans_affine& _parentTr return true; } -void esvg::Polygon::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Polygon nbPoint=" << m_listPoint.size()); +void esvg::Polygon::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Polygon nbPoint=" << m_listPoint.size()); } -void esvg::Polygon::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) -{ +void esvg::Polygon::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { _myRenderer.m_renderArea->color(agg::rgba8(m_paint.fill.r, m_paint.fill.g, m_paint.fill.b, m_paint.fill.a)); agg::path_storage path; diff --git a/esvg/Polygon.h b/esvg/Polygon.h index 1a112eb..7d54596 100644 --- a/esvg/Polygon.h +++ b/esvg/Polygon.h @@ -12,23 +12,21 @@ #include #include -namespace esvg -{ - typedef enum { - POLYGONE_MODE__NON_ZERO, - POLYGONE_MODE__EVEN_ODD, - } PolygonMode_te; - class Polygon : public esvg::Base - { +namespace esvg { + enum polygonMode { + polygoneModeNonZero, + polygoneModeEvenOdd + }; + class Polygon : public esvg::Base { private: - etk::Vector > m_listPoint; //!< list of all point of the polygone - PolygonMode_te m_diplayMode; //!< polygone specific display mode + etk::Vector > m_listPoint; //!< list of all point of the polygone + enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode public: Polygon(PaintState parentPaintState); ~Polygon(void); virtual bool parse(exml::Element * _element, agg::trans_affine& parentTrans, etk::Vector2D& sizeMax); - virtual void Display(int32_t spacing); - virtual void AggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans); + virtual void display(int32_t spacing); + virtual void aggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans); }; }; diff --git a/esvg/Polyline.cpp b/esvg/Polyline.cpp index d73771b..9e793d3 100644 --- a/esvg/Polyline.cpp +++ b/esvg/Polyline.cpp @@ -11,18 +11,15 @@ #include #include -esvg::Polyline::Polyline(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Polyline::Polyline(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Polyline::~Polyline(void) -{ +esvg::Polyline::~Polyline(void) { } -bool esvg::Polyline::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Polyline::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { // line must have a minimum size... m_paint.strokeWidth = 1; if (NULL == _element) { @@ -58,14 +55,12 @@ bool esvg::Polyline::parse(exml::Element * _element, agg::trans_affine& _parentT return true; } -void esvg::Polyline::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Polyline nbPoint=" << m_listPoint.size()); +void esvg::Polyline::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Polyline nbPoint=" << m_listPoint.size()); } -void esvg::Polyline::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) -{ +void esvg::Polyline::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { agg::path_storage path; path.start_new_path(); path.move_to(m_listPoint[0].x(), m_listPoint[0].y()); diff --git a/esvg/Polyline.h b/esvg/Polyline.h index cf8dd85..0b4e64e 100644 --- a/esvg/Polyline.h +++ b/esvg/Polyline.h @@ -12,18 +12,16 @@ #include #include -namespace esvg -{ - class Polyline : public esvg::Base - { +namespace esvg { + class Polyline : public esvg::Base { private: etk::Vector > m_listPoint; //!< list of all point of the polyline public: Polyline(PaintState _parentPaintState); ~Polyline(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Rectangle.cpp b/esvg/Rectangle.cpp index 121e955..19e98ea 100644 --- a/esvg/Rectangle.cpp +++ b/esvg/Rectangle.cpp @@ -15,20 +15,17 @@ #define __class__ "Rectangle" -esvg::Rectangle::Rectangle(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Rectangle::Rectangle(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { m_position.setValue(0,0); m_size.setValue(0,0); m_roundedCorner.setValue(0,0); } -esvg::Rectangle::~Rectangle(void) -{ +esvg::Rectangle::~Rectangle(void) { } -bool esvg::Rectangle::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Rectangle::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { if (NULL == _element) { return false; } @@ -57,13 +54,11 @@ bool esvg::Rectangle::parse(exml::Element * _element, agg::trans_affine& _parent return true; } -void esvg::Rectangle::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Rectangle : pos=" << m_position << " size=" << m_size << " corner=" << m_roundedCorner); +void esvg::Rectangle::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Rectangle : pos=" << m_position << " size=" << m_size << " corner=" << m_roundedCorner); } -void esvg::Rectangle::AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) -{ +void esvg::Rectangle::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { _myRenderer.m_renderArea->color(agg::rgba8(m_paint.fill.r, m_paint.fill.g, m_paint.fill.b, m_paint.fill.a)); // Creating a rounded rectangle agg::rounded_rect rect_r(m_position.x(), m_position.y(), m_position.x()+m_size.x(), m_position.y()+m_size.y(), m_roundedCorner.x()); diff --git a/esvg/Rectangle.h b/esvg/Rectangle.h index 4c527b9..3365352 100644 --- a/esvg/Rectangle.h +++ b/esvg/Rectangle.h @@ -11,10 +11,8 @@ #include -namespace esvg -{ - class Rectangle : public esvg::Base - { +namespace esvg { + class Rectangle : public esvg::Base { private: etk::Vector2D m_position; //!< position of the rectangle etk::Vector2D m_size; //!< size of the rectangle @@ -23,8 +21,8 @@ namespace esvg Rectangle(PaintState _parentPaintState); ~Rectangle(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void display(int32_t _spacing); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); }; }; diff --git a/esvg/Renderer.cpp b/esvg/Renderer.cpp index 84399bb..04cf44a 100644 --- a/esvg/Renderer.cpp +++ b/esvg/Renderer.cpp @@ -10,13 +10,12 @@ #include // 4 is for the RGBA ... -#define DATA_ALLOCATION_ELEMENT (4) +#define DATA_ALLOCATION_ELEMENT (4) #undef __class__ -#define __class__ "Renderer" +#define __class__ "Renderer" -esvg::Renderer::Renderer(uint32_t width, uint32_t height) -{ +esvg::Renderer::Renderer(uint32_t width, uint32_t height) { m_allocatedSize = 0; m_size.setValue(width, height); @@ -66,8 +65,7 @@ esvg::Renderer::Renderer(uint32_t width, uint32_t height) //m_basicMatrix *= agg::trans_affine_translation(m_size.x*0.7, m_size.y/2); } -esvg::Renderer::~Renderer(void) -{ +esvg::Renderer::~Renderer(void) { if (NULL != m_buffer) { delete[] m_buffer; m_buffer = NULL; @@ -77,8 +75,7 @@ esvg::Renderer::~Renderer(void) // Writing the buffer to a .PPM file, assuming it has // RGB-structure, one byte per color component //-------------------------------------------------- -void esvg::Renderer::WritePpm(etk::UString fileName) -{ +void esvg::Renderer::writePpm(etk::UString fileName) { if (NULL == m_buffer) { return; } diff --git a/esvg/Renderer.h b/esvg/Renderer.h index 65ede58..5cb9dcf 100644 --- a/esvg/Renderer.h +++ b/esvg/Renderer.h @@ -24,18 +24,17 @@ #include #include -namespace esvg -{ - typedef enum { - LINECAP_BUTT, - LINECAP_ROUND, - LINECAP_SQUARE, - } lineCap_te; - typedef enum { - LINEJOIN_MITER, - LINEJOIN_ROUND, - LINEJOIN_BEVEL, - } lineJoin_te; +namespace esvg { + enum lineCap{ + lineCapButt, + lineCapRound, + lineCapSquare + }; + enum lineJoin{ + lineJoinMiter, + lineJoinRound, + lineJoinBevel + }; class PaintState { public: @@ -43,8 +42,8 @@ namespace esvg draw::Color stroke; float strokeWidth; bool flagEvenOdd; - lineCap_te lineCap; - lineJoin_te lineJoin; + enum esvg::lineCap lineCap; + enum esvg::lineJoin lineJoin; etk::Vector2D viewPort; }; @@ -59,7 +58,7 @@ namespace esvg public: Renderer(uint32_t width, uint32_t height); ~Renderer(void); - void WritePpm(etk::UString fileName); + void writePpm(etk::UString fileName); etk::Vector2D m_size; agg::rendering_buffer * m_renderingBuffer; agg::pixfmt_rgba32 * m_pixFrame; diff --git a/esvg/Stroking.h b/esvg/Stroking.h index d354a97..c9a334b 100644 --- a/esvg/Stroking.h +++ b/esvg/Stroking.h @@ -11,8 +11,7 @@ #include -namespace esvg -{ +namespace esvg { }; diff --git a/esvg/Text.cpp b/esvg/Text.cpp index 3272132..b6ea03b 100644 --- a/esvg/Text.cpp +++ b/esvg/Text.cpp @@ -12,26 +12,22 @@ #undef __class__ #define __class__ "Text" -esvg::Text::Text(PaintState _parentPaintState) : esvg::Base(_parentPaintState) -{ +esvg::Text::Text(PaintState _parentPaintState) : esvg::Base(_parentPaintState) { } -esvg::Text::~Text(void) -{ +esvg::Text::~Text(void) { } -bool esvg::Text::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) -{ +bool esvg::Text::parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax) { _sizeMax.setValue(0,0); SVG_ERROR("NOT IMPLEMENTED"); return false; } -void esvg::Text::Display(int32_t _spacing) -{ - SVG_DEBUG(SpacingDist(_spacing) << "Text"); +void esvg::Text::display(int32_t _spacing) { + SVG_DEBUG(spacingDist(_spacing) << "Text"); } diff --git a/esvg/Text.h b/esvg/Text.h index 4f95c0a..ded1ff7 100644 --- a/esvg/Text.h +++ b/esvg/Text.h @@ -11,17 +11,13 @@ #include -namespace esvg -{ - class Text : public esvg::Base - { - private: - +namespace esvg { + class Text : public esvg::Base { public: Text(PaintState _parentPaintState); ~Text(void); virtual bool parse(exml::Element * _element, agg::trans_affine& _parentTrans, etk::Vector2D& _sizeMax); - virtual void Display(int32_t _spacing); + virtual void display(int32_t _spacing); }; }; diff --git a/esvg/esvg.cpp b/esvg/esvg.cpp index 1cf8bd0..0f98c77 100644 --- a/esvg/esvg.cpp +++ b/esvg/esvg.cpp @@ -32,11 +32,10 @@ #undef __class__ -#define __class__ "Document" +#define __class__ "Document" -esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL) -{ +esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL) { m_fileName = _fileName; m_version = "0.0"; m_loadOK = true; @@ -46,12 +45,12 @@ esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL m_paint.strokeWidth = 1.0; m_paint.viewPort.setValue(255,255); m_paint.flagEvenOdd = false; - m_paint.lineJoin = esvg::LINEJOIN_MITER; - m_paint.lineCap = esvg::LINECAP_BUTT; + m_paint.lineJoin = esvg::lineJoinMiter; + m_paint.lineCap = esvg::lineCapButt; m_size.setValue(0,0); exml::Document doc; - if (false == doc.Load(m_fileName)) { + if (false == doc.load(m_fileName)) { SVG_ERROR("Error occured when loading XML : " << m_fileName); m_loadOK = false; return; @@ -121,14 +120,14 @@ esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL // Node ignore : generaly inkscape data continue; } else { - SVG_ERROR("(l "<getPos()<<") node not suported : \""<GetValue()<<"\" must be [title,g,a,path,rect,circle,ellipse,line,polyline,polygon,text,metadata]"); + SVG_ERROR("(l "<getPos()<<") node not suported : \""<getValue()<<"\" must be [title,g,a,path,rect,circle,ellipse,line,polyline,polygon,text,metadata]"); } if (NULL == elementParser) { - SVG_ERROR("(l "<getPos()<<") error on node: \""<GetValue()<<"\" allocation error or not supported ..."); + SVG_ERROR("(l "<getPos()<<") error on node: \""<getValue()<<"\" allocation error or not supported ..."); continue; } if (false == elementParser->parse(child, m_transformMatrix, size)) { - SVG_ERROR("(l "<getPos()<<") error on node: \""<GetValue()<<"\" Sub Parsing ERROR"); + SVG_ERROR("(l "<getPos()<<") error on node: \""<getValue()<<"\" Sub Parsing ERROR"); delete(elementParser); elementParser = NULL; continue; @@ -150,8 +149,7 @@ esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL //DisplayDebug(); } -esvg::Document::~Document(void) -{ +esvg::Document::~Document(void) { if(NULL != m_renderedElement) { delete(m_renderedElement); m_renderedElement = NULL; @@ -160,22 +158,21 @@ esvg::Document::~Document(void) -void esvg::Document::DisplayDebug(void) -{ +void esvg::Document::displayDebug(void) { SVG_DEBUG("Main SVG node : size=" << m_size); for (int32_t iii=0; iiiDisplay(1); + m_subElementList[iii]->display(1); } } } -void esvg::Document::AggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basicTrans) +void esvg::Document::aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans) { for (int32_t iii=0; iiiAggDraw(myRenderer, basicTrans); + m_subElementList[iii]->aggDraw(_myRenderer, _basicTrans); } } } @@ -184,18 +181,18 @@ void esvg::Document::AggDraw(esvg::Renderer& myRenderer, agg::trans_affine& basi void esvg::Document::generateTestFile(void) { int32_t sizeX = m_size.x(); - if (SizeX == 0) { + if (sizeX == 0) { sizeX = 64; } int32_t sizeY = m_size.y(); - if (SizeY == 0) { + if (sizeY == 0) { sizeY = 64; } if(NULL != m_renderedElement) { delete(m_renderedElement); m_renderedElement = NULL; } - m_renderedElement = new esvg::Renderer(SizeX, sizeY); + m_renderedElement = new esvg::Renderer(sizeX, sizeY); // create the first element matrix modification ... agg::trans_affine basicTrans; //basicTrans *= agg::trans_affine_translation(-g_base_dx, -g_base_dy); @@ -206,67 +203,67 @@ void esvg::Document::generateTestFile(void) //basicTrans *= agg::trans_affine_translation(width/3, height/3); - AggDraw(*m_renderedElement, basicTrans); + aggDraw(*m_renderedElement, basicTrans); etk::UString tmpFileOut = "yyy_out_"; tmpFileOut += m_fileName; tmpFileOut += ".ppm"; - m_renderedElement->WritePpm(tmpFileOut); + m_renderedElement->writePpm(tmpFileOut); } -void esvg::Document::generateAnImage(int32_t sizeX, int32_t sizeY) +void esvg::Document::generateAnImage(int32_t _sizeX, int32_t _sizeY) { - int32_t sizeX = sizeX; - if (SizeX == 0) { + int32_t sizeX = _sizeX; + if (sizeX == 0) { SVG_ERROR("SizeX == 0 ==> set 64"); sizeX = 64; } - int32_t sizeY = sizeY; - if (SizeY == 0) { + int32_t sizeY = _sizeY; + if (sizeY == 0) { SVG_ERROR("SizeY == 0 ==> set 64"); sizeY = 64; } - SVG_INFO("Generate size (" << sizeX << "," << SizeY << ")"); + SVG_INFO("Generate size (" << sizeX << "," << sizeY << ")"); if(NULL != m_renderedElement) { delete(m_renderedElement); m_renderedElement = NULL; } - m_renderedElement = new esvg::Renderer(SizeX, sizeY); + m_renderedElement = new esvg::Renderer(sizeX, sizeY); // create the first element matrix modification ... agg::trans_affine basicTrans; //basicTrans *= agg::trans_affine_translation(-g_base_dx, -g_base_dy); - basicTrans *= agg::trans_affine_scaling(SizeX/m_size.x(), sizeY/m_size.y()); + basicTrans *= agg::trans_affine_scaling(sizeX/m_size.x(), sizeY/m_size.y()); //basicTrans *= agg::trans_affine_rotation(g_angle);// + agg::pi); //basicTrans *= agg::trans_affine_skewing(2.0, 5.0); //basicTrans *= agg::trans_affine_translation(width*0.3, height/2); //basicTrans *= agg::trans_affine_translation(width/3, height/3); - AggDraw(*m_renderedElement, basicTrans); + aggDraw(*m_renderedElement, basicTrans); /* etk::UString tmpFileOut = "zzz_out_test.ppm"; m_renderedElement->WritePpm(tmpFileOut); */ } -void esvg::Document::generateAnImage(draw::Image& output) +void esvg::Document::generateAnImage(draw::Image& _output) { - generateAnImage(ivec2(m_size.x(),m_size.y()), output); + generateAnImage(ivec2(m_size.x(),m_size.y()), _output); } -void esvg::Document::generateAnImage(ivec2 size, draw::Image& output) +void esvg::Document::generateAnImage(ivec2 _size, draw::Image& _output) { - generateAnImage(size.x(), size.y()); - output.Resize(size); + generateAnImage(_size.x(), _size.y()); + _output.resize(_size); draw::Color tmpp(0,0,0,0); - output.setFillColor(tmpp); - output.clear(); + _output.setFillColor(tmpp); + _output.clear(); if(NULL != m_renderedElement) { uint8_t* pointerOnData = m_renderedElement->getDataPointer(); int32_t sizeData = m_renderedElement->getDataSize(); - uint8_t* tmpOut = (uint8_t*)output.getTextureDataPointer(); + uint8_t* tmpOut = (uint8_t*)_output.getTextureDataPointer(); memcpy(tmpOut, pointerOnData, sizeData); } } diff --git a/esvg/esvg.h b/esvg/esvg.h index d2eff1a..8ae6203 100644 --- a/esvg/esvg.h +++ b/esvg/esvg.h @@ -17,10 +17,8 @@ #include #include -namespace esvg -{ - class Document : public esvg::Base - { +namespace esvg { + class Document : public esvg::Base { private: etk::UString m_fileName; bool m_loadOK; @@ -29,17 +27,16 @@ namespace esvg etk::Vector m_subElementList; vec2 m_size; esvg::Renderer* m_renderedElement; - public: Document(const etk::UString& _fileName); ~Document(void); bool isLoadOk(void) { return m_loadOK; }; - void DisplayDebug(void); + void displayDebug(void); void generateTestFile(void); void generateAnImage(int32_t _sizeX, int32_t _sizeY); void generateAnImage(ivec2 _size, draw::Image& _output); void generateAnImage(draw::Image& _output); - virtual void AggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); + virtual void aggDraw(esvg::Renderer& _myRenderer, agg::trans_affine& _basicTrans); uint8_t* getPointerOnData(void); uint32_t getSizeOnData(void); vec2 getDefinedSize(void) { return m_size;};