X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=1892f8b0a5ef1511c84e7199c05740cb9ccdbc8b;hb=c8ab29e531ee03054976a7606076f2c4ee1d9f6b;hp=cf5c2c7434f6454c83b8a9a59b8c9c02d854df11;hpb=5403f92db67b8ee3ee88fe27b93e6daa4adf7287;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index cf5c2c743..1892f8b0a 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -4,6 +4,7 @@ #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" @@ -14,6 +15,7 @@ #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" @@ -39,6 +41,7 @@ #include #include #include +#include #include #include @@ -47,6 +50,8 @@ #include #include #include +#include +#include #include #include @@ -64,6 +69,7 @@ #include #include #include +#include #include #include @@ -75,6 +81,7 @@ #include #include +#include #include #include @@ -125,10 +132,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*))); @@ -147,8 +150,7 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop)); mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop)); - myHasConstraintShown[PartSet_Tools::Geometrical] = true; - myHasConstraintShown[PartSet_Tools::Dimensional] = true; + setDefaultConstraintShown(); Config_PropManager::registerProp("Visualization", "operation_parameter_color", "Reference shape wireframe color in operation", Config_Prop::Color, @@ -193,6 +195,16 @@ void PartSet_Module::deactivateSelectionFilters() } } +void PartSet_Module::storeSelection() +{ + sketchMgr()->storeSelection(); +} + +void PartSet_Module::restoreSelection() +{ + sketchMgr()->restoreSelection(); +} + void PartSet_Module::registerValidators() { //Registering of validators @@ -214,7 +226,6 @@ void PartSet_Module::registerValidators() 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() @@ -265,6 +276,87 @@ 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; + 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(); + } + } + 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); @@ -303,6 +395,8 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* 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) { @@ -314,8 +408,7 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) QMap::const_iterator anIt = myHasConstraintShown.begin(), aLast = myHasConstraintShown.end(); for (; anIt != aLast; anIt++) { - myHasConstraintShown[anIt.key()]; - mySketchMgr->onShowConstraintsToggle(anIt.value(), myHasConstraintShown[anIt.key()]); + mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value()); } } @@ -356,8 +449,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; } } @@ -376,10 +470,10 @@ bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const return mySketchMgr->canDisplayObject(theObject); } -void PartSet_Module::processHiddenObject(const std::list& theObjects) +/*void PartSet_Module::processHiddenObject(const std::list& theObjects) { mySketchMgr->processHiddenObject(theObjects); -} +}*/ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const { @@ -397,9 +491,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) @@ -434,6 +530,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(); @@ -476,17 +580,18 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, 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(); + QList aPreselection = aSelection->getHighlighted(); if (aPreselection.size() == 1) { - ModuleBase_ViewerPrs aSelectedPrs = aPreselection[0]; - ObjectPtr anObject = aSelectedPrs.object(); + ModuleBase_ViewerPrsPtr aSelectedPrs = aPreselection[0]; + ObjectPtr anObject = aSelectedPrs->object(); FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); FeaturePtr anOpFeature = aFOperation->feature(); - TopoDS_Shape aShape = aSelectedPrs.shape(); + 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.IsNull()) { - AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aShape, + 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(); @@ -522,10 +627,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(); @@ -547,63 +652,59 @@ void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* the anOpMgr->onKeyReleased(theWnd->viewPort(), theEvent); } -void PartSet_Module::onOperationActivatedByPreselection() -{ - if (!mySketchReentrantMgr->canBeCommittedByPreselection()) - return; - mySketchMgr->operationActivatedByPreselection(); -} - -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_Workshop* aXUIWorkshop = getWorkshop(); ModuleBase_ModelWidget* aWgt = NULL; if (theType == "sketch-start-label") { PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, aWorkshop, - theWidgetApi, theParentId, mySketchMgr->showConstraintStates()); + theWidgetApi, myHasConstraintShown); connect(aLabelWgt, SIGNAL(planeSelected(const std::shared_ptr&)), mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr&))); - connect(aLabelWgt, SIGNAL(showConstraintToggled(bool, int)), - mySketchMgr, SLOT(onShowConstraintsToggle(bool, int))); + 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") { 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 == "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; } @@ -678,6 +779,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 @@ -690,7 +796,9 @@ bool PartSet_Module::deleteObjects() void PartSet_Module::onFeatureTriggered() { - QAction* aCmd = dynamic_cast(sender()); + // 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(); @@ -705,26 +813,50 @@ void PartSet_Module::onFeatureTriggered() 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) +{ + 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; + const QMap& aShownStates = + mySketchMgr->showConstraintStates(); + myHasConstraintShown = aShownStates; } - if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) { +} + +void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) +{ + if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) { // Show constraints if a constraint was anOperation - mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Geometrical); - mySketchMgr->onShowConstraintsToggle(true, PartSet_Tools::Dimensional); + mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true); + mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true); + mySketchMgr->updateBySketchParameters(PartSet_Tools::Expressions, + myHasConstraintShown[PartSet_Tools::Expressions]); } - ModuleBase_IModule::launchOperation(theCmdId); } - void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); @@ -821,15 +953,15 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the { 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()) { + if (!anObject) + return aCustomized; + + if (!theResult.get()) { bool isConflicting = myOverconstraintListener->isConflictingObject(anObject); - // customize sketcy symbol presentation + // customize sketch symbol presentation if (thePrs.get()) { Handle(AIS_InteractiveObject) anAISIO = thePrs->impl(); if (!anAISIO.IsNull()) { @@ -841,6 +973,14 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the 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; + } } } } @@ -853,11 +993,12 @@ bool PartSet_Module::customisePresentation(ResultPtr theResult, AISObjectPtr the if (aColor.empty()) XGUI_CustomPrs::getDefaultColor(anObject, true, aColor); if (!aColor.empty()) { - thePrs->setColor(aColor[0], aColor[1], aColor[2]); - aCustomized = true; + aCustomized = thePrs->setColor(aColor[0], aColor[1], aColor[2]); } } } + // customize dimentional constrains + sketchMgr()->customizePresentation(anObject); return aCustomized; } @@ -904,6 +1045,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 { @@ -927,6 +1073,17 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const 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(); @@ -939,9 +1096,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); @@ -1160,22 +1317,21 @@ AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject, } //****************************************************** -void PartSet_Module::onBooleanOperationChange(int theOperation) +void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget, + int theIndex) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (!aOperation) + 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); } } @@ -1185,3 +1341,11 @@ 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; +}