manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Further cleaning up and factorization of the stuff for the raster outline packer

This commit is contained in:
Paolo Cignoni 2013-03-26 11:22:27 +00:00
parent 319f8404ea
commit a814a0b265
4 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
wrap/qt/Outline2ToQImage.cpp
View File

@ -1,11 +1,9 @@
#include "PolyToQImage.h"
#include "Outline2ToQImage.h"
#include <wrap/qt/col_qt_convert.h>
using namespace vcg;
using namespace std;
void PolyDumper::rectSetToOutline2Vec(vector< Box2f > &rectVec, vector< vector<Point2f> > &outline2Vec)
void Outline2Dumper::rectSetToOutline2Vec(vector< Box2f > &rectVec, vector< vector<Point2f> > &outline2Vec)
{
outline2Vec.clear();
for(size_t i=0;i<rectVec.size();++i)
@ -20,7 +18,7 @@ void PolyDumper::rectSetToOutline2Vec(vector< Box2f > &rectVec, vector< vector<P
}
void PolyDumper::multiRectSetToSingleOutline2Vec(vector< Box2f > &rectVec,
void Outline2Dumper::multiRectSetToSingleOutline2Vec(vector< Box2f > &rectVec,
vector<Similarity2f> &trVec, vector<int> &indVec,
int ind, vector< vector<Point2f> > &outline2Vec,
vector<Similarity2f> &trOutline2Vec)
@ -41,7 +39,7 @@ void PolyDumper::multiRectSetToSingleOutline2Vec(vector< Box2f > &rectVec,
}
}
void PolyDumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vector<Point2f> > &multiPolyVec,
void Outline2Dumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vector<Point2f> > &multiPolyVec,
const std::vector<Similarity2f> &multiTrVec,
const std::vector<int> &indVec, int ind,
std::vector< std::vector<Point2f> > &singlePolyVec,
@ -60,7 +58,7 @@ void PolyDumper::multiOutline2VecToSingleOutline2Vec(const std::vector< std::vec
}
void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector<Point2f> > &polyVec, vector<Similarity2f> &trVec, PolyDumper::Param &pp)
void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector<Point2f> > &polyVec, vector<Similarity2f> &trVec, Outline2Dumper::Param &pp)
{
vector< vector< vector<Point2f> > > polyVecVec(polyVec.size());
for(size_t i=0;i<polyVec.size();++i)
@ -71,7 +69,7 @@ void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector<Point
dumpOutline2VecSVG(imageName,polyVecVec,trVec,pp);
}
void PolyDumper::dumpOutline2VecPNG(const char * imageName, vector< vector<Point2f> > &polyVec, vector<Similarity2f> &trVec, PolyDumper::Param &pp)
void Outline2Dumper::dumpOutline2VecPNG(const char * imageName, vector< vector<Point2f> > &polyVec, vector<Similarity2f> &trVec, Outline2Dumper::Param &pp)
{
vector< vector< vector<Point2f> > > polyVecVec(polyVec.size());
for(size_t i=0;i<polyVec.size();++i)
@ -82,13 +80,13 @@ void PolyDumper::dumpOutline2VecPNG(const char * imageName, vector< vector<Point
dumpOutline2VecPNG(imageName,polyVecVec,trVec,pp);
}
void PolyDumper::dumpOutline2VecPNG(const char * imageName, vector< vector< vector<Point2f> > > &polyVecVec, vector<Similarity2f> &trVec, PolyDumper::Param &pp)
void Outline2Dumper::dumpOutline2VecPNG(const char * imageName, vector< vector< vector<Point2f> > > &polyVecVec, vector<Similarity2f> &trVec, Outline2Dumper::Param &pp)
{
vector<string> labelVec;
dumpOutline2VecPNG(imageName,polyVecVec,trVec,labelVec,pp);
}
void PolyDumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector<Point2f> > > &polyVecVec, vector<Similarity2f> &trVec, PolyDumper::Param &pp)
void Outline2Dumper::dumpOutline2VecSVG(const char * imageName, vector< vector< vector<Point2f> > > &polyVecVec, vector<Similarity2f> &trVec, Outline2Dumper::Param &pp)
{
vector<string> 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<Point2f> > &polyVec,
void Outline2Dumper::DrawPolygonMask(const vector< vector<Point2f> > &polyVec,
QImage &img,
Similarity2f &ret,
const Similarity2f &trans)
@ -161,7 +159,7 @@ void PolyDumper::DrawPolygonMask(const vector< vector<Point2f> > &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<Point2f> > &polyVec,
vcg::Point2f Outline2Dumper::GetIncenter(const vector< vector<Point2f> > &polyVec,
const Similarity2f &tra1,
int &radius,
int resolution)
@ -263,7 +261,7 @@ vcg::Point2f PolyDumper::GetIncenter(const vector< vector<Point2f> > &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<Point2f> > > &polyVecVec,
vector<Similarity2f> &trVec,
vector<string> &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<Point2f> > > &polyVecVec,
vector<Similarity2f> &trVec,
vector< vector< string> > &labelVecVec,
vector<vector<Point2f> > &labelPosVecVec,
vector<vector<float> >&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<Point2f> > > &polyVecVec,
vector<Similarity2f> &trVec,
vector< string > &labelVec,
PolyDumper::Param &pp)
Outline2Dumper::Param &pp)
{
vector< vector< string> > labelVecVec(labelVec.size());
vector< vector<Point2f> > labelPosVec;

2
wrap/qt/Outline2ToQImage.h
View File

@ -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

8
wrap/qt/outline2_rasterizer.cpp
View File

@ -1,16 +1,14 @@
#include "qtpolyrasterizer.h"
#include <wrap/qt/outline2_rasterizer.h>
#include <wrap/qt/col_qt_convert.h>
#include "stdio.h"
#include "math.h"
#include <QDebug>
#include <vcg/space/color4.h>
#include <wrap/qt/col_qt_convert.h>
#include <new_polypacker.h>
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<vector<int> > QtPolyRasterizer::rotateGridCWise(vector< vector<int> >& inGrid) {
vector<vector<int> > QtOutline2Rasterizer::rotateGridCWise(vector< vector<int> >& inGrid) {
vector<vector<int> > outGrid(inGrid[0].size());
for (int i = 0; i < inGrid[0].size(); i++) {
outGrid[i].reserve(inGrid.size());

9
wrap/qt/outline2_rasterizer.h
View File

@ -8,15 +8,10 @@
#include <vcg/space/color4.h>
#include <vcg/space/box2.h>
#include <vcg/math/similarity2.h>
///this class is used to pass global
///parameters to the polygonal dumper
namespace vcg{
class RasterizedOutline2;
}
#include <vcg/space/rasterized_outline2_packer.h>
///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,