From: azv <azv@opencascade.com>
Date: Fri, 12 Jul 2019 06:56:55 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/Filters_Development_2'
X-Git-Tag: VEDF2019Lot4~101
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4c74e5b864eef28128e27b3ece944990ca8f3fbe;p=modules%2Fshaper.git

Merge remote-tracking branch 'remotes/origin/Filters_Development_2'

# Conflicts:
#	src/FeaturesPlugin/CMakeLists.txt
#	src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Recover.cpp
#	src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
#	src/GeomAlgoAPI/CMakeLists.txt
#	src/ModuleBase/CMakeLists.txt
#	src/XGUI/XGUI_ActiveControlMgr.cpp
#	src/XGUI/XGUI_Workshop.cpp
#	src/XGUI/XGUI_pictures.qrc
---

4c74e5b864eef28128e27b3ece944990ca8f3fbe
diff --cc src/ModuleBase/CMakeLists.txt
index 081f37b25,e36810a0a..f8a1ff2c4
--- a/src/ModuleBase/CMakeLists.txt
+++ b/src/ModuleBase/CMakeLists.txt
@@@ -103,7 -103,7 +103,8 @@@ SET(PROJECT_HEADER
    ModuleBase_WidgetRadiobox.h
    ModuleBase_WidgetPointInput.h
    ModuleBase_ITreeNode.h
+   ModuleBase_WidgetSelectionFilter.h
 +  ModuleBase_IStepPrs.h
  )
  
  SET(PROJECT_MOC_HEADERS
@@@ -221,7 -222,7 +223,8 @@@ SET(PROJECT_SOURCE
    ModuleBase_WidgetNameEdit.cpp
    ModuleBase_WidgetRadiobox.cpp
    ModuleBase_WidgetPointInput.cpp
+   ModuleBase_WidgetSelectionFilter.cpp
 +  ModuleBase_IStepPrs.cpp
  )
  
  SET(PROJECT_LIBRARIES
diff --cc src/XGUI/XGUI_ActiveControlMgr.cpp
index 775985d76,a976b6c3f..b79971cf2
--- a/src/XGUI/XGUI_ActiveControlMgr.cpp
+++ b/src/XGUI/XGUI_ActiveControlMgr.cpp
@@@ -104,9 -110,8 +110,8 @@@ void XGUI_ActiveControlMgr::deactivateS
    activateSelector(NULL);
  
    XGUI_ActiveControlSelector* aSelectorToBeActivated = 0;
-   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++)
-   {
+   for (int i = 0, aCount = mySelectors.count(); i < aCount; i++) {
 -    if (!mySelectors[i]->needToBeActiated())
 +    if (!mySelectors[i]->needToBeActivated())
        continue;
      aSelectorToBeActivated = mySelectors[i];
      break;
diff --cc src/XGUI/XGUI_pictures.qrc
index 2e0880496,b8163172b..acb22325c
--- a/src/XGUI/XGUI_pictures.qrc
+++ b/src/XGUI/XGUI_pictures.qrc
@@@ -83,8 -85,7 +85,10 @@@
       <file>pictures/arrow-up.png</file>
       <file>pictures/arrow-down.png</file>
       <file>pictures/configure_toolbars.png</file>
+      <file>pictures/add.png</file>
+      <file>pictures/reverce.png</file>
 +     <file>pictures/color.png</file>
 +     <file>pictures/normal-view-inversed.png</file>
 +     <file>pictures/normal-view.png</file>
   </qresource>
   </RCC>