diff --git a/Geo/GModel.cpp b/Geo/GModel.cpp index 640103aa32c41d9b55ba76469abcf90f9f62ff59..6406bd99f9d5db663736b79a354202f00e8f0297 100644 --- a/Geo/GModel.cpp +++ b/Geo/GModel.cpp @@ -2663,10 +2663,12 @@ GEdge *GModel::addNURBS(GVertex *start, GVertex *end, return 0; } -void GModel::addRuledFaces (std::vector<std::vector<GEdge *> > edges) +std::vector<GFace *> GModel::addRuledFaces (std::vector<std::vector<GEdge *> > edges) { + std::vector<GFace *> faces; if(_factory) - _factory->addRuledFaces(this, edges); + faces = _factory->addRuledFaces(this, edges); + return faces; } GFace* GModel::addFace (std::vector<GEdge *> edges, @@ -2677,13 +2679,15 @@ GFace* GModel::addFace (std::vector<GEdge *> edges, return 0; } -GFace* GModel::addPlanarFace (std::vector<std::vector<GEdge *> > edges){ +GFace* GModel::addPlanarFace (std::vector<std::vector<GEdge *> > edges) +{ if(_factory) return _factory->addPlanarFace(this, edges); return 0; } -GRegion* GModel::addVolume (std::vector<std::vector<GFace *> > faces){ +GRegion* GModel::addVolume (std::vector<std::vector<GFace *> > faces) +{ if(_factory) return _factory->addVolume(this, faces); return 0; @@ -2718,7 +2722,8 @@ GEntity *GModel::extrude(GEntity *e, std::vector<double> p1, std::vector<double> return 0; } -std::vector<GEntity*> GModel::extrudeBoundaryLayer(GEntity *e, int nbLayers, double hLayers, int dir, int view) +std::vector<GEntity*> GModel::extrudeBoundaryLayer(GEntity *e, int nbLayers, + double hLayers, int dir, int view) { if(_factory) return _factory->extrudeBoundaryLayer(this, e, nbLayers,hLayers, dir, view); diff --git a/Geo/GModel.h b/Geo/GModel.h index 6a973115a80a71d39c7021842334a5de56fa382b..e165f688273570d63805414de53397b78447851a 100644 --- a/Geo/GModel.h +++ b/Geo/GModel.h @@ -501,7 +501,7 @@ class GModel int dir=1, int view=-1); GEntity *addPipe(GEntity *e, std::vector<GEdge *> edges); - void addRuledFaces(std::vector<std::vector<GEdge *> > edges); + std::vector<GFace *> addRuledFaces(std::vector<std::vector<GEdge *> > edges); GFace *addFace(std::vector<GEdge *> edges, std::vector< std::vector<double > > points); GFace *addPlanarFace(std::vector<std::vector<GEdge *> > edges); GFace *add2Drect(double x0, double y0, double dx, double dy); diff --git a/Geo/GModelFactory.cpp b/Geo/GModelFactory.cpp index b3c85fe7247dbb6db0fb08a466561adac9fd0a22..a3588c6ce233da2bf6c39d2a988ac5e55f84d418 100644 --- a/Geo/GModelFactory.cpp +++ b/Geo/GModelFactory.cpp @@ -1411,7 +1411,7 @@ void OCCFactory::rotate(GModel *gm, std::vector<double> p1, std::vector<double> } std::vector<GFace *> OCCFactory::addRuledFaces(GModel *gm, - std::vector< std::vector<GEdge *> > wires) + std::vector< std::vector<GEdge *> > wires) { std::vector<GFace*> faces; Standard_Boolean anIsSolid = Standard_False;