X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=20cd411016fc4806e4f402843ee6926f4f03479e;hb=3e3d76500389cb3a5a6eeb09f229cd3c83730dac;hp=49323976a568ca433a2a268280d81d1d98c6a945;hpb=f372f5d14b070024b5b0f08adf3bcf2318e64485;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index 49323976a..20cd41101 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -20,12 +21,19 @@ #include #include #include +#include +#include +#include +#include + +#include #include #include #include #include #include +#include #include #include @@ -36,6 +44,7 @@ #include #include #include +#include #include #include @@ -51,12 +60,14 @@ //#include #include +#include #include #include #include #include #include +#include #include #include @@ -81,7 +92,7 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myRestartingMode(RM_None) + myRestartingMode(RM_None), myVisualLayerId(0) { //myWorkshop = dynamic_cast(theWshop); mySketchMgr = new PartSet_SketcherMgr(this); @@ -119,7 +130,21 @@ void PartSet_Module::registerValidators() aFactory->registerValidator("PartSet_RadiusValidator", new PartSet_RadiusValidator); aFactory->registerValidator("PartSet_RigidValidator", new PartSet_RigidValidator); aFactory->registerValidator("PartSet_DifferentObjects", new PartSet_DifferentObjectsValidator); - aFactory->registerValidator("PartSet_SketchValidator", new PartSet_SketchValidator); + aFactory->registerValidator("PartSet_DifferentShapes", new ModelAPI_ShapeValidator); + + aFactory->registerValidator("GeomValidators_Edge", new GeomValidators_Edge); + aFactory->registerValidator("GeomValidators_EdgeOrVertex", + new GeomValidators_EdgeOrVertex); + aFactory->registerValidator("GeomValidators_Face", new GeomValidators_Face); + + aFactory->registerValidator("GeomValidators_ConstructionComposite", + new GeomValidators_ConstructionComposite); + + aFactory->registerValidator("PartSet_SketchEntityValidator", + new PartSet_SketchEntityValidator); + + aFactory->registerValidator("PartSet_SameTypeAttr", + new PartSet_SameTypeAttrValidator); } void PartSet_Module::registerFilters() @@ -128,16 +153,30 @@ void PartSet_Module::registerFilters() XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters(); - aFactory->registerFilter("EdgeFilter", new ModuleBase_FilterLinearEdge); - aFactory->registerFilter("FaceFilter", new ModuleBase_FilterFace); - aFactory->registerFilter("MultiFilter", new ModuleBase_FilterMulti); - Handle(SelectMgr_Filter) aSelectFilter = new ModuleBase_FilterNoConsructionSubShapes(workshop()); - aFactory->registerFilter("NoConstructionSubShapesFilter", - new ModuleBase_FilterCustom(aSelectFilter)); + //aFactory->registerFilter("EdgeFilter", new ModuleBase_FilterLinearEdge); + //aFactory->registerFilter("FaceFilter", new ModuleBase_FilterFace); + //aFactory->registerFilter("MultiFilter", new ModuleBase_FilterMulti); + //Handle(SelectMgr_Filter) aSelectFilter = new ModuleBase_FilterNoConsructionSubShapes(workshop()); + //aFactory->registerFilter("NoConstructionSubShapesFilter", + // new ModuleBase_FilterCustom(aSelectFilter)); + //Handle(SelectMgr_Filter) aSelectFilter = new PartSet_FilterSketchEntity(workshop()); + //aFactory->registerFilter("SketchEntityFilter", new ModuleBase_FilterCustom(aSelectFilter)); +} + +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); } void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) { + if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + mySketchMgr->commitNestedSketch(theOperation); + } + if (theOperation->isEditOperation()) return; // the selection is cleared after commit the create operation @@ -175,9 +214,15 @@ void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) { - if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { + 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); + } + if (myDocumentShapeFilter.IsNull()) myDocumentShapeFilter = new PartSet_GlobalFilter(myWorkshop); myWorkshop->viewer()->addSelectionFilter(myDocumentShapeFilter); @@ -185,24 +230,76 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) { - if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { + 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 +{ + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_OperationMgr* anOpMgr = aConnector->workshop()->operationMgr(); + return anOpMgr->currentOperation(); +} + +bool PartSet_Module::canUndo() const +{ + bool aCanUndo = false; + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->hasModuleDocument() && aMgr->canUndo()) { + aCanUndo = !aMgr->isOperation(); + if (!aCanUndo) // check the enable state additionally by sketch manager + aCanUndo = aMgr->canUndo(); + } + return aCanUndo; +} + +bool PartSet_Module::canRedo() const +{ + bool aCanRedo = false; + SessionPtr aMgr = ModelAPI_Session::get(); + if (aMgr->hasModuleDocument() && aMgr->canRedo()) { + aCanRedo = !aMgr->isOperation(); + if (!aCanRedo) // check the enable state additionally by sketch manager + aCanRedo = aMgr->canRedo(); + } + return aCanRedo; +} + bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const { bool aCanDisplay = false; - if (mySketchMgr->activeSketch()) { + if (!mySketchMgr->canDisplayObject()) + return aCanDisplay; + CompositeFeaturePtr aSketchFeature = mySketchMgr->activeSketch(); + if (aSketchFeature.get() != NULL) { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - if (aFeature.get() != NULL) { - if (aFeature == mySketchMgr->activeSketch()) { + // MPV: the second and third conditions to avoid crash on exit for application + if (aFeature.get() != NULL && aFeature->data().get() && aFeature->data()->isValid()) { + if (aFeature == aSketchFeature) { aCanDisplay = false; } - else { - aCanDisplay = mySketchMgr->sketchOperationIdList().contains(aFeature->getKind().c_str()); + else if (aSketchFeature.get() && aSketchFeature->data().get() && + aSketchFeature->data()->isValid()) { + for (int i = 0; i < aSketchFeature->numberOfSubs() && !aCanDisplay; i++) { + FeaturePtr aSubFeature = aSketchFeature->subFeature(i); + std::list aResults = aSubFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end() && !aCanDisplay; ++aIt) { + if (theObject == (*aIt)) + aCanDisplay = true; + } + if (aSubFeature == theObject) + aCanDisplay = true; + } } } } @@ -214,8 +311,11 @@ bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const void PartSet_Module::addViewerItems(QMenu* theMenu) const { - if (!isSketchOperationActive() && !isSketchFeatureOperationActive()) + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if (!PartSet_SketcherMgr::isSketchOperation(anOperation) && + !PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) return; + ModuleBase_ISelection* aSelection = myWorkshop->selection(); QObjectPtrList aObjects = aSelection->selectedPresentations(); if (aObjects.size() > 0) { @@ -227,16 +327,25 @@ void PartSet_Module::addViewerItems(QMenu* theMenu) const hasFeature = true; } } - if (hasFeature) - theMenu->addAction(action("DELETE_PARTSET_CMD")); + if (hasFeature) { + XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + QAction* anAction = aWorkshop->contextMenuMgr()->action("DELETE_CMD"); + theMenu->addAction(anAction); + } + } + bool isAuxiliary; + if (mySketchMgr->canSetAuxiliary(isAuxiliary)) { + QAction* anAction = action("AUXILIARY_CMD"); + theMenu->addAction(anAction); + anAction->setChecked(isAuxiliary); } } void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) { ModuleBase_IPropertyPanel* aPanel = theOperation->propertyPanel(); - if ((theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) && - (theOperation->isEditOperation())) { + if (PartSet_SketcherMgr::isSketchOperation(theOperation) && (theOperation->isEditOperation())) { // we have to manually activate the sketch label in edit mode aPanel->activateWidget(aPanel->modelWidgets().first()); return; @@ -265,20 +374,17 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) if (theOperation->isEditOperation()) { // TODO: #391 - to be removed std::string aId = theOperation->id().toStdString(); - if (PartSet_SketcherMgr::sketchOperationIdList().contains(QString(aId.c_str()))) { - if ((aId == SketchPlugin_ConstraintRadius::ID()) || - (aId == SketchPlugin_ConstraintLength::ID()) || - (aId == SketchPlugin_ConstraintDistance::ID())) { - // 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; - } + 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; } - } + } } } } @@ -295,7 +401,7 @@ void PartSet_Module::onSelectionChanged() // An edit operation is enable only if the current opeation is the sketch operation if (mySketchMgr->activeSketch()) { if (PartSet_Tools::sketchPlane(mySketchMgr->activeSketch())) - isSketcherOp = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()); + isSketcherOp = PartSet_SketcherMgr::isSketchOperation(aOperation); } if (isSketcherOp) { // Editing of constraints can be done on selection @@ -331,24 +437,24 @@ void PartSet_Module::onEnterReleased() void PartSet_Module::onOperationActivatedByPreselection() { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if(aOperation && isSketchFeatureOperationActive()) { + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { // Set final definitions if they are necessary //propertyPanelDefined(aOperation); /// Commit sketcher operations automatically - aOperation->commit(); + anOperation->commit(); } } void PartSet_Module::onNoMoreWidgets() { - if (isSketchFeatureOperationActive()) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation) { + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if (anOperation) { + if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { if (myRestartingMode != RM_Forbided) myRestartingMode = RM_LastFeatureUsed; - aOperation->commit(); + anOperation->commit(); } } } @@ -359,90 +465,66 @@ void PartSet_Module::onVertexSelected() if (aOperation->id().toStdString() == SketchPlugin_Line::ID()) { /// If last line finished on vertex the lines creation sequence has to be break ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + ModuleBase_ModelWidget* anActiveWidget = aPanel->activeWidget(); const QList& aWidgets = aPanel->modelWidgets(); - if (aWidgets.last() == aPanel->activeWidget()) { - myRestartingMode = RM_Forbided; + QList::const_iterator anIt = aWidgets.begin(), aLast = aWidgets.end(); + bool aFoundWidget = false; + bool aFoundObligatory = false; + for (; anIt != aLast && !aFoundObligatory; anIt++) { + if (!aFoundWidget) + aFoundWidget = *anIt == anActiveWidget; + else + aFoundObligatory = (*anIt)->isObligatory(); } + if (!aFoundObligatory) + myRestartingMode = RM_Forbided; } } -QWidget* PartSet_Module::createWidgetByType(const std::string& theType, QWidget* theParent, - Config_WidgetAPI* theWidgetApi, std::string theParentId, - QList& theModelWidgets) +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_ModelWidget* aWgt = NULL; if (theType == "sketch-start-label") { - PartSet_WidgetSketchLabel* aWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, theParentId); - aWgt->setWorkshop(aWorkshop); - connect(aWgt, SIGNAL(planeSelected(const std::shared_ptr&)), + PartSet_WidgetSketchLabel* aLabelWgt = new PartSet_WidgetSketchLabel(theParent, theWidgetApi, theParentId); + aLabelWgt->setWorkshop(aWorkshop); + connect(aLabelWgt, SIGNAL(planeSelected(const std::shared_ptr&)), mySketchMgr, SLOT(onPlaneSelected(const std::shared_ptr&))); - theModelWidgets.append(aWgt); - return aWgt->getControl(); - + aWgt = aLabelWgt; } else if (theType == "sketch-2dpoint_selector") { - PartSet_WidgetPoint2D* aWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId); - aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(mySketchMgr->activeSketch()); - - connect(aWgt, SIGNAL(vertexSelected()), this, SLOT(onVertexSelected())); - - theModelWidgets.append(aWgt); - return aWgt->getControl(); - + PartSet_WidgetPoint2D* aPointWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId); + aPointWgt->setWorkshop(aWorkshop); + aPointWgt->setSketch(mySketchMgr->activeSketch()); + connect(aPointWgt, SIGNAL(vertexSelected()), this, SLOT(onVertexSelected())); + aWgt = aPointWgt; } if (theType == "point2ddistance") { - PartSet_WidgetPoint2dDistance* aWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); - aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(mySketchMgr->activeSketch()); - - theModelWidgets.append(aWgt); - return aWgt->getControl(); - + PartSet_WidgetPoint2dDistance* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); + aDistanceWgt->setWorkshop(aWorkshop); + aDistanceWgt->setSketch(mySketchMgr->activeSketch()); + aWgt = aDistanceWgt; } if (theType == "sketch_shape_selector") { - PartSet_WidgetShapeSelector* aWgt = + PartSet_WidgetShapeSelector* aShapeSelectorWgt = new PartSet_WidgetShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(mySketchMgr->activeSketch()); - - theModelWidgets.append(aWgt); - return aWgt->getControl(); - + aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aShapeSelectorWgt; } if (theType == "sketch_constraint_shape_selector") { - PartSet_WidgetConstraintShapeSelector* aWgt = + PartSet_WidgetConstraintShapeSelector* aConstraintShapeSelectorWgt = new PartSet_WidgetConstraintShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(mySketchMgr->activeSketch()); - - theModelWidgets.append(aWgt); - return aWgt->getControl(); - - } else - return 0; -} - -bool PartSet_Module::isSketchOperationActive() const -{ - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - - bool isSketchOp = aOperation && aOperation->id().toStdString() == SketchPlugin_Sketch::ID(); - return isSketchOp; -} - -bool PartSet_Module::isSketchFeatureOperationActive() const -{ - bool isCurrentSketchOp = false; - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation) { - FeaturePtr aFeature = aOperation->feature(); - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aFeature); - isCurrentSketchOp = aSPFeature.get() != NULL; + aConstraintShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aConstraintShapeSelectorWgt; } - return isCurrentSketchOp; + return aWgt; } void PartSet_Module::createActions() { - QAction* aAction = new QAction(QIcon(":pictures/delete.png"), tr("Delete"), this); - addAction("DELETE_PARTSET_CMD", aAction); + QAction* anAction; + + anAction = new QAction(tr("Auxiliary"), this); + anAction->setCheckable(true); + addAction("AUXILIARY_CMD", anAction); } QAction* PartSet_Module::action(const QString& theId) const @@ -466,34 +548,40 @@ void PartSet_Module::onAction(bool isChecked) QAction* aAction = static_cast(sender()); QString anId = aAction->data().toString(); - if (anId == "DELETE_PARTSET_CMD") { - deleteObjects(); + if (anId == "AUXILIARY_CMD") { + mySketchMgr->setAuxiliary(isChecked); } } -void PartSet_Module::deleteObjects() +bool PartSet_Module::deleteObjects() { - bool isSketchOp = isSketchOperationActive(); - if (!isSketchOp && !isSketchFeatureOperationActive()) - return; + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), + isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + if (!isSketchOp && !isNestedOp) + return false; - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Workshop* aWorkshop = aConnector->workshop(); - - XGUI_OperationMgr* anOpMgr = aWorkshop->operationMgr(); - if (!isSketchOp && anOpMgr->canStopOperation()) { - ModuleBase_Operation* aCurrentOp = anOpMgr->currentOperation(); - if (aCurrentOp) { - aCurrentOp->abort(); - } - } // sketch feature should be skipped, only sub-features can be removed // when sketch operation is active CompositeFeaturePtr aSketch = mySketchMgr->activeSketch(); + // 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 = aConnector->selection(); QObjectPtrList aSelectedObj = aSel->selectedPresentations(); + // if there are no selected objects in the viewer, that means that the selection in another + // place cased this method. It is necessary to return the false value to understande in above + // method that delete is not processed + if (aSelectedObj.count() == 0) + return false; + + // the active nested sketch operation should be aborted unconditionally + if (isNestedOp) + anOperation->abort(); + std::set aRefFeatures; foreach (ObjectPtr aObj, aSelectedObj) { @@ -509,6 +597,11 @@ void PartSet_Module::deleteObjects() //} } + QString aDescription = aWorkshop->contextMenuMgr()->action("DELETE_CMD")->text(); + /** + // according to #355 feature, it is not necessary to inform about dependencies during + // sketch delete operation + // if (!aRefFeatures.empty()) { QStringList aRefNames; std::set::const_iterator anIt = aRefFeatures.begin(), @@ -521,6 +614,7 @@ void PartSet_Module::deleteObjects() } if (!aRefNames.empty()) { QString aNames = aRefNames.join(", "); + aDescription += aNames.prepend(" "); QMainWindow* aDesktop = aWorkshop->desktop(); QMessageBox::StandardButton aRes = QMessageBox::warning( @@ -531,10 +625,10 @@ void PartSet_Module::deleteObjects() if (aRes != QMessageBox::Yes) return; } - } + }*/ SessionPtr aMgr = ModelAPI_Session::get(); - aMgr->startOperation(); + aMgr->startOperation(aDescription.toStdString()); std::set::const_iterator anIt = aRefFeatures.begin(), aLast = aRefFeatures.end(); for (; anIt != aLast; anIt++) { @@ -563,4 +657,20 @@ void PartSet_Module::deleteObjects() aWorkshop->displayer()->updateViewer(); //myDisplayer->updateViewer(); aMgr->finishOperation(); + + return true; +} + + +void PartSet_Module::onObjectDisplayed(ObjectPtr theObject, AISObjectPtr theAIS) +{ + Handle(AIS_InteractiveObject) anAIS = theAIS->impl(); + if (!anAIS.IsNull()) { + Handle(AIS_Dimension) aDim = Handle(AIS_Dimension)::DownCast(anAIS); + if (!aDim.IsNull()) { + Handle(AIS_InteractiveContext) aCtx = anAIS->GetContext(); + aCtx->SetZLayer(aDim, myVisualLayerId); + } + } } +