X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=a28587f5b278b1b7e8cae90d93f553bfabd0d7fe;hb=62d90f590c1d7d2457887fe2ff9b76e07bd9b718;hp=f4480e827d1cfd2f95a90fb58031fb16a599857e;hpb=7e98da81e21fa2f2ff5810c02fc78c6e846a1467;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index f4480e827..a28587f5b 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,22 +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_WidgetSubShapeSelector.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" @@ -36,6 +51,8 @@ #include #include #include +#include +#include #include #include #include @@ -59,29 +76,32 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include #include -#include -#include -#include +#include #include +#include #include -#include +#include +#include +#include +#include +#include #include -#include +#include +#include -#include -#include #include #include #include #include #include #include +#include +#include +#include #include #include @@ -124,6 +144,7 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* return new PartSet_Module(theWshop); } +//****************************************************** PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), myVisualLayerId(0), @@ -132,7 +153,7 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) 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(); @@ -152,8 +173,13 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) Events_Loop* aLoop = Events_Loop::loop(); aLoop->registerListener(this, Events_Loop::eventByName(EVENT_DOCUMENT_CHANGED)); - mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop)); - mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop)); + registerSelectionFilter(SF_GlobalFilter, new PartSet_GlobalFilter(myWorkshop)); + registerSelectionFilter(SF_FilterInfinite, new PartSet_FilterInfinite(myWorkshop)); + Handle(PartSet_ResultGroupNameFilter) aCRFilter = new PartSet_ResultGroupNameFilter(myWorkshop); + std::set aCRGroupNames; + aCRGroupNames.insert(ModelAPI_ResultConstruction::group()); + aCRFilter->setGroupNames(aCRGroupNames); + registerSelectionFilter(SF_ResultGroupNameFilter, aCRFilter); setDefaultConstraintShown(); @@ -166,13 +192,26 @@ 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()); + + Config_PropManager::registerProp("Visualization", "hidden_face_transparency", + "Hidden faces transparency", + Config_Prop::DblSpin, + "0.8"); } +//****************************************************** PartSet_Module::~PartSet_Module() { - SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); - for (; aIt.More(); aIt.Next()) { - Handle(SelectMgr_Filter) aFilter = aIt.Value(); + std::map::const_iterator aFiltersIt = + mySelectionFilters.begin(); + for (; aFiltersIt != mySelectionFilters.end(); aFiltersIt++) { + Handle(SelectMgr_Filter) aFilter = aFiltersIt->second; if (!aFilter.IsNull()) aFilter.Nullify(); } @@ -180,36 +219,25 @@ PartSet_Module::~PartSet_Module() delete myOverconstraintListener; } -void PartSet_Module::activateSelectionFilters() -{ - SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); - for (; aIt.More(); aIt.Next()) { - Handle(SelectMgr_Filter) aFilter = aIt.Value(); - if (!aFilter.IsNull()) - myWorkshop->viewer()->addSelectionFilter(aFilter); - } -} - -void PartSet_Module::deactivateSelectionFilters() -{ - SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); - for (; aIt.More(); aIt.Next()) { - Handle(SelectMgr_Filter) aFilter = aIt.Value(); - if (!aFilter.IsNull()) - myWorkshop->viewer()->removeSelectionFilter(aFilter); - } -} - +//****************************************************** 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() { //Registering of validators @@ -230,34 +258,31 @@ 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); + aFactory->registerValidator("PartSet_IntersectionSelection", new PartSet_IntersectionSelection); } -void PartSet_Module::registerProperties() -{ - Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_size", "Size", Config_Prop::Double, - PLANE_SIZE); - Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_thickness", "Thickness", - Config_Prop::Integer, SKETCH_WIDTH); - Config_PropManager::registerProp(SKETCH_TAB_NAME, "rotate_to_plane", - "Rotate to plane when selected", Config_Prop::Boolean, "false"); -} - +//****************************************************** void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect) { mySketchMgr->connectToPropertyPanel(theWidget, isToConnect); } +//****************************************************** void PartSet_Module::operationCommitted(ModuleBase_Operation* 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)) { @@ -273,12 +298,17 @@ void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) } } +//****************************************************** 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_OperationFeature* aFOperation = dynamic_cast @@ -366,6 +396,7 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) } } +//****************************************************** void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation) { if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { @@ -376,6 +407,7 @@ void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation) } } +//****************************************************** void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperation) { ModuleBase_OperationFeature* aFOperation = @@ -386,6 +418,7 @@ void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperati } } +//****************************************************** void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) { ModuleBase_IModule::operationResumed(theOperation); @@ -398,6 +431,7 @@ void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) } } +//****************************************************** void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) { bool isModifiedArgs = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false); @@ -424,6 +458,7 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) } } +//****************************************************** ModuleBase_Operation* PartSet_Module::currentOperation() const { XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); @@ -431,6 +466,7 @@ ModuleBase_Operation* PartSet_Module::currentOperation() const return anOpMgr->currentOperation(); } +//****************************************************** bool PartSet_Module::canUndo() const { bool aCanUndo = false; @@ -443,6 +479,7 @@ bool PartSet_Module::canUndo() const return aCanUndo; } +//****************************************************** bool PartSet_Module::canRedo() const { bool aCanRedo = false; @@ -455,6 +492,7 @@ bool PartSet_Module::canRedo() const return aCanRedo; } +//****************************************************** bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const { bool aValid = true; @@ -470,23 +508,36 @@ bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& t return aValid; } +//****************************************************** bool PartSet_Module::canEraseObject(const ObjectPtr& theObject) const { // the sketch manager put the restriction to the objects erase return mySketchMgr->canEraseObject(theObject); } +//****************************************************** bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const { // the sketch manager put the restriction to the objects display 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); }*/ +//****************************************************** bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const { bool aCanActivate = ModuleBase_IModule::canActivateSelection(theObject); @@ -504,6 +555,7 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const return aCanActivate; } +//****************************************************** bool PartSet_Module::addViewerMenu(const QMap& theStdActions, QWidget* theParent, QMap& theMenuActions) const @@ -511,20 +563,23 @@ bool PartSet_Module::addViewerMenu(const QMap& theStdActions, return myMenuMgr->addViewerMenu(theStdActions, theParent, theMenuActions); } +//****************************************************** void PartSet_Module::updateViewerMenu(const QMap& theStdActions) { myMenuMgr->updateViewerMenu(theStdActions); } +//****************************************************** bool PartSet_Module::isActionEnableStateFixed(const int theActionId) const { bool isEnabledFixed = false; if (theActionId == XGUI_ActionsMgr::AcceptAll && - mySketchReentrantMgr->isInternalEditStarted()) + mySketchReentrantMgr->isInternalEditActive()) isEnabledFixed = true; return isEnabledFixed; } +//****************************************************** QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature) { QString anError = ModuleBase_IModule::getFeatureError(theFeature); @@ -534,6 +589,7 @@ QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature) return anError; } +//****************************************************** void PartSet_Module::grantedOperationIds(ModuleBase_Operation* theOperation, QStringList& theIds) const { @@ -545,30 +601,116 @@ void PartSet_Module::grantedOperationIds(ModuleBase_Operation* theOperation, } } +//****************************************************** void PartSet_Module::activeSelectionModes(QIntList& theModes) { - theModes.clear(); if (mySketchMgr->activeSketch().get()) - PartSet_SketcherMgr::sketchSelectionModes(theModes); + PartSet_SketcherMgr::sketchSelectionModes(mySketchMgr->activeSketch(), theModes); + else + theModes = XGUI_Tools::workshop(myWorkshop)->viewerSelectionModes(); } -void PartSet_Module::customSubShapesSelectionModes(QIntList& theTypes) +//****************************************************** +void PartSet_Module::moduleSelectionModes(int theModesType, QIntList& theModes) { - if (theTypes.contains(TopAbs_FACE)) - theTypes.append(SketcherPrs_Tools::Sel_Sketch_Face); - if (theTypes.contains(TopAbs_WIRE)) - theTypes.append(SketcherPrs_Tools::Sel_Sketch_Wire); + customSubShapesSelectionModes(theModes); + //theModes.append(XGUI_Tools::workshop(myWorkshop)->viewerSelectionModes()); + //myWorkshop->module()->activeSelectionModes(theModes); } +//****************************************************** +void PartSet_Module::moduleSelectionFilters(const QIntList& theFilterTypes, + SelectMgr_ListOfFilter& theSelectionFilters) +{ + bool isSketchActive = mySketchMgr->activeSketch().get(); + + std::map::const_iterator aFiltersIt = + mySelectionFilters.begin(); + for (; aFiltersIt != mySelectionFilters.end(); aFiltersIt++) { + int aFilterType = aFiltersIt->first; + // do not add not participating filters in given parameters + if (!theFilterTypes.contains(aFilterType)) + continue; + + // using sketch filters only if sketch operation is active + if (!isSketchActive && + mySketchMgr->sketchSelectionFilter((XGUI_SelectionFilterType)aFilterType)) + continue; + + // using filtering of construction results only from faces panel + if (aFilterType == SF_ResultGroupNameFilter) + continue; + + theSelectionFilters.Append(aFiltersIt->second); + } +} + +//****************************************************** +QIntList PartSet_Module::selectionFilters() +{ + QIntList aTypes; + + std::map::const_iterator aFiltersIt = + mySelectionFilters.begin(); + for (; aFiltersIt != mySelectionFilters.end(); aFiltersIt++) + aTypes.append(aFiltersIt->first); + + return aTypes; +} + +//****************************************************** +void PartSet_Module::registerSelectionFilter(const XGUI_SelectionFilterType theFilterType, + const Handle(SelectMgr_Filter)& theFilter) +{ + mySelectionFilters[theFilterType] = theFilter; +} + +//****************************************************** +Handle(SelectMgr_Filter) PartSet_Module::selectionFilter(const int theType) +{ + XGUI_SelectionFilterType aType = (XGUI_SelectionFilterType)theType; + + if (mySelectionFilters.find(aType) != mySelectionFilters.end()) + return mySelectionFilters[aType]; + else + return Handle(SelectMgr_Filter)(); +} + +//****************************************************** +void PartSet_Module::customSubShapesSelectionModes(QIntList& theModes) +{ + if (theModes.contains(TopAbs_FACE)) + theModes.append(SketcherPrs_Tools::Sel_Sketch_Face); + if (theModes.contains(TopAbs_WIRE)) + theModes.append(SketcherPrs_Tools::Sel_Sketch_Wire); + + if (mySketchMgr->activeSketch().get()) + PartSet_SketcherMgr::sketchSelectionModes(mySketchMgr->activeSketch(), theModes); +} + +//****************************************************** +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()->isInternalEditStarted()) + if (sketchReentranceMgr()->isInternalEditActive()) isNeutralPoint = false; if (myIsOperationIsLaunched) isNeutralPoint = false; @@ -576,21 +718,23 @@ bool PartSet_Module::isSketchNeutralPointActivated() const return isNeutralPoint; } +//****************************************************** void PartSet_Module::closeDocument() { myActivePartIndex = QModelIndex(); - clearViewer(); } +//****************************************************** void PartSet_Module::clearViewer() { myCustomPrs->clearPrs(); XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_Displayer* aDisplayer = aWorkshop->displayer(); - aDisplayer->deactivateSelectionFilters(); + aDisplayer->deactivateSelectionFilters(false); } +//****************************************************** void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { ModuleBase_OperationFeature* aFOperation = @@ -604,6 +748,7 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) aPanel->activateWidget(aPanel->modelWidgets().first()); } +//****************************************************** bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, QList& theWidgets) const { @@ -656,6 +801,7 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, return aProcessed; } +//****************************************************** void PartSet_Module::onSelectionChanged() { ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); @@ -689,6 +835,7 @@ void PartSet_Module::onSelectionChanged() } } +//****************************************************** void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent) { XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); @@ -696,6 +843,7 @@ void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* the anOpMgr->onKeyReleased(theWnd->viewPort(), theEvent); } +//****************************************************** ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent, Config_WidgetAPI* theWidgetApi) @@ -723,11 +871,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); @@ -739,12 +882,6 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; } - else if (theType == "sketch_sub_shape_selector") { - PartSet_WidgetSubShapeSelector* aSubShapeSelectorWgt = - new PartSet_WidgetSubShapeSelector(theParent, aWorkshop, theWidgetApi); - aSubShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); - aWgt = aSubShapeSelectorWgt; - } else if (theType == "sketch_feature_point_selector") { PartSet_WidgetFeaturePointSelector* aPointSelectorWgt = new PartSet_WidgetFeaturePointSelector(theParent, aWorkshop, theWidgetApi); @@ -758,28 +895,30 @@ 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))); } return aWgt; } +//****************************************************** ModuleBase_ModelWidget* PartSet_Module::activeWidget() const { ModuleBase_ModelWidget* anActiveWidget = 0; - anActiveWidget = mySketchReentrantMgr->internalActiveWidget(); - if (!anActiveWidget) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation) { - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - anActiveWidget = aPanel ? aPanel->activeWidget() : 0; - } - } - return anActiveWidget; + ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); + if (!aOperation) + return anActiveWidget; + + ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + if (!aPanel) + return anActiveWidget; + + return aPanel->activeWidget(true); } +//****************************************************** bool PartSet_Module::deleteObjects() { bool isProcessed = false; @@ -830,7 +969,8 @@ 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); @@ -852,51 +992,32 @@ bool PartSet_Module::deleteObjects() return isProcessed; } -void PartSet_Module::onFeatureTriggered() -{ - // is commented for imp: Unpressing the button of the current action must behave like - // a validation if the entity can be created (instead of Cancel, as currently) - /*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 = myModule->sketchMgr()->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()); ModuleBase_IModule::editFeature(theFeature); } +//****************************************************** 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()); updateConstraintsState(theCmdId.toStdString()); - ModuleBase_IModule::launchOperation(theCmdId); + ModuleBase_IModule::launchOperation(theCmdId, isStartAfterCommitOnly); myIsOperationIsLaunched = false; } +//****************************************************** void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) { if (myWorkshop->currentOperation() && @@ -907,6 +1028,7 @@ void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) } } +//****************************************************** void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) { if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str()) || @@ -919,22 +1041,29 @@ void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) } } +//****************************************************** void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); if (!anAIS.IsNull()) { - Handle(AIS_InteractiveContext) aCtx = anAIS->GetContext(); - Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(anAIS); - if (!aDim.IsNull()) { - aCtx->SetZLayer(aDim, myVisualLayerId); - } else { - Handle(SketcherPrs_SymbolPrs) aCons = Handle(SketcherPrs_SymbolPrs)::DownCast(anAIS); - if (!aCons.IsNull()) - aCtx->SetZLayer(aCons, myVisualLayerId); + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + if (aFeature.get()) { + bool aToUseZLayer = false; + if (PartSet_Tools::findRefsToMeFeature(aFeature,SketchPlugin_Projection::ID())) + aToUseZLayer = true; + else { + CompositeFeaturePtr aParent = ModelAPI_Tools::compositeOwner(aFeature); + aToUseZLayer = (aParent.get() && (aParent->getKind() == SketchPlugin_Sketch::ID())); + } + if (aToUseZLayer) { + Handle(AIS_InteractiveContext) aCtx = anAIS->GetContext(); + aCtx->SetZLayer(anAIS, myVisualLayerId); + } } } } +//****************************************************** void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS) { // this is obsolete @@ -944,6 +1073,7 @@ void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAI // myCustomPrs->redisplay(theObject, false); } +//****************************************************** void PartSet_Module::onViewTransformed(int theTrsfType) { // Set length of arrows constant in pixel size @@ -974,35 +1104,42 @@ void PartSet_Module::onViewTransformed(int theTrsfType) } if (aView.IsNull()) return; - double aLen = aView->Convert(SketcherPrs_Tools::getDefaultArrowSize()); - - 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()); - bool isModified = false; - QList aPrsList = aDisplayer->displayedPresentations(); - foreach (AISObjectPtr aAIS, aPrsList) { - Handle(AIS_InteractiveObject) aAisObj = aAIS->impl(); - - Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(aAisObj); - if (!aDim.IsNull()) { - aDim->DimensionAspect()->ArrowAspect()->SetLength(aLen); - aContext->Redisplay(aDim, false); - isModified = true; + + ModuleBase_Operation* aCurrentOperation = myWorkshop->currentOperation(); + if (aCurrentOperation && + (PartSet_SketcherMgr::isSketchOperation(aCurrentOperation) || + sketchMgr()->isNestedSketchOperation(aCurrentOperation))) + { + double aLen = aView->Convert(SketcherPrs_Tools::getConfigArrowSize()); + + double aPrevLen = SketcherPrs_Tools::getArrowSize(); + SketcherPrs_Tools::setArrowSize(aLen); + const double aCurScale = aViewer->activeView()->Camera()->Scale(); + aViewer->SetScale(aViewer->activeView(), aCurScale); + bool isModified = false; + QList aPrsList = aDisplayer->displayedPresentations(); + foreach (AISObjectPtr aAIS, aPrsList) { + Handle(AIS_InteractiveObject) aAisObj = aAIS->impl(); + + Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(aAisObj); + if (!aDim.IsNull()) { + aDim->DimensionAspect()->ArrowAspect()->SetLength(aLen); + aContext->Redisplay(aDim, false); + isModified = true; + } } + if (isModified) + aDisplayer->updateViewer(); } - if (isModified) - aDisplayer->updateViewer(); } +//****************************************************** 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) @@ -1010,12 +1147,14 @@ void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, myCustomPrs->activate(theFeature, theFlag, theUpdateViewer); } +//****************************************************** void PartSet_Module::deactivateCustomPrs(const ModuleBase_CustomizeFlag& theFlag, const bool theUpdateViewer) { myCustomPrs->deactivate(theFlag, theUpdateViewer); } +//****************************************************** bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr thePrs, std::shared_ptr theCustomPrs) { @@ -1028,41 +1167,10 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the return aCustomized; if (!theResult.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; - } - } else if (!Handle(SketcherPrs_Coincident)::DownCast(anAISIO).IsNull()) { - Handle(SketcherPrs_Coincident) aPrs = Handle(SketcherPrs_Coincident)::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 (aColor.empty()) - XGUI_CustomPrs::getDefaultColor(anObject, true, aColor); - if (!aColor.empty()) { - aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); - } + std::vector aColor; + XGUI_CustomPrs::getDefaultColor(anObject, true, aColor); + if (!aColor.empty()) { + aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); } } // customize dimentional constrains @@ -1071,6 +1179,50 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the 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) + 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; + } + } 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 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; +} + +//****************************************************** bool PartSet_Module::customizeObject(ObjectPtr theObject, const ModuleBase_CustomizeFlag& theFlag, const bool theUpdateViewer) { @@ -1081,6 +1233,7 @@ bool PartSet_Module::customizeObject(ObjectPtr theObject, const ModuleBase_Custo return isRedisplayed; } +//****************************************************** void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) { XGUI_ObjectsBrowser* aOB = dynamic_cast(theObjectBrowser); @@ -1098,6 +1251,7 @@ void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) } } +//****************************************************** void PartSet_Module::onActiveDocPopup(const QPoint& thePnt) { SessionPtr aMgr = ModelAPI_Session::get(); @@ -1113,12 +1267,13 @@ void PartSet_Module::onActiveDocPopup(const QPoint& thePnt) aMenu.exec(aHeader->mapToGlobal(thePnt)); } +//****************************************************** Handle(AIS_InteractiveObject) PartSet_Module::createPresentation(const ResultPtr& theResult) { return mySketchMgr->createPresentation(theResult); } - +//****************************************************** ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const { ObjectPtr anObject; @@ -1141,6 +1296,7 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const return anObject; } +//****************************************************** bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const { bool aCanBeShaged = true; @@ -1152,6 +1308,7 @@ bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const return aCanBeShaged; } +//****************************************************** void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const { QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects(); @@ -1163,8 +1320,10 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const bool hasFeature = false; bool hasParameter = false; bool hasCompositeOwner = false; + bool hasResultInHistory = false; + bool hasFolder = false; ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, - hasCompositeOwner); + hasCompositeOwner, hasResultInHistory, hasFolder); ModuleBase_Operation* aCurrentOp = myWorkshop->currentOperation(); if (aSelected == 1) { @@ -1209,6 +1368,7 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } } +//****************************************************** #define EXPAND_PARENT(OBJ) \ QModelIndex aObjIndex = aDataModel->objectIndex(OBJ); \ if (aObjIndex.isValid()) { \ @@ -1218,7 +1378,7 @@ if (aObjIndex.isValid()) { \ aTreeView->setExpanded(aParent, true); \ } - +//****************************************************** void PartSet_Module::processEvent(const std::shared_ptr& theMessage) { if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) { @@ -1239,12 +1399,18 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr aActiveDoc = aMgr->activeDocument(); - if (myActivePartIndex.isValid()) - aTreeView->setExpanded(myActivePartIndex, false); + // workaround for #2431 (SISGSEGV when launching some unit tests from GUI) + //if (myActivePartIndex.isValid()) + // aTreeView->setExpanded(myActivePartIndex, false); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); - myActivePartIndex = aDataModel->documentRootIndex(aActiveDoc); - if (myActivePartIndex.isValid()) - aTreeView->setExpanded(myActivePartIndex, 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(); @@ -1260,6 +1426,10 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess 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); @@ -1296,6 +1466,7 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess } } +//****************************************************** void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) { if (myWorkshop->currentOperation()) // Do not change activation of parts if an operation active @@ -1306,7 +1477,7 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) //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(); @@ -1332,7 +1503,7 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) } } - +//****************************************************** void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*) { // z layer is created for all started operations in order to visualize operation AIS presentation @@ -1360,16 +1531,8 @@ void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*) } // if there is an active operation with validated widget, // the filters of this widget should be activated in the created view - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation) { - ModuleBase_ModelWidget* anActiveWidget = activeWidget(); - if (anActiveWidget) { - ModuleBase_WidgetSelector* aWSelector = - dynamic_cast(anActiveWidget); - if (aWSelector) - aWSelector->activateSelectionAndFilters(true); - } - } + myWorkshop->selectionActivate()->updateSelectionFilters(); + myWorkshop->selectionActivate()->updateSelectionModes(); } //****************************************************** @@ -1378,6 +1541,7 @@ void PartSet_Module::widgetStateChanged(int thePreviousState) mySketchMgr->widgetStateChanged(thePreviousState); } +//****************************************************** bool PartSet_Module::processEnter(const std::string& thePreviousAttributeID) { return mySketchReentrantMgr->processEnter(thePreviousAttributeID); @@ -1426,11 +1590,23 @@ AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject, 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;