Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'remotes/origin/occ/19115' into fixes_for_950
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_WidgetValidator.cpp
diff --git
a/src/ModuleBase/ModuleBase_WidgetValidator.cpp
b/src/ModuleBase/ModuleBase_WidgetValidator.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
8953db0
..
9f1e5a5
--- a/
src/ModuleBase/ModuleBase_WidgetValidator.cpp
+++ b/
src/ModuleBase/ModuleBase_WidgetValidator.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
20
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
//
// 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
//
// 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<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include <ModuleBase_WidgetValidator.h>
//
#include <ModuleBase_WidgetValidator.h>
@@
-29,7
+28,7
@@
ModuleBase_WidgetValidator::ModuleBase_WidgetValidator(ModuleBase_ModelWidget* theModelWidget,
ModuleBase_IWorkshop* theWorkshop)
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();
}
{
myAttributeStore = new ModuleBase_WidgetSelectorStore();
}
@@
-79,8
+78,6
@@
bool ModuleBase_WidgetValidator::isValidAttribute(const AttributePtr& theAttribu
bool ModuleBase_WidgetValidator::isFilterActivated() const
{
bool ModuleBase_WidgetValidator::isFilterActivated() const
{
- bool isActivated = false;
-
Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter();
ModuleBase_IViewer* aViewer = myWorkshop->viewer();
Handle(SelectMgr_Filter) aSelFilter = myWorkshop->validatorFilter();
ModuleBase_IViewer* aViewer = myWorkshop->viewer();