X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.cpp;h=a66bd9ffb1b6a3040a79c005147862739e5db233;hb=d2c592943592ae2d6118e1881ea899df81d692dc;hp=144caa3369e54ea25e8f89a6c54052a4fcf229b6;hpb=67b92ad7f2e5de8c032f0bbea941dea3534696dc;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp index 144caa336..a66bd9ffb 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.cpp +++ b/src/SketchPlugin/SketchPlugin_Sketch.cpp @@ -2,26 +2,33 @@ // Created: 27 Mar 2014 // Author: Mikhail PONIKAROV -#include "SketchPlugin_Sketch.h" -#include -#include +#include + +#include +#include + #include +#include +#include #include + #include #include -#include -#include -#include + +#include +#include +#include +#include +#include #include +#include -using namespace std; +#include -const int SKETCH_PLANE_COLOR = Colors::COLOR_BROWN; /// the plane edge color -const double SKETCH_WIDTH = 4.0; /// the plane edge width -// face of the square-face displayed for selection of general plane -const double PLANE_SIZE = 200; +#include +using namespace std; SketchPlugin_Sketch::SketchPlugin_Sketch() { @@ -36,39 +43,38 @@ void SketchPlugin_Sketch::initAttributes() data()->addAttribute(SketchPlugin_Sketch::FEATURES_ID(), ModelAPI_AttributeRefList::type()); } -void SketchPlugin_Sketch::execute() +void SketchPlugin_Sketch::execute() { if (!data()->isValid()) - return ; - boost::shared_ptr aRefList = - boost::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Sketch::FEATURES_ID())); - - boost::shared_ptr anOrigin = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aDirX = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::DIRX_ID())); - boost::shared_ptr aDirY = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::DIRY_ID())); - boost::shared_ptr aNorm = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::NORM_ID())); + return; + boost::shared_ptr aRefList = boost::dynamic_pointer_cast< + ModelAPI_AttributeRefList>(data()->attribute(SketchPlugin_Sketch::FEATURES_ID())); + + boost::shared_ptr anOrigin = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); + boost::shared_ptr aDirX = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRX_ID())); + boost::shared_ptr aDirY = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRY_ID())); + boost::shared_ptr aNorm = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::NORM_ID())); std::list aFeatures = aRefList->list(); if (aFeatures.empty()) - return ; + return; std::list::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end(); boost::shared_ptr aFeature; - std::list< boost::shared_ptr > aFeaturesPreview; + std::list > aFeaturesPreview; for (; anIt != aLast; anIt++) { aFeature = boost::dynamic_pointer_cast(*anIt); if (aFeature) { const std::list >& aRes = aFeature->results(); std::list >::const_iterator aResIter = aRes.cbegin(); - for(; aResIter != aRes.cend(); aResIter++) { - boost::shared_ptr aConstr = - boost::dynamic_pointer_cast(*aResIter); + for (; aResIter != aRes.cend(); aResIter++) { + boost::shared_ptr aConstr = boost::dynamic_pointer_cast< + ModelAPI_ResultConstruction>(*aResIter); if (aConstr) { boost::shared_ptr aShape = aConstr->shape(); if (aShape) @@ -79,54 +85,81 @@ void SketchPlugin_Sketch::execute() } if (aFeaturesPreview.empty()) - return ; - std::list< boost::shared_ptr > aLoops; - std::list< boost::shared_ptr > aWires; - GeomAlgoAPI_SketchBuilder::createFaces(anOrigin->pnt(), aDirX->dir(), aDirY->dir(), aNorm->dir(), - aFeaturesPreview, aLoops, aWires); - - aLoops.insert(aLoops.end(), aWires.begin(), aWires.end()); - boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aLoops); + return; + + // Collect all edges as one big wire + boost::shared_ptr aBigWire(new GeomAPI_PlanarEdges); + std::list >::const_iterator aShapeIt = aFeaturesPreview.begin(); + for (; aShapeIt != aFeaturesPreview.end(); ++aShapeIt) { + aBigWire->addEdge(*aShapeIt); + } + aBigWire->setOrigin(anOrigin->pnt()); + aBigWire->setDirX(aDirX->dir()); + aBigWire->setDirY(aDirY->dir()); + aBigWire->setNorm(aNorm->dir()); + +// GeomAlgoAPI_SketchBuilder::createFaces(anOrigin->pnt(), aDirX->dir(), aDirY->dir(), aNorm->dir(), +// aFeaturesPreview, aLoops, aWires); boost::shared_ptr aConstr = document()->createConstruction(data()); - aConstr->setShape(aCompound); + aConstr->setShape(aBigWire); setResult(aConstr); } -const void SketchPlugin_Sketch::addSub(const FeaturePtr& theFeature) +boost::shared_ptr SketchPlugin_Sketch::addFeature(std::string theID) +{ + boost::shared_ptr aNew = document()->addFeature(theID); + if (aNew) { + boost::dynamic_pointer_cast(aNew)->setSketch(this); + data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->append(aNew); + } + return aNew; +} + +int SketchPlugin_Sketch::numberOfSubs() const +{ + return data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->size(); +} + +boost::shared_ptr SketchPlugin_Sketch::subFeature(const int theIndex) const { - boost::dynamic_pointer_cast(theFeature)->setSketch(this); - data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->append(theFeature); + ObjectPtr anObj = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->object(theIndex); + return boost::dynamic_pointer_cast(anObj); +} + +int SketchPlugin_Sketch::subFeatureId(const int theIndex) const +{ + return subFeature(theIndex)->data()->featureId(); } boost::shared_ptr SketchPlugin_Sketch::to3D(const double theX, const double theY) { - boost::shared_ptr aC = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aX = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::DIRX_ID())); - boost::shared_ptr aY = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::DIRY_ID())); + boost::shared_ptr aC = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); + boost::shared_ptr aX = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRX_ID())); + boost::shared_ptr aY = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRY_ID())); - boost::shared_ptr aSum = aC->pnt()->xyz()->added( - aX->dir()->xyz()->multiplied(theX))->added(aY->dir()->xyz()->multiplied(theY)); + boost::shared_ptr aSum = aC->pnt()->xyz()->added(aX->dir()->xyz()->multiplied(theX)) + ->added(aY->dir()->xyz()->multiplied(theY)); return boost::shared_ptr(new GeomAPI_Pnt(aSum)); } bool SketchPlugin_Sketch::isPlaneSet() { - boost::shared_ptr aNormal = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::NORM_ID())); + boost::shared_ptr aNormal = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::NORM_ID())); return aNormal && !(aNormal->x() == 0 && aNormal->y() == 0 && aNormal->z() == 0); } boost::shared_ptr SketchPlugin_Sketch::plane() { - boost::shared_ptr anOrigin = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aNorm = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::NORM_ID())); + boost::shared_ptr anOrigin = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); + boost::shared_ptr aNorm = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::NORM_ID())); if (!anOrigin || !aNorm) return boost::shared_ptr(); @@ -134,50 +167,58 @@ boost::shared_ptr SketchPlugin_Sketch::plane() return boost::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); } -void addPlane(double theX, double theY, double theZ, std::list >& theShapes) +void addPlane(double theX, double theY, double theZ, + std::list >& theShapes) { boost::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); boost::shared_ptr aNormal(new GeomAPI_Dir(theX, theY, theZ)); - boost::shared_ptr aFace = - GeomAlgoAPI_FaceBuilder::square(anOrigin, aNormal, PLANE_SIZE); + double aSize = Config_PropManager::integer("Sketch planes", "Size of planes", PLANE_SIZE); + boost::shared_ptr aFace = GeomAlgoAPI_FaceBuilder::square(anOrigin, aNormal, + aSize); theShapes.push_back(aFace); } -boost::shared_ptr SketchPlugin_Sketch:: - getAISObject(boost::shared_ptr thePrevious) +AISObjectPtr SketchPlugin_Sketch::getAISObject(AISObjectPtr thePrevious) { - boost::shared_ptr aNorm = - boost::dynamic_pointer_cast(data()->attribute(SketchPlugin_Sketch::NORM_ID())); + boost::shared_ptr aNorm = boost::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::NORM_ID())); if (!aNorm || (aNorm->x() == 0 && aNorm->y() == 0 && aNorm->z() == 0)) { - boost::shared_ptr aAIS = thePrevious; + AISObjectPtr aAIS = thePrevious; if (!aAIS) { std::list > aFaces; - addPlane(1, 0, 0, aFaces); // YZ plane - addPlane(0, 1, 0, aFaces); // XZ plane - addPlane(0, 0, 1, aFaces); // XY plane + addPlane(1, 0, 0, aFaces); // YZ plane + addPlane(0, 1, 0, aFaces); // XZ plane + addPlane(0, 0, 1, aFaces); // XY plane boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aFaces); - aAIS = boost::shared_ptr(new GeomAPI_AISObject()); + aAIS = AISObjectPtr(new GeomAPI_AISObject()); aAIS->createShape(aCompound); - aAIS->setColor(SKETCH_PLANE_COLOR); - aAIS->setWidth(SKETCH_WIDTH); + + std::vector aRGB = Config_PropManager::color("Sketch planes", "planes_color", + SKETCH_PLANE_COLOR); + aAIS->setColor(aRGB[0], aRGB[1], aRGB[2]); + + aAIS->setWidth(Config_PropManager::integer("Sketch planes", "planes_thickness", + SKETCH_WIDTH)); } return aAIS; } - return boost::shared_ptr(); + return AISObjectPtr(); } -FeaturePtr SketchPlugin_Sketch::getFeature(ObjectPtr theObject) +void SketchPlugin_Sketch::erase() { - FeaturePtr aFeature = boost::dynamic_pointer_cast(theObject); - if (!aFeature) { - ResultPtr aResult = boost::dynamic_pointer_cast(theObject); - if (aResult) { - PluginManagerPtr aMgr = ModelAPI_PluginManager::get(); - DocumentPtr aDoc = aMgr->rootDocument(); - return aDoc->feature(aResult); + boost::shared_ptr aRefList = boost::dynamic_pointer_cast< + ModelAPI_AttributeRefList>(data()->attribute(SketchPlugin_Sketch::FEATURES_ID())); + std::list aFeatures = aRefList->list(); + std::list::const_iterator anIt = aFeatures.begin(); + for (; anIt != aFeatures.end(); anIt++) { + FeaturePtr aFeature = boost::dynamic_pointer_cast(*anIt); + if (aFeature) { + // subs are referenced from sketch, but must be removed for sure, so not checkings + document()->removeFeature(aFeature, false); } } - return aFeature; -} \ No newline at end of file + ModelAPI_CompositeFeature::erase(); +}