X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetSelector.cpp;h=b0c30bb74f4df4383f9cfa9376108179d44f3f82;hb=4289f04d4dcda1de53b4d33f63bc13e24a0fb650;hp=2912af30c2f2fd5297482fe2a19ac0e4b69e9531;hpb=f8eeebfb30e9c433edf90ab5dfdd12bf1651aaf7;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetSelector.cpp b/src/ModuleBase/ModuleBase_WidgetSelector.cpp old mode 100755 new mode 100644 index 2912af30c..b0c30bb74 --- a/src/ModuleBase/ModuleBase_WidgetSelector.cpp +++ b/src/ModuleBase/ModuleBase_WidgetSelector.cpp @@ -1,30 +1,54 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: ModuleBase_WidgetSelector.cpp -// Created: 19 June 2015 -// Author: Natalia ERMOLAEVA +// Copyright (C) 2014-2019 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 +#include +#include #include +#include #include -#include #include #include -#include -#include #include +#include #include +#include +#include +#include +#include #include +#include + #include ModuleBase_WidgetSelector::ModuleBase_WidgetSelector(QWidget* theParent, ModuleBase_IWorkshop* theWorkshop, const Config_WidgetAPI* theData) -: ModuleBase_WidgetValidated(theParent, theWorkshop, theData) +: ModuleBase_WidgetValidated(theParent, theWorkshop, theData), +myIsPointsFiltering(true) { + QString aFiltering = QString::fromStdString(theData->getProperty("filter_points")); + if (aFiltering.toLower() == "false") + myIsPointsFiltering = false; } //******************************************************************** @@ -39,24 +63,29 @@ void ModuleBase_WidgetSelector::getGeomSelection(const ModuleBase_ViewerPrsPtr& { ModuleBase_ISelection* aSelection = myWorkshop->selection(); theObject = aSelection->getResult(thePrs); + if (!theObject.get()) + theObject = thePrs->object(); theShape = aSelection->getShape(thePrs); } //******************************************************************** -void ModuleBase_WidgetSelector::onSelectionChanged() +bool ModuleBase_WidgetSelector::processSelection() { QList aSelected = getFilteredSelected(); // equal vertices should not be used here - ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected); + if (myIsPointsFiltering) + ModuleBase_ISelection::filterSelectionOnEqualPoints(aSelected); bool isDone = setSelection(aSelected, true/*false*/); updateOnSelectionChanged(isDone); + + return isDone; } //******************************************************************** void ModuleBase_WidgetSelector::updateOnSelectionChanged(const bool theDone) { - // "false" flag should be used here, it connects to the #26658 OCC bug, when the user click in + // "false" flag should be used here, it connects to the #26658 OCC bug, when the user click in // the same place repeatedly without mouse moved. In the case validation by filters is not // perfromed, so an invalid object is selected. E.g. distance constraint, selection of a point. // the 3rd click in the same point allow using this point. @@ -76,7 +105,9 @@ void ModuleBase_WidgetSelector::updateOnSelectionChanged(const bool theDone) QIntList ModuleBase_WidgetSelector::getShapeTypes() const { QIntList aShapeTypes = shapeTypes(); - if (aShapeTypes.contains(TopAbs_SOLID) || aShapeTypes.contains(TopAbs_SHAPE)) { + // this type should be mentioned in XML, poor selection otherwise + if (/*aShapeTypes.contains(TopAbs_SOLID) ||*/ + aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result/*TopAbs_SHAPE*/)) { // it should be selectable for both, "solids" and "objects" types aShapeTypes.append(TopAbs_COMPSOLID); } @@ -102,8 +133,10 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape, aValid = true; return aValid; } - // when the SHAPE type is provided by XML, the hole result shape can be selected. - if (!aShape.get() && aShapeTypes.contains(TopAbs_SHAPE)) { + // when the SHAPE type is provided by XML as Object, the whole result shape should be selected. + //if (!aShape.get() && aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) { + // In case of selection of a feature aShape could be not NULL, but result has to be selected + if (aShapeTypes.contains(ModuleBase_ResultPrs::Sel_Result)) { aValid = true; return aValid; } @@ -136,39 +169,37 @@ bool ModuleBase_WidgetSelector::acceptSubShape(const GeomShapePtr& theShape, std::dynamic_pointer_cast(theResult); aValid = aCResult.get() && aCResult->facesNum() > 0; } - if (!aValid) { - // the compared shape types are not equal but presentation might allow some type for another - // exactly it allow Wire type of the shape for Face XML shape type - aValid = ModuleBase_ResultPrs::isValidShapeType(aCurrentShapeType, aShapeType); - } } } return aValid; } //******************************************************************** -bool ModuleBase_WidgetSelector::activateSelectionAndFilters(bool toActivate) +void ModuleBase_WidgetSelector::selectionModes(int& theModuleSelectionModes, QIntList& theModes) +{ + theModuleSelectionModes = -1; + theModes.append(getShapeTypes()); +} + +//******************************************************************** +void ModuleBase_WidgetSelector::updateSelectionModesAndFilters(bool toActivate) { updateSelectionName(); - if (toActivate) { - myWorkshop->activateSubShapesSelection(getShapeTypes()); - } else { - myWorkshop->deactivateSubShapesSelection(); - } - return activateFilters(toActivate); + myWorkshop->selectionActivate()->updateSelectionFilters(); + myWorkshop->selectionActivate()->updateSelectionModes(); + + if (!toActivate) + clearValidatedCash(); } //******************************************************************** void ModuleBase_WidgetSelector::activateCustom() { - connect(myWorkshop, SIGNAL(selectionChanged()), this, - SLOT(onSelectionChanged()), Qt::UniqueConnection); - - activateSelectionAndFilters(true); - // Restore selection in the viewer by the attribute selection list - myWorkshop->setSelected(getAttributeSelection()); + // it should be postponed to have current widget as active to validate restored selection + static Events_ID anEvent = Events_Loop::eventByName(EVENT_UPDATE_BY_WIDGET_SELECTION); + ModelAPI_EventCreator::get()->sendUpdated(myFeature, anEvent); } //******************************************************************** @@ -195,40 +226,27 @@ bool ModuleBase_WidgetSelector::setSelectionCustom(const ModuleBase_ViewerPrsPtr getGeomSelection(thePrs, anObject, aShape); // the last flag is to be depending on hasObject is called before. To be corrected later - ModuleBase_Tools::setObject(attribute(), anObject, aShape, myWorkshop, myIsInValidate, true); - return true; + return ModuleBase_Tools::setObject(attribute(), anObject, aShape, + myWorkshop, myIsInValidate, true); } //******************************************************************** void ModuleBase_WidgetSelector::deactivate() { - ModuleBase_ModelWidget::deactivate(); - disconnect(myWorkshop, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - activateSelectionAndFilters(false); - ModuleBase_ModelWidget::deactivate(); -} - -//******************************************************************** -std::string ModuleBase_WidgetSelector::generateName(const AttributePtr& theAttribute, - ModuleBase_IWorkshop* theWorkshop) -{ - std::string aName; - if (theAttribute.get() != NULL) { - ModuleBase_Operation* anOperation = theWorkshop->currentOperation(); - - FeaturePtr aFeature = ModelAPI_Feature::feature(theAttribute->owner()); - if (aFeature.get()) { - std::string aXmlCfg, aDescription; - theWorkshop->module()->getXMLRepresentation(aFeature->getKind(), aXmlCfg, aDescription); - - ModuleBase_WidgetFactory aFactory(aXmlCfg, theWorkshop); - std::string anAttributeTitle; - aFactory.getAttributeTitle(theAttribute->id(), anAttributeTitle); - - std::stringstream aStreamName; - aStreamName << theAttribute->owner()->data()->name() << "/"<< anAttributeTitle.c_str(); - aName = aStreamName.str(); - } + ModuleBase_WidgetValidated::deactivate(); + /// clear temporary cash + AttributePtr anAttribute = attribute(); + if (!anAttribute.get()) + return; + std::string aType = anAttribute->attributeType(); + if (anAttribute->attributeType() == ModelAPI_AttributeSelection::typeId()) { + AttributeSelectionPtr aSelectAttr = + std::dynamic_pointer_cast(anAttribute); + aSelectAttr->removeTemporaryValues(); + } + else if (anAttribute->attributeType() == ModelAPI_AttributeSelectionList::typeId()) { + AttributeSelectionListPtr aSelectAttr = + std::dynamic_pointer_cast(anAttribute); + aSelectAttr->removeTemporaryValues(); } - return aName; }