X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=ac028364420d100387a6a8500b1e56d58cda7f95;hb=020e7187ee88afbd18286f149536cdef61d9f61e;hp=a1908ff43b7395a8ade484b6377f20e88ad635cd;hpb=c3b31ae009442b80a19e96b2edfda91c21f01ceb;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp old mode 100644 new mode 100755 index a1908ff43..ac0283644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -14,22 +14,35 @@ #include "PartSet_WidgetSketchCreator.h" #include "PartSet_SketcherMgr.h" #include "PartSet_MenuMgr.h" +#include "PartSet_CustomPrs.h" +#include "PartSet_IconFactory.h" + +#include "PartSet_Filters.h" +#include "PartSet_FilterInfinite.h" #include #include +#include #include +#include #include #include #include #include +#include #include #include -#include +#include +#include +#include #include #include #include +#include +#include +#include #include @@ -37,7 +50,9 @@ #include #include #include -#include +#include +#include +#include #include #include @@ -51,6 +66,9 @@ #include #include #include +#include +#include +#include #include #include @@ -58,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -90,12 +109,12 @@ #include #include +#include + #ifdef _DEBUG #include #endif - - /*!Create and return new instance of XGUI_Module*/ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop) { @@ -104,10 +123,14 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myRestartingMode(RM_None), myVisualLayerId(0) + myRestartingMode(RM_None), myVisualLayerId(0), myHasConstraintShown(true) { + new PartSet_IconFactory(); + mySketchMgr = new PartSet_SketcherMgr(this); +#ifdef ModuleDataModel myDataModel = new PartSet_DocumentDataModel(this); +#endif XGUI_ModuleConnector* aConnector = dynamic_cast(theWshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); @@ -122,17 +145,48 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*))); connect(aViewer, SIGNAL(viewTransformed(int)), SLOT(onViewTransformed(int))); + connect(aViewer, SIGNAL(viewCreated(ModuleBase_IViewWindow*)), + SLOT(onViewCreated(ModuleBase_IViewWindow*))); myMenuMgr = new PartSet_MenuMgr(this); + myCustomPrs = new PartSet_CustomPrs(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)); } PartSet_Module::~PartSet_Module() { - if (!myDocumentShapeFilter.IsNull()) - myDocumentShapeFilter.Nullify(); + SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); + for (; aIt.More(); aIt.Next()) { + Handle(SelectMgr_Filter) aFilter = aIt.Value(); + if (!aFilter.IsNull()) + aFilter.Nullify(); + } + delete myCustomPrs; +} + +void PartSet_Module::activateSelectionFilters() +{ + SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); + for (; aIt.More(); aIt.Next()) { + Handle(SelectMgr_Filter) aFilter = aIt.Value(); + if (!aFilter.IsNull()) + myWorkshop->viewer()->addSelectionFilter(aFilter); + } +} + +void PartSet_Module::deactivateSelectionFilters() +{ + SelectMgr_ListIteratorOfListOfFilter aIt(mySelectionFilters); + for (; aIt.More(); aIt.Next()) { + Handle(SelectMgr_Filter) aFilter = aIt.Value(); + if (!aFilter.IsNull()) + myWorkshop->viewer()->removeSelectionFilter(aFilter); + } } void PartSet_Module::registerValidators() @@ -150,12 +204,14 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("PartSet_HVDirSelection", new PartSet_HVDirSelection); aFactory->registerValidator("PartSet_TangentSelection", new PartSet_TangentSelection); aFactory->registerValidator("PartSet_FilletSelection", new PartSet_FilletSelection); - + aFactory->registerValidator("PartSet_AngleSelection", new PartSet_AngleSelection); aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator); - aFactory->registerValidator("PartSet_DifferentShapes", new ModelAPI_ShapeValidator); + aFactory->registerValidator("PartSet_CoincidentAttr", new PartSet_CoincidentAttr); + aFactory->registerValidator("GeomValidators_DifferentShapes", new GeomValidators_DifferentShapes); aFactory->registerValidator("GeomValidators_ShapeType", new GeomValidators_ShapeType); aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face); + aFactory->registerValidator("GeomValidators_Finite", new GeomValidators_Finite); aFactory->registerValidator("GeomValidators_ConstructionComposite", new GeomValidators_ConstructionComposite); @@ -163,11 +219,17 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("GeomValidators_ZeroOffset", new GeomValidators_ZeroOffset); + aFactory->registerValidator("GeomValidators_BooleanArguments", + new GeomValidators_BooleanArguments); + aFactory->registerValidator("PartSet_SketchEntityValidator", new PartSet_SketchEntityValidator); - aFactory->registerValidator("PartSet_SameTypeAttr", - new PartSet_SameTypeAttrValidator); + aFactory->registerValidator("GeomValidators_Different", + new GeomValidators_Different); + + aFactory->registerValidator("GeomValidators_PartitionArguments", + new GeomValidators_PartitionArguments); } void PartSet_Module::registerFilters() @@ -191,25 +253,26 @@ void PartSet_Module::onOperationCommitted(ModuleBase_Operation* theOperation) mySketchMgr->commitNestedSketch(theOperation); } - if (theOperation->isEditOperation()) + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (!aFOperation || aFOperation->isEditOperation()) return; // 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 - Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); - if (!aContext.IsNull()) - aContext->ClearSelected(); + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + aWorkshop->selector()->clearSelection(); /// Restart sketcher operations automatically - FeaturePtr aFeature = theOperation->feature(); + FeaturePtr aFeature = aFOperation->feature(); std::shared_ptr aSPFeature = std::dynamic_pointer_cast(aFeature); if (aSPFeature && (myRestartingMode == RM_LastFeatureUsed || myRestartingMode == RM_EmptyFeatureUsed)) { - myLastOperationId = theOperation->id(); - myLastFeature = myRestartingMode == RM_LastFeatureUsed ? theOperation->feature() : FeaturePtr(); - - launchOperation(myLastOperationId); + myLastOperationId = aFOperation->id(); + myLastFeature = myRestartingMode == RM_LastFeatureUsed ? aFOperation->feature() : FeaturePtr(); + if (!sketchMgr()->sketchSolverError()) + launchOperation(myLastOperationId); } breakOperationSequence(); } @@ -226,40 +289,46 @@ void PartSet_Module::onOperationAborted(ModuleBase_Operation* theOperation) breakOperationSequence(); } -void PartSet_Module::sendOperation(ModuleBase_Operation* theOperation) -{ - // Install the document filter before any other filter - if (myDocumentShapeFilter.IsNull()) - myDocumentShapeFilter = new PartSet_GlobalFilter(myWorkshop); - myWorkshop->viewer()->addSelectionFilter(myDocumentShapeFilter); - - ModuleBase_IModule::sendOperation(theOperation); -} - void PartSet_Module::onOperationStarted(ModuleBase_Operation* theOperation) { if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { - Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer(); - aViewer->AddZLayer(myVisualLayerId); mySketchMgr->startSketch(theOperation); } else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { mySketchMgr->startNestedSketch(theOperation); } + + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (aFOperation) + myCustomPrs->activate(aFOperation->feature(), true); +} + +void PartSet_Module::onOperationResumed(ModuleBase_Operation* theOperation) +{ + ModuleBase_IModule::onOperationResumed(theOperation); + + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (aFOperation) + myCustomPrs->activate(aFOperation->feature(), true); } void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation) { + bool isModified = myCustomPrs->deactivate(false); + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { mySketchMgr->stopSketch(theOperation); - Handle(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->CurrentViewer(); - aViewer->RemoveZLayer(myVisualLayerId); - myVisualLayerId = 0; } else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { mySketchMgr->stopNestedSketch(theOperation); } - myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter); + + if (isModified) { + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + aDisplayer->updateViewer(); + } + mySketchMgr->onShowConstraintsToggle(myHasConstraintShown); } ModuleBase_Operation* PartSet_Module::currentOperation() const @@ -293,6 +362,31 @@ bool PartSet_Module::canRedo() const return aCanRedo; } +bool PartSet_Module::canApplyAction(const ObjectPtr& theObject, const QString& theActionId) const +{ + bool aValid = true; + if (theActionId == "DELETE_CMD" || 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()) + aValid = false; + } + } + return aValid; +} + +bool PartSet_Module::canCommitOperation() const +{ + return mySketchMgr->canCommitOperation(); +} + +bool PartSet_Module::canEraseObject(const ObjectPtr& theObject) const +{ + // the sketch manager put the restriction to the objects erase + return mySketchMgr->canEraseObject(theObject); +} + bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const { // the sketch manager put the restriction to the objects display @@ -309,7 +403,8 @@ bool PartSet_Module::canActivateSelection(const ObjectPtr& theObject) const 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 - aCanActivate = aCanActivate || anOperation->isEditOperation(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast(anOperation); + aCanActivate = aCanActivate || (aFOperation && aFOperation->isEditOperation()); } return aCanActivate; } @@ -319,6 +414,32 @@ bool PartSet_Module::addViewerMenu(QMenu* theMenu, const QMap return myMenuMgr->addViewerMenu(theMenu, theStdActions); } +void PartSet_Module::updateViewerMenu(const QMap& theStdActions) +{ + myMenuMgr->updateViewerMenu(theStdActions); +} + +QString PartSet_Module::getFeatureError(const FeaturePtr& theFeature) +{ + QString anError = ModuleBase_IModule::getFeatureError(theFeature); + + if (anError.isEmpty()) + anError = sketchMgr()->getFeatureError(theFeature); + + if (anError.isEmpty()) { + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); + + if (anOpMgr->isValidationLocked()) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (anOpMgr->currentOperation()); + if (!aFOperation || theFeature == aFOperation->feature()) + anError = "Validation is locked by the current operation"; + } + } + return anError; +} + void PartSet_Module::activeSelectionModes(QIntList& theModes) { theModes.clear(); @@ -331,19 +452,38 @@ bool PartSet_Module::isMouseOverWindow() return mySketchMgr->isMouseOverWindow(); } +void PartSet_Module::closeDocument() +{ + clearViewer(); +} + +void PartSet_Module::clearViewer() +{ + myCustomPrs->clearPrs(); + + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_Displayer* aDisplayer = aWorkshop->displayer(); + aDisplayer->deactivateSelectionFilters(); +} + void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { - ModuleBase_IPropertyPanel* aPanel = theOperation->propertyPanel(); - if (PartSet_SketcherMgr::isSketchOperation(theOperation) && (theOperation->isEditOperation())) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast(theOperation); + if (!aFOperation) + return; + + ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel(); + if (PartSet_SketcherMgr::isSketchOperation(aFOperation) && (aFOperation->isEditOperation())) { // we have to manually activate the sketch label in edit mode aPanel->activateWidget(aPanel->modelWidgets().first()); return; } // Restart last operation type - if ((theOperation->id() == myLastOperationId) && myLastFeature) { + if ((aFOperation->id() == myLastOperationId) && myLastFeature) { ModuleBase_ModelWidget* aWgt = aPanel->activeWidget(); - if (theOperation->id().toStdString() == SketchPlugin_Line::ID()) { + if (aFOperation->id().toStdString() == SketchPlugin_Line::ID()) { // Initialise new line with first point equal to end of previous PartSet_WidgetPoint2D* aPnt2dWgt = dynamic_cast(aWgt); if (aPnt2dWgt) { @@ -352,30 +492,12 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) std::dynamic_pointer_cast(aData->attribute(SketchPlugin_Line::END_ID())); if (aPoint) { aPnt2dWgt->setPoint(aPoint->x(), aPoint->y()); - PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), theOperation->feature(), + PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), aFOperation->feature(), aWgt->attributeID(), aPoint->x(), aPoint->y()); aPanel->activateNextWidget(aPnt2dWgt); } } } - } else { - // Start editing constraint - if (theOperation->isEditOperation()) { - // TODO: #391 - to be removed - std::string aId = theOperation->id().toStdString(); - if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation) && - PartSet_SketcherMgr::isDistanceOperation(theOperation)) { - // Find and activate widget for management of point for dimension line position - QList aWidgets = aPanel->modelWidgets(); - foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { - PartSet_WidgetPoint2D* aPntWgt = dynamic_cast(aWgt); - if (aPntWgt) { - aPanel->activateWidget(aPntWgt); - return; - } - } - } - } } } @@ -404,7 +526,8 @@ void PartSet_Module::onSelectionChanged() std::string aId = aFeature->getKind(); if ((aId == SketchPlugin_ConstraintRadius::ID()) || (aId == SketchPlugin_ConstraintLength::ID()) || - (aId == SketchPlugin_ConstraintDistance::ID())) { + (aId == SketchPlugin_ConstraintDistance::ID()) || + (aId == SketchPlugin_ConstraintAngle::ID())) { editFeature(aFeature); } } @@ -443,7 +566,12 @@ void PartSet_Module::onNoMoreWidgets() if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { if (myRestartingMode != RM_Forbided) myRestartingMode = RM_LastFeatureUsed; - anOperation->commit(); + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); + // do nothing if the feature can not be applyed + if (anOpMgr->isApplyEnabled()) + anOperation->commit(); } } } @@ -473,48 +601,48 @@ void PartSet_Module::onVertexSelected() ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent, Config_WidgetAPI* theWidgetApi, std::string theParentId) { - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); + ModuleBase_IWorkshop* aWorkshop = workshop(); + XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); + XGUI_Workshop* aXUIWorkshop = aConnector->workshop(); ModuleBase_ModelWidget* aWgt = NULL; if (theType == "sketch-start-label") { - PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, + PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, aWorkshop, theWidgetApi, theParentId, mySketchMgr->isConstraintsShown()); - aLabelWgt->setWorkshop(aWorkshop); connect(aLabelWgt, SIGNAL(planeSelected(const std::shared_ptr&)), mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr&))); connect(aLabelWgt, SIGNAL(showConstraintToggled(bool)), mySketchMgr, SLOT(onShowConstraintsToggle(bool))); aWgt = aLabelWgt; } else if (theType == "sketch-2dpoint_selector") { - PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId); - aPointWgt->setWorkshop(aWorkshop); + PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, aWorkshop, + theWidgetApi, theParentId); aPointWgt->setSketch(mySketchMgr->activeSketch()); connect(aPointWgt, SIGNAL(vertexSelected()), this, SLOT(onVertexSelected())); aWgt = aPointWgt; } else if (theType == "point2ddistance") { - PartSet_WidgetPoint2dDistance* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); - aDistanceWgt->setWorkshop(aWorkshop); + PartSet_WidgetPoint2dDistance* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent, + aWorkshop, theWidgetApi, theParentId); aDistanceWgt->setSketch(mySketchMgr->activeSketch()); aWgt = aDistanceWgt; } else if(theType == "point2dangle") { - PartSet_WidgetPoint2dAngle* anAngleWgt = new PartSet_WidgetPoint2dAngle(theParent, theWidgetApi, theParentId); - anAngleWgt->setWorkshop(aWorkshop); + 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, workshop(), theWidgetApi, theParentId); + new PartSet_WidgetShapeSelector(theParent, aWorkshop, theWidgetApi, theParentId); aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; } else if (theType == "sketch_multi_selector") { PartSet_WidgetMultiSelector* aShapeSelectorWgt = - new PartSet_WidgetMultiSelector(theParent, workshop(), theWidgetApi, theParentId); + new PartSet_WidgetMultiSelector(theParent, aWorkshop, theWidgetApi, theParentId); aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); aWgt = aShapeSelectorWgt; } else if (theType == WDG_DOUBLEVALUE_EDITOR) { - aWgt = new PartSet_WidgetEditor(theParent, workshop(), theWidgetApi, theParentId); + aWgt = new PartSet_WidgetEditor(theParent, aWorkshop, theWidgetApi, theParentId); } else if (theType == "export_file_selector") { - aWgt = new PartSet_WidgetFileSelector(theParent, workshop(), theWidgetApi, theParentId); + aWgt = new PartSet_WidgetFileSelector(theParent, aWorkshop, theWidgetApi, theParentId); } else if (theType == "sketch_launcher") { aWgt = new PartSet_WidgetSketchCreator(theParent, this, theWidgetApi, theParentId); } @@ -524,7 +652,11 @@ ModuleBase_ModelWidget* PartSet_Module::createWidgetByType(const std::string& th bool PartSet_Module::deleteObjects() { - SessionPtr aMgr = ModelAPI_Session::get(); + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); + + //SessionPtr aMgr = ModelAPI_Session::get(); // 1. check whether the delete should be processed in the module ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), @@ -533,8 +665,6 @@ bool PartSet_Module::deleteObjects() // 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 - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); ModuleBase_ISelection* aSel = workshop()->selection(); QObjectPtrList aSelectedObj = aSel->selectedPresentations(); // if there are no selected objects in the viewer, that means that the selection in another @@ -561,25 +691,26 @@ bool PartSet_Module::deleteObjects() if (aSketchObjects.size() == 0) return true; - // the active nested sketch operation should be aborted unconditionally - if (isNestedOp) - anOperation->abort(); - // 3. start operation QString aDescription = aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text(); - aMgr->startOperation(aDescription.toStdString()); + ModuleBase_OperationAction* anOpAction = new ModuleBase_OperationAction(aDescription, this); + + // the active nested sketch operation should be aborted unconditionally + // the Delete action should be additionally granted for the Sketch operation + // in order to do not abort/commit it + if (!anOpMgr->canStartOperation(anOpAction->id(), isSketchOp/*granted*/)) + return true; // the objects are processed but can not be deleted + + anOpMgr->startOperation(anOpAction); // 4. delete features // sketch feature should be skipped, only sub-features can be removed // when sketch operation is active - std::set anIgnoredFeatures; - anIgnoredFeatures.insert(mySketchMgr->activeSketch()); - aWorkshop->deleteFeatures(aSketchObjects, anIgnoredFeatures); - + aWorkshop->deleteFeatures(aSketchObjects); // 5. stop operation - aWorkshop->displayer()->updateViewer(); - aMgr->finishOperation(); - } else { + anOpMgr->commitOperation(); + } + else { bool isPartRemoved = false; // Delete part with help of PartSet plugin // TODO: the deleted objects has to be processed by multiselection @@ -595,10 +726,17 @@ bool PartSet_Module::deleteObjects() std::dynamic_pointer_cast(aPartResult); DocumentPtr aPartDoc = aPart->partDoc(); if (aPartDoc.get()) { - aMgr->startOperation(PartSetPlugin_Remove::ID()); + 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(); - aMgr->finishOperation(); + + anOpMgr->commitOperation(); isPartRemoved = true; } } @@ -611,29 +749,36 @@ bool PartSet_Module::deleteObjects() void PartSet_Module::onFeatureTriggered() { - SessionPtr aMgr = ModelAPI_Session::get(); - // 1. check whether the delete should be processed in the module - ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); - bool isNestedOp = PartSet_SketcherMgr::isNestedCreateOperation(anOperation); - if (isNestedOp) { - // in case if in the viewer nothing is displayed, the create operation should not be - // comitted even if all values of the feature are initialized - if (!mySketchMgr->canDisplayCurrentCreatedFeature()) { - QAction* aCmd = dynamic_cast(sender()); - //Do nothing on uncheck - if (aCmd->isCheckable() && !aCmd->isChecked()) - return; - - // the action information should be saved before the operation is aborted - // because this abort leads to update command status, which unchecks this action - anOperation->abort(); - - launchOperation(aCmd->data().toString()); + 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); + if (isNestedOp) { + // in case if in the viewer nothing is displayed, the create operation should not be + // comitted even if all values of the feature are initialized + if (!mySketchMgr->canDisplayCurrentCreatedFeature()) { + // the action information should be saved before the operation is aborted + // because this abort leads to update command status, which unchecks this action + anOperation->abort(); + launchOperation(aCmd->data().toString()); + } } } ModuleBase_IModule::onFeatureTriggered(); } +void PartSet_Module::launchOperation(const QString& theCmdId) +{ + if (PartSet_SketcherMgr::constraintsIdList().contains(theCmdId)) { + // Show constraints if a constraint was anOperation + myHasConstraintShown = mySketchMgr->isConstraintsShown(); + mySketchMgr->onShowConstraintsToggle(true); + } + ModuleBase_IModule::launchOperation(theCmdId); +} + + void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) { Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); @@ -650,21 +795,31 @@ void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) } } +void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS) +{ + // this is obsolete + // it should be recomputed in order to disappear in the viewer if the corresponded object + // is erased + //if (myCustomPrs->isActive()) + // myCustomPrs->redisplay(theObject, false); +} + void PartSet_Module::onViewTransformed(int theTrsfType) { // Set length of arrows constant in pixel size // if the operation is panning or rotate or panglobal then do nothing if ((theTrsfType == 1) || (theTrsfType == 3) || (theTrsfType == 4)) return; - ModuleBase_IViewer* aViewer = myWorkshop->viewer(); + Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); + if (aContext.IsNull()) + return; + //Handle(V3d_View) aView = aViewer->activeView(); XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); XGUI_Displayer* aDisplayer = aWorkshop->displayer(); - Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); - Handle(V3d_Viewer) aV3dViewer = aContext->CurrentViewer(); Handle(V3d_View) aView; double aScale = 0; @@ -682,7 +837,12 @@ void PartSet_Module::onViewTransformed(int theTrsfType) return; double aLen = aView->Convert(20); + double aPrevLen = SketcherPrs_Tools::getArrowSize(); SketcherPrs_Tools::setArrowSize(aLen); + const double aPrevScale = aViewer->Scale(aViewer->activeView()); + const double aCurScale = aViewer->activeView()->Camera()->Scale(); + aViewer->SetScale(aViewer->activeView(), aCurScale); + SketcherPrs_Tools::setTextHeight (aCurScale / aPrevScale * SketcherPrs_Tools::getTextHeight()); bool isModified = false; QList aPrsList = aDisplayer->displayedPresentations(); foreach (AISObjectPtr aAIS, aPrsList) { @@ -699,36 +859,68 @@ void PartSet_Module::onViewTransformed(int theTrsfType) aDisplayer->updateViewer(); } +bool PartSet_Module::customizeObject(ObjectPtr theObject, const bool theUpdateViewer) +{ + bool isRedisplayed = false; + if (myCustomPrs->isActive()) + isRedisplayed = myCustomPrs->redisplay(theObject, theUpdateViewer); + + return isRedisplayed; +} void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) { XGUI_ObjectsBrowser* aOB = dynamic_cast(theObjectBrowser); if (aOB) { - QLineEdit* aLabel = aOB->activeDocLabel(); - QPalette aPalet = aLabel->palette(); - aPalet.setColor(QPalette::Text, QColor(0, 72, 140)); - aLabel->setPalette(aPalet); + //QLineEdit* aLabel = aOB->activeDocLabel(); + //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&)), SLOT(onTreeViewDoubleClick(const QModelIndex&))); +#ifdef ModuleDataModel connect(aOB, SIGNAL(headerMouseDblClicked(const QModelIndex&)), SLOT(onTreeViewDoubleClick(const QModelIndex&))); connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), myDataModel, SLOT(onMouseDoubleClick(const QModelIndex&))); +#endif } } +ObjectPtr PartSet_Module::findPresentedObject(const AISObjectPtr& theAIS) const +{ + ObjectPtr anObject; + ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); + 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(); + + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast + (anActiveWidget); + if (aWidgetValidated) + anObject = aWidgetValidated->findPresentedObject(theAIS); + } + return anObject; +} void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const { QObjectPtrList aObjects = myWorkshop->selection()->selectedObjects(); int aSelected = aObjects.size(); SessionPtr aMgr = ModelAPI_Session::get(); + QAction* aActivatePartAction = myMenuMgr->action("ACTIVATE_PART_CMD"); + QAction* aActivatePartSetAction = myMenuMgr->action("ACTIVATE_PARTSET_CMD"); if (aSelected == 1) { bool hasResult = false; bool hasFeature = false; bool hasParameter = false; - ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter); + bool hasSubFeature = false; + ModuleBase_Tools::checkObjects(aObjects, hasResult, hasFeature, hasParameter, hasSubFeature); ObjectPtr aObject = aObjects.first(); if (aObject) { @@ -743,30 +935,49 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const } if (aPart.get()) // this may be null is Part feature is disabled aPartDoc = aPart->partDoc(); - if (aMgr->activeDocument() == aPartDoc) - theMenu->addAction(myMenuMgr->action("DEACTIVATE_PART_CMD")); - else - theMenu->addAction(myMenuMgr->action("ACTIVATE_PART_CMD")); + + theMenu->addAction(aActivatePartAction); + aActivatePartAction->setEnabled((aMgr->activeDocument() != aPartDoc)); + } else if (aObject->document() == aMgr->activeDocument()) { if (hasParameter || hasFeature) theMenu->addAction(myMenuMgr->action("EDIT_CMD")); } + + ResultBodyPtr aResult = std::dynamic_pointer_cast(aObject); + if( aResult.get() ) + theMenu->addAction(myMenuMgr->action("SELECT_PARENT_CMD")); } else { // If feature is 0 the it means that selected root object (document) - if (aMgr->activeDocument() != aMgr->moduleDocument()) - theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD")); + theMenu->addAction(aActivatePartSetAction); + aActivatePartSetAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument())); } } else if (aSelected == 0) { // if there is no selection then it means that upper label is selected QModelIndexList aIndexes = myWorkshop->selection()->selectedIndexes(); if (aIndexes.size() == 0) // it means that selection happens in top label outside of tree view - if (aMgr->activeDocument() != aMgr->moduleDocument()) - theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD")); + theMenu->addAction(aActivatePartSetAction); + aActivatePartSetAction->setEnabled((aMgr->activeDocument() != aMgr->moduleDocument())); + } + bool aNotDeactivate = (myWorkshop->currentOperation() == 0); + if (!aNotDeactivate) { + aActivatePartAction->setEnabled(false); + aActivatePartSetAction->setEnabled(false); } } 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()) << + QString(PartSetPlugin_Duplicate::ID().c_str()) << + QString(PartSetPlugin_Remove::ID().c_str()); + if (myWorkshop->currentOperation() && + (!aAllowActivationList.contains(myWorkshop->currentOperation()->id()))) + return; XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); XGUI_DataTree* aTreeView = aWorkshop->objectBrowser()->treeView(); @@ -775,8 +986,9 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess SessionPtr aMgr = ModelAPI_Session::get(); DocumentPtr aActiveDoc = aMgr->activeDocument(); - DocumentPtr aDoc = aMgr->moduleDocument(); +#ifdef ModuleDataModel QModelIndex aOldIndex = myDataModel->activePartTree(); + DocumentPtr aDoc = aMgr->moduleDocument(); if (aActiveDoc == aDoc) { if (aOldIndex.isValid()) aTreeView->setExpanded(aOldIndex, false); @@ -798,6 +1010,16 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess } } } +#else + // Problem with MPV: At first time on creation it doesn't work because Part feature + // creation event will be sent after + if (aActivePartIndex.isValid()) + aTreeView->setExpanded(aActivePartIndex, false); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); + aActivePartIndex = aDataModel->documentRootIndex(aActiveDoc); + if (aActivePartIndex.isValid()) + aTreeView->setExpanded(aActivePartIndex, true); +#endif aLabel->setPalette(aPalet); aWorkshop->updateCommandStatus(); @@ -812,6 +1034,8 @@ void PartSet_Module::processEvent(const std::shared_ptr& theMess void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) { + if (myWorkshop->currentOperation()) // Do not change activation of parts if an operation active + return; SessionPtr aMgr = ModelAPI_Session::get(); if (!theIndex.isValid()) { aMgr->setActiveDocument(aMgr->moduleDocument()); @@ -819,7 +1043,18 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) } if (theIndex.column() != 0) // Use only first column return; +#ifdef ModuleDataModel ObjectPtr aObj = myDataModel->object(theIndex); +#else + XGUI_ModuleConnector* aConnector = dynamic_cast(myWorkshop); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + XGUI_DataModel* aDataModel = aWorkshop->objectBrowser()->dataModel(); + // De not use non editable Indexes + if ((aDataModel->flags(theIndex) & Qt::ItemIsSelectable) == 0) + return; + ObjectPtr aObj = aDataModel->object(theIndex); +#endif + ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); if (!aPart.get()) { // Probably this is Feature FeaturePtr aPartFeature = std::dynamic_pointer_cast(aObj); @@ -829,9 +1064,50 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) } if (aPart.get()) { // if this is a part if (aPart->partDoc() == aMgr->activeDocument()) { - aMgr->setActiveDocument(aMgr->moduleDocument()); + myMenuMgr->activatePartSet(); } else { aPart->activate(); } } } + + +void PartSet_Module::onViewCreated(ModuleBase_IViewWindow*) +{ + // z layer is created for all started operations in order to visualize operation AIS presentation + // over the object + Handle(AIS_InteractiveContext) aContext = myWorkshop->viewer()->AISContext(); + if (aContext.IsNull()) + return; + + Handle(V3d_Viewer) aViewer = aContext->CurrentViewer(); + if (myVisualLayerId == 0) { + if (myVisualLayerId == 0) + aViewer->AddZLayer(myVisualLayerId); + } else { + TColStd_SequenceOfInteger aZList; + aViewer->GetAllZLayers(aZList); + bool aFound = false; + for (int i = 1; i <= aZList.Length(); i++) { + if (aZList(i) == myVisualLayerId) { + aFound = true; + break; + } + } + if (!aFound) + aViewer->AddZLayer(myVisualLayerId); + } + // if there is an active operation with validated widget, + // the filters of this widget should be activated in the created view + ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); + if (aOperation) { + ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); + if (anActiveWidget) { + ModuleBase_WidgetValidated* aWidgetValidated = dynamic_cast + (anActiveWidget); + if (aWidgetValidated) + aWidgetValidated->activateFilters(true); + } + } +}