X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=4cdd4e928e10fbb67da0e9a8745a30f1dd7a236c;hb=456499432be32573f88db84184d9a1b9319a32cd;hp=1df95bb8a63115fecae382f4728b8fe94dccd3cc;hpb=c2d5bdf20467d54d22974358bf98c2450ad32a8f;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 1df95bb8a..4cdd4e928 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -1,4 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D +// Copyright (C) 2014-2017 CEA/DEN, EDF R&D +// +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include "PartSet_Module.h" #include "PartSet_WidgetSketchLabel.h" @@ -6,20 +24,19 @@ #include "PartSet_Tools.h" #include "PartSet_PreviewPlanes.h" #include "PartSet_WidgetPoint2d.h" -#include "PartSet_WidgetPoint2dDistance.h" #include "PartSet_WidgetPoint2DFlyout.h" #include "PartSet_WidgetShapeSelector.h" #include "PartSet_WidgetMultiSelector.h" +#include "PartSet_WidgetFeaturePointSelector.h" #include "PartSet_WidgetEditor.h" #include "PartSet_WidgetFileSelector.h" #include "PartSet_WidgetSketchCreator.h" #include "PartSet_SketcherMgr.h" -#include "PartSet_SketcherReetntrantMgr.h" +#include "PartSet_SketcherReentrantMgr.h" #include "PartSet_ResultSketchPrs.h" #include "PartSet_MenuMgr.h" #include "PartSet_CustomPrs.h" #include "PartSet_IconFactory.h" -#include "PartSet_WidgetChoice.h" #include "PartSet_OverconstraintListener.h" #include "PartSet_Filters.h" @@ -34,9 +51,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -51,6 +68,8 @@ #include #include #include +#include +#include #include #include @@ -69,6 +88,7 @@ #include #include #include +#include #include #include @@ -80,18 +100,20 @@ #include #include +#include #include #include #include #include +#include +#include #include #include #include #include #include -#include #include #include @@ -120,12 +142,13 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myVisualLayerId(0) + myVisualLayerId(0), + myIsOperationIsLaunched(false) { new PartSet_IconFactory(); mySketchMgr = new PartSet_SketcherMgr(this); - mySketchReentrantMgr = new PartSet_SketcherReetntrantMgr(theWshop); + mySketchReentrantMgr = new PartSet_SketcherReentrantMgr(theWshop); XGUI_ModuleConnector* aConnector = dynamic_cast(theWshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); @@ -159,6 +182,12 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) Config_PropManager::registerProp("Visualization", "operation_highlight_color", "Multi selector item color in operation", Config_Prop::Color, PartSet_CustomPrs::OPERATION_HIGHLIGHT_COLOR()); + Config_PropManager::registerProp("Visualization", "operation_remove_feature_color", + "Color of removed feature in operation", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_REMOVE_FEATURE_COLOR()); + Config_PropManager::registerProp("Visualization", "sketch_preview_plane", + "Color of sketch plane", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_SKETCH_PLANE()); } PartSet_Module::~PartSet_Module() @@ -195,12 +224,18 @@ void PartSet_Module::deactivateSelectionFilters() void PartSet_Module::storeSelection() { - sketchMgr()->storeSelection(); + // cash is used only to restore selection, so it should be filled in storeSelection and + // after applying immediatelly cleared in restoreSelection + myCurrentSelection.clear(); + sketchMgr()->storeSelection(PartSet_SketcherMgr::ST_SelectType, myCurrentSelection); } void PartSet_Module::restoreSelection() { - sketchMgr()->restoreSelection(); + // cash is used only to restore selection, so it should be filled in storeSelection and + // after applying immediatelly cleared in restoreSelection + sketchMgr()->restoreSelection(myCurrentSelection); + myCurrentSelection.clear(); } void PartSet_Module::registerValidators() @@ -223,41 +258,34 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("PartSet_CollinearSelection", new PartSet_CollinearSelection); aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection); aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator); + aFactory->registerValidator("PartSet_DifferentPoints", new PartSet_DifferentPointsValidator); aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr); + aFactory->registerValidator("PartSet_MultyTranslationSelection", + new PartSet_MultyTranslationSelection); + aFactory->registerValidator("PartSet_SplitSelection", new PartSet_SplitSelection); + aFactory->registerValidator("PartSet_ProjectionSelection", new PartSet_ProjectionSelection); } -void PartSet_Module::registerFilters() -{ - //Registering of selection filters - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters(); -} - -void PartSet_Module::registerProperties() -{ - Config_PropManager::registerProp("Sketch planes", "planes_size", "Size", Config_Prop::Double, - PLANE_SIZE); - Config_PropManager::registerProp("Sketch planes", "planes_thickness", "Thickness", - Config_Prop::Integer, SKETCH_WIDTH); - Config_PropManager::registerProp("Sketch planes", "rotate_to_plane", "Rotate to plane when selected", - Config_Prop::Boolean, "false"); -} - -void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect) +void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, + const bool isToConnect) { mySketchMgr->connectToPropertyPanel(theWidget, isToConnect); } -void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) +void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) { - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->commitNestedSketch(theOperation); } + /// deactivate of overconstraint listener should be performed after Sketch commit (#2176) + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) + overconstraintListener()->setActive(false); /// Restart sketcher operations automatically if (!mySketchReentrantMgr->operationCommitted(theOperation)) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation && !aFOperation->isEditOperation()) { // the selection is cleared after commit the create operation // in order to do not use the same selected objects in the restarted operation @@ -271,101 +299,112 @@ void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation) { /// Restart sketcher operations automatically mySketchReentrantMgr->operationAborted(theOperation); + /// deactivate of overconstraint listener should be performed after Sketch abort (#2176) + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) + overconstraintListener()->setActive(false); } void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) { - ModuleBase_IWorkshop* anIWorkshop = workshop(); - if (!theOperation->getDescription()->hasXmlRepresentation()) { //!< No need for property panel - anIWorkshop->updateCommandStatus(); - } - else { - ModuleBase_OperationFeature* aFOperation = dynamic_cast - (theOperation); - if (aFOperation) { - XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(anIWorkshop); - XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); - ModuleBase_ModelWidget* aFilledWidget = 0; - bool aPostonedWidgetActivation = false; - FeaturePtr aFeature = aFOperation->feature(); - - std::string aGreedAttributeId = ModuleBase_Tools::findGreedAttribute(anIWorkshop, aFeature); - // if there is a greed attribute, automatic commit by preselection for this feature is prohibited - aWorkshop->setPropertyPanel(aFOperation); - - // filling the operation values by the current selection - // if the operation can be committed after the controls filling, the method perform should - // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch) - bool isOperationCommitted = false; - if (!aFOperation->isEditOperation()) { - aFilledWidget = aFOperation->activateByPreselection(aGreedAttributeId); - if (currentOperation() != aFOperation) - isOperationCommitted = true; - else { - if (aGreedAttributeId.empty()) { - // a signal should be emitted before the next widget activation - // because, the activation of the next widget will give a focus to the widget. As a result - // the value of the widget is initialized. And commit may happens until the value is entered. - if (aFilledWidget) { - if (mySketchReentrantMgr->canBeCommittedByPreselection()) - isOperationCommitted = mySketchMgr->operationActivatedByPreselection(); - // activate the next obligatory widget - if (!isOperationCommitted) - aPropertyPanel->activateNextWidget(aFilledWidget); - } - } - else { // there is a greed widget - const QList& aWidgets = aPropertyPanel->modelWidgets(); - std::string aFirstAttributeId = aWidgets.front()->attributeID(); - // activate next widget after greeded if it is the first widget in the panel - // else the first panel widget is already activated by operation start - if (aFirstAttributeId == aGreedAttributeId) - aPostonedWidgetActivation = true; + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + if (aFOperation) { + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(workshop()); + XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); + + ModuleBase_ModelWidget* aFilledWidget = 0; + bool aPostonedWidgetActivation = false; + + FeaturePtr aFeature = aFOperation->feature(); + /// Restart sketcher operations automatically + /// it is important to call method of sketch reentrant manager before filling of PP + /// because it fills some created feature attributes, these new values should be used + /// to fill the property panel + mySketchReentrantMgr->operationStarted(theOperation); + + aWorkshop->fillPropertyPanel(aFOperation); + // filling the operation values by the current selection + // if the operation can be committed after the controls filling, the method perform should + // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch) + bool isOperationCommitted = false; + if (!aFOperation->isEditOperation()) { + std::string aGreedAttributeId = ModuleBase_Tools::findGreedAttribute(workshop(), aFeature); + // if there is a greed attribute, automatic commit by preselection + // for this feature is prohibited + aFilledWidget = aFOperation->activateByPreselection(aGreedAttributeId); + if (currentOperation() != aFOperation) + isOperationCommitted = true; + else { + if (aGreedAttributeId.empty()) { + // a signal should be emitted before the next widget activation + // because, the activation of the next widget will give a focus to the widget. + // As a result the value of the widget is initialized. + // And commit may happens until the value is entered. + if (aFilledWidget) { + if (mySketchReentrantMgr->canBeCommittedByPreselection()) + isOperationCommitted = mySketchMgr->operationActivatedByPreselection(); + // activate the next obligatory widget + if (!isOperationCommitted) + aPropertyPanel->activateNextWidget(aFilledWidget); } } - } if (!isOperationCommitted) { - anIWorkshop->updateCommandStatus(); - aWorkshop->connectToPropertyPanel(true); - operationStartedInternal(aFOperation); - - // the objects of the current operation should be deactivated - QObjectPtrList anObjects; - anObjects.append(aFeature); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - anObjects.append(*aIt); - } - QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); - for (; anIt != aLast; anIt++) - aWorkshop->deactivateActiveObject(*anIt, false); - if (anObjects.size() > 0) { - XGUI_Displayer* aDisplayer = aWorkshop->displayer(); - aDisplayer->updateViewer(); + else { // there is a greed widget + const QList& aWidgets = aPropertyPanel->modelWidgets(); + std::string aFirstAttributeId = aWidgets.front()->attributeID(); + // activate next widget after greeded if it is the first widget in the panel + // else the first panel widget is already activated by operation start + if (aFirstAttributeId == aGreedAttributeId) + aPostonedWidgetActivation = true; } } - if (aPostonedWidgetActivation) { - // if the widget is an empty in the chain of activated widgets, the current operation - // is restarted. It should be performed after functionality of the operation starting - aPropertyPanel->activateNextWidget(aFilledWidget); + } if (!isOperationCommitted) { + aWorkshop->connectToPropertyPanel(true); + updateSketcherOnStart(aFOperation); + updatePresentationsOnStart(aFOperation); + + // the objects of the current operation should be deactivated + QObjectPtrList anObjects; + anObjects.append(aFeature); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { + anObjects.append(*aIt); + } + QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); + for (; anIt != aLast; anIt++) + aWorkshop->deactivateActiveObject(*anIt, false); + if (anObjects.size() > 0) { + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + aDisplayer->updateViewer(); } + /// state of command actions should be updated after displayed objects modification because + /// deactivation(for example) of objects may influence on selection in the viewer + /// State of command actions may depend on selection in the viewer(e.g. Sketch) + workshop()->updateCommandStatus(); + } + if (aPostonedWidgetActivation) { + // if the widget is an empty in the chain of activated widgets, the current operation + // is restarted. It should be performed after functionality of the operation starting + aPropertyPanel->activateNextWidget(aFilledWidget); } } } -void PartSet_Module::operationStartedInternal(ModuleBase_Operation* theOperation) +void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation) { - /// Restart sketcher operations automatically - mySketchReentrantMgr->operationStarted(theOperation); - if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { mySketchMgr->startSketch(theOperation); } - else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + else if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->startNestedSketch(theOperation); } +} - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); +void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperation) +{ + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation) { myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); @@ -376,7 +415,8 @@ void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) { ModuleBase_IModule::operationResumed(theOperation); - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation) { myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); @@ -389,7 +429,7 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false); bool isModified = isModifiedArgs || isModifiedResults; - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->stopNestedSketch(theOperation); } else if (PartSet_SketcherMgr::isSketchOperation(theOperation)) @@ -402,8 +442,8 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) aDisplayer->updateViewer(); } - QMap::const_iterator anIt = myHasConstraintShown.begin(), - aLast = myHasConstraintShown.end(); + QMap::const_iterator + anIt = myHasConstraintShown.begin(), aLast = myHasConstraintShown.end(); for (; anIt != aLast; anIt++) { mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value()); } @@ -446,8 +486,9 @@ bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& t if (theActionId == "MOVE_CMD") { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); if (aFeature) { + ResultPtr aResult = ModuleBase_Tools::firstResult(aFeature); // part features can not be moved in the history. - if (aFeature->getKind() == PartSetPlugin_Part::ID()) + if (aResult.get() && aResult->groupName() == ModelAPI_ResultPart::group()) aValid = false; } } @@ -466,6 +507,15 @@ bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const return mySketchMgr->canDisplayObject(theObject); } +bool PartSet_Module::canUsePreselection(const QString& thePreviousOperationKind, + const QString& theStartedOperationKind) +{ + if (ModuleBase_IModule::canUsePreselection(thePreviousOperationKind, theStartedOperationKind)) + return true; + + return mySketchMgr->isNestedSketchFeature(theStartedOperationKind); +} + /*void PartSet_Module::processHiddenObject(const std::list& theObjects) { mySketchMgr->processHiddenObject(theObjects); @@ -477,11 +527,12 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), - isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { // in active sketch operation it is possible to activate operation object in selection // in the edit operation, e.g. points of the line can be moved when the line is edited - ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(anOperation); aCanActivate = aCanActivate || (aFOperation && aFOperation->isEditOperation()); } return aCanActivate; @@ -499,6 +550,15 @@ void PartSet_Module::updateViewerMenu(const QMap& theStdActio myMenuMgr->updateViewerMenu(theStdActions); } +bool PartSet_Module::isActionEnableStateFixed(const int theActionId) const +{ + bool isEnabledFixed = false; + if (theActionId == XGUI_ActionsMgr::AcceptAll && + mySketchReentrantMgr->isInternalEditActive()) + isEnabledFixed = true; + return isEnabledFixed; +} + QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature) { QString anError = ModuleBase_IModule::getFeatureError(theFeature); @@ -526,13 +586,44 @@ void PartSet_Module::activeSelectionModes(QIntList& theModes) PartSet_SketcherMgr::sketchSelectionModes(theModes); } +void PartSet_Module::customSubShapesSelectionModes(QIntList& theTypes) +{ + if (theTypes.contains(TopAbs_FACE)) + theTypes.append(SketcherPrs_Tools::Sel_Sketch_Face); + if (theTypes.contains(TopAbs_WIRE)) + theTypes.append(SketcherPrs_Tools::Sel_Sketch_Wire); +} + +void PartSet_Module::getGeomSelection(const std::shared_ptr& theSelected, + ObjectPtr& theObject, AttributePtr& theAttribute) +{ + ObjectPtr anObject = theSelected->object(); + GeomShapePtr aShape = theSelected->shape(); + + theAttribute = findAttribute(anObject, aShape); + // TODO: try to create result if object is an external object + theObject = anObject; +} + bool PartSet_Module::isMouseOverWindow() { return mySketchMgr->isMouseOverWindow(); } +bool PartSet_Module::isSketchNeutralPointActivated() const +{ + bool isNeutralPoint = true; + if (sketchReentranceMgr()->isInternalEditActive()) + isNeutralPoint = false; + if (myIsOperationIsLaunched) + isNeutralPoint = false; + + return isNeutralPoint; +} + void PartSet_Module::closeDocument() { + myActivePartIndex = QModelIndex(); clearViewer(); } @@ -547,7 +638,8 @@ void PartSet_Module::clearViewer() void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (!aFOperation) return; @@ -562,7 +654,8 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, { bool aProcessed = false; - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); if (mySketchMgr->activeSketch().get() && aFOperation && aPropertyPanel) { @@ -576,11 +669,19 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); FeaturePtr anOpFeature = aFOperation->feature(); GeomShapePtr aShape = aSelectedPrs->shape(); - // click on the digit of dimension constrain comes here with an empty shape, so we need the check + // click on the digit of dimension constrain comes here + // with an empty shape, so we need the check if (aFeature == anOpFeature && aShape.get() && !aShape->isNull()) { + // if feature has only one result and shape of result is equal to selected shape + // this attribute is not processed. It is a case of Sketch Point. + if (aFeature->results().size() == 1) { + ResultPtr aResult = aFeature->results().front(); + if (aResult.get() && aResult->shape()->isEqual(aShape)) + return aProcessed; + } const TopoDS_Shape& aTDShape = aShape->impl(); AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aTDShape, - mySketchMgr->activeSketch()); + mySketchMgr->activeSketch()); if (anAttribute.get()) { QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), workshop()); @@ -623,14 +724,14 @@ void PartSet_Module::onSelectionChanged() if (aFeature) { std::string aId = aFeature->getKind(); if ((aId == SketchPlugin_ConstraintRadius::ID()) || - (aId == SketchPlugin_ConstraintLength::ID()) || + (aId == SketchPlugin_ConstraintLength::ID()) || (aId == SketchPlugin_ConstraintDistance::ID()) || (aId == SketchPlugin_ConstraintAngle::ID())) { editFeature(aFeature); } } } - } + } } void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent) @@ -667,11 +768,6 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th aPointWgt->setSketch(mySketchMgr->activeSketch()); connect(aPointWgt, SIGNAL(vertexSelected()), sketchReentranceMgr(), SLOT(onVertexSelected())); aWgt = aPointWgt; - } else if (theType == "point2ddistance") { - PartSet_WidgetPoint2dDistance* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent, - aWorkshop, theWidgetApi); - aDistanceWgt->setSketch(mySketchMgr->activeSketch()); - aWgt = aDistanceWgt; } else if (theType == "sketch_shape_selector") { PartSet_WidgetShapeSelector* aShapeSelectorWgt = new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi); @@ -683,6 +779,12 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; } + else if (theType == "sketch_feature_point_selector") { + PartSet_WidgetFeaturePointSelector* aPointSelectorWgt = + new PartSet_WidgetFeaturePointSelector(theParent, aWorkshop, theWidgetApi); + aPointSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aPointSelectorWgt; + } else if (theType == WDG_DOUBLEVALUE_EDITOR) { aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi); } else if (theType == "export_file_selector") { @@ -690,7 +792,7 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th } else if (theType == "sketch_launcher") { aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi); } else if (theType == "module_choice") { - aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi); + aWgt = new ModuleBase_WidgetChoice(theParent, theWidgetApi); connect(aWgt, SIGNAL(itemSelected(ModuleBase_ModelWidget*, int)), this, SLOT(onChoiceChanged(ModuleBase_ModelWidget*, int))); } @@ -706,7 +808,7 @@ ModuleBase_ModelWidget* PartSet_Module::activeWidget() const ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); if (aOperation) { ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - anActiveWidget = aPanel->activeWidget(); + anActiveWidget = aPanel ? aPanel->activeWidget() : 0; } } return anActiveWidget; @@ -723,7 +825,7 @@ bool PartSet_Module::deleteObjects() // 1. check whether the delete should be processed in the module ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), - isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { isProcessed = true; // 2. find selected presentations @@ -762,14 +864,17 @@ bool PartSet_Module::deleteObjects() // the active nested sketch operation should be aborted unconditionally // the Delete action should be additionally granted for the Sketch operation // in order to do not abort/commit it - if (!anOpMgr->canStartOperation(anOpAction->id())) + bool isCommitted; + if (!anOpMgr->canStartOperation(anOpAction->id(), isCommitted)) return true; // the objects are processed but can not be deleted anOpMgr->startOperation(anOpAction); // WORKAROUND, should be done to avoid viewer highlight update after deletetion of objects - // the problem is in AIS Dimensions recompute if a line and the dim are removed, line is the first - // it causes the AIS recompute, where the base line is null, the result is empty AIS in the viewer + // the problem is in AIS Dimensions recompute + // if a line and the dim are removed, line is the first + // it causes the AIS recompute, where the base line is null, + // the result is empty AIS in the viewer XGUI_Tools::workshop(myWorkshop)->selector()->clearSelection(); // 4. delete features @@ -782,27 +887,6 @@ bool PartSet_Module::deleteObjects() return isProcessed; } -void PartSet_Module::onFeatureTriggered() -{ - QAction* aCmd = dynamic_cast(sender()); - if (aCmd->isCheckable() && aCmd->isChecked()) { - // 1. check whether the delete should be processed in the module - ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation); - if (isNestedOp) { - // in case if in the viewer nothing is displayed, the create operation should not be - // comitted even if all values of the feature are initialized - if (!mySketchMgr->canDisplayCurrentCreatedFeature()) { - // the action information should be saved before the operation is aborted - // because this abort leads to update command status, which unchecks this action - anOperation->abort(); - launchOperation(aCmd->data().toString()); - } - } - } - ModuleBase_IModule::onFeatureTriggered(); -} - void PartSet_Module::editFeature(FeaturePtr theFeature) { storeConstraintsState(theFeature->getKind()); @@ -814,21 +898,31 @@ bool PartSet_Module::canCommitOperation() const return true; } -void PartSet_Module::launchOperation(const QString& theCmdId) +void PartSet_Module::launchOperation(const QString& theCmdId, const bool& isStartAfterCommitOnly) { + myIsOperationIsLaunched = true; storeConstraintsState(theCmdId.toStdString()); - ModuleBase_IModule::launchOperation(theCmdId); + updateConstraintsState(theCmdId.toStdString()); + + ModuleBase_IModule::launchOperation(theCmdId, isStartAfterCommitOnly); + + myIsOperationIsLaunched = false; } void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) { - if (myWorkshop->currentOperation() && + if (myWorkshop->currentOperation() && myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID()) { const QMap& aShownStates = mySketchMgr->showConstraintStates(); myHasConstraintShown = aShownStates; } - if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) { +} + +void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) +{ + if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str()) || + PartSet_SketcherMgr::replicationsIdList().contains(theFeatureKind.c_str())) { // Show constraints if a constraint was anOperation mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true); mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true); @@ -837,7 +931,7 @@ void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) } } -void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) +void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); if (!anAIS.IsNull()) { @@ -880,8 +974,8 @@ void PartSet_Module::onViewTransformed(int theTrsfType) Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer(); Handle(V3d_View) aView; double aScale = 0; - for (aV3dViewer->InitDefinedViews(); - aV3dViewer->MoreDefinedViews(); + for (aV3dViewer->InitDefinedViews(); + aV3dViewer->MoreDefinedViews(); aV3dViewer->NextDefinedViews()) { Handle(V3d_View) aV = aV3dViewer->DefinedView(); double aS = aV->Scale(); @@ -892,14 +986,14 @@ void PartSet_Module::onViewTransformed(int theTrsfType) } if (aView.IsNull()) return; - double aLen = aView->Convert(SketcherPrs_Tools::getDefaultArrowSize()); + double aLen = aView->Convert(SketcherPrs_Tools::getConfigArrowSize()); double aPrevLen = SketcherPrs_Tools::getArrowSize(); SketcherPrs_Tools::setArrowSize(aLen); - const double aPrevScale = aViewer->Scale(aViewer->activeView()); const double aCurScale = aViewer->activeView()->Camera()->Scale(); aViewer->SetScale(aViewer->activeView(), aCurScale); - SketcherPrs_Tools::setTextHeight (aCurScale / aPrevScale * SketcherPrs_Tools::getTextHeight()); + double aTextHeight = SketcherPrs_Tools::getConfigTextHeight(); + SketcherPrs_Tools::setTextHeight (aTextHeight); bool isModified = false; QList aPrsList = aDisplayer->displayedPresentations(); foreach (AISObjectPtr aAIS, aPrsList) { @@ -908,6 +1002,7 @@ void PartSet_Module::onViewTransformed(int theTrsfType) Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(aAisObj); if (!aDim.IsNull()) { aDim->DimensionAspect()->ArrowAspect()->SetLength(aLen); + aDim->DimensionAspect()->TextAspect()->SetHeight(aTextHeight); aContext->Redisplay(aDim, false); isModified = true; } @@ -916,7 +1011,13 @@ void PartSet_Module::onViewTransformed(int theTrsfType) aDisplayer->updateViewer(); } -void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, const ModuleBase_CustomizeFlag& theFlag, +bool PartSet_Module::isCustomPrsActivated(const ModuleBase_CustomizeFlag& theFlag) const +{ + return myCustomPrs->isActive(theFlag); +} + +void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, + const ModuleBase_CustomizeFlag& theFlag, const bool theUpdateViewer) { myCustomPrs->activate(theFeature, theFlag, theUpdateViewer); @@ -933,46 +1034,64 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the { bool aCustomized = false; - if (theResult.get()) + XGUI_Workshop* aWorkshop = getWorkshop(); + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + ObjectPtr anObject = aDisplayer->getObject(thePrs); + if (!anObject) return aCustomized; + if (!theResult.get()) { + std::vector aColor; + XGUI_CustomPrs::getDefaultColor(anObject, true, aColor); + if (!aColor.empty()) { + aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); + } + } + // customize dimentional constrains + sketchMgr()->customizePresentation(anObject); + + return aCustomized; +} + +bool PartSet_Module::afterCustomisePresentation(std::shared_ptr theResult, + AISObjectPtr thePrs, + GeomCustomPrsPtr theCustomPrs) +{ + bool aCustomized = false; + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_Displayer* aDisplayer = aWorkshop->displayer(); ObjectPtr anObject = aDisplayer->getObject(thePrs); - if (anObject.get()) { - bool isConflicting = myOverconstraintListener->isConflictingObject(anObject); - // customize sketch symbol presentation - if (thePrs.get()) { - Handle(AIS_InteractiveObject) anAISIO = thePrs->impl(); - if (!anAISIO.IsNull()) { - if (!Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO).IsNull()) { - Handle(SketcherPrs_SymbolPrs) aPrs = Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO); - if (!aPrs.IsNull()) { - std::vector aColor; - myOverconstraintListener->getConflictingColor(aColor); - aPrs->SetConflictingConstraint(isConflicting, aColor); - aCustomized = true; - } - } - } - } - // customize sketch dimension constraint presentation - if (!aCustomized) { - std::vector aColor; - if (isConflicting) { - myOverconstraintListener->getConflictingColor(aColor); + if (!anObject) + return aCustomized; + + std::vector aColor; + bool aUseCustomColor = true; + if (aUseCustomColor) + myOverconstraintListener->getCustomColor(anObject, aColor); + // customize sketch symbol presentation + Handle(AIS_InteractiveObject) anAISIO = thePrs->impl(); + if (!anAISIO.IsNull()) { + if (!Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO).IsNull()) { + Handle(SketcherPrs_SymbolPrs) aPrs = Handle(SketcherPrs_SymbolPrs)::DownCast(anAISIO); + if (!aPrs.IsNull()) { + aPrs->SetCustomColor(aColor); + aCustomized = true; } - if (aColor.empty()) - XGUI_CustomPrs::getDefaultColor(anObject, true, aColor); - if (!aColor.empty()) { - aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); + } else if (!Handle(SketcherPrs_Coincident)::DownCast(anAISIO).IsNull()) { + Handle(SketcherPrs_Coincident) aPrs = Handle(SketcherPrs_Coincident)::DownCast(anAISIO); + if (!aPrs.IsNull()) { + aPrs->SetCustomColor(aColor); + aCustomized = true; } } - - // customize dimentional constrains - sketchMgr()->customizePresentation(anObject); } - + // customize sketch dimension constraint presentation + if (!aCustomized) { + if (!aColor.empty()) { // otherwise presentation has the default color + aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); + } + } return aCustomized; } @@ -992,14 +1111,14 @@ void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) if (aOB) { QLabel* aLabel = aOB->activeDocLabel(); aLabel->installEventFilter(myMenuMgr); - connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)), + connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(onActiveDocPopup(const QPoint&))); - //QPalette aPalet = aLabel->palette(); - //aPalet.setColor(QPalette::Text, QColor(0, 72, 140)); - //aLabel->setPalette(aPalet); aOB->treeView()->setExpandsOnDoubleClick(false); - connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), + connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), SLOT(onTreeViewDoubleClick(const QModelIndex&))); + + Events_Loop* aLoop = Events_Loop::loop(); + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED)); } } @@ -1036,7 +1155,7 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const // if there is an active widget, find the presented object in it if (!anActiveWidget) anActiveWidget = aPanel->preselectionWidget(); - + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast (anActiveWidget); if (aWidgetValidated) @@ -1051,7 +1170,7 @@ bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const bool aCanBeShaged = true; Handle(PartSet_ResultSketchPrs) aPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theAIS); - if (!aPrs.IsNull()) + if (!aPrs.IsNull()) aCanBeShaged = false; return aCanBeShaged; @@ -1064,19 +1183,21 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const SessionPtr aMgr = ModelAPI_Session::get(); QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD"); + bool hasResult = false; + bool hasFeature = false; + bool hasParameter = false; + bool hasCompositeOwner = false; + bool hasResultInHistory = false; + ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, + hasCompositeOwner, hasResultInHistory); + ModuleBase_Operation* aCurrentOp = myWorkshop->currentOperation(); if (aSelected == 1) { - bool hasResult = false; - bool hasFeature = false; - bool hasParameter = false; - bool hasCompositeOwner = false; - ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, - hasCompositeOwner); ObjectPtr aObject = aObjects.first(); if (aObject) { ResultPartPtr aPart = std::dynamic_pointer_cast(aObject); FeaturePtr aFeature = std::dynamic_pointer_cast(aObject); - bool isPart = aPart.get() || + bool isPart = aPart.get() || (aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID())); if (isPart) { DocumentPtr aPartDoc; @@ -1085,7 +1206,7 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } if (aPart.get()) // this may be null is Part feature is disabled aPartDoc = aPart->partDoc(); - + theMenu->addAction(aActivatePartAction); aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc)); @@ -1099,10 +1220,12 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } } } - - ResultBodyPtr aResult = std::dynamic_pointer_cast(aObject); - if( aResult.get() ) - theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD")); + } + } else { + if (hasFeature) { + myMenuMgr->action("EDIT_CMD")->setEnabled(aCurrentOp == 0); + theMenu->addAction(myMenuMgr->action("EDIT_CMD")); + theMenu->addSeparator(); } } bool aNotDeactivate = (aCurrentOp == 0); @@ -1111,17 +1234,27 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } } +#define EXPAND_PARENT(OBJ) \ +QModelIndex aObjIndex = aDataModel->objectIndex(OBJ); \ +if (aObjIndex.isValid()) { \ + QModelIndex aParent = aObjIndex.parent(); \ + int aCount = aDataModel->rowCount(aParent); \ + if (aCount == 1) \ + aTreeView->setExpanded(aParent, true); \ +} + + void PartSet_Module::processEvent(const std::shared_ptr& theMessage) { if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) { // Do not change activation of parts if an operation active static QStringList aAllowActivationList; if (aAllowActivationList.isEmpty()) - aAllowActivationList << - QString(PartSetPlugin_Part::ID().c_str()) << + aAllowActivationList << + QString(PartSetPlugin_Part::ID().c_str()) << QString(PartSetPlugin_Duplicate::ID().c_str()) << QString(PartSetPlugin_Remove::ID().c_str()); - if (myWorkshop->currentOperation() && + if (myWorkshop->currentOperation() && (!aAllowActivationList.contains(myWorkshop->currentOperation()->id()))) return; XGUI_Workshop* aWorkshop = getWorkshop(); @@ -1131,12 +1264,17 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr aActiveDoc = aMgr->activeDocument(); - if (aActivePartIndex.isValid()) - aTreeView->setExpanded(aActivePartIndex, false); + if (myActivePartIndex.isValid()) + aTreeView->setExpanded(myActivePartIndex, false); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); - aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc); - if (aActivePartIndex.isValid()) - aTreeView->setExpanded(aActivePartIndex, true); + myActivePartIndex = aDataModel->documentRootIndex(aActiveDoc, 0); + bool needUpdate = false; + if (myActivePartIndex.isValid()) { + needUpdate = aTreeView->isExpanded(myActivePartIndex); + if (!needUpdate) + aTreeView->setExpanded(myActivePartIndex, true); + } aLabel->setPalette(aPalet); aWorkshop->updateCommandStatus(); @@ -1146,13 +1284,49 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess QObjectPtrList aObjects = aDisplayer->displayedObjects(); bool aHidden; foreach(ObjectPtr aObj, aObjects) { - //TODO: replace by redisplay event. - aHidden = !aObj->data() || !aObj->data()->isValid() || + aHidden = !aObj->data() || !aObj->data()->isValid() || aObj->isDisabled() || (!aObj->isDisplayed()); if (!aHidden) aDisplayer->redisplay(aObj, false); } aDisplayer->updateViewer(); + // Update tree items if they are expanded + if (needUpdate) { + aTreeView->viewport()->repaint(aTreeView->viewport()->rect()); + } + } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) { + std::shared_ptr aUpdMsg = + std::dynamic_pointer_cast(theMessage); + std::set aObjects = aUpdMsg->objects(); + + ObjectPtr aConstrObj; + ObjectPtr aResultObj; + std::set::const_iterator aIt; + DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument(); + for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { + ObjectPtr aObject = (*aIt); + if ((!aResultObj.get()) && (aObject->groupName() == ModelAPI_ResultBody::group()) + && (aObject->document() != aRootDoc)) + aResultObj = aObject; + if ((!aConstrObj.get()) && (aObject->groupName() == ModelAPI_ResultConstruction::group()) + && (aObject->document() != aRootDoc)) + aConstrObj = aObject; + if (aResultObj.get() && aConstrObj.get()) + break; + } + + if (aResultObj.get() || aConstrObj.get()) { + XGUI_Workshop* aWorkshop = getWorkshop(); + XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView(); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); + + if (aResultObj.get()) { + EXPAND_PARENT(aResultObj) + } + if (aConstrObj.get()) { + EXPAND_PARENT(aConstrObj) + } + } } } @@ -1162,10 +1336,11 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) return; SessionPtr aMgr = ModelAPI_Session::get(); if (!theIndex.isValid()) { - aMgr->setActiveDocument(aMgr->moduleDocument()); + // It seems that this code is obsolete + //aMgr->setActiveDocument(aMgr->moduleDocument()); return; } - if (theIndex.column() != 0) // Use only first column + if (theIndex.column() != 1) // Use only first column return; XGUI_Workshop* aWorkshop = getWorkshop(); @@ -1186,7 +1361,7 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) if (aPart->partDoc() == aMgr->activeDocument()) { myMenuMgr->activatePartSet(); } else { - aPart->activate(); + myMenuMgr->activatePart(aPart); } } } @@ -1223,7 +1398,8 @@ void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*) if (aOperation) { ModuleBase_ModelWidget* anActiveWidget = activeWidget(); if (anActiveWidget) { - ModuleBase_WidgetSelector* aWSelector = dynamic_cast(anActiveWidget); + ModuleBase_WidgetSelector* aWSelector = + dynamic_cast(anActiveWidget); if (aWSelector) aWSelector->activateSelectionAndFilters(true); } @@ -1241,11 +1417,6 @@ bool PartSet_Module::processEnter(const std::string& thePreviousAttributeID) return mySketchReentrantMgr->processEnter(thePreviousAttributeID); } -//****************************************************** -void PartSet_Module::beforeOperationStarted(ModuleBase_Operation* theOperation) -{ -} - //****************************************************** void PartSet_Module::beforeOperationStopped(ModuleBase_Operation* theOperation) { @@ -1260,7 +1431,7 @@ GeomShapePtr PartSet_Module::findShape(const AttributePtr& theAttribute) GeomShapePtr aGeomShape; ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { + if (anOperation && sketchMgr()->isNestedSketchOperation(anOperation)) { aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop); } return aGeomShape; @@ -1283,17 +1454,29 @@ AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject, if (aGeomShape.get()) { TopoDS_Shape aTDSShape = aGeomShape->impl(); - return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape, + return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape, mySketchMgr->activeSketch()); } return anAttribute; } +//****************************************************** +std::shared_ptr PartSet_Module::reentrantMessage() +{ + return sketchReentranceMgr()->reentrantMessage(); +} + +//****************************************************** +void PartSet_Module::setReentrantPreSelection(const std::shared_ptr& theMessage) +{ + sketchReentranceMgr()->setReentrantPreSelection(theMessage); +} + //****************************************************** void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget, int theIndex) { - PartSet_WidgetChoice* aChoiceWidget = dynamic_cast(theWidget); + ModuleBase_WidgetChoice* aChoiceWidget = dynamic_cast(theWidget); if (!aChoiceWidget) return; @@ -1322,38 +1505,3 @@ void PartSet_Module::setDefaultConstraintShown() myHasConstraintShown[PartSet_Tools::Dimensional] = true; myHasConstraintShown[PartSet_Tools::Expressions] = false; } - -//****************************************************** -bool PartSet_Module::canActivateSelectionMode(const Handle(AIS_InteractiveObject)& theIO, int theMode) const -{ - if (theMode == TopAbs_FACE) { - Handle(PartSet_ResultSketchPrs) aSketchPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theIO); - if (!aSketchPrs.IsNull()) { - ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - if (anOperation) { - ModuleBase_IPropertyPanel* aPropPanel = anOperation->propertyPanel(); - if (aPropPanel) { - ModuleBase_ModelWidget* aModelWgt = aPropPanel->activeWidget(); - ModuleBase_WidgetSelector* aWgtSelector = dynamic_cast(aModelWgt); - if (aWgtSelector) { - return aWgtSelector->isFilterActivated(); - } else - return true; - } else - return false; - } else - return false; - } - } - return true; -} - -//****************************************************** -bool PartSet_Module::needDeactivateSelectionMode(const Handle(AIS_InteractiveObject)& theIO, int theMode) const -{ - if (theMode == TopAbs_FACE) { - Handle(PartSet_ResultSketchPrs) aSketchPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theIO); - return !aSketchPrs.IsNull(); - } - return false; -}