X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.cpp;h=466cb64294fb598cc0eb6681dfb7e8bb5c4c75cf;hb=ce0bfd481aa0958b4c802393f1c5536ec995df1e;hp=fd8a22ee036f59b52242c20a5305a6c0317ebc71;hpb=95512b16482062b851109925074d77c7bca74cce;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp index fd8a22ee0..466cb6429 100644 --- a/src/PartSet/PartSet_SketcherMgr.cpp +++ b/src/PartSet/PartSet_SketcherMgr.cpp @@ -23,6 +23,8 @@ #include #include +#include + #include #include @@ -49,17 +51,17 @@ /// Returns list of unique objects by sum of objects from List1 and List2 -QList getSumList(const QList& theList1, +QList getSumList(const QList& theList1, const QList& theList2) { - QList aRes; + QList aRes; foreach (ModuleBase_ViewerPrs aPrs, theList1) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); + if (!aRes.contains(aPrs)) + aRes.append(aPrs); } foreach (ModuleBase_ViewerPrs aPrs, theList2) { - if (!aRes.contains(aPrs.object())) - aRes.append(aPrs.object()); + if (!aRes.contains(aPrs)) + aRes.append(aPrs); } return aRes; } @@ -118,13 +120,10 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE if ((!isSketcher) && (!isEditing)) return; - if (theEvent->modifiers()) { - // If user performs multiselection - if (isSketchOpe /* && (!isSketcher)*/) - if (!aOperation->commit()) - aOperation->abort(); - return; - } + // MoveTo in order to highlight current object + ModuleBase_IViewer* aViewer = aWorkshop->viewer(); + aViewer->AISContext()->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView()); + // Remember highlighted objects for editing ModuleBase_ISelection* aSelect = aWorkshop->selection(); QList aHighlighted = aSelect->getHighlighted(); @@ -133,12 +132,12 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE myEditingAttr.clear(); bool aHasShift = (theEvent->modifiers() & Qt::ShiftModifier); - QObjectPtrList aSelObjects; + QList aSelObjects; if (aHasShift) aSelObjects = getSumList(aHighlighted, aSelected); else { foreach (ModuleBase_ViewerPrs aPrs, aHighlighted) { - aSelObjects.append(aPrs.object()); + aSelObjects.append(aPrs); } } if ((aSelObjects.size() == 0)) { @@ -148,32 +147,22 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE aOperation->abort(); return; } - if (aSelObjects.size() == 1) { - // 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); - } + + foreach(ModuleBase_ViewerPrs aPrs, aSelObjects) { + FeaturePtr aFeature = ModelAPI_Feature::feature(aPrs.object()); + if (aFeature) { + myEditingFeatures.append(aFeature); + AttributePtr aAttr; + TopoDS_Shape aShape = aPrs.shape(); + if (!aShape.IsNull()) { + if (aShape.ShapeType() == TopAbs_VERTEX) { + aAttr = PartSet_Tools::findAttributeBy2dPoint(aFeature, aShape, myCurrentSketch); } } + 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; @@ -186,8 +175,8 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE launchEditing(); } else if (isSketchOpe && isEditing) { - // If selected another object - aOperation->abort(); + // If selected another object commit current result + aOperation->commit(); myIsDragging = true; get2dPoint(theWnd, theEvent, myCurX, myCurY); @@ -216,7 +205,7 @@ void PartSet_SketcherMgr::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouse myIsDragging = false; if (myDragDone) { aViewer->enableMultiselection(true); - aOp->commit(); + //aOp->commit(); myEditingFeatures.clear(); myEditingAttr.clear(); @@ -241,7 +230,6 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve 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; @@ -249,77 +237,123 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve 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; + ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); + XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + bool isEnableUpdateViewer = aDisplayer->enableUpdateViewer(false); + + static Events_ID aMoveEvent = Events_Loop::eventByName(EVENT_OBJECT_MOVED); + static Events_ID aUpdateEvent = Events_Loop::eventByName(EVENT_OBJECT_UPDATED); + + for (int i = 0; i < myEditingFeatures.size(); i++) { + AttributePtr aAttr = myEditingAttr.at(i); + FeaturePtr aFeature = myEditingFeatures.at(i); + // save the previous selection + std::set aSelectedAttributes; + std::set aSelectedResults; + getCurrentSelection(aFeature, myCurrentSketch, aWorkshop, aSelectedAttributes, + aSelectedResults); + // save the previous selection: end + + // Process selection by attribute + if (aAttr.get() != NULL) { + std::string aAttrId = aAttr->id(); + DataPtr aData = aFeature->data(); + if (aData.get() != NULL) { + std::shared_ptr aPoint = + std::dynamic_pointer_cast(aData->attribute(aAttrId)); + if (aPoint.get() != NULL) { + bool isImmutable = aPoint->setImmutable(true); + aPoint->move(dX, dY); + ModelAPI_EventCreator::get()->sendUpdated(aFeature, aMoveEvent); + aPoint->setImmutable(isImmutable); } } - } - } else { - foreach(FeaturePtr aFeature, myEditingFeatures) { + } else { + // Process selection by feature std::shared_ptr aSketchFeature = std::dynamic_pointer_cast(aFeature); - if (aSketchFeature) { - // save the previous selection - /*ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); - XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - QIntList anActivatedModes; - - ResultPtr aResult = aSketchFeature->firstResult(); - - aDisplayer->getModesOfActivation(aResult, anActivatedModes); - - std::list aSelectedAttributes; - getCurrentSelection(aSketchFeature, myCurrentSketch, aWorkshop, aSelectedAttributes);*/ - // save the previous selection: end - - + if (aSketchFeature) { aSketchFeature->move(dX, dY); - ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent); - /* + ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, aMoveEvent); // TODO: the selection restore should be after the AIS presentation is rebuilt - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); - - // restore the previous selection - aResult = aSketchFeature->firstResult(); - aDisplayer->activate(aResult, anActivatedModes); - - SelectMgr_IndexedMapOfOwner anOwnersToSelect; - getSelectionOwners(aSketchFeature, myCurrentSketch, aWorkshop, aSelectedAttributes, - anOwnersToSelect); - - ModuleBase_IViewer* aViewer = aWorkshop->viewer(); - Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); - for (Standard_Integer i = 1, n = anOwnersToSelect.Extent(); i <= n; i++) - aContext->AddOrRemoveSelected(anOwnersToSelect(i), false); // SetSelected() - - aContext->UpdateCurrentViewer(); - // restore the previous selection*/ } } - // TODO: set here - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + Events_Loop::loop()->flush(aMoveEvent); + Events_Loop::loop()->flush(aUpdateEvent); + // restore the previous selection + SelectMgr_IndexedMapOfOwner anOwnersToSelect; + getSelectionOwners(aFeature, myCurrentSketch, aWorkshop, aSelectedAttributes, + aSelectedResults, anOwnersToSelect); + aConnector->workshop()->selector()->setSelectedOwners(anOwnersToSelect, false); + // restore the previous selection + ModelAPI_EventCreator::get()->sendUpdated(aFeature, aMoveEvent, true); } + Events_Loop::loop()->flush(aUpdateEvent); + aDisplayer->enableUpdateViewer(isEnableUpdateViewer); + aDisplayer->updateViewer(); myDragDone = true; myCurX = aX; myCurY = aY; } } + //if ((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 { + // ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); + // XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); + // XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + // bool isEnableUpdateViewer = aDisplayer->enableUpdateViewer(false); + + // foreach(FeaturePtr aFeature, myEditingFeatures) { + // std::shared_ptr aSketchFeature = + // std::dynamic_pointer_cast(aFeature); + // if (aSketchFeature) { + // // save the previous selection + + // std::set aSelectedAttributes; + // std::set aSelectedResults; + // getCurrentSelection(aSketchFeature, myCurrentSketch, aWorkshop, aSelectedAttributes, + // aSelectedResults); + // // save the previous selection: end + + // aSketchFeature->move(dX, dY); + // // TODO: the selection restore should be after the AIS presentation is rebuilt + // Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); + // Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + + // // restore the previous selection + // SelectMgr_IndexedMapOfOwner anOwnersToSelect; + // getSelectionOwners(aSketchFeature, myCurrentSketch, aWorkshop, aSelectedAttributes, + // aSelectedResults, anOwnersToSelect); + // aConnector->workshop()->selector()->setSelectedOwners(anOwnersToSelect, false); + // // restore the previous selection + // } + // ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, anEvent, true); + // Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + // } + // // TODO: set here + // //Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_MOVED)); + // //Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_UPDATED)); + + // //Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + // aDisplayer->enableUpdateViewer(isEnableUpdateViewer); + // aDisplayer->updateViewer(); + //} void PartSet_SketcherMgr::onMouseDoubleClick(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) { @@ -464,7 +498,8 @@ void PartSet_SketcherMgr::onPlaneSelected(const std::shared_ptr& th void PartSet_SketcherMgr::getCurrentSelection(const ObjectPtr& theObject, const FeaturePtr& theSketch, ModuleBase_IWorkshop* theWorkshop, - std::list& theSelectedAttributes) + std::set& theSelectedAttributes, + std::set& theSelectedResults) { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); if (aFeature.get() == NULL) @@ -475,24 +510,23 @@ void PartSet_SketcherMgr::getCurrentSelection(const ObjectPtr& theObject, XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - // TODO: check all results and IPresentable feature - ResultPtr aResult = aFeature->firstResult(); - - bool isVisibleSketch = aDisplayer->isVisible(aResult); - AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult); - - if (aAISObj.get() != NULL) { + std::list aResults = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) + { + ResultPtr aResult = *aIt; + AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult); + if (aAISObj.get() == NULL) + continue; Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl(); for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) { Handle(StdSelect_BRepOwner) aBRepOwner = Handle(StdSelect_BRepOwner)::DownCast( aContext->SelectedOwner()); - if (aBRepOwner.IsNull()) continue; - + if (aBRepOwner.IsNull()) + continue; Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast( - aBRepOwner->Selectable()); - if (anIO != anAISIO) continue; - + aBRepOwner->Selectable()); if (aBRepOwner->HasShape()) { const TopoDS_Shape& aShape = aBRepOwner->Shape(); TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); @@ -500,7 +534,11 @@ void PartSet_SketcherMgr::getCurrentSelection(const ObjectPtr& theObject, AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theObject, aShape, theSketch); if (aPntAttr.get() != NULL) - theSelectedAttributes.push_back(aPntAttr); + theSelectedAttributes.insert(aPntAttr); + } + else if (aShapeType == TopAbs_EDGE && + theSelectedResults.find(aResult) == theSelectedResults.end()) { + theSelectedResults.insert(aResult); } } } @@ -510,7 +548,8 @@ void PartSet_SketcherMgr::getCurrentSelection(const ObjectPtr& theObject, void PartSet_SketcherMgr::getSelectionOwners(const ObjectPtr& theObject, const FeaturePtr& theSketch, ModuleBase_IWorkshop* theWorkshop, - const std::list& theSelectedAttributes, + const std::set& theSelectedAttributes, + const std::set& theSelectedResults, SelectMgr_IndexedMapOfOwner& anOwnersToSelect) { FeaturePtr aFeature = ModelAPI_Feature::feature(theObject); @@ -522,17 +561,17 @@ void PartSet_SketcherMgr::getSelectionOwners(const ObjectPtr& theObject, XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - // TODO: check all results and IPresentable feature - ResultPtr aResult = aFeature->firstResult(); - - bool isVisibleSketch = aDisplayer->isVisible(aResult); - AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult); - - if (aAISObj.get() != NULL) { + std::list aResults = aFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) + { + ResultPtr aResult = *aIt; + AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult); + if (aAISObj.get() == NULL) + continue; Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl(); - SelectMgr_IndexedMapOfOwner aSelectedOwners; - + SelectMgr_IndexedMapOfOwner aSelectedOwners; aConnector->workshop()->selector()->selection()->entityOwners(anAISIO, aSelectedOwners); for ( Standard_Integer i = 1, n = aSelectedOwners.Extent(); i <= n; i++ ) { Handle(StdSelect_BRepOwner) anOwner = Handle(StdSelect_BRepOwner)::DownCast(aSelectedOwners(i)); @@ -542,17 +581,18 @@ void PartSet_SketcherMgr::getSelectionOwners(const ObjectPtr& theObject, TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); if (aShapeType == TopAbs_VERTEX) { AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(aFeature, aShape, theSketch); - if (aPntAttr.get() != NULL) { - std::list::const_iterator anIt = theSelectedAttributes.begin(), - aLast = theSelectedAttributes.end(); - for (; anIt != aLast; anIt++) { - AttributePtr anAttrIt = *anIt; - if (anAttrIt.get() == aPntAttr.get()) { - anOwnersToSelect.Add(anOwner); - } - } + if (aPntAttr.get() != NULL && + theSelectedAttributes.find(aPntAttr) != theSelectedAttributes.end()) { + anOwnersToSelect.Add(anOwner); } } + else if (aShapeType == TopAbs_EDGE) { + bool aFound = theSelectedResults.find(aResult) != theSelectedResults.end(); + int anIndex = anOwnersToSelect.FindIndex(anOwner); + if (theSelectedResults.find(aResult) != theSelectedResults.end()/* && + anOwnersToSelect.FindIndex(anOwner) < 0*/) + anOwnersToSelect.Add(anOwner); + } } } }