// ModuleBase_ModelWidget* aFirstWidget = aModule->activeWidget();
// ModuleBase_IPropertyPanel* aPanel = aModule->currentOperation()->propertyPanel();
// if (aFirstWidget != aPanel->activeWidget()) {
-// ModuleBase_WidgetSelector* aWSelector = dynamic_cast<ModuleBase_WidgetSelector*>(aFirstWidget);
+// ModuleBase_WidgetSelector* aWSelector = dynamic_cast<ModuleBase_WidgetSelector*>
+// (aFirstWidget);
// if (aWSelector) {
-// myWorkshop->selectionActivate()->activateSelectionAndFilters(aWSelector);
+// myWorkshop->selectionActivate()->updateSelectionModesAndFilters(aWSelector);
// }
// }
//}
return;
if (aFOperation && module()->sketchMgr()->isNestedSketchOperation(aFOperation)) {
- bool isStarted = false;
- if (!module()->sketchMgr()->sketchSolverError()) {
- if (myRestartingMode != RM_Forbided) {
- myRestartingMode = RM_LastFeatureUsed;
- isStarted = startInternalEdit(thePreviousAttributeID);
+ if (aFOperation->isNeedToBeAborted()) {
+ aFOperation->abort();
+ }
+ else {
+ bool isStarted = false;
+ if (!module()->sketchMgr()->sketchSolverError()) {
+ if (myRestartingMode != RM_Forbided) {
+ myRestartingMode = RM_LastFeatureUsed;
+ isStarted = startInternalEdit(thePreviousAttributeID);
+ }
}
+ if (!isStarted)
+ aFOperation->commit();
}
- if (!isStarted)
- aFOperation->commit();
}
}
std::cout << "PartSet_SketcherReentrantMgr::deleteInternalFeature: "
<< myInternalFeature->data()->name() << std::endl;
#endif
- if (myInternalActiveWidget) {
- ModuleBase_WidgetSelector* aWSelector =
- dynamic_cast<ModuleBase_WidgetSelector*>(myInternalActiveWidget);
- if (aWSelector)
- myWorkshop->selectionActivate()->activateSelectionAndFilters(aWSelector);
+ if (myInternalActiveWidget)
myInternalActiveWidget = 0;
- }
delete myInternalWidget;
myInternalWidget = 0;