X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSketchPlugin%2FSketchPlugin_Sketch.cpp;h=67fd1be899f23b7c4835f135abe87ed7b749f1b7;hb=b69a4c4ae0f7eb0e9c17d3db0229b04b1fe77ecf;hp=e1ac62b0c8c03519117e1aa950f11469dff472d9;hpb=f47c90a323b39a5c01cee810005e2094ffbb07ea;p=modules%2Fshaper.git diff --git a/src/SketchPlugin/SketchPlugin_Sketch.cpp b/src/SketchPlugin/SketchPlugin_Sketch.cpp index e1ac62b0c..67fd1be89 100644 --- a/src/SketchPlugin/SketchPlugin_Sketch.cpp +++ b/src/SketchPlugin/SketchPlugin_Sketch.cpp @@ -1,3 +1,5 @@ +// Copyright (C) 2014-20xx CEA/DEN, EDF R&D --> + // File: SketchPlugin_Sketch.cxx // Created: 27 Mar 2014 // Author: Mikhail PONIKAROV @@ -28,7 +30,7 @@ #include #include -#include +#include #include #include @@ -56,16 +58,16 @@ 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( + std::shared_ptr aDirY = std::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(); @@ -73,10 +75,10 @@ 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); @@ -86,13 +88,13 @@ void SketchPlugin_Sketch::execute() 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); } @@ -104,8 +106,8 @@ void SketchPlugin_Sketch::execute() return; // Collect all edges as one big wire - boost::shared_ptr aBigWire(new GeomAPI_PlanarEdges); - std::list >::const_iterator aShapeIt = aFeaturesPreview.begin(); + std::shared_ptr aBigWire(new GeomAPI_PlanarEdges); + std::list >::const_iterator aShapeIt = aFeaturesPreview.begin(); for (; aShapeIt != aFeaturesPreview.end(); ++aShapeIt) { aBigWire->addEdge(*aShapeIt); } @@ -116,30 +118,53 @@ void SketchPlugin_Sketch::execute() // GeomAlgoAPI_SketchBuilder::createFaces(anOrigin->pnt(), aDirX->dir(), aDirY->dir(), aNorm->dir(), // aFeaturesPreview, aLoops, aWires); - boost::shared_ptr aConstr = document()->createConstruction(data()); + std::shared_ptr aConstr = document()->createConstruction(data()); aConstr->setShape(aBigWire); setResult(aConstr); } -boost::shared_ptr SketchPlugin_Sketch::addFeature(std::string theID) +std::shared_ptr SketchPlugin_Sketch::addFeature(std::string theID) { - boost::shared_ptr aNew = document()->addFeature(theID); + std::shared_ptr aNew = document()->addFeature(theID); if (aNew) { - boost::dynamic_pointer_cast(aNew)->setSketch(this); + std::dynamic_pointer_cast(aNew)->setSketch(this); data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->append(aNew); } return aNew; } +void SketchPlugin_Sketch::removeFeature(ModelAPI_Feature* theFeature) +{ + 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.get() == 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()); +} + int SketchPlugin_Sketch::numberOfSubs() const { return data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->size(); } -boost::shared_ptr SketchPlugin_Sketch::subFeature(const int theIndex) const +std::shared_ptr SketchPlugin_Sketch::subFeature(const int theIndex) const { ObjectPtr anObj = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->object(theIndex); - return boost::dynamic_pointer_cast(anObj); + return std::dynamic_pointer_cast(anObj); } int SketchPlugin_Sketch::subFeatureId(const int theIndex) const @@ -150,9 +175,9 @@ int SketchPlugin_Sketch::subFeatureId(const int theIndex) const bool SketchPlugin_Sketch::isSub(ObjectPtr theObject) const { // check is this feature of result - FeaturePtr aFeature = boost::dynamic_pointer_cast(theObject); + FeaturePtr aFeature = std::dynamic_pointer_cast(theObject); if (!aFeature) { - ResultPtr aRes = boost::dynamic_pointer_cast(theObject); + ResultPtr aRes = std::dynamic_pointer_cast(theObject); if (aRes) aFeature = document()->feature(aRes); } @@ -166,29 +191,29 @@ bool SketchPlugin_Sketch::isSub(ObjectPtr theObject) const return false; } -boost::shared_ptr SketchPlugin_Sketch::to3D(const double theX, const double theY) +std::shared_ptr SketchPlugin_Sketch::to3D(const double theX, const double theY) { - boost::shared_ptr aC = boost::dynamic_pointer_cast( + std::shared_ptr aC = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aX = boost::dynamic_pointer_cast( + std::shared_ptr aX = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::DIRX_ID())); - boost::shared_ptr aY = boost::dynamic_pointer_cast( + std::shared_ptr aY = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::DIRY_ID())); - boost::shared_ptr aSum = aC->pnt()->xyz()->added(aX->dir()->xyz()->multiplied(theX)) + std::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)); + return std::shared_ptr(new GeomAPI_Pnt(aSum)); } -boost::shared_ptr SketchPlugin_Sketch::to2D( - const boost::shared_ptr& thePnt) +std::shared_ptr SketchPlugin_Sketch::to2D( + const std::shared_ptr& thePnt) { - boost::shared_ptr aC = boost::dynamic_pointer_cast( + std::shared_ptr aC = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - boost::shared_ptr aX = boost::dynamic_pointer_cast( + std::shared_ptr aX = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::DIRX_ID())); - boost::shared_ptr aY = boost::dynamic_pointer_cast( + std::shared_ptr aY = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::DIRY_ID())); return thePnt->to2D(aC->pnt(), aX->dir(), aY->dir()); } @@ -196,141 +221,81 @@ boost::shared_ptr SketchPlugin_Sketch::to2D( bool SketchPlugin_Sketch::isPlaneSet() { - boost::shared_ptr aNormal = boost::dynamic_pointer_cast( + std::shared_ptr aNormal = std::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() +std::shared_ptr SketchPlugin_Sketch::plane() { - 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 aNorm = boost::dynamic_pointer_cast( + std::shared_ptr aNorm = std::dynamic_pointer_cast( data()->attribute(SketchPlugin_Sketch::NORM_ID())); if (!anOrigin || !aNorm) - return boost::shared_ptr(); + return std::shared_ptr(); - return boost::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); -} - -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)); - 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); -} - -AISObjectPtr SketchPlugin_Sketch::getAISObject(AISObjectPtr thePrevious) -{ - 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_thickness", - SKETCH_WIDTH)); - } - return aAIS; - } - return AISObjectPtr(); + return std::shared_ptr(new GeomAPI_Pln(anOrigin->pnt(), aNorm->dir())); } 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); + 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, false); + // subs are referenced from sketch, but must be removed for sure, so not checkings + document()->removeFeature(aFeature); } } ModelAPI_CompositeFeature::erase(); } -void SketchPlugin_Sketch::attributeChanged() { - static bool kIsUpdated = false; // to avoid infinitive cycle on attrubtes change - static bool kIsAttrChanged = false; - boost::shared_ptr aSelection = - data()->selection(SketchPlugin_Feature::EXTERNAL_ID())->value(); - if (aSelection && !kIsUpdated) { // update arguments due to the selection value - kIsUpdated = true; - // update the sketch plane - boost::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 - boost::shared_ptr aNormDir(new GeomAPI_Dir(anA, aB, aC)); - boost::shared_ptr aCoords = aNormDir->xyz(); - boost::shared_ptr aZero(new GeomAPI_XYZ(0, 0, 0)); - aCoords = aCoords->multiplied(-aD * aCoords->distance(aZero)); - boost::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; - boost::shared_ptr aTempDir( - isX ? new GeomAPI_Dir(0, 1, 0) : new GeomAPI_Dir(1, 0, 0)); - boost::shared_ptr aYDir(new GeomAPI_Dir(aNormDir->cross(aTempDir))); - boost::shared_ptr aXDir(new GeomAPI_Dir(aYDir->cross(aNormDir))); - - kIsAttrChanged = false; // track the attributes were really changed during the plane update - boost::shared_ptr anOrigin = boost::dynamic_pointer_cast - (data()->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - anOrigin->setValue(anOrigPnt); - boost::shared_ptr aNormal = boost::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Sketch::NORM_ID())); - aNormal->setValue(aNormDir); - boost::shared_ptr aDirX = boost::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Sketch::DIRX_ID())); - aDirX->setValue(aXDir); - boost::shared_ptr aDirY = boost::dynamic_pointer_cast( - data()->attribute(SketchPlugin_Sketch::DIRY_ID())); - aDirY->setValue(aYDir); - boost::shared_ptr aDir = aPlane->direction(); - - if (kIsAttrChanged) { - /* now it is in updater - // the plane was changed, so reexecute sub-elements to update shapes (located in new plane) - ModelAPI_ValidatorsFactory* aFactory = ModelAPI_Session::get()->validators(); - list aSubs = data()->reflist(SketchPlugin_Sketch::FEATURES_ID())->list(); - for(list::iterator aSubIt = aSubs.begin(); aSubIt != aSubs.end(); aSubIt++) { - boost::shared_ptr aFeature = - boost::dynamic_pointer_cast(*aSubIt); - if (aFeature && aFactory->validate(aFeature)) { - aFeature->execute(); - } - } - */ - kIsAttrChanged = false; +void SketchPlugin_Sketch::attributeChanged(const std::string& theID) { + if (theID == SketchPlugin_Feature::EXTERNAL_ID()) { + std::shared_ptr aSelection = + data()->selection(SketchPlugin_Feature::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 aDirY = std::dynamic_pointer_cast( + data()->attribute(SketchPlugin_Sketch::DIRY_ID())); + aDirY->setValue(aYDir); + std::shared_ptr aDir = aPlane->direction(); } } - kIsUpdated = false; - } else if (kIsUpdated) { // other attributes are updated during the selection comupation - kIsAttrChanged = true; } }