X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.cpp;h=aaa1ff6d4d2691785d3bf9c47ed343f419fa7386;hb=1dfcab3d738e427bea678317e167c587dfbff195;hp=0f2b51f3b0c5e7dd43e32df5d7cbb0e9dbfdfc3c;hpb=afc557be2f0bae011c5167c50460f117a7c5cf01;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp index 0f2b51f3b..aaa1ff6d4 100644 --- a/src/PartSet/PartSet_SketcherMgr.cpp +++ b/src/PartSet/PartSet_SketcherMgr.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2019 CEA/DEN, EDF R&D +// Copyright (C) 2014-2020 CEA/DEN, EDF R&D // // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public @@ -60,6 +60,7 @@ #include #include +#include #include @@ -70,6 +71,8 @@ #include #include #include +#include +#include #include #include #include @@ -116,6 +119,8 @@ #include #include +#include + //#define DEBUG_DO_NOT_BY_ENTER //#define DEBUG_SKETCHER_ENTITIES //#define DEBUG_SKETCH_ENTITIES_ON_MOVE @@ -138,7 +143,7 @@ void getAttributesOrResults(const Handle(SelectMgr_EntityOwner)& theOwner, const FeaturePtr& theFeature, const FeaturePtr& theSketch, const ResultPtr& theResult, - std::set& theSelectedAttributes, + std::map& theSelectedAttributes, std::set& theSelectedResults, TopTools_MapOfShape& theShapes) { @@ -152,10 +157,10 @@ void getAttributesOrResults(const Handle(SelectMgr_EntityOwner)& theOwner, theShapes.Add(aShape); TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); if (aShapeType == TopAbs_VERTEX) { - AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theFeature, - aShape, theSketch); - if (aPntAttr.get() != NULL) - theSelectedAttributes.insert(aPntAttr); + std::pair aPntAttrIndex = + PartSet_Tools::findAttributeBy2dPoint(theFeature, aShape, theSketch); + if (aPntAttrIndex.first.get() != NULL) + theSelectedAttributes[aPntAttrIndex.first] = aPntAttrIndex.second; } else if (aShapeType == TopAbs_EDGE && theSelectedResults.find(theResult) == theSelectedResults.end()) { @@ -165,10 +170,17 @@ void getAttributesOrResults(const Handle(SelectMgr_EntityOwner)& theOwner, } PartSet_SketcherMgr::PartSet_SketcherMgr(PartSet_Module* theModule) - : QObject(theModule), myModule(theModule), myIsEditLaunching(false), myIsDragging(false), - myDragDone(false), myIsMouseOverWindow(false), - myIsMouseOverViewProcessed(true), myPreviousUpdateViewerEnabled(true), - myIsPopupMenuActive(false), myExternalPointsMgr(0), myNoDragMoving(false) + : QObject(theModule), + myModule(theModule), + myIsEditLaunching(false), + myIsDragging(false), + myDragDone(false), + myIsMouseOverWindow(false), + myIsMouseOverViewProcessed(true), + myIsPopupMenuActive(false), + myPreviousUpdateViewerEnabled(true), + myExternalPointsMgr(0), + myNoDragMoving(false) { ModuleBase_IWorkshop* anIWorkshop = myModule->workshop(); ModuleBase_IViewer* aViewer = anIWorkshop->viewer(); @@ -199,6 +211,8 @@ PartSet_SketcherMgr::PartSet_SketcherMgr(PartSet_Module* theModule) registerSelectionFilter(SF_SketchCirclePointFilter, new PartSet_CirclePointFilter(anIWorkshop)); registerSelectionFilter(SF_SketchPlaneFilter, new ModuleBase_ShapeInPlaneFilter()); + + Events_Loop::loop()->registerListener(this, Events_Loop::eventByName(EVENT_DOF_OBJECTS)); } PartSet_SketcherMgr::~PartSet_SketcherMgr() @@ -218,15 +232,17 @@ void PartSet_SketcherMgr::onEnterViewPort() return; #endif - if (canChangeCursor(getCurrentOperation())) { - QCursor* aCurrentCursor = QApplication::overrideCursor(); - if (!aCurrentCursor || aCurrentCursor->shape() != Qt::CrossCursor) { - QApplication::setOverrideCursor(QCursor(Qt::CrossCursor)); -#ifdef DEBUG_CURSOR - qDebug("onEnterViewPort() : Qt::CrossCursor"); -#endif + // It is switched off because of + // Task #3067: 5.2.2 Drawing in the sketcher: change the mouse cursor arrow + if (canChangeCursor(getCurrentOperation())) { + QCursor* aCurrentCursor = QApplication::overrideCursor(); + if (!aCurrentCursor || aCurrentCursor->shape() != Qt::CrossCursor) { + QApplication::setOverrideCursor(PartSet_Tools::getOperationCursor()); + //#ifdef DEBUG_CURSOR + // qDebug("onEnterViewPort() : Qt::CrossCursor"); + //#endif + } } - } if (!isNestedCreateOperation(getCurrentOperation(), activeSketch())) return; @@ -260,9 +276,9 @@ void PartSet_SketcherMgr::onLeaveViewPort() if (canChangeCursor(getCurrentOperation())) { QApplication::restoreOverrideCursor(); -#ifdef DEBUG_CURSOR - qDebug("onLeaveViewPort() : None"); -#endif +//#ifdef DEBUG_CURSOR +// qDebug("onLeaveViewPort() : None"); +//#endif } if (!isNestedCreateOperation(getCurrentOperation(), activeSketch())) @@ -340,11 +356,35 @@ void PartSet_SketcherMgr::onAfterValuesChangedInPropertyPanel() } */ +bool PartSet_SketcherMgr::isDragModeCreation() const +{ + ModuleBase_Operation* aOp = getCurrentOperation(); + if (!aOp) + return false; + bool aUserPref = Config_PropManager::boolean(SKETCH_TAB_NAME, "create_by_dragging"); + if (!aUserPref) + return false; + QString aId = aOp->id(); + // Acceptable features; + QStringList aList; + aList << "SketchLine" << "SketchMacroCircle" << "SketchMacroArc" << + "SketchMacroEllipse" << "SketchMacroEllipticArc" << "SketchRectangle"; + return aList.contains(aId); +} + +static bool MyModeByDrag = false; +static bool MyMultiselectionState = true; + void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) { + MyModeByDrag = isDragModeCreation(); + // Clear dragging mode myIsDragging = false; + myMousePoint.setX(theEvent->x()); + myMousePoint.setY(theEvent->y()); + if (myModule->sketchReentranceMgr()->processMousePressed(theWnd, theEvent)) return; //get2dPoint(theWnd, theEvent, myClickedPoint); @@ -390,9 +430,24 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE return; // Ignore creation sketch operation - if ((!isSketcher) && (!isEditing)) + if ((!isSketcher) && (!isEditing)) { + if (MyModeByDrag) { + ModuleBase_ModelWidget* anActiveWidget = getActiveWidget(); + PartSet_MouseProcessor* aProcessor = dynamic_cast(anActiveWidget); + if (aProcessor) { + MyMultiselectionState = aViewer->isMultiSelectionEnabled(); + aViewer->enableMultiselection(false); + myIsDragging = true; + ModuleBase_ISelection* aSelection = aWorkshop->selection(); + QList aPreSelected = aSelection->getHighlighted(); + if (!aPreSelected.empty()) + aProcessor->setPreSelection(aPreSelected.first(), theWnd, theEvent); + else + aProcessor->mouseReleased(theWnd, theEvent); + } + } return; - + } bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier); storeSelection(aHasShift ? ST_SelectAndHighlightType : ST_HighlightType, myCurrentSelection); @@ -405,7 +460,6 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE } // Init flyout point for radius rotation FeaturePtr aFeature = myCurrentSelection.begin().key(); - get2dPoint(theWnd, theEvent, myCurrentPoint); if (isSketcher) { if (aCanDrag) { @@ -435,14 +489,34 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE /// Internal edit should not be stored as editing operation as the result will be a /// creation operation, where previous selection should not be used(and will be cleared) myIsEditLaunching = !myModule->sketchReentranceMgr()->isInternalEditActive(); - aFOperation->commit(); + + std::shared_ptr aSPFeature = + std::dynamic_pointer_cast(aFOperation->feature()); + bool isRelaunchEditing = true; + if (aSPFeature->isExternal()) { + foreach(FeaturePtr aF, myCurrentSelection.keys()) { + FeaturePtr aProducerFeature = PartSet_Tools::findRefsToMeFeature(aF, + aSPFeature->getKind()); + if (aProducerFeature == aSPFeature) { + isRelaunchEditing = false; + break; + } + } + } + else { + if (myCurrentSelection.size() > 1) + isRelaunchEditing = !myCurrentSelection.contains(aSPFeature); + } + if (isRelaunchEditing) + aFOperation->commit(); if (aCanDrag) { myIsDragging = true; myDragDone = false; } myPreviousDrawModeEnabled = aViewer->enableDrawMode(false); - launchEditing(); + if (isRelaunchEditing) + launchEditing(); myIsEditLaunching = aPrevLaunchingState; if (aFeature.get() != NULL) { std::shared_ptr aSPFeature = @@ -464,8 +538,9 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE void PartSet_SketcherMgr::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) { ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); + ModuleBase_IViewer* aViewer = aWorkshop->viewer(); if (myIsDragging) - aWorkshop->viewer()->enableDrawMode(myPreviousDrawModeEnabled); + aViewer->enableDrawMode(myPreviousDrawModeEnabled); bool aWasDragging = myIsDragging; myIsDragging = false; @@ -477,13 +552,13 @@ void PartSet_SketcherMgr::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouse if (!myIsMouseOverViewProcessed) { return; } - ModuleBase_IViewer* aViewer = aWorkshop->viewer(); - //if (!aViewer->canDragByMouse()) - // return; + ModuleBase_OperationFeature* aOp = - dynamic_cast(getCurrentOperation()); + dynamic_cast(getCurrentOperation()); + bool isEditing = false; if (aOp) { - bool aStartNoDragOperation = !aViewer->canDragByMouse() && aOp->isEditOperation(); + isEditing = aOp->isEditOperation(); + bool aStartNoDragOperation = !aViewer->canDragByMouse() && isEditing; if (aStartNoDragOperation || myNoDragMoving) { // Process edit operation without dragging if (myCurrentSelection.size() > 0) @@ -513,11 +588,32 @@ void PartSet_SketcherMgr::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouse } } - ModuleBase_ModelWidget* anActiveWidget = getActiveWidget(); PartSet_MouseProcessor* aProcessor = dynamic_cast(anActiveWidget); - if (aProcessor) - aProcessor->mouseReleased(theWnd, theEvent); + if (aProcessor) { + ModuleBase_ISelection* aSelection = aWorkshop->selection(); + QList aPreSelected = aSelection->getHighlighted(); + if (MyModeByDrag && !aPreSelected.empty() && !isEditing) + aProcessor->setPreSelection(aPreSelected.first(), theWnd, theEvent); + else + aProcessor->mouseReleased(theWnd, theEvent); + } + if (MyModeByDrag && aOp) { + aViewer->enableMultiselection(true); + QString aOpId = aOp->id(); + if (aOpId == "Sketch") + return; + QPoint aPnt(theEvent->x(), theEvent->y()); + anActiveWidget = getActiveWidget(); + if ((aPnt == myMousePoint) && anActiveWidget) { + aOp->abort(); + return; + } + bool aCanRestart = !anActiveWidget && !isEditing; + if (aCanRestart) { + module()->launchOperation(aOpId, true); + } + } } void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) @@ -535,9 +631,14 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve qDebug(QString("%1").arg(anInfo.size()).arg(anInfoStr).toStdString().c_str()); } #endif + if (myModule->sketchReentranceMgr()->processMouseMoved(theWnd, theEvent)) return; + ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); + XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + if (isNestedCreateOperation(getCurrentOperation(), activeSketch())) { #ifdef DRAGGING_DEBUG QTime t; @@ -562,6 +663,7 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature)); } } + aDisplayer->updateViewer(); #ifdef DRAGGING_DEBUG cout << "Mouse move processing " << t.elapsed() << endl; #endif @@ -586,7 +688,6 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve #endif Handle(V3d_View) aView = theWnd->v3dView(); - gp_Pnt aPoint = PartSet_Tools::convertClickToPoint(theEvent->pos(), aView); Point aMousePnt; get2dPoint(theWnd, theEvent, aMousePnt); @@ -595,9 +696,6 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve std::shared_ptr aCurrentPosition = std::shared_ptr( new GeomAPI_Pnt2d(aMousePnt.myCurX, aMousePnt.myCurY)); - ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); - XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); // 3. the flag to disable the update viewer should be set in order to avoid blinking in the // viewer happens by deselect/select the modified objects. The flag should be restored after // the selection processing. The update viewer should be also called. @@ -612,26 +710,26 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve for (; anIt != aLast; anIt++) { FeaturePtr aFeature = anIt.key(); - std::set anAttributes = anIt.value().myAttributes; + std::map anAttributes = anIt.value().myAttributes; // Process selection by attribute: the priority to the attribute if (!anAttributes.empty()) { - std::set::const_iterator anAttIt = anAttributes.begin(), + std::map::const_iterator anAttIt = anAttributes.begin(), anAttLast = anAttributes.end(); for (; anAttIt != anAttLast; anAttIt++) { - AttributePtr anAttr = *anAttIt; + AttributePtr anAttr = anAttIt->first; if (anAttr.get() == NULL) continue; std::string aAttrId = anAttr->id(); DataPtr aData = aFeature->data(); if (aData->isValid()) { - std::shared_ptr aPoint = - std::dynamic_pointer_cast(aData->attribute(aAttrId)); - if (aPoint.get() != NULL) { + AttributePtr aPoint = aData->attribute(aAttrId); + if (aPoint->attributeType() == GeomDataAPI_Point2D::typeId() || + aPoint->attributeType() == GeomDataAPI_Point2DArray::typeId()) { bool isImmutable = aPoint->setImmutable(true); std::shared_ptr aMessage = std::shared_ptr (new ModelAPI_ObjectMovedMessage(this)); - aMessage->setMovedAttribute(aPoint); + aMessage->setMovedAttribute(aPoint, anAttIt->second); aMessage->setOriginalPosition(anOriginalPosition); aMessage->setCurrentPosition(aCurrentPosition); Events_Loop::loop()->send(aMessage); @@ -879,13 +977,15 @@ void PartSet_SketcherMgr::sketchSelectionModes(const CompositeFeaturePtr& theSke theModes.append(TopAbs_EDGE); } -Handle(AIS_InteractiveObject) PartSet_SketcherMgr::createPresentation(const ResultPtr& theResult) +Handle(AIS_InteractiveObject) PartSet_SketcherMgr::createPresentation(const ObjectPtr& theObj) { Handle(AIS_InteractiveObject) aPrs; - FeaturePtr aFeature = ModelAPI_Feature::feature(theResult); + FeaturePtr aFeature = ModelAPI_Feature::feature(theObj); if (aFeature.get() && aFeature->getKind() == SketchPlugin_Sketch::ID()) { - aPrs = new PartSet_ResultSketchPrs(theResult); + ResultPtr aResult = std::dynamic_pointer_cast(theObj); + if (aResult.get()) + aPrs = new PartSet_ResultSketchPrs(aResult); } return aPrs; } @@ -955,7 +1055,11 @@ bool PartSet_SketcherMgr::isEntity(const std::string& theId) return (theId == SketchPlugin_Line::ID()) || (theId == SketchPlugin_Point::ID()) || (theId == SketchPlugin_Arc::ID()) || - (theId == SketchPlugin_Circle::ID()); + (theId == SketchPlugin_Circle::ID()) || + (theId == SketchPlugin_Ellipse::ID()) || + (theId == SketchPlugin_Projection::ID()) || + (theId == SketchPlugin_IntersectionPoint::ID()) || + (theId == SketchPlugin_EllipticArc::ID()); } bool PartSet_SketcherMgr::isExternalFeature(const FeaturePtr& theFeature) @@ -985,6 +1089,9 @@ bool PartSet_SketcherMgr::isDistanceKind(std::string& theKind) void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) { + static Events_ID EVENT_ATTR = Events_Loop::loop()->eventByName(EVENT_VISUAL_ATTRIBUTES); + static Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY); + ModuleBase_OperationFeature* aFOperation = dynamic_cast (getCurrentOperation()); if (!aFOperation) @@ -1057,7 +1164,6 @@ void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) myModule->overconstraintListener()->setActive(true); // Display sketcher objects QStringList anInfo; - Events_ID EVENT_DISP = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY); const ModelAPI_EventCreator* aECreator = ModelAPI_EventCreator::get(); aNumberOfSubs = myCurrentSketch->numberOfSubs(); for (int i = 0; i < aNumberOfSubs; i++) { @@ -1078,13 +1184,13 @@ void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) aECreator->sendUpdated(aFeature, EVENT_DISP); else aFeature->setDisplayed(true); + aECreator->sendUpdated(aFeature, EVENT_ATTR); } #ifdef DEBUG_SKETCHER_ENTITIES QString anInfoStr = anInfo.join(";\t"); qDebug(QString("startSketch: %1, %2").arg(anInfo.size()).arg(anInfoStr).toStdString().c_str()); #endif - bool aHasPlane = false; std::shared_ptr aPln; aPln = PartSet_Tools::sketchPlane(myCurrentSketch); Handle(SelectMgr_Filter) aFilter = myModule->selectionFilter(SF_SketchPlaneFilter); @@ -1094,21 +1200,22 @@ void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) workshop()->selectionActivate()->updateSelectionFilters(); workshop()->selectionActivate()->updateSelectionModes(); - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + Events_Loop::loop()->flush(EVENT_ATTR); + Events_Loop::loop()->flush(EVENT_DISP); myExternalPointsMgr = new PartSet_ExternalPointsMgr(myModule->workshop(), myCurrentSketch); workshop()->viewer()->set2dMode(true); - PartSet_Fitter* aFitter = new PartSet_Fitter(myCurrentSketch); + PartSet_Fitter* aFitter = new PartSet_Fitter(this); myModule->workshop()->viewer()->setFitter(aFitter); } void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* theOperation) { XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); - PartSet_Fitter* aFitter = (PartSet_Fitter*)myModule->workshop()->viewer()->currentFitter(); - myModule->workshop()->viewer()->unsetFitter(); + PartSet_Fitter* aFitter = (PartSet_Fitter*)myModule->workshop()->viewer()->fitter(); + myModule->workshop()->viewer()->setFitter(0); delete aFitter; myIsMouseOverWindow = false; @@ -1183,10 +1290,10 @@ void PartSet_SketcherMgr::startNestedSketch(ModuleBase_Operation* theOperation) if (canChangeCursor(theOperation) && myIsMouseOverWindow) { QCursor* aCurrentCursor = QApplication::overrideCursor(); if (!aCurrentCursor || aCurrentCursor->shape() != Qt::CrossCursor) { - QApplication::setOverrideCursor(QCursor(Qt::CrossCursor)); -#ifdef DEBUG_CURSOR - qDebug("startNestedSketch() : Qt::CrossCursor"); -#endif + QApplication::setOverrideCursor(PartSet_Tools::getOperationCursor()); +//#ifdef DEBUG_CURSOR +// qDebug("startNestedSketch() : Qt::CrossCursor"); +//#endif } } } @@ -1196,12 +1303,12 @@ void PartSet_SketcherMgr::stopNestedSketch(ModuleBase_Operation* theOperation) myIsMouseOverViewProcessed = true; operationMgr()->onValidateOperation(); // when sketch nested operation is stopped the cursor should be restored unconditionally - //if (canChangeCursor(theOperation)) { + if (canChangeCursor(theOperation)) { QApplication::restoreOverrideCursor(); #ifdef DEBUG_CURSOR qDebug("stopNestedSketch() : None"); #endif - //} + } /// improvement to deselect automatically all eventual selected objects, when // returning to the neutral point of the Sketcher bool isClearSelectionPossible = true; @@ -1399,8 +1506,6 @@ bool PartSet_SketcherMgr::canDisplayConstraint(const FeaturePtr& theFeature, std::string aKind = theFeature->getKind(); if (aConstrIds.contains(QString(aKind.c_str()))) { - bool isTypedConstraint = false; - switch (theState) { case PartSet_Tools::Dimensional: { bool isDistance = isDistanceKind(aKind); @@ -1536,17 +1641,19 @@ const QMap& PartSet_SketcherMgr::sh bool PartSet_SketcherMgr::isObjectOfSketch(const ObjectPtr& theObject) const { - bool isFoundObject = false; - + if (!myCurrentSketch.get()) + return false; FeaturePtr anObjectFeature = ModelAPI_Feature::feature(theObject); if (anObjectFeature.get()) { int aSize = myCurrentSketch->numberOfSubs(); - for (int i = 0; i < aSize && !isFoundObject; i++) { - FeaturePtr aCurrentFeature = myCurrentSketch->subFeature(i); - isFoundObject = myCurrentSketch->subFeature(i) == anObjectFeature; + FeaturePtr aCurrentFeature; + for (int i = 0; i < aSize; i++) { + aCurrentFeature = myCurrentSketch->subFeature(i); + if (myCurrentSketch->subFeature(i) == anObjectFeature) + return true; } } - return isFoundObject; + return false; } void PartSet_SketcherMgr::onPlaneSelected(const std::shared_ptr& thePlane) @@ -1645,11 +1752,9 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, FeatureToSelectionMap::const_iterator anIt = theSelection.find(theFeature); SelectionInfo anInfo = anIt.value(); - std::set aSelectedAttributes = anInfo.myAttributes; + std::map aSelectedAttributes = anInfo.myAttributes; std::set aSelectedResults = anInfo.myResults; - ModuleBase_IViewer* aViewer = theWorkshop->viewer(); - XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); @@ -1697,10 +1802,10 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, const TopoDS_Shape& aShape = anOwner->Shape(); TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); if (aShapeType == TopAbs_VERTEX) { - AttributePtr aPntAttr = + std::pair aPntAttrIndex = PartSet_Tools::findAttributeBy2dPoint(theFeature, aShape, theSketch); - if (aPntAttr.get() != NULL && - aSelectedAttributes.find(aPntAttr) != aSelectedAttributes.end()) + if (aPntAttrIndex.first.get() != NULL && + aSelectedAttributes.find(aPntAttrIndex.first) != aSelectedAttributes.end()) theOwnersToSelect.Add(anOwner); else if (isSameShape && anInfo.myLocalSelectedShapes.Contains(aShape)) { theOwnersToSelect.Add(anOwner); @@ -1720,13 +1825,13 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, // result owners are put in the list of selection only if local selected shapes were not // found if (aSelectedResults.find(aResult) != aSelectedResults.end()) { - for ( Standard_Integer i = 1, n = aSelectedOwners.Extent(); i <= n; i++ ) { + for (Standard_Integer i = 1, n = aSelectedOwners.Extent(); i <= n; i++ ) { Handle(StdSelect_BRepOwner) anOwner = - Handle(StdSelect_BRepOwner)::DownCast(aSelectedOwners(i)); - if ( anOwner.IsNull() || !anOwner->HasShape() || theOwnersToSelect.FindIndex(anOwner)) + Handle(StdSelect_BRepOwner)::DownCast(aSelectedOwners(i)); + if (anOwner.IsNull() || !anOwner->HasShape() || theOwnersToSelect.FindIndex(anOwner)) continue; - // select whole result - theOwnersToSelect.Add(anOwner); + // select whole result + theOwnersToSelect.Add(anOwner); } } } @@ -1760,8 +1865,8 @@ void PartSet_SketcherMgr::widgetStateChanged(int thePreviousState) ModuleBase_OperationFeature* aFOperation = dynamic_cast (getCurrentOperation()); if (aFOperation) { - if (PartSet_SketcherMgr::isSketchOperation(aFOperation) || - isNestedSketchOperation(aFOperation) && + if ((PartSet_SketcherMgr::isSketchOperation(aFOperation) || + isNestedSketchOperation(aFOperation)) && thePreviousState == ModuleBase_ModelWidget::ModifiedInPP) { FeaturePtr aFeature = aFOperation->feature(); visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature)); @@ -1769,26 +1874,26 @@ void PartSet_SketcherMgr::widgetStateChanged(int thePreviousState) } } -void PartSet_SketcherMgr::customizePresentation(const ObjectPtr& theObject) -{ - ModuleBase_OperationFeature* aFOperation = dynamic_cast - (getCurrentOperation()); - if (aFOperation && (PartSet_SketcherMgr::isSketchOperation(aFOperation) || - isNestedSketchOperation(aFOperation))) - SketcherPrs_Tools::sendExpressionShownEvent(myIsConstraintsShown[PartSet_Tools::Expressions]); - - // update entities selection priorities - FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); - if (aFeature.get() && PartSet_SketcherMgr::isEntity(aFeature->getKind())) { - // update priority for feature - updateSelectionPriority(aFeature, aFeature); - // update priority for results of the feature - std::list aResults = aFeature->results(); - std::list::const_iterator anIt = aResults.begin(), aLastIt = aResults.end(); - for (; anIt != aLastIt; anIt++) - updateSelectionPriority(*anIt, aFeature); - } -} +//void PartSet_SketcherMgr::customisePresentation(const ObjectPtr& theObject) +//{ +// ModuleBase_OperationFeature* aFOperation = dynamic_cast +// (getCurrentOperation()); +// if (aFOperation && (PartSet_SketcherMgr::isSketchOperation(aFOperation) || +// isNestedSketchOperation(aFOperation))) +// SketcherPrs_Tools::sendExpressionShownEvent(myIsConstraintsShown[PartSet_Tools::Expressions]); +// +// // update entities selection priorities +// FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); +// if (aFeature.get() && PartSet_SketcherMgr::isEntity(aFeature->getKind())) { +// // update priority for feature +// updateSelectionPriority(aFeature, aFeature); +// // update priority for results of the feature +// std::list aResults = aFeature->results(); +// std::list::const_iterator anIt = aResults.begin(), aLastIt = aResults.end(); +// for (; anIt != aLastIt; anIt++) +// updateSelectionPriority(*anIt, aFeature); +// } +//} ModuleBase_Operation* PartSet_SketcherMgr::getCurrentOperation() const { @@ -1820,9 +1925,6 @@ void PartSet_SketcherMgr::visualizeFeature(const FeaturePtr& theFeature, if (isEditOperation || !theFeature.get()) return; - ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); - XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); - // 1. change visibility of the object itself, here the presentable object is processed, // e.g. constraints features //FeaturePtr aFeature = aFOperation->feature(); @@ -1944,6 +2046,7 @@ void PartSet_SketcherMgr::onShowConstraintsToggle(int theType, bool theState) PartSet_Tools::ConstraintVisibleState aType = (PartSet_Tools::ConstraintVisibleState)theType; updateBySketchParameters(aType, theState); + myModule->workshop()->viewer()->update(); } void PartSet_SketcherMgr::updateBySketchParameters( @@ -1960,8 +2063,6 @@ void PartSet_SketcherMgr::updateBySketchParameters( case PartSet_Tools::Geometrical: case PartSet_Tools::Dimensional: { if (aPrevState != theState) { - ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); - XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); int aNumberOfSubs = myCurrentSketch->numberOfSubs(); for (int i = 0; i < aNumberOfSubs; i++) { FeaturePtr aSubFeature = myCurrentSketch->subFeature(i); @@ -1978,11 +2079,16 @@ void PartSet_SketcherMgr::updateBySketchParameters( if (aPrevState != theState) { /// call all sketch features redisplay, the expression state will be corrected in customize /// of distance presentation + SketcherPrs_Tools::ParameterStyle aStyle = myIsConstraintsShown[PartSet_Tools::Expressions] + ? SketcherPrs_Tools::ParameterText : SketcherPrs_Tools::ParameterValue; + SketcherPrs_Tools::setParameterStyle(aStyle); Events_ID anEventId = Events_Loop::loop()->eventByName(EVENT_OBJECT_TO_REDISPLAY); PartSet_Tools::sendSubFeaturesEvent(myCurrentSketch, anEventId); } } break; + default: // [to avoid compilation warning] + break; } } @@ -2107,27 +2213,212 @@ void PartSet_SketcherMgr::onShowPoints(bool toShow) aViewer->update(); } +void PartSet_SketcherMgr::processEvent(const std::shared_ptr& theMessage) +{ + if (theMessage->eventID() == Events_Loop::loop()->eventByName(EVENT_DOF_OBJECTS)) { + std::shared_ptr anUpdateMsg = + std::dynamic_pointer_cast(theMessage); + std::set aObjects = anUpdateMsg->objects(); + std::set::const_iterator aIt; + QList aPrsList; + for (aIt = aObjects.cbegin(); aIt != aObjects.cend(); aIt++) { + FeaturePtr aFeature = std::dynamic_pointer_cast(*aIt); + if (aFeature.get()) { + std::list aRes = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aRes.cbegin(); aIt != aRes.cend(); ++aIt) { + ModuleBase_ViewerPrsPtr aPrsPtr(new ModuleBase_ViewerPrs(*aIt)); + aPrsList.append(aPrsPtr); + } + } + } + if (aPrsList.size() > 0) { + myModule->workshop()->setSelected(aPrsList); + } + } +} + +bool isExternal(const ObjectPtr& theObject) +{ + AttributeSelectionPtr aAttr = + theObject->data()->selection(SketchPlugin_SketchEntity::EXTERNAL_ID()); + if (aAttr) + return aAttr->context().get() != NULL && !aAttr->isInvalid(); + return false; +} + +bool isCopy(const ObjectPtr& theObject) +{ + AttributeBooleanPtr anAttr = theObject->data()->boolean(SketchPlugin_SketchEntity::COPY_ID()); + if (anAttr.get()) + return anAttr->value(); + return false; +} + +bool isIncludeToResult(const ObjectPtr& theObject) +{ + AttributeBooleanPtr anAttr; + std::set aRefsToMe = theObject->data()->refsToMe(); + std::set::const_iterator aIt; + for (aIt = aRefsToMe.cbegin(); aIt != aRefsToMe.cend(); ++aIt) { + if ((*aIt)->id() == SketchPlugin_Projection::PROJECTED_FEATURE_ID()) { + FeaturePtr aFeature = std::dynamic_pointer_cast((*aIt)->owner()); + if (aFeature.get()) { + anAttr = aFeature->data()->boolean(SketchPlugin_Projection::INCLUDE_INTO_RESULT()); + if (anAttr.get()) + return anAttr->value(); + } + } + } + return true; +} + +//************************************************************************************** +std::vector PartSet_SketcherMgr::colorOfObject(const ObjectPtr& theObject, + const FeaturePtr& theFeature, bool isConstruction) const +{ + PartSet_OverconstraintListener* aOCListener = myModule->overconstraintListener(); + std::string aKind = theFeature->getKind(); + + if (aOCListener->isConflictingObject(theObject)) { + return Config_PropManager::color("Visualization", "sketch_overconstraint_color"); + } + if (aOCListener->isFullyConstrained()) { + return Config_PropManager::color("Visualization", "sketch_fully_constrained_color"); + } + if (isDistanceKind(aKind)) { + return Config_PropManager::color("Visualization", "sketch_dimension_color"); + } + if (aKind == SketchPlugin_ConstraintCoincidence::ID()) + return std::vector(3, 0); + + if (isExternal(theFeature)) + return Config_PropManager::color("Visualization", "sketch_external_color"); + if (isConstruction) + return Config_PropManager::color("Visualization", "sketch_auxiliary_color"); + + return Config_PropManager::color("Visualization", "sketch_entity_color"); +} + +//************************************************************************************** +void PartSet_SketcherMgr::customizeSketchPresentation(const ObjectPtr& theObject, + const AISObjectPtr& thePrs) const +{ + FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); + + // set color from preferences + std::shared_ptr anAuxiliaryAttr = + aFeature->data()->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID()); + bool isConstruction = anAuxiliaryAttr.get() != NULL && anAuxiliaryAttr->value(); + + std::vector aColor = colorOfObject(theObject, aFeature, isConstruction); + if (!aColor.empty()) { + // The code below causes redisplay again + if (ModelAPI_Session::get()->isOperation()) { + AttributeIntArrayPtr aColorAttr = theObject->data()->intArray(ModelAPI_Result::COLOR_ID()); + if (aColorAttr.get()) { + aColorAttr->setSize(3, false); + // Set the color attribute in order do not use default colors in the presentation object + for (int i = 0; i < 3; i++) + aColorAttr->setValue(i, aColor[i], false); + } + } + thePrs->setColor(aColor[0], aColor[1], aColor[2]); + } + + int aShapeType = thePrs->getShapeType(); + // a compound is processed like the edge because the + // arc feature uses the compound for presentable AIS + if (aShapeType != 6/*an edge*/ && aShapeType != 7/*a vertex*/ && aShapeType != 0/*compound*/) + return; -void PartSet_Fitter::fitScene(Handle(V3d_View) theView) + int aWidth = Config_PropManager::integer("Visualization", "sketch_line_width"); + if (isExternal(aFeature)) { + thePrs->setWidth(isIncludeToResult(aFeature)? aWidth : 1); + return; + } + std::string aKind = aFeature->getKind(); + if (isDistanceKind(aKind)) + return; + + if (aShapeType == 6 || aShapeType == 0) { // if this is an edge or a compound + if (isConstruction) { + // Set axilliary line + thePrs->setWidth(SketchPlugin_SketchEntity::SKETCH_LINE_WIDTH_AUXILIARY()); + thePrs->setLineStyle(SketchPlugin_SketchEntity::SKETCH_LINE_STYLE_AUXILIARY()); + } + else { + thePrs->setWidth(aWidth); + thePrs->setLineStyle(SketchPlugin_SketchEntity::SKETCH_LINE_STYLE()); + } + } + else if (aShapeType == 7) { // otherwise this is a vertex + // The width value do not have effect on the point presentation. + // It is defined in order to extend selection area of the object. + thePrs->setWidth(17); + // thePrs->setPointMarker(1, 1.); // Set point as a '+' symbol + } + if (isCopy(aFeature) && !isIncludeToResult(aFeature)) { + double aWidth = thePrs->width(); + thePrs->setWidth(aWidth / 2.5); + } + + double aDeflection = Config_PropManager::real("Visualization", "construction_deflection"); + thePrs->setDeflection(aDeflection); +} + +//************************************************************************************* +void PartSet_Fitter::fitAll(Handle(V3d_View) theView) { + CompositeFeaturePtr aSketch = mySketchMgr->activeSketch(); + + ModuleBase_IWorkshop* aWorkshop = mySketchMgr->module()->workshop(); + XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + Bnd_Box aBndBox; - int aNumberOfSubs = mySketch->numberOfSubs(); + int aNumberOfSubs = aSketch->numberOfSubs(); + double aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; for (int i = 0; i < aNumberOfSubs; i++) { - FeaturePtr aFeature = mySketch->subFeature(i); - std::list aResults = aFeature->results(); - std::list::const_iterator aIt; - ResultPtr aRes; - double aXmin, aYmin, aZmin, aXmax, aYmax, aZmax; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - aRes = (*aIt); - if (aRes->isDisplayed()) { - GeomShapePtr aShape = aRes->shape(); - aShape->computeSize(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + FeaturePtr aFeature = aSketch->subFeature(i); + if (aDisplayer->isVisible(aFeature)) { + AISObjectPtr aAisPtr = aDisplayer->getAISObject(aFeature); + Handle(AIS_InteractiveObject) aAisObj = aAisPtr->impl(); + if (!aAisObj->IsInfinite()) { Bnd_Box aBox; - aBox.Update(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + aAisObj->BoundingBox(aBox); aBndBox.Add(aBox); } } + else { + std::list aResults = aFeature->results(); + std::list::const_iterator aIt; + ResultPtr aRes; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { + aRes = (*aIt); + if (aRes->isDisplayed()) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aRes); + if (aFeature.get()) { + std::shared_ptr aSPFeature = + std::dynamic_pointer_cast(aFeature); + if (aSPFeature.get()) { + bool isAxiliary = + aSPFeature->boolean(SketchPlugin_SketchEntity::AUXILIARY_ID())->value(); + if (!(aSPFeature->isExternal() || isAxiliary)) { + GeomShapePtr aShape = aRes->shape(); + aShape->computeSize(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + Bnd_Box aBox; + aBox.Update(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax); + aBndBox.Add(aBox); + } + } + } + } + } + } } - theView->FitAll(aBndBox, 0.01); + if (aBndBox.IsVoid()) + theView->FitAll(); + else + theView->FitAll(aBndBox, 0.01); }