X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.cpp;h=64b0c09f6f36f39ddaa0dd51a6c0f9071ec65e01;hb=af6247648ee46f0c5a829bc142b75b91254e410c;hp=256ba9d5e5057573512dfde8770fe3bb6569fac1;hpb=f54f110afd9cf0f574384bedaeae8b51654b18a9;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp index 256ba9d5e..64b0c09f6 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.cpp +++ b/src/SketchPlugin/SketchPlugin_Sketch.cpp @@ -1,20 +1,37 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_Sketch.cxx // 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 +#include -#include +#include +#include +#include + +#include + +#include +#include using namespace std; @@ -24,27 +41,28 @@ SketchPlugin_Sketch::SketchPlugin_Sketch() void SketchPlugin_Sketch::initAttributes() { - data()->addAttribute(SketchPlugin_Sketch::ORIGIN_ID(), GeomDataAPI_Point::type()); - data()->addAttribute(SketchPlugin_Sketch::DIRX_ID(), GeomDataAPI_Dir::type()); - data()->addAttribute(SketchPlugin_Sketch::DIRY_ID(), GeomDataAPI_Dir::type()); - data()->addAttribute(SketchPlugin_Sketch::NORM_ID(), GeomDataAPI_Dir::type()); - data()->addAttribute(SketchPlugin_Sketch::FEATURES_ID(), ModelAPI_AttributeRefList::type()); + data()->addAttribute(SketchPlugin_Sketch::ORIGIN_ID(), GeomDataAPI_Point::typeId()); + data()->addAttribute(SketchPlugin_Sketch::DIRX_ID(), GeomDataAPI_Dir::typeId()); + data()->addAttribute(SketchPlugin_Sketch::NORM_ID(), GeomDataAPI_Dir::typeId()); + data()->addAttribute(SketchPlugin_Sketch::FEATURES_ID(), ModelAPI_AttributeRefList::typeId()); + // the selected face, base for the sketcher plane, not obligatory + data()->addAttribute(SketchPlugin_SketchEntity::EXTERNAL_ID(), ModelAPI_AttributeSelection::typeId()); + ModelAPI_Session::get()->validators()->registerNotObligatory( + getKind(), SketchPlugin_SketchEntity::EXTERNAL_ID()); } void SketchPlugin_Sketch::execute() { if (!data()->isValid()) return; - boost::shared_ptr aRefList = boost::dynamic_pointer_cast< + std::shared_ptr aRefList = std::dynamic_pointer_cast< ModelAPI_AttributeRefList>(data()->attribute(SketchPlugin_Sketch::FEATURES_ID())); - boost::shared_ptr anOrigin = boost::dynamic_pointer_cast( + std::shared_ptr anOrigin = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aDirX = boost::dynamic_pointer_cast( + std::shared_ptr aDirX = std::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( + std::shared_ptr aNorm = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::NORM_ID())); std::list aFeatures = aRefList->list(); @@ -52,19 +70,31 @@ void SketchPlugin_Sketch::execute() return; std::list::const_iterator anIt = aFeatures.begin(), aLast = aFeatures.end(); - boost::shared_ptr aFeature; - std::list > aFeaturesPreview; + std::shared_ptr aFeature; + std::list > aFeaturesPreview; for (; anIt != aLast; anIt++) { - aFeature = boost::dynamic_pointer_cast(*anIt); + aFeature = std::dynamic_pointer_cast(*anIt); if (aFeature) { + if (!aFeature->sketch()) // on load document the back references are missed + aFeature->setSketch(this); + // do not include the external edges into the result + if (aFeature->data()->attribute(SketchPlugin_SketchEntity::EXTERNAL_ID())) { + if (aFeature->data()->selection(SketchPlugin_SketchEntity::EXTERNAL_ID())->value()) + continue; + } + // do not include the construction entities in the result + if (aFeature->data()->attribute(SketchPlugin_SketchEntity::AUXILIARY_ID())) { + if (aFeature->data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value()) + continue; + } - const std::list >& aRes = aFeature->results(); - std::list >::const_iterator aResIter = aRes.cbegin(); + 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< + std::shared_ptr aConstr = std::dynamic_pointer_cast< ModelAPI_ResultConstruction>(*aResIter); if (aConstr) { - boost::shared_ptr aShape = aConstr->shape(); + std::shared_ptr aShape = aConstr->shape(); if (aShape) aFeaturesPreview.push_back(aShape); } @@ -74,110 +104,141 @@ void SketchPlugin_Sketch::execute() if (aFeaturesPreview.empty()) return; - std::list > aLoops; - std::list > 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); - boost::shared_ptr aConstr = document()->createConstruction(data()); - aConstr->setShape(aCompound); + + // Collect all edges as one big wire + std::shared_ptr aBigWire(new GeomAPI_PlanarEdges); + std::list >::const_iterator aShapeIt = aFeaturesPreview.begin(); + for (; aShapeIt != aFeaturesPreview.end(); ++aShapeIt) { + aBigWire->addEdge(*aShapeIt); + } + aBigWire->setPlane(anOrigin->pnt(), aDirX->dir(), aNorm->dir()); + std::shared_ptr aConstr = document()->createConstruction(data()); + aConstr->setShape(aBigWire); setResult(aConstr); } -const void SketchPlugin_Sketch::addSub(const FeaturePtr& theFeature) +std::shared_ptr SketchPlugin_Sketch::addFeature(std::string theID) { - boost::dynamic_pointer_cast(theFeature)->setSketch(this); - data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->append(theFeature); + std::shared_ptr aNew = document()->addFeature(theID); + if (aNew) { + std::dynamic_pointer_cast(aNew)->setSketch(this); + data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->append(aNew); + } + return aNew; } -boost::shared_ptr SketchPlugin_Sketch::to3D(const double theX, const double theY) +void SketchPlugin_Sketch::removeFeature(std::shared_ptr theFeature) { - 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)); - - return boost::shared_ptr(new GeomAPI_Pnt(aSum)); + if (!data().get()) // sketch is already removed (case on undo of sketch), sync is not needed + return; + list aSubs = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->list(); + list::iterator aSubIt = aSubs.begin(), aLastIt = aSubs.end(); + bool isRemoved = false; + bool aHasEmtpyFeature = false; + for(; aSubIt != aLastIt && !isRemoved; aSubIt++) { + std::shared_ptr aFeature = std::dynamic_pointer_cast(*aSubIt); + if (aFeature.get() != NULL && aFeature == theFeature) { + data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->remove(aFeature); + isRemoved = true; + } + else if (aFeature.get() == NULL) + aHasEmtpyFeature = true; + } + // if the object is not found in the sketch sub-elements, that means that the object is removed already. + // Find the first empty element and remove it + if (!isRemoved && aHasEmtpyFeature) + data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->remove(ObjectPtr()); } -bool SketchPlugin_Sketch::isPlaneSet() +int SketchPlugin_Sketch::numberOfSubs() const { - 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); + return data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->size(); } -boost::shared_ptr SketchPlugin_Sketch::plane() +std::shared_ptr SketchPlugin_Sketch::subFeature(const int theIndex) const { - 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(); - - return boost::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); + ObjectPtr anObj = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->object(theIndex); + return std::dynamic_pointer_cast(anObj); } -void addPlane(double theX, double theY, double theZ, - std::list >& theShapes) +int SketchPlugin_Sketch::subFeatureId(const int theIndex) const { - boost::shared_ptr anOrigin(new GeomAPI_Pnt(0, 0, 0)); - boost::shared_ptr aNormal(new GeomAPI_Dir(theX, theY, theZ)); - 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); + return subFeature(theIndex)->data()->featureId(); } -AISObjectPtr SketchPlugin_Sketch::getAISObject(AISObjectPtr thePrevious) +bool SketchPlugin_Sketch::isSub(ObjectPtr theObject) const { - 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)) { - 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 - boost::shared_ptr aCompound = GeomAlgoAPI_CompoundBuilder::compound(aFaces); - aAIS = AISObjectPtr(new GeomAPI_AISObject()); - aAIS->createShape(aCompound); - - 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_thikness", - SKETCH_WIDTH)); + // check is this feature of result + FeaturePtr aFeature = std::dynamic_pointer_cast(theObject); + if (!aFeature) { + ResultPtr aRes = std::dynamic_pointer_cast(theObject); + if (aRes) + aFeature = document()->feature(aRes); + } + if (aFeature) { + list aSubs = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->list(); + for(list::iterator aSubIt = aSubs.begin(); aSubIt != aSubs.end(); aSubIt++) { + if (*aSubIt == aFeature) + return true; } - return aAIS; } - return AISObjectPtr(); + return false; } + void SketchPlugin_Sketch::erase() { - boost::shared_ptr aRefList = boost::dynamic_pointer_cast< + std::shared_ptr aRefList = std::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) + FeaturePtr aFeature = std::dynamic_pointer_cast(*anIt); + if (aFeature) { + // subs are referenced from sketch, but must be removed for sure, so not checkings document()->removeFeature(aFeature); + } + } + ModelAPI_CompositeFeature::erase(); +} + +void SketchPlugin_Sketch::attributeChanged(const std::string& theID) { + if (theID == SketchPlugin_SketchEntity::EXTERNAL_ID()) { + std::shared_ptr aSelection = + data()->selection(SketchPlugin_SketchEntity::EXTERNAL_ID())->value(); + if (aSelection) { // update arguments due to the selection value + // update the sketch plane + std::shared_ptr aPlane = GeomAlgoAPI_FaceBuilder::plane(aSelection); + if (aPlane) { + double anA, aB, aC, aD; + aPlane->coefficients(anA, aB, aC, aD); + + // calculate attributes of the sketch + std::shared_ptr aNormDir(new GeomAPI_Dir(anA, aB, aC)); + std::shared_ptr aCoords = aNormDir->xyz(); + std::shared_ptr aZero(new GeomAPI_XYZ(0, 0, 0)); + aCoords = aCoords->multiplied(-aD * aCoords->distance(aZero)); + std::shared_ptr anOrigPnt(new GeomAPI_Pnt(aCoords)); + // X axis is preferable to be dirX on the sketch + static const double tol = 1.e-7; + bool isX = fabs(anA - 1.0) < tol && fabs(aB) < tol && fabs(aC) < tol; + std::shared_ptr aTempDir( + isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); + std::shared_ptr aYDir(new GeomAPI_Dir(aNormDir->cross(aTempDir))); + std::shared_ptr aXDir(new GeomAPI_Dir(aYDir->cross(aNormDir))); + + // update position of the sketch + std::shared_ptr anOrigin = std::dynamic_pointer_cast + (data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); + anOrigin->setValue(anOrigPnt); + std::shared_ptr aNormal = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::NORM_ID())); + aNormal->setValue(aNormDir); + std::shared_ptr aDirX = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRX_ID())); + aDirX->setValue(aXDir); + std::shared_ptr aDir = aPlane->direction(); + } + } } - SketchPlugin_Feature::erase(); }