From: nds Date: Thu, 9 Mar 2017 13:31:44 +0000 (+0300) Subject: Issue #2027 Sketcher Trim Feature: split shapes by highlighted point is moved from... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_Sketcher_Trim_Feature_1;p=modules%2Fshaper.git Issue #2027 Sketcher Trim Feature: split shapes by highlighted point is moved from GUI to Trim feature. Trim Line/Arc features: code correction. --- diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp index 7f7c8765e..1df2c7f87 100644 --- a/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp +++ b/src/GeomAlgoAPI/GeomAlgoAPI_ShapeTools.cpp @@ -718,7 +718,6 @@ void GeomAlgoAPI_ShapeTools::splitShape(const std::shared_ptr& th } aBOP.AddArgument(aBaseEdge); - //std::list >::const_iterator aPtIt = thePoints.begin(); PointToRefsMap::const_iterator aPIt = thePointsInfo.begin(); for (; aPIt != thePointsInfo.end(); ++aPIt) { std::shared_ptr aPnt = aPIt->first; diff --git a/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp b/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp index e72db6c83..eaa7f58e2 100644 --- a/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp +++ b/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp @@ -24,13 +24,12 @@ #include #include #include -#include #include "PartSet_WidgetFeaturePointSelector.h" #include "PartSet_Tools.h" -#include -#include +//#include +//#include #include #include @@ -53,13 +52,10 @@ PartSet_WidgetFeaturePointSelector::PartSet_WidgetFeaturePointSelector(QWidget* const Config_WidgetAPI* theData) : ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData) { - myUseGraphicIntersection = theData->getBooleanAttribute("use_graphic_intersection", false); - //myCurrentSubShape = std::shared_ptr(new ModuleBase_ViewerPrs()); } PartSet_WidgetFeaturePointSelector::~PartSet_WidgetFeaturePointSelector() { - //myCashedShapes.clear(); } //******************************************************************** @@ -115,7 +111,6 @@ void PartSet_WidgetFeaturePointSelector::deactivate() aSStyle->SetColor(mySelectionColor); aContext->SetSelectionStyle(aSStyle); #endif - //myWorkshop->module()->deactivateCustomPrs(ModuleBase_IModule::CustomizeHighlightedObjects, true); } //******************************************************************** @@ -151,15 +146,10 @@ bool PartSet_WidgetFeaturePointSelector::fillFeature( bool aFilled = false; if (theSelectedPrs.get() && theSelectedPrs->object().get()) { ObjectPtr anObject = theSelectedPrs->object(); - //if (myCashedShapes.find(anObject) == myCashedShapes.end()) - // fillObjectShapes(anObject); - //const std::set& aShapes = myCashedShapes[anObject]; - //if (!aShapes.empty()) { gp_Pnt aPnt = PartSet_Tools::convertClickToPoint(theEvent->pos(), theWindow->v3dView()); double aX, anY; Handle(V3d_View) aView = theWindow->v3dView(); PartSet_Tools::convertTo2D(aPnt, mySketch, aView, aX, anY); - //std::shared_ptr aPoint = PartSet_Tools::convertTo3D(aX, anY, mySketch); std::shared_ptr aRef = std::dynamic_pointer_cast( @@ -169,7 +159,6 @@ bool PartSet_WidgetFeaturePointSelector::fillFeature( std::shared_ptr anAttributePoint = std::dynamic_pointer_cast( feature()->data()->attribute(SketchPlugin_Trim::ENTITY_POINT())); - //std::shared_ptr aPoint2D = anAttributePoint->pnt(); anAttributePoint->setValue(aX, anY); // redisplay AIS presentation in viewer #ifndef HIGHLIGHT_STAYS_PROBLEM @@ -178,50 +167,10 @@ bool PartSet_WidgetFeaturePointSelector::fillFeature( #endif updateObject(feature()); aFilled = true; - - /* - std::set::const_iterator anIt = aShapes.begin(), aLast = aShapes.end(); - for (; anIt != aLast; anIt++) { - GeomShapePtr aBaseShape = *anIt; - std::shared_ptr aProjectedPoint; - if (ModelGeomAlgo_Point2D::isPointOnEdge(aBaseShape, aPoint, aProjectedPoint)) { - XGUI_Tools::workshop(myWorkshop)->displayer()->clearSelected(false); - if (myCurrentSubShape->object() != anObject || - myCurrentSubShape->shape() != aBaseShape) { - myCurrentSubShape->setObject(anObject); - myCurrentSubShape->setShape(aBaseShape); - - ModuleBase_IModule* aModule = myWorkshop->module(); - - - if (!aModule->isCustomPrsActivated(ModuleBase_IModule::CustomizeHighlightedObjects)) - aModule->activateCustomPrs(myFeature, - ModuleBase_IModule::CustomizeHighlightedObjects, true); - aModule->customizeObject(myFeature, - ModuleBase_IModule::CustomizeHighlightedObjects, true); - } - else - XGUI_Tools::workshop(myWorkshop)->displayer()->updateViewer(); - break; - } - }*/ - //} - //} } return aFilled; } -//******************************************************************** -/*void PartSet_WidgetFeaturePointSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& thePrs, - ObjectPtr& theObject, - GeomShapePtr& theShape) -{ - ModuleBase_ISelection* aSelection = myWorkshop->selection(); - theObject = aSelection->getResult(thePrs); - if (!theObject.get() && myCurrentSubShape->object()) - theObject = myCurrentSubShape->object(); -}*/ - //******************************************************************** QList PartSet_WidgetFeaturePointSelector::getAttributeSelection() const { @@ -234,122 +183,7 @@ bool PartSet_WidgetFeaturePointSelector::setSelection( QList>& theValues, const bool theToValidate) { - return false; - //return !theValues.empty(); - - /*ObjectPtr aBaseObject = myCurrentSubShape->object(); - GeomShapePtr aBaseShape = myCurrentSubShape->shape(); - bool aResult = aBaseObject.get() && aBaseShape.get(); - // firstly set the selection to the attribute - if (aResult) { - QList aValues; - aValues.append(myCurrentSubShape); - aResult = ModuleBase_WidgetShapeSelector::setSelection(aValues, theToValidate); - } - // secondly fill additional attributes - if (aResult) { - aResult = false; - if (aBaseShape->shapeType() == GeomAPI_Shape::EDGE) { - std::shared_ptr anEdge(new GeomAPI_Edge(aBaseShape)); - - std::shared_ptr aFirstPnt = anEdge->firstPoint(); - std::shared_ptr aLastPnt = anEdge->lastPoint(); - - std::shared_ptr aFirstPointAttr, aLastPointAttr; - /// find the points in base feature attributes - FeaturePtr aBaseFeature = ModelAPI_Feature::feature(aBaseObject); - std::list a2DPointAttributes = aBaseFeature->data()->attributes( - GeomDataAPI_Point2D::typeId()); - std::list::const_iterator anIt = a2DPointAttributes.begin(), - aLast = a2DPointAttributes.end(); - for (; anIt != aLast; anIt++) { - std::shared_ptr anAttributePoint = - std::dynamic_pointer_cast(*anIt); - std::shared_ptr aPoint2D = anAttributePoint->pnt(); - std::shared_ptr aPoint3D = PartSet_Tools::convertTo3D(aPoint2D->x(), - aPoint2D->y(), mySketch); - if (aFirstPnt->isEqual(aPoint3D)) - aFirstPointAttr = anAttributePoint; - else if (aLastPnt->isEqual(aPoint3D)) - aLastPointAttr = anAttributePoint; - } - - /// find the points in coincident features - PntToAttributesMap aRefAttributes = myCashedReferences[aBaseObject]; - PntToAttributesMap::const_iterator - aRIt = aRefAttributes.begin(), aRLast = aRefAttributes.end(); - for (PntToAttributesMap::const_iterator aRIt = aRefAttributes.begin(), - aRLast = aRefAttributes.end(); aRIt != aRLast; aRIt++) { - std::shared_ptr anAttribute = aRIt->first; - std::shared_ptr aPoint = aRIt->second; - if (!aFirstPointAttr.get() && aFirstPnt->isEqual(aPoint)) - aFirstPointAttr = anAttribute; - if (!aLastPointAttr.get() && aLastPnt->isEqual(aPoint)) - aLastPointAttr = anAttribute; - if (aFirstPointAttr.get() && aLastPointAttr.get()) - break; - } - - /// find the points in objects that intersect the base feature - ObjectPtr aFirstPointObject, aLastPointObject; - if (myUseGraphicIntersection && (!aFirstPointAttr.get() || !aLastPointAttr.get())) { - PntToObjectsMap aRefObjects = myCashedObjects[aBaseObject]; - PntToObjectsMap::const_iterator - anObjectIt = aRefObjects.begin(), anObjectLast = aRefObjects.end(); - for (; anObjectIt != anObjectLast; anObjectIt++) { - std::list< std::shared_ptr > anObjects = anObjectIt->second; - if (anObjects.empty()) - continue; - std::shared_ptr anObject = anObjects.front(); - std::shared_ptr aPoint = anObjectIt->first; - if (!aFirstPointAttr.get() && !aFirstPointObject.get() && aFirstPnt->isEqual(aPoint)) - aFirstPointObject = anObject; - if (!aLastPointAttr.get() && !aLastPointObject.get() && aLastPnt->isEqual(aPoint)) - aLastPointObject = anObject; - if (aFirstPointAttr.get() && aLastPointAttr.get()) - break; - } - } - - if ((!aFirstPointAttr.get() && !aFirstPointObject.get()) || - (!aLastPointAttr.get() && !aLastPointObject.get())) - return false; - - FeaturePtr aFeature = feature(); - AttributeRefAttrPtr anAPointAttr = std::dynamic_pointer_cast( - aFeature->attribute(SketchPlugin_Constraint::ENTITY_A())); - AttributeRefAttrPtr aBPointAttr = std::dynamic_pointer_cast( - aFeature->attribute(SketchPlugin_Constraint::ENTITY_B())); - if (aFirstPointAttr.get()) - anAPointAttr->setAttr(aFirstPointAttr); - else - anAPointAttr->setObject(aFirstPointObject); - - if (aLastPointAttr.get()) - aBPointAttr->setAttr(aLastPointAttr); - else - aBPointAttr->setObject(aLastPointObject); - - if (myUseGraphicIntersection) { - // fill geometrical points - AttributePtr anAPointAttr = aFeature->attribute(SketchPlugin_Trim::ENTITY_A_POINT()); - AttributePtr aBPointAttr = aFeature->attribute(SketchPlugin_Trim::ENTITY_B_POINT()); - if (anAPointAttr.get() && aBPointAttr.get()) { - std::shared_ptr aPlane = PartSet_Tools::sketchPlane(sketch()); - - std::shared_ptr anAPoint = - std::dynamic_pointer_cast(anAPointAttr); - anAPoint->setValue(aFirstPnt->to2D(aPlane)); - - std::shared_ptr aBPoint = - std::dynamic_pointer_cast(aBPointAttr); - aBPoint->setValue(aLastPnt->to2D(aPlane)); - } - } - aResult = true; - } - } - return aResult;*/ + // false is returned to do not emit focus out widget by selected sub-shape return false; } @@ -361,74 +195,3 @@ void PartSet_WidgetFeaturePointSelector::setPreSelection( if (fillFeature(thePreSelected, theWnd, theEvent)) mouseReleased(theWnd, theEvent); } - -//******************************************************************** -/*bool PartSet_WidgetFeaturePointSelector::isValidSelectionCustom( - const std::shared_ptr& thePrs) -{ - // as we are modfying the attribute in move, we should not check validity here, by highlight - return false; -}*/ - -//******************************************************************** -/*void PartSet_WidgetFeaturePointSelector::getHighlighted( - QList>& theValues) -{ - if (myCurrentSubShape.get() && myCurrentSubShape->object().get()) - theValues.append(myCurrentSubShape); -}*/ - -//******************************************************************** -/*void PartSet_WidgetFeaturePointSelector::fillObjectShapes(const ObjectPtr& theObject) -{ - std::set > aShapes; - std::map, std::shared_ptr > aPointToAttributes; - std::map, - std::list< std::shared_ptr > > aPointToObjects; - - std::set > aRefAttributes; - // current feature - FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - std::set anEdgeShapes; - // edges on feature - ModelAPI_Tools::shapesOfType(aFeature, GeomAPI_Shape::EDGE, anEdgeShapes); - if (!anEdgeShapes.empty()) { - GeomShapePtr aFeatureShape = (*anEdgeShapes.begin())->shape(); - - // coincidences to the feature - std::list > aPoints; - - ModelGeomAlgo_Point2D::getPointsOfReference(aFeature, SketchPlugin_ConstraintCoincidence::ID(), - aRefAttributes, SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID()); - // layed on feature coincidences to divide it on several shapes - CompositeFeaturePtr aSketch = sketch(); - std::shared_ptr aData = aSketch->data(); - std::shared_ptr aC = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Sketch::ORIGIN_ID())); - std::shared_ptr aX = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Sketch::DIRX_ID())); - std::shared_ptr aNorm = std::dynamic_pointer_cast( - aData->attribute(SketchPlugin_Sketch::NORM_ID())); - std::shared_ptr aY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir()))); - ModelGeomAlgo_Point2D::getPointsInsideShape(aFeatureShape, aRefAttributes, aC->pnt(), - aX->dir(), aY, aPoints, aPointToAttributes); - - // intersection points - if (myUseGraphicIntersection) { - std::list aFeatures; - for (int i = 0; i < aSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = aSketch->subFeature(i); - if (aFeature.get()) - aFeatures.push_back(aFeature); - } - ModelGeomAlgo_Point2D::getPointsIntersectedShape(aFeature, aFeatures, aPoints, - aPointToObjects); - } - GeomAlgoAPI_ShapeTools::splitShape(aFeatureShape, aPoints, aShapes); - } - myCashedShapes[theObject] = aShapes; - myCashedReferences[theObject] = aPointToAttributes; - if (myUseGraphicIntersection) - myCashedObjects[theObject] = aPointToObjects; -} -*/ diff --git a/src/PartSet/PartSet_WidgetFeaturePointSelector.h b/src/PartSet/PartSet_WidgetFeaturePointSelector.h index 503c0bc8b..cfb6329db 100644 --- a/src/PartSet/PartSet_WidgetFeaturePointSelector.h +++ b/src/PartSet/PartSet_WidgetFeaturePointSelector.h @@ -18,9 +18,6 @@ #include -#include -#include - class ModuleBase_IWorkshop; class Config_WidgetAPI; class ModuleBase_IViewWindow; @@ -99,28 +96,6 @@ Q_OBJECT ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent); protected: - /// Checks the widget validity. By default, it returns true. - /// \param thePrs a selected presentation in the view - /// \return a boolean value - //virtual bool isValidSelectionCustom(const std::shared_ptr& thePrs); - - /// Return an object and geom shape by the viewer presentation - /// \param thePrs a selection - /// \param theObject an output object - /// \param theShape a shape of the selection - //virtual void getGeomSelection(const std::shared_ptr& thePrs, - // ObjectPtr& theObject, - // GeomShapePtr& theShape); - //void fillObjectShapes(const ObjectPtr& theObject); - - /// Return an object and geom shape by the viewer presentation - /// \param thePrs a selection - /// \param theObject an output object - /// \param theShape a shape of the selection - //virtual void getGeomSelection(const std::shared_ptr& thePrs, - // ObjectPtr& theObject, - // GeomShapePtr& theShape); - /// Return the attribute values wrapped in a list of viewer presentations /// \return a list of viewer presentations, which contains an attribute result and /// a shape. If the attribute do not uses the shape, it is empty @@ -134,20 +109,9 @@ protected: bool fillFeature(const std::shared_ptr& theSelectedPrs, ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent); - //std::shared_ptr myCurrentSubShape; - //std::map > myCashedShapes; - - //typedef std::map, - // std::shared_ptr > PntToAttributesMap; - //std::map myCashedReferences; - - //typedef std::map, - // std::list< std::shared_ptr > > PntToObjectsMap; - //std::map myCashedObjects; /// Pointer to a sketch CompositeFeaturePtr mySketch; - bool myUseGraphicIntersection; Quantity_Color myHighlightColor; Quantity_Color mySelectionColor; }; diff --git a/src/PartSet/PartSet_WidgetSubShapeSelector.cpp b/src/PartSet/PartSet_WidgetSubShapeSelector.cpp index e9d157a1d..b0e41e4f1 100755 --- a/src/PartSet/PartSet_WidgetSubShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetSubShapeSelector.cpp @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -46,7 +45,6 @@ PartSet_WidgetSubShapeSelector::PartSet_WidgetSubShapeSelector(QWidget* theParen const Config_WidgetAPI* theData) : ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData) { - myUseGraphicIntersection = theData->getBooleanAttribute("use_graphic_intersection", false); myCurrentSubShape = std::shared_ptr(new ModuleBase_ViewerPrs()); } @@ -165,7 +163,7 @@ bool PartSet_WidgetSubShapeSelector::setSelection( std::shared_ptr aLastPnt = anEdge->lastPoint(); std::shared_ptr aFirstPointAttr, aLastPointAttr; - /// find the points in base feature attributes + /// find the points in feature attributes FeaturePtr aBaseFeature = ModelAPI_Feature::feature(aBaseObject); std::list a2DPointAttributes = aBaseFeature->data()->attributes( GeomDataAPI_Point2D::typeId()); @@ -187,8 +185,7 @@ bool PartSet_WidgetSubShapeSelector::setSelection( PntToAttributesMap aRefAttributes = myCashedReferences[aBaseObject]; PntToAttributesMap::const_iterator aRIt = aRefAttributes.begin(), aRLast = aRefAttributes.end(); - for (PntToAttributesMap::const_iterator aRIt = aRefAttributes.begin(), - aRLast = aRefAttributes.end(); aRIt != aRLast; aRIt++) { + for (; aRIt != aRLast; aRIt++) { std::shared_ptr anAttribute = aRIt->first; std::shared_ptr aPoint = aRIt->second; if (!aFirstPointAttr.get() && aFirstPnt->isEqual(aPoint)) @@ -198,30 +195,7 @@ bool PartSet_WidgetSubShapeSelector::setSelection( if (aFirstPointAttr.get() && aLastPointAttr.get()) break; } - - /// find the points in objects that intersect the base feature - ObjectPtr aFirstPointObject, aLastPointObject; - if (myUseGraphicIntersection && (!aFirstPointAttr.get() || !aLastPointAttr.get())) { - PntToObjectsMap aRefObjects = myCashedObjects[aBaseObject]; - PntToObjectsMap::const_iterator - anObjectIt = aRefObjects.begin(), anObjectLast = aRefObjects.end(); - for (; anObjectIt != anObjectLast; anObjectIt++) { - std::list< std::shared_ptr > anObjects = anObjectIt->second; - if (anObjects.empty()) - continue; - std::shared_ptr anObject = anObjects.front(); - std::shared_ptr aPoint = anObjectIt->first; - if (!aFirstPointAttr.get() && !aFirstPointObject.get() && aFirstPnt->isEqual(aPoint)) - aFirstPointObject = anObject; - if (!aLastPointAttr.get() && !aLastPointObject.get() && aLastPnt->isEqual(aPoint)) - aLastPointObject = anObject; - if (aFirstPointAttr.get() && aLastPointAttr.get()) - break; - } - } - - if ((!aFirstPointAttr.get() && !aFirstPointObject.get()) || - (!aLastPointAttr.get() && !aLastPointObject.get())) + if (!aFirstPointAttr.get() || !aLastPointAttr) return false; FeaturePtr aFeature = feature(); @@ -229,32 +203,8 @@ bool PartSet_WidgetSubShapeSelector::setSelection( aFeature->attribute(SketchPlugin_Constraint::ENTITY_A())); AttributeRefAttrPtr aBPointAttr = std::dynamic_pointer_cast( aFeature->attribute(SketchPlugin_Constraint::ENTITY_B())); - if (aFirstPointAttr.get()) - anAPointAttr->setAttr(aFirstPointAttr); - else - anAPointAttr->setObject(aFirstPointObject); - - if (aLastPointAttr.get()) - aBPointAttr->setAttr(aLastPointAttr); - else - aBPointAttr->setObject(aLastPointObject); - - /*if (myUseGraphicIntersection) { - // fill geometrical points - AttributePtr anAPointAttr = aFeature->attribute(SketchPlugin_Trim::ENTITY_A_POINT()); - AttributePtr aBPointAttr = aFeature->attribute(SketchPlugin_Trim::ENTITY_B_POINT()); - if (anAPointAttr.get() && aBPointAttr.get()) { - std::shared_ptr aPlane = PartSet_Tools::sketchPlane(sketch()); - - std::shared_ptr anAPoint = - std::dynamic_pointer_cast(anAPointAttr); - anAPoint->setValue(aFirstPnt->to2D(aPlane)); - - std::shared_ptr aBPoint = - std::dynamic_pointer_cast(aBPointAttr); - aBPoint->setValue(aLastPnt->to2D(aPlane)); - } - }*/ + anAPointAttr->setAttr(aFirstPointAttr); + aBPointAttr->setAttr(aLastPointAttr); aResult = true; } } @@ -275,21 +225,16 @@ void PartSet_WidgetSubShapeSelector::fillObjectShapes(const ObjectPtr& theObject { std::set > aShapes; std::map, std::shared_ptr > aPointToAttributes; - std::map, - std::list< std::shared_ptr > > aPointToObjects; - std::set > aRefAttributes; // current feature FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - std::set anEdgeShapes; // edges on feature - ModelAPI_Tools::shapesOfType(aFeature, GeomAPI_Shape::EDGE, anEdgeShapes); - if (!anEdgeShapes.empty()) { - GeomShapePtr aFeatureShape = (*anEdgeShapes.begin())->shape(); + std::set anEdgeResults; + ModelAPI_Tools::shapesOfType(aFeature, GeomAPI_Shape::EDGE, anEdgeResults); + if (!anEdgeResults.empty()) { + GeomShapePtr aFeatureShape = (*anEdgeResults.begin())->shape(); // coincidences to the feature - std::list > aPoints; - ModelGeomAlgo_Point2D::getPointsOfReference(aFeature, SketchPlugin_ConstraintCoincidence::ID(), aRefAttributes, SketchPlugin_Point::ID(), SketchPlugin_Point::COORD_ID()); // layed on feature coincidences to divide it on several shapes @@ -302,25 +247,13 @@ void PartSet_WidgetSubShapeSelector::fillObjectShapes(const ObjectPtr& theObject std::shared_ptr aNorm = std::dynamic_pointer_cast( aData->attribute(SketchPlugin_Sketch::NORM_ID())); std::shared_ptr aY(new GeomAPI_Dir(aNorm->dir()->cross(aX->dir()))); + std::list > aPoints; ModelGeomAlgo_Point2D::getPointsInsideShape_p(aFeatureShape, aRefAttributes, aC->pnt(), aX->dir(), aY, aPoints, aPointToAttributes); - // intersection points - /*if (myUseGraphicIntersection) { - std::list aFeatures; - for (int i = 0; i < aSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = aSketch->subFeature(i); - if (aFeature.get()) - aFeatures.push_back(aFeature); - } - ModelGeomAlgo_Point2D::getPointsIntersectedShape(aFeature, aFeatures, aPoints, - aPointToObjects); - }*/ GeomAlgoAPI_ShapeTools::splitShape_p(aFeatureShape, aPoints, aShapes); } myCashedShapes[theObject] = aShapes; myCashedReferences[theObject] = aPointToAttributes; - if (myUseGraphicIntersection) - myCashedObjects[theObject] = aPointToObjects; } diff --git a/src/PartSet/PartSet_WidgetSubShapeSelector.h b/src/PartSet/PartSet_WidgetSubShapeSelector.h index 4b86b46af..376ffb139 100644 --- a/src/PartSet/PartSet_WidgetSubShapeSelector.h +++ b/src/PartSet/PartSet_WidgetSubShapeSelector.h @@ -119,13 +119,8 @@ protected: std::shared_ptr > PntToAttributesMap; std::map myCashedReferences; - typedef std::map, - std::list< std::shared_ptr > > PntToObjectsMap; - std::map myCashedObjects; - /// Pointer to a sketch CompositeFeaturePtr mySketch; - bool myUseGraphicIntersection; }; #endif \ No newline at end of file diff --git a/src/SketchPlugin/CMakeLists.txt b/src/SketchPlugin/CMakeLists.txt index f92561777..d42a75c18 100644 --- a/src/SketchPlugin/CMakeLists.txt +++ b/src/SketchPlugin/CMakeLists.txt @@ -146,7 +146,6 @@ ADD_UNIT_TESTS(TestSketchPointLine.py TestHighload.py TestSnowflake.py TestArcBehavior.py - Test1924.py TestRemoveSketch.py Test1061.py Test1673.py