Commit 966fe39f authored by Jund Thomas's avatar Jund Thomas
Browse files

importSVG: removing some display and minor correct

parent 4b268fba
...@@ -239,8 +239,6 @@ void readCoordAndStyle(xmlNode* cur_path, ...@@ -239,8 +239,6 @@ void readCoordAndStyle(xmlNode* cur_path,
it2 = curPoly.begin(); it2 = curPoly.begin();
} }
std::cout << "v " << v << std::endl;
if(v[2]>0) if(v[2]>0)
{ {
std::reverse(curPoly.begin(), curPoly.end()); std::reverse(curPoly.begin(), curPoly.end());
...@@ -381,7 +379,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib ...@@ -381,7 +379,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
bb = Algo::Geometry::computeBoundingBox<PFP>(map, position) ; bb = Algo::Geometry::computeBoundingBox<PFP>(map, position) ;
float tailleX = bb.size(0) ; float tailleX = bb.size(0) ;
float tailleY = bb.size(1) ; float tailleY = bb.size(1) ;
float tailleM = std::max<float>(tailleX, tailleY) / 80 ; float tailleM = std::max<float>(tailleX, tailleY) / 30 ;
std::cout << "bounding box = " << tailleX << " X " << tailleY << std::endl; std::cout << "bounding box = " << tailleX << " X " << tailleY << std::endl;
for(Dart d = map.begin();d != map.end(); map.next(d)) for(Dart d = map.begin();d != map.end(); map.next(d))
...@@ -393,9 +391,10 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib ...@@ -393,9 +391,10 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
std::cout << "importSVG : Polygons generated." << std::endl; std::cout << "importSVG : Polygons generated." << std::endl;
///////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////
unsigned int count = 0 ;
//cut the edges to have a more regular sampling //cut the edges to have a more regular sampling
TraversorE<typename PFP::MAP> edges(map) ; TraversorE<typename PFP::MAP> edges(map) ;
unsigned int count = 0 ;
for (Dart d = edges.begin() ; d != edges.end() ; d = edges.next()) for (Dart d = edges.begin() ; d != edges.end() ; d = edges.next())
{ {
if (!buildingMark.isMarked(d)) if (!buildingMark.isMarked(d))
...@@ -558,6 +557,13 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib ...@@ -558,6 +557,13 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
} }
map.closeMap(); map.closeMap();
for (Dart d = map.begin() ; d != map.end() ; map.next(d))
{
if (map.isBoundaryMarked(d))
buildingMark.mark(d);
}
} }
return true ; return true ;
......
...@@ -125,7 +125,7 @@ public: ...@@ -125,7 +125,7 @@ public:
*************************************************************************/ *************************************************************************/
//@{ //@{
//! Create an new polyline of nbEdges, i.e 2*nbEdges darts pairewise sewn by phi2 //! Create an new polyline of nbEdges, i.e 2*nbEdges darts pairwise sewn by phi2
/*! @param nbEdges the number of edges /*! @param nbEdges the number of edges
* @return return a dart of the face * @return return a dart of the face
*/ */
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment