X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModuleBase%2FModuleBase_WidgetValidator.cpp;h=9f1e5a5b8241798c4c3a3ab56b336101af9ada4c;hb=2ae03d01e656c09a563bf30d741e5f6ce4cf3a53;hp=8f6113c44054e819dd3607f3edd0ca752fea7b70;hpb=a50d298cf3f55609f4a143a243a66ba140f89683;p=modules%2Fshaper.git diff --git a/src/ModuleBase/ModuleBase_WidgetValidator.cpp b/src/ModuleBase/ModuleBase_WidgetValidator.cpp old mode 100755 new mode 100644 index 8f6113c44..9f1e5a5b8 --- a/src/ModuleBase/ModuleBase_WidgetValidator.cpp +++ b/src/ModuleBase/ModuleBase_WidgetValidator.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2014-2017 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 @@ -12,10 +12,9 @@ // // 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 +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // -// See http://www.salome-platform.org/ or -// email : webmaster.salome@opencascade.com +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -29,7 +28,7 @@ ModuleBase_WidgetValidator::ModuleBase_WidgetValidator(ModuleBase_ModelWidget* theModelWidget, ModuleBase_IWorkshop* theWorkshop) -: myModelWidget(theModelWidget), myWorkshop(theWorkshop), myIsInValidate(false) + : myIsInValidate(false), myModelWidget(theModelWidget), myWorkshop(theWorkshop) { myAttributeStore = new ModuleBase_WidgetSelectorStore(); } @@ -40,7 +39,8 @@ ModuleBase_WidgetValidator::~ModuleBase_WidgetValidator() } //******************************************************************** -void ModuleBase_WidgetValidator::selectionFilters(SelectMgr_ListOfFilter& theSelectionFilters) +void ModuleBase_WidgetValidator::selectionFilters(QIntList& theModuleSelectionFilters, + SelectMgr_ListOfFilter& theSelectionFilters) { theSelectionFilters.Append(myWorkshop->validatorFilter()); } @@ -78,8 +78,6 @@ bool ModuleBase_WidgetValidator::isValidAttribute(const AttributePtr& theAttribu bool ModuleBase_WidgetValidator::isFilterActivated() const { - bool isActivated = false; - Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter(); ModuleBase_IViewer* aViewer = myWorkshop->viewer();