From 32b1966f8d42e374eaa8f2d5d9cae5d4f5d1db8b Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 11 Nov 2013 20:19:43 +0100 Subject: [PATCH] [DEV] integarate std x11 --- esvg/Base.cpp | 18 +++++++++--------- esvg/Base.h | 6 +++--- esvg/Circle.cpp | 2 +- esvg/Ellipse.cpp | 2 +- esvg/Group.cpp | 2 +- esvg/Group.h | 4 ++-- esvg/Line.cpp | 2 +- esvg/Path.cpp | 30 +++++++++++++++--------------- esvg/Path.h | 2 +- esvg/Polygon.cpp | 4 ++-- esvg/Polygon.h | 4 ++-- esvg/Polyline.cpp | 4 ++-- esvg/Polyline.h | 4 ++-- esvg/Rectangle.cpp | 2 +- esvg/Renderer.cpp | 2 +- esvg/Renderer.h | 2 +- esvg/esvg.cpp | 8 ++++---- esvg/esvg.h | 12 ++++++------ 18 files changed, 55 insertions(+), 55 deletions(-) diff --git a/esvg/Base.cpp b/esvg/Base.cpp index d61a0e0..87b20ac 100644 --- a/esvg/Base.cpp +++ b/esvg/Base.cpp @@ -24,7 +24,7 @@ void esvg::Base::parseTransform(exml::Element* _element) { if (NULL == _element) { return; } - etk::UString inputString = _element->getAttribute("transform"); + std::string inputString = _element->getAttribute("transform"); if (inputString.size() == 0) { return; } @@ -93,7 +93,7 @@ void esvg::Base::parsePosition(const exml::Element *_element, etk::Vector2DgetAttribute("x"); + std::string content = _element->getAttribute("x"); if (content.size()!=0) { _pos.setX(parseLength(content)); } @@ -117,10 +117,10 @@ void esvg::Base::parsePosition(const exml::Element *_element, etk::Vector2D='0' && _dataInput[iii]<='9') || _dataInput[iii]<='+' @@ -161,7 +161,7 @@ float esvg::Base::parseLength(const etk::UString& _dataInput) { } // return the next char position ... (after ';' or NULL) -int32_t extractPartOfStyle(const etk::UString& _data, etk::UString& _outputType, etk::UString& _outputData, int32_t _pos) { +int32_t extractPartOfStyle(const std::string& _data, std::string& _outputType, std::string& _outputData, int32_t _pos) { _outputType = ""; _outputData = ""; if (_pos == -1) { @@ -205,7 +205,7 @@ void esvg::Base::parsePaintAttr(const exml::Element *_element) { } bool fillNone = false; bool strokeNone = false; - etk::UString content = _element->getAttribute("fill"); + std::string content = _element->getAttribute("fill"); if (content.size()!=0) { m_paint.fill = parseColor(content); if (m_paint.fill.a == 0) { @@ -280,8 +280,8 @@ void esvg::Base::parsePaintAttr(const exml::Element *_element) { } content = _element->getAttribute("style"); if (content.size()!=0) { - etk::UString outputType; - etk::UString outputValue; + std::string outputType; + std::string outputValue; for( int32_t sss=extractPartOfStyle(content, outputType, outputValue, 0); -2 != sss; @@ -369,7 +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 std::string& _inputData) { draw::Color localColor = draw::color::white; if( _inputData.size() > 4 diff --git a/esvg/Base.h b/esvg/Base.h index dd7901d..87b58fd 100644 --- a/esvg/Base.h +++ b/esvg/Base.h @@ -10,7 +10,7 @@ #define __ESVG_BASE_H__ #include -#include +#include #include #include @@ -45,9 +45,9 @@ namespace esvg { 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); + float parseLength(const std::string& _dataInput); void parsePaintAttr(const exml::Element *_element); - draw::Color parseColor(const etk::UString& _inputData); + draw::Color parseColor(const std::string& _inputData); }; }; diff --git a/esvg/Circle.cpp b/esvg/Circle.cpp index d1d2e7c..455c014 100644 --- a/esvg/Circle.cpp +++ b/esvg/Circle.cpp @@ -34,7 +34,7 @@ bool esvg::Circle::parse(exml::Element * _element, agg::trans_affine& _parentTra // add the property of the parrent modifications ... m_transformMatrix *= _parentTrans; - etk::UString content = _element->getAttribute("cx"); + std::string content = _element->getAttribute("cx"); if (content.size()!=0) { m_position.setX(parseLength(content)); } diff --git a/esvg/Ellipse.cpp b/esvg/Ellipse.cpp index e713b29..daa9994 100644 --- a/esvg/Ellipse.cpp +++ b/esvg/Ellipse.cpp @@ -35,7 +35,7 @@ bool esvg::Ellipse::parse(exml::Element * _element, agg::trans_affine& _parentTr m_c.setValue(0,0); m_r.setValue(0,0); - etk::UString content = _element->getAttribute("cx"); + std::string content = _element->getAttribute("cx"); if (content.size()!=0) { m_c.setX(parseLength(content)); } diff --git a/esvg/Group.cpp b/esvg/Group.cpp index ba8ce10..69f7187 100644 --- a/esvg/Group.cpp +++ b/esvg/Group.cpp @@ -92,7 +92,7 @@ bool esvg::Group::parse(exml::Element * _element, agg::trans_affine& _parentTran _sizeMax.setValue(etk_max(_sizeMax.x(), tmpPos.x()), etk_max(_sizeMax.y(), tmpPos.y())); // add element in the system - m_subElementList.pushBack(elementParser); + m_subElementList.push_back(elementParser); } } } diff --git a/esvg/Group.h b/esvg/Group.h index 1b89426..bfdd5c0 100644 --- a/esvg/Group.h +++ b/esvg/Group.h @@ -10,12 +10,12 @@ #define __ESVG_GROUP_H__ #include -#include +#include namespace esvg { class Group : public esvg::Base { private: - etk::Vector m_subElementList; //!< group sub elements ... + std::vector m_subElementList; //!< group sub elements ... public: Group(PaintState _parentPaintState); ~Group(void); diff --git a/esvg/Line.cpp b/esvg/Line.cpp index 6ce822e..7b80b6a 100644 --- a/esvg/Line.cpp +++ b/esvg/Line.cpp @@ -35,7 +35,7 @@ bool esvg::Line::parse(exml::Element * _element, agg::trans_affine& _parentTrans // add the property of the parrent modifications ... m_transformMatrix *= _parentTrans; - etk::UString content = _element->getAttribute("x1"); + std::string content = _element->getAttribute("x1"); if (content.size()!=0) { m_startPos.setX(parseLength(content)); } diff --git a/esvg/Path.cpp b/esvg/Path.cpp index ef0d860..2583d32 100644 --- a/esvg/Path.cpp +++ b/esvg/Path.cpp @@ -27,7 +27,7 @@ esvg::Path::~Path(void) { // return the next char position ... (after 'X' or NULL) -const char * extractCmd(const char* _input, char& _cmd, etk::Vector& _outputList) { +const char * extractCmd(const char* _input, char& _cmd, std::vector& _outputList) { if (*_input == '\0') { return NULL; } @@ -51,7 +51,7 @@ const char * extractCmd(const char* _input, char& _cmd, etk::Vector& _out 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.push_back(element); iii += nbElementRead; } outputPointer = &_input[iii]; @@ -73,7 +73,7 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans m_transformMatrix *= _parentTrans; - etk::UString elementXML1 = _element->getAttribute("d"); + std::string elementXML1 = _element->getAttribute("d"); if (elementXML1.size() == 0) { SVG_ERROR("(l "<<_element->getPos()<<") path: missing 'p' attribute"); return false; @@ -81,7 +81,7 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans SVG_VERBOSE("Parse Path : \"" << elementXML << "\""); char command; - etk::Vector listDot; + std::vector listDot; etk::Char plop = elementXML1.c_str(); const char* elementXML = plop; @@ -119,13 +119,13 @@ bool esvg::Path::parse(exml::Element * _element, agg::trans_affine& _parentTrans if (listDot.size() >= 2) { pathElement.m_element[0] = listDot[0]; pathElement.m_element[1] = listDot[1]; - m_listElement.pushBack(pathElement); + m_listElement.push_back(pathElement); } pathElement.m_cmd = esvg::pathLineTo; for(int32_t iii=2; iii m_listElement; + std::vector m_listElement; public: Path(PaintState _parentPaintState); ~Path(void); diff --git a/esvg/Polygon.cpp b/esvg/Polygon.cpp index 80a758d..628d3e7 100644 --- a/esvg/Polygon.cpp +++ b/esvg/Polygon.cpp @@ -36,7 +36,7 @@ bool esvg::Polygon::parse(exml::Element * _element, agg::trans_affine& _parentTr SVG_VERBOSE("parsed P2. trans : (" << m_transformMatrix.sx << "," << m_transformMatrix.shy << "," << m_transformMatrix.shx << "," << m_transformMatrix.sy << "," << m_transformMatrix.tx << "," << m_transformMatrix.ty << ")"); - const etk::UString sss1 = _element->getAttribute("points"); + const std::string sss1 = _element->getAttribute("points"); if (sss1.size() == 0) { SVG_ERROR("(l "/*<<_element->Pos()*/<<") polygon: missing points attribute"); return false; @@ -49,7 +49,7 @@ bool esvg::Polygon::parse(exml::Element * _element, agg::trans_affine& _parentTr vec2 pos(0,0); int32_t n; if (sscanf(sss, "%f,%f%n", &pos.m_floats[0], &pos.m_floats[1], &n) == 2) { - m_listPoint.pushBack(pos); + m_listPoint.push_back(pos); sss += n; _sizeMax.setValue(etk_max(_sizeMax.x(), pos.x()), etk_max(_sizeMax.y(), pos.y())); diff --git a/esvg/Polygon.h b/esvg/Polygon.h index 7d54596..9eafc48 100644 --- a/esvg/Polygon.h +++ b/esvg/Polygon.h @@ -10,7 +10,7 @@ #define __ESVG_POLYGON_H__ #include -#include +#include namespace esvg { enum polygonMode { @@ -19,7 +19,7 @@ namespace esvg { }; class Polygon : public esvg::Base { private: - etk::Vector > m_listPoint; //!< list of all point of the polygone + std::vector > m_listPoint; //!< list of all point of the polygone enum esvg::polygonMode m_diplayMode; //!< polygone specific display mode public: Polygon(PaintState parentPaintState); diff --git a/esvg/Polyline.cpp b/esvg/Polyline.cpp index 2dfb561..063911a 100644 --- a/esvg/Polyline.cpp +++ b/esvg/Polyline.cpp @@ -31,7 +31,7 @@ bool esvg::Polyline::parse(exml::Element * _element, agg::trans_affine& _parentT // add the property of the parrent modifications ... m_transformMatrix *= _parentTrans; - etk::UString sss1 = _element->getAttribute("points"); + std::string sss1 = _element->getAttribute("points"); if (sss1.size() == 0) { SVG_ERROR("(l "<<_element->getPos()<<") polyline: missing points attribute"); return false; @@ -44,7 +44,7 @@ bool esvg::Polyline::parse(exml::Element * _element, agg::trans_affine& _parentT etk::Vector2D pos; int32_t n; if (sscanf(sss, "%f,%f %n", &pos.m_floats[0], &pos.m_floats[1], &n) == 2) { - m_listPoint.pushBack(pos); + m_listPoint.push_back(pos); _sizeMax.setValue(etk_max(_sizeMax.x(), pos.x()), etk_max(_sizeMax.y(), pos.y())); sss += n; diff --git a/esvg/Polyline.h b/esvg/Polyline.h index 0b4e64e..8019d27 100644 --- a/esvg/Polyline.h +++ b/esvg/Polyline.h @@ -10,12 +10,12 @@ #define __ESVG_POLYLINE_H__ #include -#include +#include namespace esvg { class Polyline : public esvg::Base { private: - etk::Vector > m_listPoint; //!< list of all point of the polyline + std::vector > m_listPoint; //!< list of all point of the polyline public: Polyline(PaintState _parentPaintState); ~Polyline(void); diff --git a/esvg/Rectangle.cpp b/esvg/Rectangle.cpp index 25f5b2b..7e42b5f 100644 --- a/esvg/Rectangle.cpp +++ b/esvg/Rectangle.cpp @@ -41,7 +41,7 @@ bool esvg::Rectangle::parse(exml::Element * _element, agg::trans_affine& _parent parsePosition(_element, m_position, m_size); - etk::UString content = _element->getAttribute("rx"); + std::string content = _element->getAttribute("rx"); if (content.size()!=0) { m_roundedCorner.setX(parseLength(content)); } diff --git a/esvg/Renderer.cpp b/esvg/Renderer.cpp index 7119c83..20a3f1c 100644 --- a/esvg/Renderer.cpp +++ b/esvg/Renderer.cpp @@ -75,7 +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(std::string fileName) { if (NULL == m_buffer) { return; } diff --git a/esvg/Renderer.h b/esvg/Renderer.h index 5cb9dcf..3e61a4a 100644 --- a/esvg/Renderer.h +++ b/esvg/Renderer.h @@ -58,7 +58,7 @@ namespace esvg { public: Renderer(uint32_t width, uint32_t height); ~Renderer(void); - void writePpm(etk::UString fileName); + void writePpm(std::string fileName); etk::Vector2D m_size; agg::rendering_buffer * m_renderingBuffer; agg::pixfmt_rgba32 * m_pixFrame; diff --git a/esvg/esvg.cpp b/esvg/esvg.cpp index c2af536..55df61c 100644 --- a/esvg/esvg.cpp +++ b/esvg/esvg.cpp @@ -35,7 +35,7 @@ #define __class__ "Document" -esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL) { +esvg::Document::Document(const std::string& _fileName) : m_renderedElement(NULL) { m_fileName = _fileName; m_version = "0.0"; m_loadOK = true; @@ -139,7 +139,7 @@ esvg::Document::Document(const etk::UString& _fileName) : m_renderedElement(NULL maxSize.setY(size.y()); } // add element in the system - m_subElementList.pushBack(elementParser); + m_subElementList.push_back(elementParser); } if (m_size.x() == 0 || m_size.y()==0) { m_size.setValue((int32_t)maxSize.x(), (int32_t)maxSize.y()); @@ -204,7 +204,7 @@ void esvg::Document::generateTestFile(void) aggDraw(*m_renderedElement, basicTrans); - etk::UString tmpFileOut = "yyy_out_"; + std::string tmpFileOut = "yyy_out_"; tmpFileOut += m_fileName; tmpFileOut += ".ppm"; m_renderedElement->writePpm(tmpFileOut); @@ -243,7 +243,7 @@ void esvg::Document::generateAnImage(int32_t _sizeX, int32_t _sizeY) aggDraw(*m_renderedElement, basicTrans); /* - etk::UString tmpFileOut = "zzz_out_test.ppm"; + std::string tmpFileOut = "zzz_out_test.ppm"; m_renderedElement->WritePpm(tmpFileOut); */ } diff --git a/esvg/esvg.h b/esvg/esvg.h index 8ae6203..2da6a30 100644 --- a/esvg/esvg.h +++ b/esvg/esvg.h @@ -10,7 +10,7 @@ #define __ESVG_H__ #include -#include +#include #include #include @@ -20,15 +20,15 @@ namespace esvg { class Document : public esvg::Base { private: - etk::UString m_fileName; + std::string m_fileName; bool m_loadOK; - etk::UString m_version; - etk::UString m_title; - etk::Vector m_subElementList; + std::string m_version; + std::string m_title; + std::vector m_subElementList; vec2 m_size; esvg::Renderer* m_renderedElement; public: - Document(const etk::UString& _fileName); + Document(const std::string& _fileName); ~Document(void); bool isLoadOk(void) { return m_loadOK; }; void displayDebug(void);