X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=4382fca68cb83d42f93e640f775004b734061e97;hb=787e0f26ba0c38ea246c0757cbb1ea244f494185;hp=120d4d6acad297a075a6786fee038144ce0b8ce3;hpb=c0a6e5394839f5951f2122370895551b5501dbd4;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 120d4d6ac..4382fca68 100755 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -6,16 +6,16 @@ #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" @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #include @@ -53,6 +52,7 @@ #include #include #include +#include #include #include @@ -90,12 +90,13 @@ #include #include +#include +#include #include #include #include #include #include -#include #include #include @@ -130,7 +131,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(); @@ -164,10 +165,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 planes", "disable_input_fields", "Disable input fields", - Config_Prop::Boolean, "true"); + Config_PropManager::registerProp("Visualization", "operation_remove_feature_color", + "Color of removed feature in operation", Config_Prop::Color, + PartSet_CustomPrs::OPERATION_REMOVE_FEATURE_COLOR()); } PartSet_Module::~PartSet_Module() @@ -233,40 +233,29 @@ 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_MultyTranslationSelection", + new PartSet_MultyTranslationSelection); + aFactory->registerValidator("PartSet_SplitSelection", new PartSet_SplitSelection); + aFactory->registerValidator("PartSet_ProjectionSelection", new PartSet_ProjectionSelection); } -void PartSet_Module::registerFilters() -{ - //Registering of selection filters - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters(); -} - -void PartSet_Module::registerProperties() -{ - Config_PropManager::registerProp("Sketch planes", "planes_size", "Size", Config_Prop::Double, - PLANE_SIZE); - Config_PropManager::registerProp("Sketch planes", "planes_thickness", "Thickness", - Config_Prop::Integer, SKETCH_WIDTH); - Config_PropManager::registerProp("Sketch planes", "rotate_to_plane", "Rotate to plane when selected", - Config_Prop::Boolean, "false"); -} - -void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, const bool isToConnect) +void PartSet_Module::connectToPropertyPanel(ModuleBase_ModelWidget* theWidget, + const bool isToConnect) { mySketchMgr->connectToPropertyPanel(theWidget, isToConnect); } -void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) +void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) { - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation, sketchMgr()->activeSketch())) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->commitNestedSketch(theOperation); } /// Restart sketcher operations automatically if (!mySketchReentrantMgr->operationCommitted(theOperation)) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation && !aFOperation->isEditOperation()) { // the selection is cleared after commit the create operation // in order to do not use the same selected objects in the restarted operation @@ -307,15 +296,17 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) 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 + // if there is a greed attribute, automatic commit by preselection + // for this feature is prohibited aFilledWidget = aFOperation->activateByPreselection(aGreedAttributeId); if (currentOperation() != aFOperation) isOperationCommitted = true; else { if (aGreedAttributeId.empty()) { // a signal should be emitted before the next widget activation - // because, the activation of the next widget will give a focus to the widget. As a result - // the value of the widget is initialized. And commit may happens until the value is entered. + // 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(); @@ -334,7 +325,6 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) } } } if (!isOperationCommitted) { - workshop()->updateCommandStatus(); aWorkshop->connectToPropertyPanel(true); updateSketcherOnStart(aFOperation); updatePresentationsOnStart(aFOperation); @@ -355,6 +345,10 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) XGUI_Displayer* aDisplayer = aWorkshop->displayer(); aDisplayer->updateViewer(); } + /// state of command actions should be updated after displayed objects modification because + /// deactivation(for example) of objects may influence on selection in the viewer + /// State of command actions may depend on selection in the viewer(e.g. Sketch) + workshop()->updateCommandStatus(); } if (aPostonedWidgetActivation) { // if the widget is an empty in the chain of activated widgets, the current operation @@ -369,15 +363,15 @@ void PartSet_Module::updateSketcherOnStart(ModuleBase_Operation* theOperation) if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { mySketchMgr->startSketch(theOperation); } - else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation, - sketchMgr()->activeSketch())) { + else if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->startNestedSketch(theOperation); } } void PartSet_Module::updatePresentationsOnStart(ModuleBase_Operation* theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation) { myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); @@ -388,7 +382,8 @@ void PartSet_Module::operationResumed(ModuleBase_Operation* theOperation) { ModuleBase_IModule::operationResumed(theOperation); - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (aFOperation) { myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeArguments, true); myCustomPrs->activate(aFOperation->feature(), ModuleBase_IModule::CustomizeResults, true); @@ -401,7 +396,7 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) bool isModifiedResults = myCustomPrs->deactivate(ModuleBase_IModule::CustomizeResults, false); bool isModified = isModifiedArgs || isModifiedResults; - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation, sketchMgr()->activeSketch())) { + if (sketchMgr()->isNestedSketchOperation(theOperation)) { mySketchMgr->stopNestedSketch(theOperation); } else if (PartSet_SketcherMgr::isSketchOperation(theOperation)) @@ -414,8 +409,8 @@ void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) aDisplayer->updateViewer(); } - QMap::const_iterator anIt = myHasConstraintShown.begin(), - aLast = myHasConstraintShown.end(); + QMap::const_iterator + anIt = myHasConstraintShown.begin(), aLast = myHasConstraintShown.end(); for (; anIt != aLast; anIt++) { mySketchMgr->updateBySketchParameters(anIt.key(), anIt.value()); } @@ -490,12 +485,12 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), - isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation, - sketchMgr()->activeSketch()); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { // in active sketch operation it is possible to activate operation object in selection // in the edit operation, e.g. points of the line can be moved when the line is edited - ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(anOperation); aCanActivate = aCanActivate || (aFOperation && aFOperation->isEditOperation()); } return aCanActivate; @@ -517,7 +512,7 @@ bool PartSet_Module::isActionEnableStateFixed(const int theActionId) const { bool isEnabledFixed = false; if (theActionId == XGUI_ActionsMgr::AcceptAll && - mySketchReentrantMgr->isInternalEditStarted()) + mySketchReentrantMgr->isInternalEditActive()) isEnabledFixed = true; return isEnabledFixed; } @@ -565,7 +560,7 @@ bool PartSet_Module::isMouseOverWindow() bool PartSet_Module::isSketchNeutralPointActivated() const { bool isNeutralPoint = true; - if (sketchReentranceMgr()->isInternalEditStarted()) + if (sketchReentranceMgr()->isInternalEditActive()) isNeutralPoint = false; if (myIsOperationIsLaunched) isNeutralPoint = false; @@ -575,6 +570,7 @@ bool PartSet_Module::isSketchNeutralPointActivated() const void PartSet_Module::closeDocument() { + myActivePartIndex = QModelIndex(); clearViewer(); } @@ -589,7 +585,8 @@ void PartSet_Module::clearViewer() void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); if (!aFOperation) return; @@ -604,7 +601,8 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, { bool aProcessed = false; - ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + ModuleBase_OperationFeature* aFOperation = + dynamic_cast(theOperation); XGUI_Workshop* aWorkshop = getWorkshop(); XGUI_PropertyPanel* aPropertyPanel = aWorkshop->propertyPanel(); if (mySketchMgr->activeSketch().get() && aFOperation && aPropertyPanel) { @@ -618,11 +616,19 @@ bool PartSet_Module::createWidgets(ModuleBase_Operation* theOperation, FeaturePtr aFeature = ModelAPI_Feature::feature(anObject); FeaturePtr anOpFeature = aFOperation->feature(); GeomShapePtr aShape = aSelectedPrs->shape(); - // click on the digit of dimension constrain comes here with an empty shape, so we need the check + // click on the digit of dimension constrain comes here + // with an empty shape, so we need the check if (aFeature == anOpFeature && aShape.get() && !aShape->isNull()) { + // if feature has only one result and shape of result is equal to selected shape + // this attribute is not processed. It is a case of Sketch Point. + if (aFeature->results().size() == 1) { + ResultPtr aResult = aFeature->results().front(); + if (aResult.get() && aResult->shape()->isEqual(aShape)) + return aProcessed; + } const TopoDS_Shape& aTDShape = aShape->impl(); AttributePtr anAttribute = PartSet_Tools::findAttributeBy2dPoint(anObject, aTDShape, - mySketchMgr->activeSketch()); + mySketchMgr->activeSketch()); if (anAttribute.get()) { QString aXmlRepr = aFOperation->getDescription()->xmlRepresentation(); ModuleBase_WidgetFactory aFactory(aXmlRepr.toStdString(), workshop()); @@ -665,14 +671,14 @@ void PartSet_Module::onSelectionChanged() if (aFeature) { std::string aId = aFeature->getKind(); if ((aId == SketchPlugin_ConstraintRadius::ID()) || - (aId == SketchPlugin_ConstraintLength::ID()) || + (aId == SketchPlugin_ConstraintLength::ID()) || (aId == SketchPlugin_ConstraintDistance::ID()) || (aId == SketchPlugin_ConstraintAngle::ID())) { editFeature(aFeature); } } } - } + } } void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent) @@ -709,11 +715,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); @@ -731,6 +732,12 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th aSubShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aSubShapeSelectorWgt; } + else if (theType == "sketch_feature_point_selector") { + PartSet_WidgetFeaturePointSelector* aPointSelectorWgt = + new PartSet_WidgetFeaturePointSelector(theParent, aWorkshop, theWidgetApi); + aPointSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aPointSelectorWgt; + } else if (theType == WDG_DOUBLEVALUE_EDITOR) { aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi); } else if (theType == "export_file_selector") { @@ -754,7 +761,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; @@ -771,8 +778,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, - sketchMgr()->activeSketch()); + isNestedOp = sketchMgr()->isNestedSketchOperation(anOperation); if (isSketchOp || isNestedOp) { isProcessed = true; // 2. find selected presentations @@ -817,8 +823,10 @@ 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 + // 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 @@ -839,7 +847,7 @@ void PartSet_Module::onFeatureTriggered() 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 @@ -878,7 +886,7 @@ void PartSet_Module::launchOperation(const QString& theCmdId) void PartSet_Module::storeConstraintsState(const std::string& theFeatureKind) { - if (myWorkshop->currentOperation() && + if (myWorkshop->currentOperation() && myWorkshop->currentOperation()->id().toStdString() == SketchPlugin_Sketch::ID()) { const QMap& aShownStates = mySketchMgr->showConstraintStates(); @@ -898,7 +906,7 @@ void PartSet_Module::updateConstraintsState(const std::string& theFeatureKind) } } -void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) +void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); if (!anAIS.IsNull()) { @@ -941,8 +949,8 @@ void PartSet_Module::onViewTransformed(int theTrsfType) Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer(); Handle(V3d_View) aView; double aScale = 0; - for (aV3dViewer->InitDefinedViews(); - aV3dViewer->MoreDefinedViews(); + for (aV3dViewer->InitDefinedViews(); + aV3dViewer->MoreDefinedViews(); aV3dViewer->NextDefinedViews()) { Handle(V3d_View) aV = aV3dViewer->DefinedView(); double aS = aV->Scale(); @@ -977,7 +985,13 @@ void PartSet_Module::onViewTransformed(int theTrsfType) aDisplayer->updateViewer(); } -void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, const ModuleBase_CustomizeFlag& theFlag, +bool PartSet_Module::isCustomPrsActivated(const ModuleBase_CustomizeFlag& theFlag) const +{ + return myCustomPrs->isActive(theFlag); +} + +void PartSet_Module::activateCustomPrs(const FeaturePtr& theFeature, + const ModuleBase_CustomizeFlag& theFlag, const bool theUpdateViewer) { myCustomPrs->activate(theFeature, theFlag, theUpdateViewer); @@ -1001,41 +1015,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 @@ -1044,6 +1027,48 @@ 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) { @@ -1060,14 +1085,14 @@ void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) if (aOB) { QLabel* aLabel = aOB->activeDocLabel(); aLabel->installEventFilter(myMenuMgr); - connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)), + connect(aLabel, SIGNAL(customContextMenuRequested(const QPoint&)), SLOT(onActiveDocPopup(const QPoint&))); - //QPalette aPalet = aLabel->palette(); - //aPalet.setColor(QPalette::Text, QColor(0, 72, 140)); - //aLabel->setPalette(aPalet); aOB->treeView()->setExpandsOnDoubleClick(false); - connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), + connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), SLOT(onTreeViewDoubleClick(const QModelIndex&))); + + Events_Loop* aLoop = Events_Loop::loop(); + aLoop->registerListener(this, Events_Loop::eventByName(EVENT_OBJECT_CREATED)); } } @@ -1104,7 +1129,7 @@ ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const // if there is an active widget, find the presented object in it if (!anActiveWidget) anActiveWidget = aPanel->preselectionWidget(); - + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast (anActiveWidget); if (aWidgetValidated) @@ -1119,7 +1144,7 @@ bool PartSet_Module::canBeShaded(Handle(AIS_InteractiveObject) theAIS) const bool aCanBeShaged = true; Handle(PartSet_ResultSketchPrs) aPrs = Handle(PartSet_ResultSketchPrs)::DownCast(theAIS); - if (!aPrs.IsNull()) + if (!aPrs.IsNull()) aCanBeShaged = false; return aCanBeShaged; @@ -1132,19 +1157,20 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const SessionPtr aMgr = ModelAPI_Session::get(); QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD"); + bool hasResult = false; + bool hasFeature = false; + bool hasParameter = false; + bool hasCompositeOwner = false; + ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, + hasCompositeOwner); + ModuleBase_Operation* aCurrentOp = myWorkshop->currentOperation(); if (aSelected == 1) { - bool hasResult = false; - bool hasFeature = false; - bool hasParameter = false; - bool hasCompositeOwner = false; - ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, - hasCompositeOwner); ObjectPtr aObject = aObjects.first(); if (aObject) { ResultPartPtr aPart = std::dynamic_pointer_cast(aObject); FeaturePtr aFeature = std::dynamic_pointer_cast(aObject); - bool isPart = aPart.get() || + bool isPart = aPart.get() || (aFeature.get() && (aFeature->getKind() == PartSetPlugin_Part::ID())); if (isPart) { DocumentPtr aPartDoc; @@ -1153,7 +1179,7 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } if (aPart.get()) // this may be null is Part feature is disabled aPartDoc = aPart->partDoc(); - + theMenu->addAction(aActivatePartAction); aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc)); @@ -1167,10 +1193,12 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } } } - - ResultBodyPtr aResult = std::dynamic_pointer_cast(aObject); - if( aResult.get() ) - theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD")); + } + } else { + if (hasFeature) { + myMenuMgr->action("EDIT_CMD")->setEnabled(aCurrentOp == 0); + theMenu->addAction(myMenuMgr->action("EDIT_CMD")); + theMenu->addSeparator(); } } bool aNotDeactivate = (aCurrentOp == 0); @@ -1179,17 +1207,27 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } } +#define EXPAND_PARENT(OBJ) \ +QModelIndex aObjIndex = aDataModel->objectIndex(OBJ); \ +if (aObjIndex.isValid()) { \ + QModelIndex aParent = aObjIndex.parent(); \ + int aCount = aDataModel->rowCount(aParent); \ + if (aCount == 1) \ + aTreeView->setExpanded(aParent, true); \ +} + + void PartSet_Module::processEvent(const std::shared_ptr& theMessage) { if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOCUMENT_CHANGED)) { // Do not change activation of parts if an operation active static QStringList aAllowActivationList; if (aAllowActivationList.isEmpty()) - aAllowActivationList << - QString(PartSetPlugin_Part::ID().c_str()) << + aAllowActivationList << + QString(PartSetPlugin_Part::ID().c_str()) << QString(PartSetPlugin_Duplicate::ID().c_str()) << QString(PartSetPlugin_Remove::ID().c_str()); - if (myWorkshop->currentOperation() && + if (myWorkshop->currentOperation() && (!aAllowActivationList.contains(myWorkshop->currentOperation()->id()))) return; XGUI_Workshop* aWorkshop = getWorkshop(); @@ -1199,12 +1237,12 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr aActiveDoc = aMgr->activeDocument(); - if (aActivePartIndex.isValid()) - aTreeView->setExpanded(aActivePartIndex, false); + if (myActivePartIndex.isValid()) + aTreeView->setExpanded(myActivePartIndex, false); XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); - aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc); - if (aActivePartIndex.isValid()) - aTreeView->setExpanded(aActivePartIndex, true); + myActivePartIndex = aDataModel->documentRootIndex(aActiveDoc); + if (myActivePartIndex.isValid()) + aTreeView->setExpanded(myActivePartIndex, true); aLabel->setPalette(aPalet); aWorkshop->updateCommandStatus(); @@ -1214,13 +1252,45 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess QObjectPtrList aObjects = aDisplayer->displayedObjects(); bool aHidden; foreach(ObjectPtr aObj, aObjects) { - //TODO: replace by redisplay event. - aHidden = !aObj->data() || !aObj->data()->isValid() || + aHidden = !aObj->data() || !aObj->data()->isValid() || aObj->isDisabled() || (!aObj->isDisplayed()); if (!aHidden) aDisplayer->redisplay(aObj, false); } aDisplayer->updateViewer(); + } else if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_OBJECT_CREATED)) { + std::shared_ptr aUpdMsg = + std::dynamic_pointer_cast(theMessage); + std::set aObjects = aUpdMsg->objects(); + + ObjectPtr aConstrObj; + ObjectPtr aResultObj; + std::set::const_iterator aIt; + DocumentPtr aRootDoc = ModelAPI_Session::get()->moduleDocument(); + for (aIt = aObjects.begin(); aIt != aObjects.end(); ++aIt) { + ObjectPtr aObject = (*aIt); + if ((!aResultObj.get()) && (aObject->groupName() == ModelAPI_ResultBody::group()) + && (aObject->document() != aRootDoc)) + aResultObj = aObject; + if ((!aConstrObj.get()) && (aObject->groupName() == ModelAPI_ResultConstruction::group()) + && (aObject->document() != aRootDoc)) + aConstrObj = aObject; + if (aResultObj.get() && aConstrObj.get()) + break; + } + + if (aResultObj.get() || aConstrObj.get()) { + XGUI_Workshop* aWorkshop = getWorkshop(); + XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView(); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); + + if (aResultObj.get()) { + EXPAND_PARENT(aResultObj) + } + if (aConstrObj.get()) { + EXPAND_PARENT(aConstrObj) + } + } } } @@ -1230,7 +1300,8 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) return; SessionPtr aMgr = ModelAPI_Session::get(); if (!theIndex.isValid()) { - aMgr->setActiveDocument(aMgr->moduleDocument()); + // It seems that this code is obsolete + //aMgr->setActiveDocument(aMgr->moduleDocument()); return; } if (theIndex.column() != 0) // Use only first column @@ -1254,7 +1325,7 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) if (aPart->partDoc() == aMgr->activeDocument()) { myMenuMgr->activatePartSet(); } else { - aPart->activate(); + myMenuMgr->activatePart(aPart); } } } @@ -1291,7 +1362,8 @@ void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*) if (aOperation) { ModuleBase_ModelWidget* anActiveWidget = activeWidget(); if (anActiveWidget) { - ModuleBase_WidgetSelector* aWSelector = dynamic_cast(anActiveWidget); + ModuleBase_WidgetSelector* aWSelector = + dynamic_cast(anActiveWidget); if (aWSelector) aWSelector->activateSelectionAndFilters(true); } @@ -1323,8 +1395,7 @@ GeomShapePtr PartSet_Module::findShape(const AttributePtr& theAttribute) GeomShapePtr aGeomShape; ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - if (anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation, - sketchMgr()->activeSketch())) { + if (anOperation && sketchMgr()->isNestedSketchOperation(anOperation)) { aGeomShape = PartSet_Tools::findShapeBy2DPoint(theAttribute, myWorkshop); } return aGeomShape; @@ -1347,7 +1418,7 @@ AttributePtr PartSet_Module::findAttribute(const ObjectPtr& theObject, if (aGeomShape.get()) { TopoDS_Shape aTDSShape = aGeomShape->impl(); - return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape, + return PartSet_Tools::findAttributeBy2dPoint(theObject, aTDSShape, mySketchMgr->activeSketch()); } return anAttribute;