OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#4435 Make sure we don't ask user about changes to preferences that haven't been changed

Browse Source
This commit is contained in:
Gaute Lindkvist
2019-05-27 08:28:23 +02:00
parent 9be3972dc4
commit af83ee310f
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Application/RiaGuiApplication.cpp
View File

@@ -1435,15 +1435,21 @@ void RiaGuiApplication::applyGuiPreferences(const RiaPreferences* oldPreferences
auto rim3dView = dynamic_cast<Rim3dView*>(viewWindow);
if (rim3dView)
{
if (rim3dView->meshMode() != oldPreferences->defaultMeshModeType())
if (m_preferences->defaultMeshModeType() != oldPreferences->defaultMeshModeType() &&
rim3dView->meshMode() != oldPreferences->defaultMeshModeType() &&
rim3dView->meshMode() != m_preferences->defaultMeshModeType())
{
existingViewsWithDifferentMeshLines = true;
}
if (rim3dView->backgroundColor() != oldPreferences->defaultViewerBackgroundColor())
if (m_preferences->defaultViewerBackgroundColor() != oldPreferences->defaultViewerBackgroundColor() &&
rim3dView->backgroundColor() != oldPreferences->defaultViewerBackgroundColor() &&
rim3dView->backgroundColor() != m_preferences->defaultViewerBackgroundColor())
{
existingViewsWithCustomColors = true;
}
if (rim3dView->scaleZ() != static_cast<double>(oldPreferences->defaultScaleFactorZ))
if (m_preferences->defaultScaleFactorZ() != oldPreferences->defaultScaleFactorZ() &&
rim3dView->scaleZ() != static_cast<double>(oldPreferences->defaultScaleFactorZ) &&
rim3dView->scaleZ() != static_cast<double>(m_preferences->defaultScaleFactorZ))
{
existingViewsWithCustomZScale = true;
}
@@ -1458,7 +1464,9 @@ void RiaGuiApplication::applyGuiPreferences(const RiaPreferences* oldPreferences
RimEclipseView* eclipseView = dynamic_cast<RimEclipseView*>(rim3dView);
if (eclipseView)
{
if (eclipseView->wellCollection()->wellLabelColor() != oldPreferences->defaultWellLabelColor())
if (m_preferences->defaultWellLabelColor() != oldPreferences->defaultWellLabelColor() &&
eclipseView->wellCollection()->wellLabelColor() != oldPreferences->defaultWellLabelColor() &&
eclipseView->wellCollection()->wellLabelColor() != m_preferences->defaultWellLabelColor())
{
existingViewsWithCustomColors = true;
}