(#80) Added navigation modes

New navigation modes: GeoQuest and RMS. In addition, right mouse button
can now be used for panning in CAD navigation mode.
This commit is contained in:
Pål Hagen
2015-07-02 12:31:35 +02:00
parent 1a3a2f1ff5
commit c863d087f0
10 changed files with 951 additions and 10 deletions

View File

@@ -45,7 +45,9 @@
#include "RimEclipseFaultColors.h"
#include "cafCeetronNavigation.h"
#include "cafCadNavigation.h"
#include "RiuCadNavigation.h"
#include "RiuRmsNavigation.h"
#include "RiuGeoQuestNavigation.h"
#include "RiaSocketServer.h"
#include "cafUiProcess.h"
//
@@ -96,11 +98,12 @@ void AppEnum< RiaApplication::RINavigationPolicy >::setUp()
{
addItem(RiaApplication::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron");
addItem(RiaApplication::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD");
addItem(RiaApplication::NAVIGATION_POLICY_GEOQUEST, "NAVIGATION_POLICY_GEOQUEST", "GEOQUEST");
addItem(RiaApplication::NAVIGATION_POLICY_RMS, "NAVIGATION_POLICY_RMS", "RMS");
setDefault(RiaApplication::NAVIGATION_POLICY_CAD);
}
}
namespace RegTestNames
{
const QString generatedFolderName = "RegTestGeneratedImages";
@@ -1380,11 +1383,23 @@ void RiaApplication::applyPreferences()
{
if (m_preferences->navigationPolicy() == NAVIGATION_POLICY_CAD)
{
m_activeReservoirView->viewer()->setNavigationPolicy(new caf::CadNavigation);
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
{
m_activeReservoirView->viewer()->setNavigationPolicy(new caf::CeetronPlusNavigation);
CVF_ASSERT(0);
}
m_activeReservoirView->viewer()->enablePerfInfoHud(m_preferences->showHud());