X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=b35aaf442d332bf922a924764eca4f2ebb804005;hb=cd8f50ce5c9cf41e43a1f9b7155d12aad1c37494;hp=6cb3178322a0b6addc71f1d05d60846cbc4d96c0;hpb=28bbf47d23aa7fc8217e1cbf9ab089acef27cec3;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 6cb317832..b35aaf442 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -10,12 +10,13 @@ #include "PartSet_WidgetPoint2DFlyout.h" #include "PartSet_WidgetShapeSelector.h" #include "PartSet_WidgetMultiSelector.h" -#include "PartSet_WidgetMultiSelectorComposite.h" +#include "PartSet_WidgetSubShapeSelector.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" @@ -41,6 +42,7 @@ #include #include #include +#include #include #include @@ -50,6 +52,7 @@ #include #include #include +#include #include #include @@ -67,6 +70,8 @@ #include #include #include +#include +#include #include #include @@ -78,6 +83,7 @@ #include #include +#include #include #include @@ -118,7 +124,8 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myVisualLayerId(0) + myVisualLayerId(0), + myIsOperationIsLaunched(false) { new PartSet_IconFactory(); @@ -146,9 +153,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; - myHasConstraintShown[PartSet_Tools::Expressions] = false; + setDefaultConstraintShown(); Config_PropManager::registerProp("Visualization", "operation_parameter_color", "Reference shape wireframe color in operation", Config_Prop::Color, @@ -159,6 +164,9 @@ 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(SKETCH_TAB_NAME, "disable_input_fields", "Disable input fields", + // Config_Prop::Boolean, "true"); } PartSet_Module::~PartSet_Module() @@ -235,11 +243,11 @@ void PartSet_Module::registerFilters() void PartSet_Module::registerProperties() { - Config_PropManager::registerProp("Sketch planes", "planes_size", "Size", Config_Prop::Double, + Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_size", "Size", Config_Prop::Double, PLANE_SIZE); - Config_PropManager::registerProp("Sketch planes", "planes_thickness", "Thickness", + Config_PropManager::registerProp(SKETCH_TAB_NAME, "planes_thickness", "Thickness", Config_Prop::Integer, SKETCH_WIDTH); - Config_PropManager::registerProp("Sketch planes", "rotate_to_plane", "Rotate to plane when selected", + Config_PropManager::registerProp(SKETCH_TAB_NAME, "rotate_to_plane", "Rotate to plane when selected", Config_Prop::Boolean, "false"); } @@ -250,7 +258,7 @@ void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, c void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) { - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->commitNestedSketch(theOperation); } @@ -275,96 +283,98 @@ 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); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + if (aFOperation) { + XGUI_Workshop* aWorkshop = XGUI_Tools::workshop(workshop()); + XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); + + ModuleBase_ModelWidget* aFilledWidget = 0; + bool aPostonedWidgetActivation = false; + + FeaturePtr aFeature = aFOperation->feature(); + /// Restart sketcher operations automatically + /// it is important to call method of sketch reentrant manager before filling of PP + /// because it fills some created feature attributes, these new values should be used + /// to fill the property panel + mySketchReentrantMgr->operationStarted(theOperation); + + aWorkshop->fillPropertyPanel(aFOperation); + // filling the operation values by the current selection + // if the operation can be committed after the controls filling, the method perform should + // be stopped. Otherwise unnecessary presentations can be shown(e.g. operation prs in sketch) + bool isOperationCommitted = false; + if (!aFOperation->isEditOperation()) { + std::string aGreedAttributeId = ModuleBase_Tools::findGreedAttribute(workshop(), aFeature); // if there is a greed attribute, automatic commit by preselection for this feature is prohibited - 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); - } + 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(); + else { // there is a greed widget + const QList& aWidgets = aPropertyPanel->modelWidgets(); + std::string aFirstAttributeId = aWidgets.front()->attributeID(); + // activate next widget after greeded if it is the first widget in the panel + // else the first panel widget is already activated by operation start + if (aFirstAttributeId == aGreedAttributeId) + aPostonedWidgetActivation = true; } } - if (aPostonedWidgetActivation) { - // if the widget is an empty in the chain of activated widgets, the current operation - // is restarted. It should be performed after functionality of the operation starting - aPropertyPanel->activateNextWidget(aFilledWidget); + } if (!isOperationCommitted) { + workshop()->updateCommandStatus(); + aWorkshop->connectToPropertyPanel(true); + updateSketcherOnStart(aFOperation); + updatePresentationsOnStart(aFOperation); + + // the objects of the current operation should be deactivated + QObjectPtrList anObjects; + anObjects.append(aFeature); + std::list aResults; + ModelAPI_Tools::allResults(aFeature, aResults); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { + anObjects.append(*aIt); } + QObjectPtrList::const_iterator anIt = anObjects.begin(), aLast = anObjects.end(); + for (; anIt != aLast; anIt++) + aWorkshop->deactivateActiveObject(*anIt, false); + if (anObjects.size() > 0) { + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + aDisplayer->updateViewer(); + } + } + if (aPostonedWidgetActivation) { + // if the widget is an empty in the chain of activated widgets, the current operation + // is restarted. It should be performed after functionality of the operation starting + aPropertyPanel->activateNextWidget(aFilledWidget); } } } -void PartSet_Module::operationStartedInternal(ModuleBase_Operation* theOperation) +void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation) { - /// Restart sketcher operations automatically - mySketchReentrantMgr->operationStarted(theOperation); - if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { mySketchMgr->startSketch(theOperation); } - else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + else if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->startNestedSketch(theOperation); } +} +void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperation) +{ ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); if (aFOperation) { myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); @@ -389,9 +399,11 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false); bool isModified = isModifiedArgs || isModifiedResults; - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->stopNestedSketch(theOperation); } + else if (PartSet_SketcherMgr::isSketchOperation(theOperation)) + setDefaultConstraintShown(); //VSV: Viewer is updated on feature update and redisplay if (isModified) { @@ -403,7 +415,6 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) QMap::const_iterator anIt = myHasConstraintShown.begin(), aLast = myHasConstraintShown.end(); for (; anIt != aLast; anIt++) { - myHasConstraintShown[anIt.key()]; mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value()); } } @@ -445,8 +456,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; } } @@ -465,10 +477,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 { @@ -476,7 +488,7 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), - isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { // in active sketch operation it is possible to activate operation object in selection // in the edit operation, e.g. points of the line can be moved when the line is edited @@ -486,9 +498,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) @@ -496,6 +510,15 @@ void PartSet_Module::updateViewerMenu(const QMap& theStdActio myMenuMgr->updateViewerMenu(theStdActions); } +bool PartSet_Module::isActionEnableStateFixed(const int theActionId) const +{ + bool isEnabledFixed = false; + if (theActionId == XGUI_ActionsMgr::AcceptAll && + mySketchReentrantMgr->isInternalEditStarted()) + isEnabledFixed = true; + return isEnabledFixed; +} + QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature) { QString anError = ModuleBase_IModule::getFeatureError(theFeature); @@ -523,11 +546,30 @@ 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(); } +bool PartSet_Module::isSketchNeutralPointActivated() const +{ + bool isNeutralPoint = true; + if (sketchReentranceMgr()->isInternalEditStarted()) + isNeutralPoint = false; + if (myIsOperationIsLaunched) + isNeutralPoint = false; + + return isNeutralPoint; +} + void PartSet_Module::closeDocument() { clearViewer(); @@ -565,14 +607,14 @@ 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(); - GeomShapePtr 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.get() && !aShape->isNull()) { const TopoDS_Shape& aTDShape = aShape->impl(); @@ -612,10 +654,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(); @@ -679,10 +721,12 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi); aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; - } else if (theType == "composite_multi_selector") { - PartSet_WidgetMultiSelectorComposite* aShapeSelectorWgt = - new PartSet_WidgetMultiSelectorComposite(theParent, aWorkshop, theWidgetApi); - 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 == WDG_DOUBLEVALUE_EDITOR) { aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi); @@ -707,7 +751,7 @@ ModuleBase_ModelWidget* PartSet_Module::activeWidget() const ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); if (aOperation) { ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - anActiveWidget = aPanel->activeWidget(); + anActiveWidget = aPanel ? aPanel->activeWidget() : 0; } } return anActiveWidget; @@ -724,7 +768,7 @@ bool PartSet_Module::deleteObjects() // 1. check whether the delete should be processed in the module ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), - isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { isProcessed = true; // 2. find selected presentations @@ -768,6 +812,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 @@ -780,11 +829,13 @@ 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(); - bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation); + 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 @@ -795,7 +846,7 @@ void PartSet_Module::onFeatureTriggered() launchOperation(aCmd->data().toString()); } } - } + }*/ ModuleBase_IModule::onFeatureTriggered(); } @@ -807,13 +858,18 @@ void PartSet_Module::editFeature(FeaturePtr theFeature) bool PartSet_Module::canCommitOperation() const { - return PartSet_WidgetSketchCreator::canCommitCurrentSketch(myWorkshop); + return true; } void PartSet_Module::launchOperation(const QString& theCmdId) { + myIsOperationIsLaunched = true; storeConstraintsState(theCmdId.toStdString()); + updateConstraintsState(theCmdId.toStdString()); + ModuleBase_IModule::launchOperation(theCmdId); + + myIsOperationIsLaunched = false; } void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) @@ -824,7 +880,12 @@ void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) mySketchMgr->showConstraintStates(); myHasConstraintShown = aShownStates; } - if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str())) { +} + +void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) +{ + if (PartSet_SketcherMgr::constraintsIdList().contains(theFeatureKind.c_str()) || + PartSet_SketcherMgr::replicationsIdList().contains(theFeatureKind.c_str())) { // Show constraints if a constraint was anOperation mySketchMgr->updateBySketchParameters(PartSet_Tools::Geometrical, true); mySketchMgr->updateBySketchParameters(PartSet_Tools::Dimensional, true); @@ -912,6 +973,11 @@ void PartSet_Module::onViewTransformed(int theTrsfType) 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) { @@ -929,13 +995,13 @@ 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 sketch symbol presentation if (thePrs.get()) { @@ -949,6 +1015,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; + } } } } @@ -961,14 +1035,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); } + // customize dimentional constrains + sketchMgr()->customizePresentation(anObject); return aCustomized; } @@ -1043,6 +1115,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(); @@ -1055,9 +1138,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); @@ -1227,11 +1310,6 @@ bool PartSet_Module::processEnter(const std::string& thePreviousAttributeID) return mySketchReentrantMgr->processEnter(thePreviousAttributeID); } -//****************************************************** -void PartSet_Module::beforeOperationStarted(ModuleBase_Operation* theOperation) -{ -} - //****************************************************** void PartSet_Module::beforeOperationStopped(ModuleBase_Operation* theOperation) { @@ -1246,7 +1324,7 @@ GeomShapePtr PartSet_Module::findShape(const AttributePtr& theAttribute) GeomShapePtr aGeomShape; ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { + if (anOperation && sketchMgr()->isNestedSketchOperation(anOperation)) { aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop); } return aGeomShape; @@ -1289,7 +1367,8 @@ void PartSet_Module::onChoiceChanged(ModuleBase_ModelWidget* theWidget, if (!aOperation) return; ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - aPanel->setWindowTitle(aChoiceTitle); + if (aPanel) + aPanel->setWindowTitle(aChoiceTitle); } } @@ -1299,3 +1378,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; +}