atria-soft/esvg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct line generations

Browse Source
This commit is contained in:
Edouard DUPIN 2016-08-22 21:52:37 +02:00
parent cb9f67b530
commit ae7ee334d2
21 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
esvg/Base.cpp
View File

@ -433,7 +433,7 @@ void esvg::Base::setId(const std::string& _newId) {
void esvg::Base::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {

2
esvg/Base.h
View File

@ -83,7 +83,7 @@ namespace esvg {
*/
virtual void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1);

2
esvg/Circle.cpp
View File

@ -147,7 +147,7 @@ void esvg::Circle::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t
void esvg::Circle::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Circle");

2
esvg/Circle.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

2
esvg/Ellipse.cpp
View File

@ -153,7 +153,7 @@ void esvg::Ellipse::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t
void esvg::Ellipse::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Ellipse");

2
esvg/Ellipse.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

2
esvg/Group.cpp
View File

@ -118,7 +118,7 @@ void esvg::Group::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _
void esvg::Group::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW shape esvg::group");

2
esvg/Group.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
};

2
esvg/Line.cpp
View File

@ -120,7 +120,7 @@ void esvg::Line::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _l
void esvg::Line::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Line");

2
esvg/Line.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

3
esvg/Path.cpp
View File

@ -329,7 +329,7 @@ void esvg::Path::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _l
void esvg::Path::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Path");
@ -341,7 +341,6 @@ void esvg::Path::drawShapePoints(std::vector<std::vector<vec2>>& _out,
listPoints = m_listElement.generateListPoints(_level, _recurtionMax, _threshold);
for (auto &it : listPoints.m_data) {
ESVG_CRITICAL("add list... " << it.size() << " / " << m_listElement.m_listElement.size());
std::vector<vec2> listPoint;
for (auto &itDot : it) {
listPoint.push_back(itDot.m_pos);

2
esvg/Path.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
};

2
esvg/Polygon.cpp
View File

@ -134,7 +134,7 @@ void esvg::Polygon::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t
void esvg::Polygon::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Polygon");

2
esvg/Polygon.h
View File

@ -29,7 +29,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

2
esvg/Polyline.cpp
View File

@ -131,7 +131,7 @@ void esvg::Polyline::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_
void esvg::Polyline::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Polyline");

2
esvg/Polyline.h
View File

@ -22,7 +22,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

2
esvg/Rectangle.cpp
View File

@ -148,7 +148,7 @@ void esvg::Rectangle::draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32
void esvg::Rectangle::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW Shape esvg::Rectangle");

2
esvg/Rectangle.h
View File

@ -23,7 +23,7 @@ namespace esvg {
void draw(esvg::Renderer& _myRenderer, mat2& _basicTrans, int32_t _level) override;
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
private:

4
esvg/esvg.cpp
View File

@ -1,8 +1,6 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
@ -390,7 +388,7 @@ std::vector<std::vector<vec2>> esvg::Document::getLines(vec2 _size) {
void esvg::Document::drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level) {
ESVG_VERBOSE(spacingDist(_level) << "DRAW shape esvg::Document");

4
esvg/esvg.h
View File

@ -1,8 +1,6 @@
/** @file
* @author Edouard DUPIN
*
* @copyright 2011, Edouard DUPIN, all right reserved
*
* @license APACHE v2.0 (see license file)
*/
#pragma once
@ -96,7 +94,7 @@ namespace esvg {
protected:
void drawShapePoints(std::vector<std::vector<vec2>>& _out,
int32_t _recurtionMax,
int32_t _threshold,
float _threshold,
mat2& _basicTrans,
int32_t _level=1) override;
};

4
esvg/render/Path.cpp
View File

@ -509,10 +509,6 @@ esvg::render::PointList esvg::render::Path::generateListPoints(int32_t _level, i
out.addList(tmpListPoint);
tmpListPoint.clear();
}
ESVG_VERBOSE(spacingDist(_level) << " ==> " << out.m_data.size());
for (auto &it : out.m_data) {
ESVG_VERBOSE(spacingDist(_level) << " " << it.size());
}
out.display();
return out;
}