From f7aa51174a463154762bf9bccc20a277f41e1720 Mon Sep 17 00:00:00 2001 From: nds Date: Thu, 23 Jun 2016 20:21:41 +0300 Subject: [PATCH] Regression about not-external object in sketch: create sketch, line, start arc creation, select tangency mode. The points of the line are not selectable. --- src/PartSet/PartSet_WidgetMultiSelector.cpp | 19 ++++++++++--------- src/PartSet/PartSet_WidgetShapeSelector.cpp | 19 ++++++++++--------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/PartSet/PartSet_WidgetMultiSelector.cpp b/src/PartSet/PartSet_WidgetMultiSelector.cpp index 60059f31f..13a832a68 100755 --- a/src/PartSet/PartSet_WidgetMultiSelector.cpp +++ b/src/PartSet/PartSet_WidgetMultiSelector.cpp @@ -74,16 +74,17 @@ void PartSet_WidgetMultiSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr std::dynamic_pointer_cast(aSelectedFeature); // there is no a sketch feature is selected, but the shape exists, try to create an exernal object // TODO: unite with the same functionality in PartSet_WidgetShapeSelector - if (aSPFeature.get() == NULL) + if (aSPFeature.get() == NULL) { theObject = ObjectPtr(); - if (myExternalObjectMgr->useExternal()) { - GeomShapePtr aShape = theShape; - if (!aShape.get()) { - ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); - if (aResult.get()) - aShape = aResult->shape(); + if (myExternalObjectMgr->useExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); } - if (aShape.get() != NULL && !aShape->isNull()) - theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); } } diff --git a/src/PartSet/PartSet_WidgetShapeSelector.cpp b/src/PartSet/PartSet_WidgetShapeSelector.cpp index 7490a8510..a502fcdfa 100755 --- a/src/PartSet/PartSet_WidgetShapeSelector.cpp +++ b/src/PartSet/PartSet_WidgetShapeSelector.cpp @@ -78,17 +78,18 @@ void PartSet_WidgetShapeSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr std::dynamic_pointer_cast(aSelectedFeature); // there is no a sketch feature is selected, but the shape exists, try to create an exernal object // TODO: unite with the same functionality in PartSet_WidgetShapeSelector - if (aSPFeature.get() == NULL) + if (aSPFeature.get() == NULL) { theObject = ObjectPtr(); - if (myExternalObjectMgr->useExternal()) { - GeomShapePtr aShape = theShape; - if (!aShape.get()) { - ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); - if (aResult.get()) - aShape = aResult->shape(); + if (myExternalObjectMgr->useExternal()) { + GeomShapePtr aShape = theShape; + if (!aShape.get()) { + ResultPtr aResult = myWorkshop->selection()->getResult(thePrs); + if (aResult.get()) + aShape = aResult->shape(); + } + if (aShape.get() != NULL && !aShape->isNull()) + theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); } - if (aShape.get() != NULL && !aShape->isNull()) - theObject = myExternalObjectMgr->externalObject(theObject, aShape, sketch(), myIsInValidate); } } -- 2.30.2