X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_SketcherMgr.cpp;h=9bccd1ab05971ce0b530916fb2523b40045ea08a;hb=7b4a6a2a335d41a647e0f6a6becb7c23df042be1;hp=caf3218825096d347e4b7def4495a68105ef09dd;hpb=82649b17a20b5d5b6a66c876f6450eff1cfc28d6;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_SketcherMgr.cpp b/src/PartSet/PartSet_SketcherMgr.cpp index caf321882..9bccd1ab0 100644 --- a/src/PartSet/PartSet_SketcherMgr.cpp +++ b/src/PartSet/PartSet_SketcherMgr.cpp @@ -11,26 +11,27 @@ #include "PartSet_Tools.h" #include "PartSet_WidgetSketchLabel.h" -#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 @@ -54,6 +55,7 @@ #include #include #include +#include #include #include @@ -67,6 +69,7 @@ #include #include +#include #include #include @@ -90,9 +93,14 @@ return aRes; }*/ -void fillFeature2Attribute(const QList& theList, - QMap >& theFeature2AttributeMap, - const FeaturePtr theSketch) +// Fills the list of features the list of selected presentations. +// \param theList a list of selected presentations +// \param theSketch a sketch to project a vertex shape of a presentation to the plane +// and find the corresponded attribute +// \param theFeatureList an output list of features +void fillFeatureList(const QList& theList, + const FeaturePtr theSketch, + QList& theFeatureList) { QList aRes; @@ -102,32 +110,49 @@ void fillFeature2Attribute(const QList& theList, { ModuleBase_ViewerPrs aPrs = *anIt; FeaturePtr aFeature = ModelAPI_Feature::feature(aPrs.object()); - if (aFeature.get() == NULL) - continue; + if (aFeature.get() && !theFeatureList.contains(aFeature)) + theFeatureList.append(aFeature); + } +} - QList anAttributes; - if (theFeature2AttributeMap.contains(aFeature)) { - anAttributes = theFeature2AttributeMap[aFeature]; +/// Fills attribute and result lists by the selected owner. In case if the attribute is found, +/// by the owner shape, it is put to the list. Otherwise if type of owner shape is edge, put the function +/// result as is to the list of results. +/// \param theOwner a viewer selected owner +/// \param theFeature a feature, where the attribute is searched +/// \param theSketch a current sketch +/// \param theSelectedAttribute an output list of attributes +/// \param theSelectedResults an output list of edge results +void getAttributesOrResults(const Handle(SelectMgr_EntityOwner)& theOwner, + const FeaturePtr& theFeature, const FeaturePtr& theSketch, + const ResultPtr& theResult, + std::set& aSelectedAttributes, + std::set& aSelectedResults) +{ + Handle(StdSelect_BRepOwner) aBRepOwner = Handle(StdSelect_BRepOwner)::DownCast(theOwner); + if (aBRepOwner.IsNull()) + return; + Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast( + aBRepOwner->Selectable()); + if (aBRepOwner->HasShape()) { + const TopoDS_Shape& aShape = aBRepOwner->Shape(); + TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); + if (aShapeType == TopAbs_VERTEX) { + AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theFeature, + aShape, theSketch); + if (aPntAttr.get() != NULL) + aSelectedAttributes.insert(aPntAttr); } - AttributePtr anAttr; - TopoDS_Shape aShape = aPrs.shape(); - if (!aShape.IsNull()) { - if (aShape.ShapeType() == TopAbs_VERTEX) { - anAttr = PartSet_Tools::findAttributeBy2dPoint(aFeature, aShape, theSketch); - if (anAttr.get() != NULL && !anAttributes.contains(anAttr)) - anAttributes.push_back(anAttr); - } + else if (aShapeType == TopAbs_EDGE && + aSelectedResults.find(theResult) == aSelectedResults.end()) { + aSelectedResults.insert(theResult); } - theFeature2AttributeMap[aFeature] = anAttributes; } } - - - PartSet_SketcherMgr::PartSet_SketcherMgr(PartSet_Module* theModule) : QObject(theModule), myModule(theModule), myIsDragging(false), myDragDone(false), - myIsPropertyPanelValueChanged(false), myIsMouseOverWindow(false), + myIsResetCurrentValue(false), myIsMouseOverWindow(false), myIsMouseOverViewProcessed(true), myPreviousUpdateViewerEnabled(true), myIsPopupMenuActive(false), myIsConstraintsShown(true) { @@ -166,7 +191,10 @@ void PartSet_SketcherMgr::onEnterViewPort() // the mouse move and use the cursor position to update own values. If the presentaion is // redisplayed before this update, the feature presentation jumps from reset value to current. myIsMouseOverWindow = true; - myIsPropertyPanelValueChanged = false; + myIsResetCurrentValue = false; + // it is important to validate operation here only if sketch entity create operation is active + // because at this operation we reacts to the mouse leave/enter view port + //operationMgr()->onValidateOperation(); #ifdef DEBUG_MOUSE_OVER_WINDOW_FLAGS qDebug(QString("onEnterViewPort: %1").arg(mouseOverWindowFlagsInfo()).toStdString().c_str()); #endif @@ -177,16 +205,20 @@ void PartSet_SketcherMgr::onEnterViewPort() if (!isNestedCreateOperation(getCurrentOperation())) return; + operationMgr()->onValidateOperation(); + // we need change displayed state of the current operation feature // if the feature is presentable, e.g. distance construction. It has no results, so workshop does // not accept a signal about the result created. Nothing is shown until mouse is moved out/in view // port. If the isDisplayed flag is true, the presentable feature is displayed as soon as the // presentation becomes valid and redisplay happens - ModuleBase_Operation* aOperation = getCurrentOperation(); - if (aOperation) { - FeaturePtr aFeature = aOperation->feature(); + //ModuleBase_Operation* aOperation = getCurrentOperation(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); if (aFeature.get() && aFeature->data()->isValid()) { - visualizeFeature(aOperation, canDisplayObject(aFeature), false); + visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature), false); } } } @@ -195,7 +227,9 @@ void PartSet_SketcherMgr::onLeaveViewPort() { myIsMouseOverViewProcessed = false; myIsMouseOverWindow = false; - myIsPropertyPanelValueChanged = false; + // it is important to validate operation here only if sketch entity create operation is active + // because at this operation we reacts to the mouse leave/enter view port + //operationMgr()->onValidateOperation(); #ifdef DEBUG_MOUSE_OVER_WINDOW_FLAGS qDebug(QString("onLeaveViewPort: %1").arg(mouseOverWindowFlagsInfo()).toStdString().c_str()); #endif @@ -211,6 +245,8 @@ void PartSet_SketcherMgr::onLeaveViewPort() if (myIsPopupMenuActive) return; + operationMgr()->onValidateOperation(); + // 2. if the mouse IS NOT over window, reset the active widget value and hide the presentation ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); XGUI_ModuleConnector* aConnector = dynamic_cast(aWorkshop); @@ -221,21 +257,26 @@ void PartSet_SketcherMgr::onLeaveViewPort() ModuleBase_Operation* aOperation = getCurrentOperation(); ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); ModuleBase_ModelWidget* aActiveWgt = aPanel->activeWidget(); - if (aActiveWgt) { - aActiveWgt->reset(); + if (aActiveWgt && aActiveWgt->reset()) { + myIsResetCurrentValue = true; } aDisplayer->enableUpdateViewer(isEnableUpdateViewer); // hides the presentation of the current operation feature - //myIsPropertyPanelValueChanged = false; // the feature is to be erased here, but it is correct to call canDisplayObject because // there can be additional check (e.g. editor widget in distance constraint) - FeaturePtr aFeature = getCurrentOperation()->feature(); - visualizeFeature(aOperation, canDisplayObject(aFeature)); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature)); + } } void PartSet_SketcherMgr::onBeforeValuesChangedInPropertyPanel() { + myIsResetCurrentValue = false; + if (isNestedCreateOperation(getCurrentOperation())) return; // it is necessary to save current selection in order to restore it after the values are modifed @@ -271,12 +312,16 @@ void PartSet_SketcherMgr::onValuesChangedInPropertyPanel() return; // visualize the current operation feature - myIsPropertyPanelValueChanged = true; - ModuleBase_Operation* aOperation = getCurrentOperation(); + //myIsResetCurrentValue = false; + operationMgr()->onValidateOperation(); // the feature is to be erased here, but it is correct to call canDisplayObject because // there can be additional check (e.g. editor widget in distance constraint) - FeaturePtr aFeature = getCurrentOperation()->feature(); - visualizeFeature(aOperation, canDisplayObject(aFeature)); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature)); + } } void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) @@ -291,40 +336,47 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); ModuleBase_IViewer* aViewer = aWorkshop->viewer(); + myPreviousSelectionEnabled = aViewer->isSelectionEnabled(); if (!aViewer->canDragByMouse()) return; - ModuleBase_Operation* aOperation = getCurrentOperation(); - if (aOperation && aOperation->isEditOperation()) { - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (!aFOperation) + return; + + if (aFOperation->isEditOperation()) { + ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel(); ModuleBase_ModelWidget* aActiveWgt = aPanel->activeWidget(); - // If the current widget is a selector, do do nothing, it processes the mouse press + // If the current widget is a selector, do nothing, it processes the mouse press if(aActiveWgt && aActiveWgt->isViewerSelector()) { return; } } // Use only for sketch operations - if (aOperation && myCurrentSketch) { + if (myCurrentSketch) { if (!PartSet_Tools::sketchPlane(myCurrentSketch)) return; - bool isSketcher = isSketchOperation(aOperation); - bool isSketchOpe = isNestedSketchOperation(aOperation); + bool isSketcher = isSketchOperation(aFOperation); + bool isSketchOpe = isNestedSketchOperation(aFOperation); // Avoid non-sketch operations if ((!isSketchOpe) && (!isSketcher)) return; - bool isEditing = aOperation->isEditOperation(); + bool isEditing = aFOperation->isEditOperation(); // Ignore creation sketch operation if ((!isSketcher) && (!isEditing)) return; - // MoveTo in order to highlight current object - aViewer->AISContext()->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView()); - + Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); + if (!aContext.IsNull()) { + // MoveTo in order to highlight current object + aContext->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView()); + } // Remember highlighted objects for editing ModuleBase_ISelection* aSelect = aWorkshop->selection(); @@ -334,8 +386,8 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE if (myCurrentSelection.empty()) { if (isSketchOpe && (!isSketcher)) // commit previous operation - if (!aOperation->commit()) - aOperation->abort(); + if (!aFOperation->commit()) + aFOperation->abort(); return; } // Init flyout point for radius rotation @@ -359,7 +411,7 @@ void PartSet_SketcherMgr::onMousePressed(ModuleBase_IViewWindow* theWnd, QMouseE } } else if (isSketchOpe && isEditing) { // If selected another object commit current result - aOperation->commit(); + aFOperation->commit(); myIsDragging = true; get2dPoint(theWnd, theEvent, myCurrentPoint); @@ -388,13 +440,15 @@ void PartSet_SketcherMgr::onMouseReleased(ModuleBase_IViewWindow* theWnd, QMouse if (myDragDone) { //aOp->commit(); myCurrentSelection.clear(); + /*Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); + if (!aContext.IsNull()) { // Reselect edited object - /*aViewer->AISContext()->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView()); + aContext->MoveTo(theEvent->x(), theEvent->y(), theWnd->v3dView()); if (theEvent->modifiers() & Qt::ShiftModifier) - aViewer->AISContext()->ShiftSelect(); + aContext->ShiftSelect(); else - aViewer->AISContext()->Select(); - */ + aContext->Select(); + */ } } } @@ -424,8 +478,12 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve } // the feature is to be erased here, but it is correct to call canDisplayObject because // there can be additional check (e.g. editor widget in distance constraint) - FeaturePtr aFeature = getCurrentOperation()->feature(); - visualizeFeature(aOperation, canDisplayObject(aFeature)); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + visualizeFeature(aFeature, aFOperation->isEditOperation(), canDisplayObject(aFeature)); + } } myClickedPoint.clear(); @@ -438,10 +496,10 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve ModuleBase_IViewer* aViewer = myModule->workshop()->viewer(); aViewer->enableSelection(false); - ModuleBase_Operation* aOperation = getCurrentOperation(); - if (!aOperation) + ModuleBase_Operation* aCurrentOperation = getCurrentOperation(); + if (!aCurrentOperation) return; - if (isSketchOperation(aOperation)) + if (isSketchOperation(aCurrentOperation)) return; // No edit operation activated Handle(V3d_View) aView = theWnd->v3dView(); @@ -464,6 +522,7 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve FeatureToSelectionMap::const_iterator anIt = myCurrentSelection.begin(), aLast = myCurrentSelection.end(); // 4. the features and attributes modification(move) + bool isModified = false; for (; anIt != aLast; anIt++) { FeaturePtr aFeature = anIt.key(); @@ -484,6 +543,7 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve if (aPoint.get() != NULL) { bool isImmutable = aPoint->setImmutable(true); aPoint->move(dX, dY); + isModified = true; ModelAPI_EventCreator::get()->sendUpdated(aFeature, aMoveEvent); aPoint->setImmutable(isImmutable); } @@ -495,10 +555,16 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve std::dynamic_pointer_cast(aFeature); if (aSketchFeature) { aSketchFeature->move(dX, dY); + isModified = true; ModelAPI_EventCreator::get()->sendUpdated(aSketchFeature, aMoveEvent); } } } + // the modified state of the current operation should be updated if there are features, which + // were changed here + if (isModified) { + aCurrentOperation->onValuesChanged(); + } Events_Loop::loop()->flush(aMoveEvent); // up all move events - to be processed in the solver //Events_Loop::loop()->flush(aUpdateEvent); // up update events - to redisplay presentations @@ -515,13 +581,14 @@ void PartSet_SketcherMgr::onMouseMoved(ModuleBase_IViewWindow* theWnd, QMouseEve void PartSet_SketcherMgr::onMouseDoubleClick(ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) { - ModuleBase_Operation* aOperation = getCurrentOperation(); - if (aOperation && aOperation->isEditOperation()) { - std::string aId = aOperation->id().toStdString(); - if (isDistanceOperation(aOperation)) + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation && aFOperation->isEditOperation()) { + std::string aId = aFOperation->id().toStdString(); + if (isDistanceOperation(aFOperation)) { // Activate dimension value editing on double click - ModuleBase_IPropertyPanel* aPanel = aOperation->propertyPanel(); + ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel(); QList aWidgets = aPanel->modelWidgets(); // Find corresponded widget to activate value editing foreach (ModuleBase_ModelWidget* aWgt, aWidgets) { @@ -604,6 +671,48 @@ void PartSet_SketcherMgr::launchEditing() } } +bool PartSet_SketcherMgr::sketchSolverError() +{ + bool anError = false; + CompositeFeaturePtr aSketch = activeSketch(); + if (aSketch.get()) { + AttributeStringPtr aAttributeString = aSketch->string(SketchPlugin_Sketch::SOLVER_ERROR()); + anError = !aAttributeString->value().empty(); + } + return anError; +} + +QString PartSet_SketcherMgr::getFeatureError(const FeaturePtr& theFeature) +{ + QString anError = ""; + if (!theFeature.get() || !theFeature->data()->isValid()) + return anError; + + CompositeFeaturePtr aSketch = activeSketch(); + if (aSketch.get() && aSketch == theFeature) { + AttributeStringPtr aAttributeString = aSketch->string(SketchPlugin_Sketch::SOLVER_ERROR()); + anError = aAttributeString->value().c_str(); + } + else if (myIsResetCurrentValue) { // this flag do not allow commit of the current operation + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + if (aFeature.get() && aFeature == theFeature && isNestedCreateOperation(aFOperation)) { + QString anAttributeName = ""; + ModuleBase_IPropertyPanel* aPanel = aFOperation->propertyPanel(); + ModuleBase_ModelWidget* anActiveWgt = aPanel->activeWidget(); + if (anActiveWgt) { + AttributePtr anAttr = aFeature->attribute(anActiveWgt->attributeID()); + if (anAttr.get()) + anAttributeName = anAttr->id().c_str(); + } + anError = "Attribute \"" + anAttributeName + "\" is not initialized."; + } + } + } + return anError; +} const QStringList& PartSet_SketcherMgr::sketchOperationIdList() { @@ -635,6 +744,7 @@ const QStringList& PartSet_SketcherMgr::constraintsIdList() aIds << SketchPlugin_ConstraintTangent::ID().c_str(); aIds << SketchPlugin_ConstraintCoincidence::ID().c_str(); aIds << SketchPlugin_ConstraintMirror::ID().c_str(); + aIds << SketchPlugin_ConstraintAngle::ID().c_str(); aIds << SketchPlugin_MultiRotation::ID().c_str(); aIds << SketchPlugin_MultiTranslation::ID().c_str(); } @@ -665,7 +775,9 @@ bool PartSet_SketcherMgr::isNestedSketchOperation(ModuleBase_Operation* theOpera bool PartSet_SketcherMgr::isNestedCreateOperation(ModuleBase_Operation* theOperation) { - return theOperation && !theOperation->isEditOperation() && isNestedSketchOperation(theOperation); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + return aFOperation && !aFOperation->isEditOperation() && isNestedSketchOperation(aFOperation); } bool PartSet_SketcherMgr::isEntity(const std::string& theId) @@ -682,15 +794,21 @@ bool PartSet_SketcherMgr::isDistanceOperation(ModuleBase_Operation* theOperation return (aId == SketchPlugin_ConstraintLength::ID()) || (aId == SketchPlugin_ConstraintDistance::ID()) || - (aId == SketchPlugin_ConstraintRadius::ID()); + (aId == SketchPlugin_ConstraintRadius::ID()) || + (aId == SketchPlugin_ConstraintAngle::ID()); } void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) { + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (!aFOperation) + return; + myModule->onViewTransformed(); // Display all sketcher sub-Objects - myCurrentSketch = std::dynamic_pointer_cast(theOperation->feature()); + myCurrentSketch = std::dynamic_pointer_cast(aFOperation->feature()); XGUI_ModuleConnector* aConnector = dynamic_cast(myModule->workshop()); // Hide sketcher result @@ -716,23 +834,25 @@ void PartSet_SketcherMgr::startSketch(ModuleBase_Operation* theOperation) myPlaneFilter = new ModuleBase_ShapeInPlaneFilter(); myModule->workshop()->viewer()->addSelectionFilter(myPlaneFilter); + bool aHasPlane = false; - if (theOperation->isEditOperation()) { + std::shared_ptr aPln; + if (aFOperation->isEditOperation()) { // If it is editing of sketch then it means that plane is already defined - std::shared_ptr aPln = PartSet_Tools::sketchPlane(myCurrentSketch); - if (aPln.get()) { - myPlaneFilter->setPlane(aPln->impl()); + aPln = PartSet_Tools::sketchPlane(myCurrentSketch); + if (aPln.get()) aHasPlane = true; - } } + myPlaneFilter->setPlane(aPln); + Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); // all sketch objects should be activated in the sketch selection modes by edit operation start // in case of creation operation, there is an active widget, which activates own selection mode - if (theOperation->isEditOperation() && aHasPlane) + if (aFOperation->isEditOperation() && aHasPlane) aConnector->activateModuleSelectionModes(); } -void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* theOperation) +void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* /* theOperation*/) { myIsMouseOverWindow = false; myIsConstraintsShown = true; @@ -758,27 +878,33 @@ void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* theOperation) } } else { - // Hide all sketcher sub-Objects - for (int i = 0; i < myCurrentSketch->numberOfSubs(); i++) { - FeaturePtr aFeature = myCurrentSketch->subFeature(i); - std::list aResults = aFeature->results(); + // Hide all sketcher sub-Objects + 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) { + (*aIt)->setDisplayed(false); + } + aFeature->setDisplayed(false); + } + // Display sketcher result + std::list aResults = myCurrentSketch->results(); std::list::const_iterator aIt; + Events_Loop* aLoop = Events_Loop::loop(); + static Events_ID aDispEvent = aLoop->eventByName(EVENT_OBJECT_TO_REDISPLAY); for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - (*aIt)->setDisplayed(false); + (*aIt)->setDisplayed(true); + // this display event is needed because sketch already may have "displayed" state, + // but not displayed while it is still active (issue 613, abort of existing sketch) + ModelAPI_EventCreator::get()->sendUpdated(*aIt, aDispEvent); } - aFeature->setDisplayed(false); - } - // Display sketcher result - std::list aResults = myCurrentSketch->results(); - std::list::const_iterator aIt; - for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - (*aIt)->setDisplayed(true); - } - myCurrentSketch->setDisplayed(true); + myCurrentSketch->setDisplayed(true); - myCurrentSketch = CompositeFeaturePtr(); - myModule->workshop()->viewer()->removeSelectionFilter(myPlaneFilter); - Events_Loop::loop()->flush(Events_Loop::eventByName(EVENT_OBJECT_TO_REDISPLAY)); + myCurrentSketch = CompositeFeaturePtr(); + myModule->workshop()->viewer()->removeSelectionFilter(myPlaneFilter); + + Events_Loop::loop()->flush(aDispEvent); } // restore the module selection modes, which were changed on startSketch aConnector->activateModuleSelectionModes(); @@ -786,28 +912,31 @@ void PartSet_SketcherMgr::stopSketch(ModuleBase_Operation* theOperation) void PartSet_SketcherMgr::startNestedSketch(ModuleBase_Operation* theOperation) { - if (constraintsIdList().contains(theOperation->id())) { - // Show constraints if a constraint was created - onShowConstraintsToggle(true); - } connectToPropertyPanel(true); + QApplication::setOverrideCursor(QCursor(QIcon(":pictures/button_plus.png").pixmap(20,20))); } void PartSet_SketcherMgr::stopNestedSketch(ModuleBase_Operation* theOp) { connectToPropertyPanel(false); - myIsPropertyPanelValueChanged = false; + myIsResetCurrentValue = false; myIsMouseOverViewProcessed = true; + operationMgr()->onValidateOperation(); + QApplication::restoreOverrideCursor(); } void PartSet_SketcherMgr::commitNestedSketch(ModuleBase_Operation* theOperation) { if (isNestedCreateOperation(theOperation)) { - FeaturePtr aFeature = theOperation->feature(); - // it is necessary to check the the feature data validity because - // some kind of features are removed by an operation commit(the macro state of a feature) - if (aFeature.get() && aFeature->data()->isValid()) { - visualizeFeature(theOperation, true); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (theOperation); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); + // it is necessary to check the the feature data validity because + // some kind of features are removed by an operation commit(the macro state of a feature) + if (aFeature.get() && aFeature->data()->isValid()) { + visualizeFeature(aFeature, aFOperation->isEditOperation(), true); + } } } } @@ -822,6 +951,38 @@ bool PartSet_SketcherMgr::canRedo() const return isNestedCreateOperation(getCurrentOperation()); } +bool PartSet_SketcherMgr::canCommitOperation() const +{ + bool aCanCommit = true; + + if (isNestedCreateOperation(getCurrentOperation()) && myIsResetCurrentValue) + aCanCommit = false; + + return aCanCommit; +} + +bool PartSet_SketcherMgr::canEraseObject(const ObjectPtr& theObject) const +{ + bool aCanErase = true; + // when the sketch operation is active, results of sketch sub-feature can not be hidden + if (myCurrentSketch.get()) { + ResultPtr aResult = std::dynamic_pointer_cast(theObject); + if (aResult.get()) { + // Display sketcher objects + for (int i = 0; i < myCurrentSketch->numberOfSubs() && aCanErase; i++) { + + FeaturePtr aFeature = myCurrentSketch->subFeature(i); + std::list aResults = aFeature->results(); + std::list::const_iterator anIt; + for (anIt = aResults.begin(); anIt != aResults.end() && aCanErase; ++anIt) { + aCanErase = *anIt != aResult; + } + } + } + } + return aCanErase; +} + bool PartSet_SketcherMgr::canDisplayObject(const ObjectPtr& theObject) const { bool aCanDisplay = true; @@ -851,9 +1012,10 @@ bool PartSet_SketcherMgr::canDisplayObject(const ObjectPtr& theObject) const // 3. the method should not filter the objects, which are not related to the current operation. // The object is filtered just if it is a current operation feature or this feature result bool isObjectFound = false; - ModuleBase_Operation* anOperation = getCurrentOperation(); - if (anOperation) { - FeaturePtr aFeature = anOperation->feature(); + ModuleBase_OperationFeature* aFOperation = dynamic_cast + (getCurrentOperation()); + if (aFOperation) { + FeaturePtr aFeature = aFOperation->feature(); if (aFeature.get()) { std::list aResults = aFeature->results(); if (theObject == aFeature) @@ -895,7 +1057,7 @@ bool PartSet_SketcherMgr::canDisplayObject(const ObjectPtr& theObject) const bool PartSet_SketcherMgr::canDisplayCurrentCreatedFeature() const { - return myIsPropertyPanelValueChanged || myIsMouseOverWindow; + return myIsMouseOverWindow || !myIsResetCurrentValue; #ifdef DEBUG_MOUSE_OVER_WINDOW_FLAGS qDebug(QString("canDisplayCurrentCreatedFeature: %1").arg(mouseOverWindowFlagsInfo()).toStdString().c_str()); #endif @@ -918,7 +1080,10 @@ bool PartSet_SketcherMgr::isObjectOfSketch(const ObjectPtr& theObject) const void PartSet_SketcherMgr::onPlaneSelected(const std::shared_ptr& thePln) { - myPlaneFilter->setPlane(thePln->impl()); + if (myPlaneFilter.IsNull()) + myPlaneFilter = new ModuleBase_ShapeInPlaneFilter(); + + myPlaneFilter->setPlane(thePln); } void PartSet_SketcherMgr::getCurrentSelection(const FeaturePtr& theFeature, @@ -934,42 +1099,35 @@ void PartSet_SketcherMgr::getCurrentSelection(const FeaturePtr& theFeature, ModuleBase_IViewer* aViewer = theWorkshop->viewer(); Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); - XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); - XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); + if (!aContext.IsNull()) { + XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); + XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); - std::list aResults = theFeature->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()) + std::list aResults = theFeature->results(); + std::list::const_iterator aIt; + for (aIt = aResults.begin(); aIt != aResults.end(); ++aIt) { - Handle(StdSelect_BRepOwner) aBRepOwner = Handle(StdSelect_BRepOwner)::DownCast( - aContext->SelectedOwner()); - if (aBRepOwner.IsNull()) + ResultPtr aResult = *aIt; + AISObjectPtr aAISObj = aDisplayer->getAISObject(aResult); + if (aAISObj.get() == NULL) continue; - Handle(AIS_InteractiveObject) anIO = Handle(AIS_InteractiveObject)::DownCast( - aBRepOwner->Selectable()); - if (anIO != anAISIO) - continue; - - if (aBRepOwner->HasShape()) { - const TopoDS_Shape& aShape = aBRepOwner->Shape(); - TopAbs_ShapeEnum aShapeType = aShape.ShapeType(); - if (aShapeType == TopAbs_VERTEX) { - AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theFeature, - aShape, theSketch); - if (aPntAttr.get() != NULL) - aSelectedAttributes.insert(aPntAttr); - } - else if (aShapeType == TopAbs_EDGE && - aSelectedResults.find(aResult) == aSelectedResults.end()) { - aSelectedResults.insert(aResult); - } + Handle(AIS_InteractiveObject) anAISIO = aAISObj->impl(); + for (aContext->InitSelected(); aContext->MoreSelected(); aContext->NextSelected()) + { + Handle(SelectMgr_EntityOwner) anOwner = aContext->SelectedOwner(); + if (anOwner->Selectable() != anAISIO) + continue; + getAttributesOrResults(anOwner, theFeature, theSketch, aResult, + aSelectedAttributes, aSelectedResults); + } + for (aContext->InitDetected(); aContext->MoreDetected(); aContext->NextDetected()) { + Handle(SelectMgr_EntityOwner) anOwner = aContext->DetectedOwner(); + if (anOwner.IsNull()) + continue; + if (anOwner->Selectable() != anAISIO) + continue; + getAttributesOrResults(anOwner, theFeature, theSketch, aResult, + aSelectedAttributes, aSelectedResults); } } } @@ -980,7 +1138,7 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, const FeaturePtr& theSketch, ModuleBase_IWorkshop* theWorkshop, const FeatureToSelectionMap& theSelection, - SelectMgr_IndexedMapOfOwner& anOwnersToSelect) + SelectMgr_IndexedMapOfOwner& theOwnersToSelect) { if (theFeature.get() == NULL) return; @@ -990,7 +1148,7 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, std::set aSelectedResults = anIt.value().second; ModuleBase_IViewer* aViewer = theWorkshop->viewer(); - Handle(AIS_InteractiveContext) aContext = aViewer->AISContext(); + XGUI_ModuleConnector* aConnector = dynamic_cast(theWorkshop); XGUI_Displayer* aDisplayer = aConnector->workshop()->displayer(); @@ -999,12 +1157,12 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, if (aAISObj.get() != NULL && aSelectedAttributes.empty() && aSelectedResults.empty()) { 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(SelectMgr_EntityOwner) anOwner = aSelectedOwners(i); if (!anOwner.IsNull()) - anOwnersToSelect.Add(anOwner); + theOwnersToSelect.Add(anOwner); } } @@ -1031,14 +1189,14 @@ void PartSet_SketcherMgr::getSelectionOwners(const FeaturePtr& theFeature, AttributePtr aPntAttr = PartSet_Tools::findAttributeBy2dPoint(theFeature, aShape, theSketch); if (aPntAttr.get() != NULL && aSelectedAttributes.find(aPntAttr) != aSelectedAttributes.end()) { - anOwnersToSelect.Add(anOwner); + theOwnersToSelect.Add(anOwner); } } else if (aShapeType == TopAbs_EDGE) { bool aFound = aSelectedResults.find(aResult) != aSelectedResults.end(); if (aSelectedResults.find(aResult) != aSelectedResults.end() && - anOwnersToSelect.FindIndex(anOwner) <= 0) - anOwnersToSelect.Add(anOwner); + theOwnersToSelect.FindIndex(anOwner) <= 0) + theOwnersToSelect.Add(anOwner); } } } @@ -1076,7 +1234,8 @@ ModuleBase_Operation* PartSet_SketcherMgr::getCurrentOperation() const return myModule->workshop()->currentOperation(); } -void PartSet_SketcherMgr::visualizeFeature(ModuleBase_Operation* theOperation, +void PartSet_SketcherMgr::visualizeFeature(const FeaturePtr& theFeature, + const bool isEditOperation, const bool isToDisplay, const bool isFlushRedisplay) { @@ -1084,7 +1243,7 @@ void PartSet_SketcherMgr::visualizeFeature(ModuleBase_Operation* theOperation, return; #endif - if (!theOperation || theOperation->isEditOperation()) + if (isEditOperation || !theFeature.get()) return; ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); @@ -1092,12 +1251,12 @@ void PartSet_SketcherMgr::visualizeFeature(ModuleBase_Operation* theOperation, // 1. change visibility of the object itself, here the presentable object is processed, // e.g. constraints features - FeaturePtr aFeature = theOperation->feature(); - std::list aResults = aFeature->results(); + //FeaturePtr aFeature = aFOperation->feature(); + std::list aResults = theFeature->results(); if (isToDisplay) - aFeature->setDisplayed(true); + theFeature->setDisplayed(true); else - aFeature->setDisplayed(false); + theFeature->setDisplayed(false); // change visibility of the object results, e.g. non-constraint features std::list::const_iterator aIt; @@ -1118,25 +1277,23 @@ void PartSet_SketcherMgr::storeSelection(const bool theHighlightedOnly) ModuleBase_IWorkshop* aWorkshop = myModule->workshop(); ModuleBase_ISelection* aSelect = aWorkshop->selection(); QList aHighlighted = aSelect->getHighlighted(); - - QMap > aFeature2AttributeMap; + + QList aFeatureList; if (theHighlightedOnly) { - fillFeature2Attribute(aHighlighted, aFeature2AttributeMap, myCurrentSketch); + fillFeatureList(aHighlighted, myCurrentSketch, aFeatureList); } else { - fillFeature2Attribute(aHighlighted, aFeature2AttributeMap, myCurrentSketch); + fillFeatureList(aHighlighted, myCurrentSketch, aFeatureList); - QList aSelected = aSelect->getSelected(); - fillFeature2Attribute(aSelected, aFeature2AttributeMap, myCurrentSketch); + QList aSelected = aSelect->getSelected(ModuleBase_ISelection::AllControls); + fillFeatureList(aSelected, myCurrentSketch, aFeatureList); } // 1. it is necessary to save current selection in order to restore it after the features moving myCurrentSelection.clear(); - QMap >::const_iterator anIt = aFeature2AttributeMap.begin(), - aLast = aFeature2AttributeMap.end(); + QList::const_iterator anIt = aFeatureList.begin(), aLast = aFeatureList.end(); for (; anIt != aLast; anIt++) { - FeaturePtr aFeature = anIt.key(); - getCurrentSelection(aFeature, myCurrentSketch, aWorkshop, myCurrentSelection); + getCurrentSelection(*anIt, myCurrentSketch, aWorkshop, myCurrentSelection); } //qDebug(QString(" storeSelection: %1").arg(myCurrentSelection.size()).toStdString().c_str()); } @@ -1184,6 +1341,15 @@ void PartSet_SketcherMgr::onShowConstraintsToggle(bool theOn) QString PartSet_SketcherMgr::mouseOverWindowFlagsInfo() const { - return QString("myIsPropertyPanelValueChanged = %1, myIsMouseOverWindow = %2") - .arg(myIsPropertyPanelValueChanged).arg(myIsMouseOverWindow); + return QString("myIsResetCurrentValue = %1, myIsMouseOverWindow = %2") + .arg(myIsResetCurrentValue).arg(myIsMouseOverWindow); +} + +XGUI_OperationMgr* PartSet_SketcherMgr::operationMgr() const +{ + ModuleBase_IWorkshop* anIWorkshop = myModule->workshop(); + XGUI_ModuleConnector* aConnector = dynamic_cast(anIWorkshop); + XGUI_Workshop* aWorkshop = aConnector->workshop(); + + return aWorkshop->operationMgr(); }