diff --git a/wrap/qt/Outline2ToQImage.cpp b/wrap/qt/Outline2ToQImage.cpp index 809e47d5..c1af6b38 100644 --- a/wrap/qt/Outline2ToQImage.cpp +++ b/wrap/qt/Outline2ToQImage.cpp @@ -1,11 +1,9 @@ - - -#include "PolyToQImage.h" +#include "Outline2ToQImage.h" #include using namespace vcg; using namespace std; -void PolyDumper::rectSetToOutline2Vec(vector< Box2f > &rectVec, vector< vector > &outline2Vec) +void Outline2Dumper::rectSetToOutline2Vec(vector< Box2f > &rectVec, vector< vector > &outline2Vec) { outline2Vec.clear(); for(size_t i=0;i &rectVec, vector< vector

&rectVec, +void Outline2Dumper::multiRectSetToSingleOutline2Vec(vector< Box2f > &rectVec, vector &trVec, vector &indVec, int ind, vector< vector > &outline2Vec, vector &trOutline2Vec) @@ -41,7 +39,7 @@ void PolyDumper::multiRectSetToSingleOutline2Vec(vector< Box2f > &rectVec, } } -void PolyDumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vector > &multiPolyVec, +void Outline2Dumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vector > &multiPolyVec, const std::vector &multiTrVec, const std::vector &indVec, int ind, std::vector< std::vector > &singlePolyVec, @@ -60,7 +58,7 @@ void PolyDumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vec } -void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector > &polyVec, vector &trVec, PolyDumper::Param &pp) +void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector > &polyVec, vector &trVec, Outline2Dumper::Param &pp) { vector< vector< vector > > polyVecVec(polyVec.size()); for(size_t i=0;i > &polyVec, vector &trVec, PolyDumper::Param &pp) +void Outline2Dumper::dumpOutline2VecPNG(const char * imageName, vector< vector > &polyVec, vector &trVec, Outline2Dumper::Param &pp) { vector< vector< vector > > polyVecVec(polyVec.size()); for(size_t i=0;i > > &polyVecVec, vector &trVec, PolyDumper::Param &pp) +void Outline2Dumper::dumpOutline2VecPNG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, Outline2Dumper::Param &pp) { vector labelVec; dumpOutline2VecPNG(imageName,polyVecVec,trVec,labelVec,pp); } -void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, PolyDumper::Param &pp) +void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, Outline2Dumper::Param &pp) { vector labelVec(polyVecVec.size()); dumpOutline2VecSVG(imageName,polyVecVec,trVec,labelVec,pp); @@ -96,7 +94,7 @@ void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vect ///this class draw a black mask fora given polygon, cenetered and scaled to fit with ///the image size, it return the transformation to tranform back the polygon to 2D space -void PolyDumper::DrawPolygonMask(const vector< vector > &polyVec, +void Outline2Dumper::DrawPolygonMask(const vector< vector > &polyVec, QImage &img, Similarity2f &ret, const Similarity2f &trans) @@ -161,7 +159,7 @@ void PolyDumper::DrawPolygonMask(const vector< vector > &polyVec, ///return the max radius of a point inside a polygon ,given the mask image ///actually it evaluate the maximum bounding box -int PolyDumper::getMaxMaskRadius(int x,int y,QImage &img) +int Outline2Dumper::getMaxMaskRadius(int x,int y,QImage &img) { int sizeY=img.size().height(); int sizeX=img.size().width(); @@ -197,7 +195,7 @@ int PolyDumper::getMaxMaskRadius(int x,int y,QImage &img) ///return the point inside the polygon with the bigger distance to the border, ///this is used to write labels within the polygon, it handle polygons with holes too -vcg::Point2f PolyDumper::GetIncenter(const vector< vector > &polyVec, +vcg::Point2f Outline2Dumper::GetIncenter(const vector< vector > &polyVec, const Similarity2f &tra1, int &radius, int resolution) @@ -263,7 +261,7 @@ vcg::Point2f PolyDumper::GetIncenter(const vector< vector > &polyVec, ///write a polygon on a PNG file, format of the polygon is vector of vector of contours...nested contours are holes ///takes the name of the image in input, the set of polygons, the set of per polygons transformation, ///the label to be written and the global parameter for drawing style -void PolyDumper::dumpOutline2VecPNG(const char * imageName, +void Outline2Dumper::dumpOutline2VecPNG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, vector &labelVec, @@ -336,13 +334,13 @@ void PolyDumper::dumpOutline2VecPNG(const char * imageName, ///write a polygon on a SVG file, format of the polygon is vector of vector of contours...nested contours are holes ///takes the name of the image in input, the set of polygons, the set of per polygons transformation, ///the label to be written and the global parameter for drawing style -void PolyDumper::dumpOutline2VecSVG(const char * imageName, +void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, vector< vector< string> > &labelVecVec, vector > &labelPosVecVec, vector >&labelRadVecVec, - PolyDumper::Param &pp) + Outline2Dumper::Param &pp) { assert(polyVecVec.size() == trVec.size()); @@ -430,11 +428,11 @@ void PolyDumper::dumpOutline2VecSVG(const char * imageName, painter.end(); } -void PolyDumper::dumpOutline2VecSVG(const char * imageName, +void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector > > &polyVecVec, vector &trVec, vector< string > &labelVec, - PolyDumper::Param &pp) + Outline2Dumper::Param &pp) { vector< vector< string> > labelVecVec(labelVec.size()); vector< vector > labelPosVec; diff --git a/wrap/qt/Outline2ToQImage.h b/wrap/qt/Outline2ToQImage.h index 8e780559..46589c09 100644 --- a/wrap/qt/Outline2ToQImage.h +++ b/wrap/qt/Outline2ToQImage.h @@ -12,7 +12,7 @@ ///parameters to the polygonal dumper ///this class is used to draw polygons on an image could be vectorial or not -class PolyDumper +class Outline2Dumper { public: class Param diff --git a/wrap/qt/outline2_rasterizer.cpp b/wrap/qt/outline2_rasterizer.cpp index 10213870..0f0bd7a9 100644 --- a/wrap/qt/outline2_rasterizer.cpp +++ b/wrap/qt/outline2_rasterizer.cpp @@ -1,16 +1,14 @@ -#include "qtpolyrasterizer.h" +#include #include #include "stdio.h" #include "math.h" -#include #include #include -#include using namespace vcg; using namespace std; -void QtPolyRasterizer::rasterize(RasterizedOutline2 &poly, +void QtOutline2Rasterizer::rasterize(RasterizedOutline2 &poly, float scale, int rast_i, int rotationNum, @@ -164,7 +162,7 @@ void QtPolyRasterizer::rasterize(RasterizedOutline2 &poly, // rotates the grid 90 degree clockwise (by simple swap) // used to lower the cost of rasterization. -vector > QtPolyRasterizer::rotateGridCWise(vector< vector >& inGrid) { +vector > QtOutline2Rasterizer::rotateGridCWise(vector< vector >& inGrid) { vector > outGrid(inGrid[0].size()); for (int i = 0; i < inGrid[0].size(); i++) { outGrid[i].reserve(inGrid.size()); diff --git a/wrap/qt/outline2_rasterizer.h b/wrap/qt/outline2_rasterizer.h index e94336e1..ced214f5 100644 --- a/wrap/qt/outline2_rasterizer.h +++ b/wrap/qt/outline2_rasterizer.h @@ -8,15 +8,10 @@ #include #include #include - -///this class is used to pass global -///parameters to the polygonal dumper -namespace vcg{ -class RasterizedOutline2; -} +#include ///this class is used to draw polygons on an image could be vectorial or not -class QtPolyRasterizer +class QtOutline2Rasterizer { public: static void rasterize(vcg::RasterizedOutline2 &poly,