X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=03b29dd75a50a4cc255b261bb270f8bd7b171b29;hb=013eda84dcea4a427d406c5c75ba7870f4124b7f;hp=c5852a61c4d974688676604aa76afec5b3f9779e;hpb=2136782ef0f410c48485d75704779ceedf7a29c1;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 c5852a61c..03b29dd75 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -14,15 +14,22 @@ #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 @@ -30,6 +37,8 @@ #include #include #include +#include +#include #include @@ -38,6 +47,7 @@ #include #include #include +#include #include #include @@ -51,6 +61,8 @@ #include #include #include +#include +#include #include #include @@ -58,6 +70,7 @@ #include #include #include +#include #include #include #include @@ -90,12 +103,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) { @@ -106,6 +119,8 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), myRestartingMode(RM_None), myVisualLayerId(0) { + new PartSet_IconFactory(); + mySketchMgr = new PartSet_SketcherMgr(this); myDataModel = new PartSet_DocumentDataModel(this); @@ -122,23 +137,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)); - if (myFilterInfinite.IsNull()) - myFilterInfinite = new PartSet_FilterInfinite(); - myWorkshop->viewer()->addSelectionFilter(myFilterInfinite); + mySelectionFilters.Append(new PartSet_GlobalFilter(myWorkshop)); + mySelectionFilters.Append(new PartSet_FilterInfinite(myWorkshop)); } PartSet_Module::~PartSet_Module() { - if (!myDocumentShapeFilter.IsNull()) - myDocumentShapeFilter.Nullify(); - if (!myFilterInfinite.IsNull()) - myFilterInfinite.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() @@ -156,10 +196,13 @@ 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_ShapeType", new GeomValidators_ShapeType); aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face); @@ -169,11 +212,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); } void PartSet_Module::registerFilters() @@ -202,9 +251,9 @@ void PartSet_Module::onOperationCommitted(ModuleBase_Operation* theOperation) // the selection is cleared after commit the create operation // in order to do not use the same selected objects in the restarted operation // for common behaviour, the selection is cleared even if the operation is not restarted - 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(); @@ -232,40 +281,28 @@ 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); } + + myCustomPrs->activate(theOperation->feature()); } void PartSet_Module::onOperationStopped(ModuleBase_Operation* theOperation) { + myCustomPrs->deactivate(); + 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); } ModuleBase_Operation* PartSet_Module::currentOperation() const @@ -299,6 +336,25 @@ 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::canDisplayObject(const ObjectPtr& theObject) const { // the sketch manager put the restriction to the objects display @@ -325,6 +381,12 @@ bool PartSet_Module::addViewerMenu(QMenu* theMenu, const QMap return myMenuMgr->addViewerMenu(theMenu, theStdActions); } +void PartSet_Module::updateViewerMenu(const QMap& theStdActions) +{ + myMenuMgr->updateViewerMenu(theStdActions); +} + + void PartSet_Module::activeSelectionModes(QIntList& theModes) { theModes.clear(); @@ -364,24 +426,6 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) } } } - } 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; - } - } - } - } } } @@ -410,7 +454,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); } } @@ -479,48 +524,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); } @@ -578,10 +623,7 @@ bool PartSet_Module::deleteObjects() // 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(); @@ -656,6 +698,14 @@ void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) } } +void PartSet_Module::onBeforeObjectErase(ObjectPtr theObject, AISObjectPtr theAIS) +{ + // it should be recomputed in order to disappear in the viewer if the corresponded object + // is erased + if (myCustomPrs->isActive()) + myCustomPrs->customize(theObject); +} + void PartSet_Module::onViewTransformed(int theTrsfType) { // Set length of arrows constant in pixel size @@ -710,6 +760,11 @@ void PartSet_Module::onViewTransformed(int theTrsfType) aDisplayer->updateViewer(); } +void PartSet_Module::customizeObject(ObjectPtr theObject) +{ + if (myCustomPrs->isActive()) + myCustomPrs->customize(theObject); +} void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) { @@ -720,15 +775,36 @@ void PartSet_Module::customizeObjectBrowser(QWidget* theObjectBrowser) aPalet.setColor(QPalette::Text, QColor(0, 72, 140)); aLabel->setPalette(aPalet); aOB->treeView()->setExpandsOnDoubleClick(false); +#ifdef ModuleDataModel connect(aOB->treeView(), SIGNAL(doubleClicked(const QModelIndex&)), SLOT(onTreeViewDoubleClick(const QModelIndex&))); 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 { @@ -739,7 +815,8 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const 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) { @@ -762,6 +839,12 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const 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")); @@ -773,11 +856,25 @@ void PartSet_Module::addObjectBrowserMenu(QMenu* theMenu) const if (aMgr->activeDocument() != aMgr->moduleDocument()) theMenu->addAction(myMenuMgr->action("ACTIVATE_PARTSET_CMD")); } + bool aCanDeactivate = (myWorkshop->currentOperation() == 0); + myMenuMgr->action("ACTIVATE_PARTSET_CMD")->setEnabled(aCanDeactivate); + myMenuMgr->action("DEACTIVATE_PART_CMD")->setEnabled(aCanDeactivate); + myMenuMgr->action("ACTIVATE_PART_CMD")->setEnabled(aCanDeactivate); } 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(); @@ -786,8 +883,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); @@ -809,6 +907,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(); @@ -823,6 +931,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()); @@ -846,3 +956,27 @@ void PartSet_Module::onTreeViewDoubleClick(const QModelIndex& theIndex) } } } + + +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(V3d_Viewer) aViewer = myWorkshop->viewer()->AISContext()->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); + } +}