From ae56990359c40cfa4fa0fc99be2fd7e64c4c0ea3 Mon Sep 17 00:00:00 2001
From: nds <natalia.donis@opencascade.com>
Date: Thu, 21 May 2015 10:24:53 +0300
Subject: [PATCH] Code improvement: separate restore selection functionality in
 an additional method

---
 src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp | 5 +++--
 src/ModuleBase/ModuleBase_WidgetMultiSelector.h   | 2 +-
 src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp | 4 ++--
 src/ModuleBase/ModuleBase_WidgetShapeSelector.h   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
index 57c4d06dc..312183b9e 100644
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.cpp
@@ -109,7 +109,7 @@ void ModuleBase_WidgetMultiSelector::activateCustom()
   activateShapeSelection(true);
 
   // Restore selection in the viewer by the attribute selection list
-  myWorkshop->setSelected(getCurrentSelection());
+  myWorkshop->setSelected(getAttributeSelection());
 
   activateFilters(myWorkshop, true);
 }
@@ -224,6 +224,7 @@ bool ModuleBase_WidgetMultiSelector::setSelection(const QList<ModuleBase_ViewerP
   }
   if (isDone) {
     updateObject(myFeature);
+    // this emit is necessary to call store/restore method an restore type of selection
     emit valuesChanged();
   }
   return isDone;
@@ -373,7 +374,7 @@ void ModuleBase_WidgetMultiSelector::activateShapeSelection(const bool isActivat
   }
 }
 
-QList<ModuleBase_ViewerPrs> ModuleBase_WidgetMultiSelector::getCurrentSelection() const
+QList<ModuleBase_ViewerPrs> ModuleBase_WidgetMultiSelector::getAttributeSelection() const
 {
   QList<ModuleBase_ViewerPrs> aSelected;
   // Restore selection in the viewer by the attribute selection list
diff --git a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
index fe665938f..033b260b4 100644
--- a/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetMultiSelector.h
@@ -125,7 +125,7 @@ protected slots:
   /// Return the attribute values wrapped in a list of viewer presentations
   /// \return a list of viewer presentations, which contains an attribute result and
   /// a shape. If the attribute do not uses the shape, it is empty
-  QList<ModuleBase_ViewerPrs> getCurrentSelection() const;
+  QList<ModuleBase_ViewerPrs> getAttributeSelection() const;
 
  protected:
    /// Update selection list
diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index 9d80e0f79..cea370ba2 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -147,7 +147,7 @@ bool ModuleBase_WidgetShapeSelector::setObject(ObjectPtr theSelectedObject,
 }
 
 //********************************************************************
-QList<ModuleBase_ViewerPrs> ModuleBase_WidgetShapeSelector::getCurrentSelection() const
+QList<ModuleBase_ViewerPrs> ModuleBase_WidgetShapeSelector::getAttributeSelection() const
 {
   QList<ModuleBase_ViewerPrs> aSelected;
   if(myFeature) {
@@ -330,7 +330,7 @@ void ModuleBase_WidgetShapeSelector::activateCustom()
   activateSelection(true);
 
   // Restore selection in the viewer by the attribute selection list
-  myWorkshop->setSelected(getCurrentSelection());
+  myWorkshop->setSelected(getAttributeSelection());
 
   activateFilters(myWorkshop, true);
 }
diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
index 66d766d9f..e21d756fd 100644
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.h
@@ -139,7 +139,7 @@ Q_OBJECT
   /// Return the attribute values wrapped in a list of viewer presentations
   /// \return a list of viewer presentations, which contains an attribute result and
   /// a shape. If the attribute do not uses the shape, it is empty
-  QList<ModuleBase_ViewerPrs> getCurrentSelection() const;
+  QList<ModuleBase_ViewerPrs> getAttributeSelection() const;
 
   //----------- Class members -------------
   protected:
-- 
2.39.2