X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=f53edf79b0b553ce577e56f3702a4375b11d7592;hb=a8cfbfb436c27ff96edd5c808e9a452c35cef207;hp=9b380a839de031128e1b0311af90b67a7373f389;hpb=24f9658d6e124a268c6a3abcf24f07aa2dc6d268;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 9b380a839..f53edf79b 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -4,21 +4,23 @@ #include "PartSet_WidgetSketchLabel.h" #include "PartSet_Validators.h" #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_WidgetPoint2dAngle.h" #include "PartSet_WidgetMultiSelector.h" #include "PartSet_WidgetEditor.h" #include "PartSet_WidgetFileSelector.h" #include "PartSet_WidgetSketchCreator.h" #include "PartSet_SketcherMgr.h" #include "PartSet_SketcherReetntrantMgr.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" #include "PartSet_FilterInfinite.h" @@ -37,6 +39,9 @@ #include #include #include +#include +#include +#include #include #include @@ -45,6 +50,7 @@ #include #include #include +#include #include #include @@ -61,6 +67,8 @@ #include #include #include +#include +#include #include #include @@ -93,6 +101,7 @@ #include #include #include +#include #include #include @@ -111,7 +120,7 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myVisualLayerId(0), myHasConstraintShown(true) + myVisualLayerId(0) { new PartSet_IconFactory(); @@ -121,10 +130,6 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) XGUI_ModuleConnector* aConnector = dynamic_cast(theWshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); - XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); - connect(anOpMgr, SIGNAL(operationActivatedByPreselection()), - this, SLOT(onOperationActivatedByPreselection())); - ModuleBase_IViewer* aViewer = theWshop->viewer(); connect(aViewer, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)), this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*))); @@ -132,15 +137,28 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) SLOT(onViewTransformed(int))); connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)), SLOT(onViewCreated(ModuleBase_IViewWindow*))); - myMenuMgr = new PartSet_MenuMgr(this); myCustomPrs = new PartSet_CustomPrs(theWshop); + myOverconstraintListener = new PartSet_OverconstraintListener(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)); + + setDefaultConstraintShown(); + + Config_PropManager::registerProp("Visualization", "operation_parameter_color", + "Reference shape wireframe color in operation", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_PARAMETER_COLOR()); + Config_PropManager::registerProp("Visualization", "operation_result_color", + "Result shape wireframe color in operation", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_RESULT_COLOR()); + Config_PropManager::registerProp("Visualization", "operation_highlight_color", + "Multi selector item color in operation", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_HIGHLIGHT_COLOR()); } PartSet_Module::~PartSet_Module() @@ -152,6 +170,7 @@ PartSet_Module::~PartSet_Module() aFilter.Nullify(); } delete myCustomPrs; + delete myOverconstraintListener; } void PartSet_Module::activateSelectionFilters() @@ -174,6 +193,16 @@ void PartSet_Module::deactivateSelectionFilters() } } +void PartSet_Module::storeSelection() +{ + sketchMgr()->storeSelection(); +} + +void PartSet_Module::restoreSelection() +{ + sketchMgr()->restoreSelection(); +} + void PartSet_Module::registerValidators() { //Registering of validators @@ -191,9 +220,10 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("PartSet_FilletSelection", new PartSet_FilletSelection); aFactory->registerValidator("PartSet_AngleSelection", new PartSet_AngleSelection); aFactory->registerValidator("PartSet_EqualSelection", new PartSet_EqualSelection); + aFactory->registerValidator("PartSet_CollinearSelection", new PartSet_CollinearSelection); + aFactory->registerValidator("PartSet_MiddlePointSelection", new PartSet_MiddlePointSelection); aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator); aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr); - aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator); } void PartSet_Module::registerFilters() @@ -232,9 +262,7 @@ void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) // the selection is cleared after commit the create operation // in order to do not use the same selected objects in the restarted operation // for common behaviour, the selection is cleared even if the operation is not restarted - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - aWorkshop->selector()->clearSelection(); + getWorkshop()->selector()->clearSelection(); } } } @@ -246,6 +274,86 @@ void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation) } 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; + } + } + } 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(); + } + } + 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) { /// Restart sketcher operations automatically mySketchReentrantMgr->operationStarted(theOperation); @@ -258,8 +366,10 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) } ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); - if (aFOperation) - myCustomPrs->activate(aFOperation->feature(), true); + if (aFOperation) { + myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); + myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); + } } void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) @@ -267,28 +377,36 @@ void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) ModuleBase_IModule::operationResumed(theOperation); ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); - if (aFOperation) - myCustomPrs->activate(aFOperation->feature(), true); + if (aFOperation) { + myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); + myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); + } } void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) { - bool isModified = myCustomPrs->deactivate(false); + bool isModifiedArgs = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeArguments, false); + bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false); + bool isModified = isModifiedArgs || isModifiedResults; - if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { - mySketchMgr->stopSketch(theOperation); - } - else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { mySketchMgr->stopNestedSketch(theOperation); } + else if (PartSet_SketcherMgr::isSketchOperation(theOperation)) + setDefaultConstraintShown(); //VSV: Viewer is updated on feature update and redisplay - //if (isModified) { - // XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - // XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - // aDisplayer->updateViewer(); - //} - mySketchMgr->onShowConstraintsToggle(myHasConstraintShown); + if (isModified) { + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + aDisplayer->updateViewer(); + } + + QMap::const_iterator anIt = myHasConstraintShown.begin(), + aLast = myHasConstraintShown.end(); + for (; anIt != aLast; anIt++) { + mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value()); + } } ModuleBase_Operation* PartSet_Module::currentOperation() const @@ -325,11 +443,12 @@ bool PartSet_Module::canRedo() const bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const { bool aValid = true; - if (theActionId == "DELETE_CMD" || theActionId == "MOVE_CMD") { + if (theActionId == "MOVE_CMD") { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); if (aFeature) { - // part features are removed in the PartSet module only. - if (aFeature->getKind() == PartSetPlugin_Part::ID()) + ResultPtr aResult = ModuleBase_Tools::firstResult(aFeature); + // part features can not be moved in the history. + if (aResult.get() && aResult->groupName() == ModelAPI_ResultPart::group()) aValid = false; } } @@ -348,6 +467,11 @@ bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const return mySketchMgr->canDisplayObject(theObject); } +/*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); @@ -364,9 +488,11 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const return aCanActivate; } -bool PartSet_Module::addViewerMenu(QMenu* theMenu, const QMap& theStdActions) const +bool PartSet_Module::addViewerMenu(const QMap& theStdActions, + QWidget* theParent, + QMap& theMenuActions) const { - return myMenuMgr->addViewerMenu(theMenu, theStdActions); + return myMenuMgr->addViewerMenu(theStdActions, theParent, theMenuActions); } void PartSet_Module::updateViewerMenu(const QMap& theStdActions) @@ -389,9 +515,7 @@ void PartSet_Module::grantedOperationIds(ModuleBase_Operation* theOperation, myMenuMgr->grantedOperationIds(theOperation, theIds); if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - + XGUI_Workshop* aWorkshop = getWorkshop(); theIds.append(aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text()); } } @@ -403,6 +527,14 @@ 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); +} + bool PartSet_Module::isMouseOverWindow() { return mySketchMgr->isMouseOverWindow(); @@ -417,8 +549,7 @@ void PartSet_Module::clearViewer() { myCustomPrs->clearPrs(); - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_Displayer* aDisplayer = aWorkshop->displayer(); aDisplayer->deactivateSelectionFilters(); } @@ -435,6 +566,48 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) aPanel->activateWidget(aPanel->modelWidgets().first()); } +bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, + QList& theWidgets) const +{ + bool aProcessed = false; + + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + XGUI_Workshop* aWorkshop = getWorkshop(); + XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); + if (mySketchMgr->activeSketch().get() && aFOperation && aPropertyPanel) { + ModuleBase_ISelection* aSelection = workshop()->selection(); + // click on a point in sketch leads here with the point is highlighted, not yet selected + QList aPreselection = aSelection->getHighlighted(); + if (aPreselection.size() == 1) { + ModuleBase_ViewerPrsPtr aSelectedPrs = aPreselection[0]; + ObjectPtr anObject = aSelectedPrs->object(); + + 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 + if (aFeature == anOpFeature && aShape.get() && !aShape->isNull()) { + const TopoDS_Shape& aTDShape = aShape->impl(); + AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aTDShape, + mySketchMgr->activeSketch()); + if (anAttribute.get()) { + QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); + ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), workshop()); + + const std::string anAttributeId = anAttribute->id(); + aFactory.createWidget(aPropertyPanel->contentWidget(), anAttributeId); + + theWidgets = aFactory.getModelWidgets(); + // it is possible that the point does not present in XML definition, + // in this case, we assume that it is not processed by this module + // e.g. "Intersection point" feature + aProcessed = !theWidgets.isEmpty(); + } + } + } + } + return aProcessed; +} void PartSet_Module::onSelectionChanged() { @@ -451,10 +624,10 @@ void PartSet_Module::onSelectionChanged() if (isSketcherOp) { // Editing of constraints can be done on selection ModuleBase_ISelection* aSelect = myWorkshop->selection(); - QList aSelected = aSelect->getSelected(); + QList aSelected = aSelect->getSelected(); if (aSelected.size() == 1) { - ModuleBase_ViewerPrs aPrs = aSelected.first(); - ObjectPtr aObject = aPrs.object(); + ModuleBase_ViewerPrsPtr aPrs = aSelected.first(); + ObjectPtr aObject = aPrs->object(); FeaturePtr aFeature = ModelAPI_Feature::feature(aObject); if (aFeature) { std::string aId = aFeature->getKind(); @@ -473,80 +646,62 @@ void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* the { XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); - anOpMgr->onKeyReleased(theEvent); -} - -void PartSet_Module::onOperationActivatedByPreselection() -{ - if (!mySketchReentrantMgr->canBeCommittedByPreselection()) - return; - - ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { - // Set final definitions if they are necessary - //propertyPanelDefined(aOperation); - - /// Commit sketcher operations automatically - anOperation->commit(); - } + anOpMgr->onKeyReleased(theWnd->viewPort(), theEvent); } -ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent, - Config_WidgetAPI* theWidgetApi, std::string theParentId) +ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, + QWidget* theParent, + Config_WidgetAPI* theWidgetApi) { ModuleBase_IWorkshop* aWorkshop = workshop(); - XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); - XGUI_Workshop* aXUIWorkshop = aConnector->workshop(); + XGUI_Workshop* aXUIWorkshop = getWorkshop(); ModuleBase_ModelWidget* aWgt = NULL; if (theType == "sketch-start-label") { PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, aWorkshop, - theWidgetApi, theParentId, mySketchMgr->isConstraintsShown()); + theWidgetApi, myHasConstraintShown); connect(aLabelWgt, SIGNAL(planeSelected(const std::shared_ptr&)), mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr&))); - connect(aLabelWgt, SIGNAL(showConstraintToggled(bool)), - mySketchMgr, SLOT(onShowConstraintsToggle(bool))); + connect(aLabelWgt, SIGNAL(showConstraintToggled(int, bool)), + mySketchMgr, SLOT(onShowConstraintsToggle(int, bool))); aWgt = aLabelWgt; } else if (theType == "sketch-2dpoint_selector") { PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, aWorkshop, - theWidgetApi, theParentId); + theWidgetApi); aPointWgt->setSketch(mySketchMgr->activeSketch()); connect(aPointWgt, SIGNAL(vertexSelected()), sketchReentranceMgr(), SLOT(onVertexSelected())); aWgt = aPointWgt; - } else if (theType == "sketch-2dpoint_flyout_selector") { + }else if (theType == "sketch-2dpoint_flyout_selector") { PartSet_WidgetPoint2DFlyout* aPointWgt = new PartSet_WidgetPoint2DFlyout(theParent, aWorkshop, - theWidgetApi, theParentId); + theWidgetApi); 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, theParentId); + aWorkshop, theWidgetApi); aDistanceWgt->setSketch(mySketchMgr->activeSketch()); aWgt = aDistanceWgt; - } else if(theType == "point2dangle") { - PartSet_WidgetPoint2dAngle* anAngleWgt = new PartSet_WidgetPoint2dAngle(theParent, - aWorkshop, theWidgetApi, theParentId); - anAngleWgt->setSketch(mySketchMgr->activeSketch()); - aWgt = anAngleWgt; } else if (theType == "sketch_shape_selector") { PartSet_WidgetShapeSelector* aShapeSelectorWgt = - new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi, theParentId); + new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi); aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; } else if (theType == "sketch_multi_selector") { PartSet_WidgetMultiSelector* aShapeSelectorWgt = - new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi, theParentId); + new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi); aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; - } else if (theType == WDG_DOUBLEVALUE_EDITOR) { - aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi, theParentId); + } + else if (theType == WDG_DOUBLEVALUE_EDITOR) { + aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi); } else if (theType == "export_file_selector") { - aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi, theParentId); + aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi); } else if (theType == "sketch_launcher") { - aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi, theParentId); + aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi); } else if (theType == "module_choice") { - aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi, theParentId); - connect(aWgt, SIGNAL(itemSelected(int)), SLOT(onBooleanOperationChange(int))); + aWgt = new PartSet_WidgetChoice(theParent, theWidgetApi); + connect(aWgt, SIGNAL(itemSelected(ModuleBase_ModelWidget*, int)), + this, SLOT(onChoiceChanged(ModuleBase_ModelWidget*, int))); } return aWgt; } @@ -568,8 +723,9 @@ ModuleBase_ModelWidget* PartSet_Module::activeWidget() const bool PartSet_Module::deleteObjects() { - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + bool isProcessed = false; + + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); //SessionPtr aMgr = ModelAPI_Session::get(); @@ -578,6 +734,7 @@ bool PartSet_Module::deleteObjects() bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { + isProcessed = true; // 2. find selected presentations // selected objects should be collected before the current operation abort because // the abort leads to selection lost on constraint objects. It can be corrected after #386 issue @@ -619,6 +776,11 @@ bool PartSet_Module::deleteObjects() 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 + XGUI_Tools::workshop(myWorkshop)->selector()->clearSelection(); + // 4. delete features // sketch feature should be skipped, only sub-features can be removed // when sketch operation is active @@ -626,41 +788,7 @@ bool PartSet_Module::deleteObjects() // 5. stop operation anOpMgr->commitOperation(); } - else { - bool isPartRemoved = false; - // Delete part with help of PartSet plugin - // TODO: the deleted objects has to be processed by multiselection - QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects(); - if (aObjects.size() == 1) { - ObjectPtr aObj = aObjects.first(); - FeaturePtr aFeature = std::dynamic_pointer_cast(aObj); - if (aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID())) { - // Remove feature should be created in the document of the part results - ResultPtr aPartResult = aFeature->firstResult(); - if (aPartResult.get()) { - std::shared_ptr aPart = - std::dynamic_pointer_cast(aPartResult); - DocumentPtr aPartDoc = aPart->partDoc(); - if (aPartDoc.get()) { - ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction - (PartSetPlugin_Remove::ID().c_str(), this); - if (!anOpMgr->canStartOperation(anOpAction->id())) - return true; // the objects are processed but can not be deleted - - anOpMgr->startOperation(anOpAction); - - FeaturePtr aFeature = aPartDoc->addFeature(PartSetPlugin_Remove::ID()); - aFeature->execute(); - - anOpMgr->commitOperation(); - isPartRemoved = true; - } - } - } - } - return isPartRemoved; - } - return true; + return isProcessed; } void PartSet_Module::onFeatureTriggered() @@ -684,16 +812,45 @@ void PartSet_Module::onFeatureTriggered() 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) { - if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) { - // Show constraints if a constraint was anOperation - myHasConstraintShown = mySketchMgr->isConstraintsShown(); - mySketchMgr->onShowConstraintsToggle(true); - } + storeConstraintsState(theCmdId.toStdString()); + updateConstraintsState(theCmdId.toStdString()); + ModuleBase_IModule::launchOperation(theCmdId); } +void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) +{ + if (myWorkshop->currentOperation() && + myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID()) { + const QMap& aShownStates = + mySketchMgr->showConstraintStates(); + myHasConstraintShown = aShownStates; + } +} + +void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) +{ + if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) { + // Show constraints if a constraint was anOperation + mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true); + mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true); + mySketchMgr->updateBySketchParameters(PartSet_Tools::Expressions, + myHasConstraintShown[PartSet_Tools::Expressions]); + } +} void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { @@ -733,8 +890,7 @@ void PartSet_Module::onViewTransformed(int theTrsfType) //Handle(V3d_View) aView = aViewer->activeView(); - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_Displayer* aDisplayer = aWorkshop->displayer(); Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer(); Handle(V3d_View) aView; @@ -751,7 +907,7 @@ void PartSet_Module::onViewTransformed(int theTrsfType) } if (aView.IsNull()) return; - double aLen = aView->Convert(20); + double aLen = aView->Convert(SketcherPrs_Tools::getDefaultArrowSize()); double aPrevLen = SketcherPrs_Tools::getArrowSize(); SketcherPrs_Tools::setArrowSize(aLen); @@ -775,11 +931,72 @@ void PartSet_Module::onViewTransformed(int theTrsfType) aDisplayer->updateViewer(); } -bool PartSet_Module::customizeObject(ObjectPtr theObject, const bool theUpdateViewer) +void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, const ModuleBase_CustomizeFlag& theFlag, + const bool theUpdateViewer) +{ + 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) +{ + bool aCustomized = false; + + if (theResult.get()) + return aCustomized; + + 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 (aColor.empty()) + 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::customizeObject(ObjectPtr theObject, const ModuleBase_CustomizeFlag& theFlag, + const bool theUpdateViewer) { bool isRedisplayed = false; - if (myCustomPrs->isActive()) - isRedisplayed = myCustomPrs->redisplay(theObject, theUpdateViewer); + if (myCustomPrs->isActive(theFlag)) + isRedisplayed = myCustomPrs->redisplay(theObject, theFlag, theUpdateViewer); return isRedisplayed; } @@ -806,8 +1023,7 @@ void PartSet_Module::onActiveDocPopup(const QPoint& thePnt) SessionPtr aMgr = ModelAPI_Session::get(); QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PARTSET_CMD"); - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Workshop* aWorkshop = getWorkshop(); QLabel* aHeader = aWorkshop->objectBrowser()->activeDocLabel(); aActivatePartAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument())); @@ -817,6 +1033,11 @@ 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 { @@ -825,19 +1046,32 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const if (aOperation) { /// If last line finished on vertex the lines creation sequence has to be break ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); - // if there is an active widget, find the presented object in it - if (!anActiveWidget) - anActiveWidget = aPanel->preselectionWidget(); + if (aPanel) { + ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); + // 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) - anObject = aWidgetValidated->findPresentedObject(theAIS); + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast + (anActiveWidget); + if (aWidgetValidated) + anObject = aWidgetValidated->findPresentedObject(theAIS); + } } return anObject; } +bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const +{ + bool aCanBeShaged = true; + + Handle(PartSet_ResultSketchPrs) aPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theAIS); + if (!aPrs.IsNull()) + aCanBeShaged = false; + + return aCanBeShaged; +} + void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const { QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects(); @@ -850,9 +1084,9 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const bool hasResult = false; bool hasFeature = false; bool hasParameter = false; - bool hasSubFeature = false; - ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature); - + bool hasCompositeOwner = false; + ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, + hasCompositeOwner); ObjectPtr aObject = aObjects.first(); if (aObject) { ResultPartPtr aPart = std::dynamic_pointer_cast(aObject); @@ -905,8 +1139,7 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess if (myWorkshop->currentOperation() && (!aAllowActivationList.contains(myWorkshop->currentOperation()->id()))) return; - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView(); QLabel* aLabel = aWorkshop->objectBrowser()->activeDocLabel(); QPalette aPalet = aLabel->palette(); @@ -950,8 +1183,7 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) if (theIndex.column() != 0) // Use only first column return; - XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); // De not use non editable Indexes if ((aDataModel->flags(theIndex) & Qt::ItemIsSelectable) == 0) @@ -1024,23 +1256,84 @@ bool PartSet_Module::processEnter(const std::string& thePreviousAttributeID) return mySketchReentrantMgr->processEnter(thePreviousAttributeID); } +//****************************************************** +void PartSet_Module::beforeOperationStarted(ModuleBase_Operation* theOperation) +{ +} //****************************************************** -void PartSet_Module::onBooleanOperationChange(int theOperation) +void PartSet_Module::beforeOperationStopped(ModuleBase_Operation* theOperation) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (!aOperation) + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { + mySketchMgr->stopSketch(theOperation); + } +} + +//****************************************************** +GeomShapePtr PartSet_Module::findShape(const AttributePtr& theAttribute) +{ + GeomShapePtr aGeomShape; + + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { + aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop); + } + return aGeomShape; +} + +//****************************************************** +AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject, + const GeomShapePtr& theGeomShape) +{ + AttributePtr anAttribute; + GeomShapePtr aGeomShape = theGeomShape; + if (!aGeomShape.get()) { + // processing shape of result, e.g. sketch circle center is selected, this is a result + // the geom shape is empty, the shape of result should be used + ResultPtr aResult = std::dynamic_pointer_cast(theObject); + if (aResult.get()) { + aGeomShape = aResult->shape(); + } + } + + if (aGeomShape.get()) { + TopoDS_Shape aTDSShape = aGeomShape->impl(); + return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape, + mySketchMgr->activeSketch()); + } + return anAttribute; +} + +//****************************************************** +void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget, + int theIndex) +{ + PartSet_WidgetChoice* aChoiceWidget = dynamic_cast(theWidget); + if (!aChoiceWidget) return; - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - switch (theOperation) { - case 0: - aPanel->setWindowTitle(tr("Cut")); - break; - case 1: - aPanel->setWindowTitle(tr("Fuse")); - break; - case 2: - aPanel->setWindowTitle(tr("Common")); - break; + + QString aChoiceTitle = aChoiceWidget->getPropertyPanelTitle(theIndex); + if (!aChoiceTitle.isEmpty()) { + ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); + if (!aOperation) + return; + ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + if (aPanel) + aPanel->setWindowTitle(aChoiceTitle); } } + +//****************************************************** +XGUI_Workshop* PartSet_Module::getWorkshop() const +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + return aConnector->workshop(); +} + +//****************************************************** +void PartSet_Module::setDefaultConstraintShown() +{ + myHasConstraintShown[PartSet_Tools::Geometrical] = true; + myHasConstraintShown[PartSet_Tools::Dimensional] = true; + myHasConstraintShown[PartSet_Tools::Expressions] = false; +}