(#80) Refactored navigation mode related code

Made sure that navigation policies are created only one place, in the
new member function RiuViewer::updateNavigationPolicy().
This commit is contained in:
Pål Hagen
2015-07-02 12:44:57 +02:00
parent c863d087f0
commit 22c0c812af
4 changed files with 37 additions and 49 deletions

View File

@@ -44,10 +44,6 @@
#include "RimFaultCollection.h"
#include "RimEclipseFaultColors.h"
#include "cafCeetronNavigation.h"
#include "RiuCadNavigation.h"
#include "RiuRmsNavigation.h"
#include "RiuGeoQuestNavigation.h"
#include "RiaSocketServer.h"
#include "cafUiProcess.h"
//
@@ -1381,27 +1377,7 @@ void RiaApplication::applyPreferences()
{
if (m_activeReservoirView && m_activeReservoirView->viewer())
{
if (m_preferences->navigationPolicy() == NAVIGATION_POLICY_CAD)
{
m_activeReservoirView->viewer()->setNavigationPolicy(new RiuCadNavigation);
}
else if (m_preferences->navigationPolicy() == NAVIGATION_POLICY_CEETRON)
{
m_activeReservoirView->viewer()->setNavigationPolicy(new caf::CeetronPlusNavigation);
}
else if (m_preferences->navigationPolicy() == NAVIGATION_POLICY_GEOQUEST)
{
m_activeReservoirView->viewer()->setNavigationPolicy(new RiuGeoQuestNavigation);
}
else if (m_preferences->navigationPolicy() == NAVIGATION_POLICY_RMS)
{
m_activeReservoirView->viewer()->setNavigationPolicy(new RiuRmsNavigation);
}
else
{
CVF_ASSERT(0);
}
m_activeReservoirView->viewer()->updateNavigationPolicy();
m_activeReservoirView->viewer()->enablePerfInfoHud(m_preferences->showHud());
}