Add tools

[modules/shaper.git] / src / ModuleBase / ModuleBase_WidgetShapeSelector.cpp

diff --git a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
index c455309d710003bf86bc83cd61adb2591c1cbaa7..113a6113f8b2d73e5059a7826b64f501baf93192 100644 (file)
--- a/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetShapeSelector.cpp
@@ -1,6 +1,6 @@
 // Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
-// File:        ModuleBase_WidgetShapeSelector.h
+// File:        ModuleBase_WidgetShapeSelector.cpp
 // Created:     2 June 2014
 // Author:      Vitaly Smetannikov
 
@@ -13,8 +13,6 @@
 #include <ModuleBase_FilterFactory.h>
 #include <ModuleBase_Filter.h>
 
-#include <GeomValidators_ShapeType.h>
-
 #include <Config_WidgetAPI.h>
 #include <Events_Loop.h>
 #include <Events_Message.h>
@@ -37,7 +35,6 @@
 #include <ModelAPI_AttributeRefAttr.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_AttributeValidator.h>
-#include <ModelAPI_ShapeValidator.h>
 
 #include <Config_WidgetAPI.h>
 #include <Events_Error.h>
@@ -163,7 +160,7 @@ void ModuleBase_WidgetShapeSelector::clearAttribute()
 }
 
 //********************************************************************
-bool ModuleBase_WidgetShapeSelector::restoreValue()
+bool ModuleBase_WidgetShapeSelector::restoreValueCustom()
 {
   bool isBlocked = this->blockSignals(true);
   updateSelectionName();
@@ -182,9 +179,7 @@ QList<QWidget*> ModuleBase_WidgetShapeSelector::getControls() const
 
 void ModuleBase_WidgetShapeSelector::updateFocus()
 {
-  ObjectPtr anObject = GeomValidators_Tools::getObject(myFeature->attribute(attributeID()));
-  if (anObject.get())
-    emit focusOutWidget(this);
+  emit focusOutWidget(this);
 }
 
 //********************************************************************
@@ -251,6 +246,8 @@ void ModuleBase_WidgetShapeSelector::updateSelectionName()
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::storeAttributeValue()
 {
+  ModuleBase_WidgetValidated::storeAttributeValue();
+
   DataPtr aData = myFeature->data();
   AttributePtr anAttribute = myFeature->attribute(attributeID());
 
@@ -268,6 +265,8 @@ void ModuleBase_WidgetShapeSelector::storeAttributeValue()
 //********************************************************************
 void ModuleBase_WidgetShapeSelector::restoreAttributeValue(bool theValid)
 {
+  ModuleBase_WidgetValidated::restoreAttributeValue(theValid);
+
   DataPtr aData = myFeature->data();
   AttributePtr anAttribute = myFeature->attribute(attributeID());