From ba5426bf412f08914a662b39bf50df8f38615829 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 5 Aug 2016 11:37:39 +0200 Subject: [PATCH] #282 Make sure project files for earlier versions are imported correctly --- .../Commands/RicEclipsePropertyFilterFeatureImpl.cpp | 1 + ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp | 2 +- ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp index 6124ffde97..e160c0ea9f 100644 --- a/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp +++ b/ApplicationCode/Commands/RicEclipsePropertyFilterFeatureImpl.cpp @@ -123,4 +123,5 @@ void RicEclipsePropertyFilterFeatureImpl::setDefaults(RimEclipsePropertyFilter* propertyFilter->resultDefinition->loadResult(); propertyFilter->setToDefaultValues(); propertyFilter->updateFilterName(); + propertyFilter->m_valueSelection = true; } diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp index da9bbffead..9cb274e5aa 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp @@ -77,7 +77,7 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter() CAF_PDM_InitFieldNoDefault(&m_selectedValues, "SelectedValues", "Values", "", "", ""); - CAF_PDM_InitField(&m_valueSelection, "ValueSelection", true, "Value Selection", "", "", ""); + CAF_PDM_InitField(&m_valueSelection, "ValueSelection", false, "Value Selection", "", "", ""); m_upperBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); updateIconState(); diff --git a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h index dda068b4dd..94bbdb8525 100644 --- a/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h +++ b/ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.h @@ -67,7 +67,8 @@ protected: virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute); private: - friend RimEclipsePropertyFilterCollection; + friend class RimEclipsePropertyFilterCollection; + friend class RicEclipsePropertyFilterFeatureImpl; void updateActiveState(); void updateFieldVisibility();