X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_Module.cpp;h=83f59bfe61bab2cde6132c700e168076a81b57df;hb=571cc113b54efb9fb058a053cd9ac489549a0729;hp=c154d43d4804b95a66db049279c76be00e05d770;hpb=3d7368386762b057fff327d24d0079b4a73c3004;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp index c154d43d4..83f59bfe6 100644 --- a/src/PartSet/PartSet_Module.cpp +++ b/src/PartSet/PartSet_Module.cpp @@ -7,6 +7,8 @@ #include #include #include +#include +#include #include #include @@ -15,13 +17,18 @@ #include #include #include - +#include +#include +#include +#include +#include #include #include #include #include #include +#include #include #include @@ -32,21 +39,23 @@ #include #include #include +#include #include -#include +#include #include -#include -#include -#include +#include +//#include +//#include #include #include #include #include #include -#include +//#include #include +#include #include #include @@ -59,6 +68,8 @@ #include #include #include +#include +#include #include #include @@ -67,23 +78,6 @@ #include #endif - -/// Returns list of unique objects by sum of objects from List1 and List2 -QList getSumList(const QList& theList1, - const QList& theList2) -{ - QList aRes; - foreach (ModuleBase_ViewerPrs aPrs, theList1) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); - } - foreach (ModuleBase_ViewerPrs aPrs, theList2) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); - } - return aRes; -} - /*!Create and return new instance of XGUI_Module*/ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* theWshop) { @@ -92,21 +86,10 @@ extern "C" PARTSET_EXPORT ModuleBase_IModule* createModule(ModuleBase_IWorkshop* PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) : ModuleBase_IModule(theWshop), - myIsDragging(false), myRestartingMode(RM_None), myDragDone(false) + myRestartingMode(RM_None) { //myWorkshop = dynamic_cast(theWshop); - ModuleBase_IViewer* aViewer = aViewer = theWshop->viewer(); - connect(aViewer, SIGNAL(mousePress(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMousePressed(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseRelease(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseReleased(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseMove(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseMoved(ModuleBase_IViewWindow*, QMouseEvent*))); - - connect(aViewer, SIGNAL(mouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*)), - this, SLOT(onMouseDoubleClick(ModuleBase_IViewWindow*, QMouseEvent*))); + mySketchMgr = new PartSet_SketcherMgr(this); XGUI_ModuleConnector* aConnector = dynamic_cast(theWshop); XGUI_Workshop* aWorkshop = aConnector->workshop(); @@ -116,16 +99,17 @@ PartSet_Module::PartSet_Module(ModuleBase_IWorkshop* theWshop) connect(anOpMgr, SIGNAL(operationActivatedByPreselection()), this, SLOT(onOperationActivatedByPreselection())); + ModuleBase_IViewer* aViewer = theWshop->viewer(); connect(aViewer, SIGNAL(keyRelease(ModuleBase_IViewWindow*, QKeyEvent*)), this, SLOT(onKeyRelease(ModuleBase_IViewWindow*, QKeyEvent*))); + + createActions(); } PartSet_Module::~PartSet_Module() { if (!myDocumentShapeFilter.IsNull()) myDocumentShapeFilter.Nullify(); - if (!myPlaneFilter.IsNull()) - myPlaneFilter.Nullify(); } void PartSet_Module::registerValidators() @@ -140,6 +124,8 @@ 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_DifferentShapes", new ModelAPI_ShapeValidator); + aFactory->registerValidator("PartSet_SketchValidator", new PartSet_SketchValidator); } void PartSet_Module::registerFilters() @@ -148,13 +134,39 @@ void PartSet_Module::registerFilters() XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); ModuleBase_FilterFactory* aFactory = aConnector->selectionFilters(); - aFactory->registerFilter("LinearEdgeFilter", new ModuleBase_FilterLinearEdge); + 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)); + 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 + // 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(); + /// Restart sketcher operations automatically FeaturePtr aFeature = theOperation->feature(); std::shared_ptr aSPFeature = @@ -163,6 +175,7 @@ void PartSet_Module::operationCommitted(ModuleBase_Operation* theOperation) myRestartingMode == RM_EmptyFeatureUsed)) { myLastOperationId = theOperation->id(); myLastFeature = myRestartingMode == RM_LastFeatureUsed ? theOperation->feature() : FeaturePtr(); + launchOperation(myLastOperationId); } breakOperationSequence(); @@ -182,39 +195,13 @@ void PartSet_Module::operationAborted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) { - if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { - // Display all sketcher sub-Objects - myCurrentSketch = std::dynamic_pointer_cast(theOperation->feature()); - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - - for (int i = 0; i < myCurrentSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = myCurrentSketch->subFeature(i); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->display((*aIt), false); - } - aDisplayer->display(aFeature); - } - // Hide sketcher result - std::list aResults = myCurrentSketch->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->erase((*aIt), false); - } - aDisplayer->erase(myCurrentSketch); - - - if (myPlaneFilter.IsNull()) - myPlaneFilter = new ModuleBase_ShapeInPlaneFilter(); - myWorkshop->viewer()->addSelectionFilter(myPlaneFilter); - if (theOperation->isEditOperation()) { - // If it is editing of sketch then it means that plane is already defined - std::shared_ptr aPln = PartSet_Tools::sketchPlane(myCurrentSketch); - myPlaneFilter->setPlane(aPln->impl()); - } + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { + mySketchMgr->startSketch(theOperation); } + else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + mySketchMgr->startNestedSketch(theOperation); + } + if (myDocumentShapeFilter.IsNull()) myDocumentShapeFilter = new PartSet_GlobalFilter(myWorkshop); myWorkshop->viewer()->addSelectionFilter(myDocumentShapeFilter); @@ -222,50 +209,119 @@ void PartSet_Module::operationStarted(ModuleBase_Operation* theOperation) void PartSet_Module::operationStopped(ModuleBase_Operation* theOperation) { - if (theOperation->id().toStdString() == SketchPlugin_Sketch::ID()) { - DataPtr aData = myCurrentSketch->data(); - if ((!aData) || (!aData->isValid())) { - // The sketch was aborted - myCurrentSketch = CompositeFeaturePtr(); - return; - } - // Hide all sketcher sub-Objects - XGUI_ModuleConnector* aConnector = dynamic_cast(workshop()); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - for (int i = 0; i < myCurrentSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = myCurrentSketch->subFeature(i); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->erase((*aIt), false); - } - aDisplayer->erase(aFeature, false); - } - // Display sketcher result - std::list aResults = myCurrentSketch->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aDisplayer->display((*aIt), false); - } - aDisplayer->display(myCurrentSketch); - - myCurrentSketch = CompositeFeaturePtr(); - myWorkshop->viewer()->removeSelectionFilter(myPlaneFilter); + if (PartSet_SketcherMgr::isSketchOperation(theOperation)) { + mySketchMgr->stopSketch(theOperation); + } + else if (PartSet_SketcherMgr::isNestedSketchOperation(theOperation)) { + mySketchMgr->stopNestedSketch(theOperation); } myWorkshop->viewer()->removeSelectionFilter(myDocumentShapeFilter); } -void PartSet_Module::onPlaneSelected(const std::shared_ptr& thePln) +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 { - myPlaneFilter->setPlane(thePln->impl()); + bool aCanDisplay = false; + if (!mySketchMgr->canDisplayObject()) + return aCanDisplay; + CompositeFeaturePtr aSketchFeature = mySketchMgr->activeSketch(); + if (aSketchFeature.get() != NULL) { + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + + // 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 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; + } + } + } + } + else { + aCanDisplay = ModuleBase_IModule::canDisplayObject(theObject); + } + return aCanDisplay; } +void PartSet_Module::addViewerItems(QMenu* theMenu) const +{ + 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) { + bool hasFeature = false; + foreach(ObjectPtr aObject, aObjects) + { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObject); + if (aFeature.get() != NULL) { + hasFeature = true; + } + } + 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; @@ -283,30 +339,28 @@ 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(myCurrentSketch, theOperation->feature(), + PartSet_Tools::setConstraints(mySketchMgr->activeSketch(), theOperation->feature(), aWgt->attributeID(), aPoint->x(), aPoint->y()); - theOperation->propertyPanel()->activateNextWidget(aPnt2dWgt); + aPanel->activateNextWidget(aPnt2dWgt); } } } } else { // Start editing constraint if (theOperation->isEditOperation()) { + // TODO: #391 - to be removed std::string aId = theOperation->id().toStdString(); - if (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; } - } + } } } } @@ -316,240 +370,33 @@ void PartSet_Module::propertyPanelDefined(ModuleBase_Operation* theOperation) void PartSet_Module::onSelectionChanged() { ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - bool isSketcherOp = false; - // An edit operation is enable only if the current opeation is the sketch operation - if (aOperation && myCurrentSketch) { - if (PartSet_Tools::sketchPlane(myCurrentSketch)) - isSketcherOp = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()); - } - if (!isSketcherOp) + if (!aOperation) return; - // Editing of constraints can be done on selection - ModuleBase_ISelection* aSelect = myWorkshop->selection(); - QList aSelected = aSelect->getSelected(); - if (aSelected.size() == 1) { - ModuleBase_ViewerPrs aPrs = aSelected.first(); - ObjectPtr aObject = aPrs.object(); - FeaturePtr aFeature = ModelAPI_Feature::feature(aObject); - if (aFeature) { - std::string aId = aFeature->getKind(); - if ((aId == SketchPlugin_ConstraintRadius::ID()) || - (aId == SketchPlugin_ConstraintLength::ID()) || - (aId == SketchPlugin_ConstraintDistance::ID())) { - editFeature(aFeature); - } - } + bool isSketcherOp = false; + // An edit operation is enable only if the current opeation is the sketch operation + if (mySketchMgr->activeSketch()) { + if (PartSet_Tools::sketchPlane(mySketchMgr->activeSketch())) + isSketcherOp = PartSet_SketcherMgr::isSketchOperation(aOperation); } -} - -void PartSet_Module::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - if (!(theEvent->buttons() & Qt::LeftButton)) - return; - - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - // Use only for sketch operations - if (aOperation && myCurrentSketch) { - if (!PartSet_Tools::sketchPlane(myCurrentSketch)) - return; - - bool isSketcher = (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()); - bool isSketchOpe = sketchOperationIdList().contains(aOperation->id()); - - // Avoid non-sketch operations - if ((!isSketchOpe) && (!isSketcher)) - return; - - bool isEditing = aOperation->isEditOperation(); - - // Ignore creation sketch operation - if ((!isSketcher) && (!isEditing)) - return; - - if (theEvent->modifiers()) { - // If user performs multiselection - if (isSketchOpe && (!isSketcher)) - if (!aOperation->commit()) - aOperation->abort(); - return; - } - // Remember highlighted objects for editing + if (isSketcherOp) { + // Editing of constraints can be done on selection ModuleBase_ISelection* aSelect = myWorkshop->selection(); - QList aHighlighted = aSelect->getHighlighted(); QList aSelected = aSelect->getSelected(); - myEditingFeatures.clear(); - myEditingAttr.clear(); - if ((aHighlighted.size() == 0) && (aSelected.size() == 0)) { - if (isSketchOpe && (!isSketcher)) - // commit previous operation - if (!aOperation->commit()) - aOperation->abort(); - return; - } - - QObjectPtrList aSelObjects = getSumList(aHighlighted, aSelected); - if ((aHighlighted.size() == 1) && (aSelected.size() == 0)) { - // Move by selected shape (vertex). Can be used only for single selection - foreach(ModuleBase_ViewerPrs aPrs, aHighlighted) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aHighlighted.first().object()); - if (aFeature) { - myEditingFeatures.append(aFeature); - TopoDS_Shape aShape = aPrs.shape(); - if (!aShape.IsNull()) { - if (aShape.ShapeType() == TopAbs_VERTEX) { - AttributePtr aAttr = PartSet_Tools::findAttributeBy2dPoint(myEditingFeatures.first(), - aShape, myCurrentSketch); - if (aAttr) - myEditingAttr.append(aAttr); - } - } - } - } - } else { - // Provide multi-selection. Can be used only for features - foreach (ObjectPtr aObj, aSelObjects) { - FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); - if (aFeature && (!myEditingFeatures.contains(aFeature))) - myEditingFeatures.append(aFeature); - } - - } - // If nothing highlighted - return - if (myEditingFeatures.size() == 0) - return; - - if (isSketcher) { - myIsDragging = true; - get2dPoint(theWnd, theEvent, myCurX, myCurY); - myDragDone = false; - myWorkshop->viewer()->enableSelection(false); - launchEditing(); - - } else if (isSketchOpe && isEditing) { - // If selected another object - aOperation->abort(); - - myIsDragging = true; - get2dPoint(theWnd, theEvent, myCurX, myCurY); - myDragDone = false; - myWorkshop->viewer()->enableSelection(false); - - // This is necessary in order to finalize previous operation - QApplication::processEvents(); - launchEditing(); - } - } -} - - -void PartSet_Module::get2dPoint(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent, - double& theX, double& theY) -{ - Handle(V3d_View) aView = theWnd->v3dView(); - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); - PartSet_Tools::convertTo2D(aPoint, myCurrentSketch, aView, theX, theY); -} - - -void PartSet_Module::launchEditing() -{ - if (myEditingFeatures.size() > 0) { - FeaturePtr aFeature = myEditingFeatures.first(); - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aFeature); - if (aSPFeature) { - editFeature(aSPFeature); - } - } -} - -void PartSet_Module::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - myWorkshop->viewer()->enableSelection(true); - if (myIsDragging) { - myIsDragging = false; - if (myDragDone) { - myWorkshop->currentOperation()->commit(); - myEditingFeatures.clear(); - myEditingAttr.clear(); - } - } -} - - -void PartSet_Module::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - if (myIsDragging) { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation->id().toStdString() == SketchPlugin_Sketch::ID()) - return; // No edit operation activated - - static Events_ID anEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED); - Handle(V3d_View) aView = theWnd->v3dView(); - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); - double aX, aY; - PartSet_Tools::convertTo2D(aPoint, myCurrentSketch, aView, aX, aY); - double dX = aX - myCurX; - double dY = aY - myCurY; - - if ((aOperation->id().toStdString() == SketchPlugin_Line::ID()) && - (myEditingAttr.size() == 1) && - myEditingAttr.first()) { - // probably we have prehighlighted point - AttributePtr aAttr = myEditingAttr.first(); - std::string aAttrId = aAttr->id(); - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - QList aWidgets = aPanel->modelWidgets(); - // Find corresponded widget to provide dragging - foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { - if (aWgt->attributeID() == aAttrId) { - PartSet_WidgetPoint2D* aWgt2d = dynamic_cast(aWgt); - if (aWgt2d) { - aWgt2d->setPoint(aWgt2d->x() + dX, aWgt2d->y() + dY); - break; - } - } - } - } else { - foreach(FeaturePtr aFeature, myEditingFeatures) { - std::shared_ptr aSketchFeature = - std::dynamic_pointer_cast(aFeature); - if (aSketchFeature) { - aSketchFeature->move(dX, dY); - ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent); - } - } - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - } - myDragDone = true; - myCurX = aX; - myCurY = aY; - } -} - -void PartSet_Module::onMouseDoubleClick(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) -{ - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation && aOperation->isEditOperation()) { - std::string aId = aOperation->id().toStdString(); - if ((aId == SketchPlugin_ConstraintLength::ID()) || - (aId == SketchPlugin_ConstraintDistance::ID()) || - (aId == SketchPlugin_ConstraintRadius::ID())) - { - // Activate dimension value editing on double click - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); - QList aWidgets = aPanel->modelWidgets(); - // Find corresponded widget to activate value editing - foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { - if (aWgt->attributeID() == "ConstraintValue") { - aWgt->focusTo(); - return; + if (aSelected.size() == 1) { + ModuleBase_ViewerPrs aPrs = aSelected.first(); + ObjectPtr aObject = aPrs.object(); + FeaturePtr aFeature = ModelAPI_Feature::feature(aObject); + if (aFeature) { + std::string aId = aFeature->getKind(); + if ((aId == SketchPlugin_ConstraintRadius::ID()) || + (aId == SketchPlugin_ConstraintLength::ID()) || + (aId == SketchPlugin_ConstraintDistance::ID())) { + editFeature(aFeature); } } } - } + } } void PartSet_Module::onKeyRelease(ModuleBase_IViewWindow* theWnd, QKeyEvent* theEvent) @@ -566,117 +413,229 @@ void PartSet_Module::onEnterReleased() void PartSet_Module::onOperationActivatedByPreselection() { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (!aOperation) - return; - - // Set final definitions if they are necessary - //propertyPanelDefined(aOperation); + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if(anOperation && PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { + // Set final definitions if they are necessary + //propertyPanelDefined(aOperation); - /// Commit sketcher operations automatically - FeaturePtr aFeature = aOperation->feature(); - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aFeature); - if (aSPFeature) { - aOperation->commit(); + /// Commit sketcher operations automatically + anOperation->commit(); } } void PartSet_Module::onNoMoreWidgets() { - ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); - if (aOperation) { - /// Restart sketcher operations automatically - FeaturePtr aFeature = aOperation->feature(); - std::shared_ptr aSPFeature = - std::dynamic_pointer_cast(aFeature); - if (aSPFeature) { + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + if (anOperation) { + if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) { if (myRestartingMode != RM_Forbided) myRestartingMode = RM_LastFeatureUsed; - aOperation->commit(); + anOperation->commit(); } } } -QStringList PartSet_Module::sketchOperationIdList() const -{ - QStringList aIds; - aIds << SketchPlugin_Line::ID().c_str(); - aIds << SketchPlugin_Point::ID().c_str(); - aIds << SketchPlugin_Arc::ID().c_str(); - aIds << SketchPlugin_Circle::ID().c_str(); - aIds << SketchPlugin_ConstraintLength::ID().c_str(); - aIds << SketchPlugin_ConstraintDistance::ID().c_str(); - aIds << SketchPlugin_ConstraintRigid::ID().c_str(); - aIds << SketchPlugin_ConstraintRadius::ID().c_str(); - aIds << SketchPlugin_ConstraintPerpendicular::ID().c_str(); - aIds << SketchPlugin_ConstraintParallel::ID().c_str(); - return aIds; -} - -void PartSet_Module::onVertexSelected(ObjectPtr theObject, const TopoDS_Shape& theShape) +void PartSet_Module::onVertexSelected() { ModuleBase_Operation* aOperation = myWorkshop->currentOperation(); 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&)), - this, SLOT(onPlaneSelected(const std::shared_ptr&))); - theModelWidgets.append(aWgt); - return aWgt->getControl(); - + 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&))); + aWgt = aLabelWgt; } else if (theType == "sketch-2dpoint_selector") { - PartSet_WidgetPoint2D* aWgt = new PartSet_WidgetPoint2D(theParent, theWidgetApi, theParentId); - aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(myCurrentSketch); + 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* aDistanceWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); + aDistanceWgt->setWorkshop(aWorkshop); + aDistanceWgt->setSketch(mySketchMgr->activeSketch()); + aWgt = aDistanceWgt; + } if (theType == "sketch_shape_selector") { + PartSet_WidgetShapeSelector* aShapeSelectorWgt = + new PartSet_WidgetShapeSelector(theParent, workshop(), theWidgetApi, theParentId); + aShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aShapeSelectorWgt; + } if (theType == "sketch_constraint_shape_selector") { + PartSet_WidgetConstraintShapeSelector* aConstraintShapeSelectorWgt = + new PartSet_WidgetConstraintShapeSelector(theParent, workshop(), theWidgetApi, theParentId); + aConstraintShapeSelectorWgt->setSketcher(mySketchMgr->activeSketch()); + aWgt = aConstraintShapeSelectorWgt; + } + return aWgt; +} - connect(aWgt, SIGNAL(vertexSelected(ObjectPtr, const TopoDS_Shape&)), - this, SLOT(onVertexSelected(ObjectPtr, const TopoDS_Shape&))); +void PartSet_Module::createActions() +{ + QAction* anAction; - theModelWidgets.append(aWgt); - return aWgt->getControl(); + anAction = new QAction(tr("Auxiliary"), this); + anAction->setCheckable(true); + addAction("AUXILIARY_CMD", anAction); +} - } if (theType == "point2ddistance") { - PartSet_WidgetPoint2dDistance* aWgt = new PartSet_WidgetPoint2dDistance(theParent, theWidgetApi, theParentId); - aWgt->setWorkshop(aWorkshop); - aWgt->setSketch(myCurrentSketch); +QAction* PartSet_Module::action(const QString& theId) const +{ + if (myActions.contains(theId)) + return myActions[theId]; + return 0; +} - theModelWidgets.append(aWgt); - return aWgt->getControl(); +void PartSet_Module::addAction(const QString& theId, QAction* theAction) +{ + if (myActions.contains(theId)) + qCritical("A command with Id = '%s' already defined!", qPrintable(theId)); + theAction->setData(theId); + connect(theAction, SIGNAL(triggered(bool)), this, SLOT(onAction(bool))); + myActions[theId] = theAction; +} - } if (theType == "sketch_shape_selector") { - PartSet_WidgetShapeSelector* aWgt = - new PartSet_WidgetShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(myCurrentSketch); +void PartSet_Module::onAction(bool isChecked) +{ + QAction* aAction = static_cast(sender()); + QString anId = aAction->data().toString(); - theModelWidgets.append(aWgt); - return aWgt->getControl(); + if (anId == "AUXILIARY_CMD") { + mySketchMgr->setAuxiliary(isChecked); + } +} - } if (theType == "sketch_constraint_shape_selector") { - PartSet_WidgetConstraintShapeSelector* aWgt = - new PartSet_WidgetConstraintShapeSelector(theParent, workshop(), theWidgetApi, theParentId); - aWgt->setSketcher(myCurrentSketch); +bool PartSet_Module::deleteObjects() +{ + ModuleBase_Operation* anOperation = myWorkshop->currentOperation(); + bool isSketchOp = PartSet_SketcherMgr::isSketchOperation(anOperation), + isNestedOp = PartSet_SketcherMgr::isNestedSketchOperation(anOperation); + if (!isSketchOp && !isNestedOp) + return false; + + // 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; + + if (isNestedOp) + anOperation->abort(); + + // the active nested sketch operation should be aborted unconditionally + if (PartSet_SketcherMgr::isNestedSketchOperation(anOperation)) + anOperation->abort(); + + std::set aRefFeatures; + foreach (ObjectPtr aObj, aSelectedObj) + { + //ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); + //if (aPart) { + // TODO: check for what there is this condition. It is placed here historicaly because + // ther is this condition during remove features. + //} else { + FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); + if (aFeature.get() != NULL) { + aObj->document()->refsToFeature(aFeature, aRefFeatures, false); + } + //} + } - theModelWidgets.append(aWgt); - return aWgt->getControl(); + 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(), + aLast = aRefFeatures.end(); + for (; anIt != aLast; anIt++) { + FeaturePtr aFeature = (*anIt); + if (aFeature == aSketch) + continue; + aRefNames.append((*anIt)->name().c_str()); + } + if (!aRefNames.empty()) { + QString aNames = aRefNames.join(", "); + aDescription += aNames.prepend(" "); + + QMainWindow* aDesktop = aWorkshop->desktop(); + QMessageBox::StandardButton aRes = QMessageBox::warning( + aDesktop, tr("Delete features"), + QString(tr("Selected features are used in the following features: %1.\ + These features will be deleted also. Would you like to continue?")).arg(aNames), + QMessageBox::No | QMessageBox::Yes, QMessageBox::No); + if (aRes != QMessageBox::Yes) + return; + } + }*/ - }else - return 0; -} + SessionPtr aMgr = ModelAPI_Session::get(); + aMgr->startOperation(aDescription.toStdString()); + std::set::const_iterator anIt = aRefFeatures.begin(), + aLast = aRefFeatures.end(); + for (; anIt != aLast; anIt++) { + FeaturePtr aRefFeature = (*anIt); + if (aRefFeature == aSketch) + continue; + aRefFeature->document()->removeFeature(aRefFeature); + } + foreach (ObjectPtr aObj, aSelectedObj) + { + DocumentPtr aDoc = aObj->document(); + //ResultPartPtr aPart = std::dynamic_pointer_cast(aObj); + //if (aPart) { + // if (aDoc == aMgr->activeDocument()) { + // aDoc->close(); + // } + //} else { + //FeaturePtr aFeature = std::dynamic_pointer_cast(aObj); + FeaturePtr aFeature = ModelAPI_Feature::feature(aObj); + if (aFeature.get() != NULL) { + aDoc->removeFeature(aFeature); + } + //} + } + aWorkshop->displayer()->updateViewer(); + //myDisplayer->updateViewer(); + aMgr->finishOperation(); + + return true; +}