X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FPartSet%2FPartSet_WidgetFeaturePointSelector.cpp;h=c39cc3cdec0ede3f4b168ddcb93e30a213ab54de;hb=047a6c0106078a9953f72510f4e204313f2bcf72;hp=0fecb7ed7855e535d11dfc007a7ffe30e5565f84;hpb=a87ec82289d152ffd66b1cb7133bfb5cbfe92281;p=modules%2Fshaper.git diff --git a/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp b/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp index 0fecb7ed7..c39cc3cde 100644 --- a/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp +++ b/src/PartSet/PartSet_WidgetFeaturePointSelector.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: PartSet_WidgetFeaturePointSelector.cpp -// Created: 28 Feb 2017 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include @@ -17,6 +31,7 @@ #include #include +#include #include #include #include @@ -28,10 +43,7 @@ #include "PartSet_WidgetFeaturePointSelector.h" #include "PartSet_Tools.h" -//#include -//#include #include -#include #include #include @@ -52,6 +64,13 @@ PartSet_WidgetFeaturePointSelector::PartSet_WidgetFeaturePointSelector(QWidget* const Config_WidgetAPI* theData) : ModuleBase_WidgetShapeSelector(theParent, theWorkshop, theData) { + std::string anAttributes = theData->getProperty("selection_attributes"); + QStringList anAttributesList = QString(anAttributes.c_str()).split(' ', QString::SkipEmptyParts); + + mySelectedObjectAttribute = anAttributesList[0].toStdString(); + mySelectedPointAttribute = anAttributesList[1].toStdString(); + myPreviewObjectAttribute = anAttributesList[2].toStdString(); + myPreviewPointAttribute = anAttributesList[3].toStdString(); } PartSet_WidgetFeaturePointSelector::~PartSet_WidgetFeaturePointSelector() @@ -67,7 +86,7 @@ bool PartSet_WidgetFeaturePointSelector::isValidSelection( } //******************************************************************** -bool PartSet_WidgetFeaturePointSelector::activateSelectionAndFilters(bool toActivate) +void PartSet_WidgetFeaturePointSelector::activateSelectionAndFilters(bool toActivate) { #ifdef HIGHLIGHT_STAYS_PROBLEM Handle(AIS_InteractiveContext) aContext = @@ -94,7 +113,7 @@ bool PartSet_WidgetFeaturePointSelector::activateSelectionAndFilters(bool toActi #endif - return ModuleBase_WidgetShapeSelector::activateSelectionAndFilters(toActivate); + ModuleBase_WidgetShapeSelector::activateSelectionAndFilters(toActivate); } //******************************************************************** @@ -132,21 +151,26 @@ void PartSet_WidgetFeaturePointSelector::mouseReleased(ModuleBase_IViewWindow* t if (theEvent->button() != Qt::LeftButton) return; + std::shared_ptr aRefPreviewAttr = + std::dynamic_pointer_cast( + feature()->data()->attribute(myPreviewObjectAttribute)); + ObjectPtr aPreviewObject = aRefPreviewAttr->value(); + // do not move focus from the current widget if the object is not highlighted/selected + if (!aPreviewObject.get()) + return; + // set parameters of preview into parameters of selection in the feature std::shared_ptr aRefSelectedAttr = std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::SELECTED_OBJECT())); - std::shared_ptr aRefPreviewAttr = - std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::PREVIEW_OBJECT())); + feature()->data()->attribute(mySelectedObjectAttribute)); aRefSelectedAttr->setValue(aRefPreviewAttr->value()); std::shared_ptr aPointSelectedAttr = std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::SELECTED_POINT())); + feature()->data()->attribute(mySelectedPointAttribute)); std::shared_ptr aPointPreviewAttr = std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::PREVIEW_POINT())); + feature()->data()->attribute(myPreviewPointAttribute)); aPointSelectedAttr->setValue(aPointPreviewAttr->x(), aPointPreviewAttr->y()); updateObject(feature()); @@ -167,17 +191,14 @@ bool PartSet_WidgetFeaturePointSelector::fillFeature( if (theSelectedPrs.get() && theSelectedPrs->object().get()) anObject = theSelectedPrs->object(); - if (!anObject.get()) - return aFilled; - std::shared_ptr aRef = std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::PREVIEW_OBJECT())); + feature()->data()->attribute(myPreviewObjectAttribute)); aRef->setValue(anObject); std::shared_ptr anAttributePoint = std::dynamic_pointer_cast( - feature()->data()->attribute(SketchPlugin_Trim::PREVIEW_POINT())); + feature()->data()->attribute(myPreviewPointAttribute)); std::shared_ptr aPoint = PartSet_Tools::getPnt2d(theEvent, theWindow, mySketch); anAttributePoint->setValue(aPoint); // redisplay AIS presentation in viewer @@ -213,6 +234,7 @@ void PartSet_WidgetFeaturePointSelector::setPreSelection( ModuleBase_IViewWindow* theWnd, QMouseEvent* theEvent) { - if (fillFeature(thePreSelected, theWnd, theEvent)) - mouseReleased(theWnd, theEvent); + // the method is empty because firstly by starging of the feature there is no selection of + // sub-segments in the viewer, secondly preselection of restart operation is processed by + // special reentrant message sent by the feature }