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

More class renaming. File names not done yet.

Browse Source 
RIApplication	RiaApplication
RIPreferences	RiaPreferences
p4#: 21065
This commit is contained in:
Jacob Støren 2013-03-22 15:50:44 +01:00
parent e493db37d0
commit 949084784e
16 changed files with 156 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
ApplicationCode/Application/RIApplication.cpp
View File

@ -60,11 +60,11 @@
namespace caf
{
template<>
void AppEnum< RIApplication::RINavigationPolicy >::setUp()
void AppEnum< RiaApplication::RINavigationPolicy >::setUp()
{
addItem(RIApplication::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron");
addItem(RIApplication::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD");
setDefault(RIApplication::NAVIGATION_POLICY_CAD);
addItem(RiaApplication::NAVIGATION_POLICY_CEETRON, "NAVIGATION_POLICY_CEETRON", "Ceetron");
addItem(RiaApplication::NAVIGATION_POLICY_CAD, "NAVIGATION_POLICY_CAD", "CAD");
setDefault(RiaApplication::NAVIGATION_POLICY_CAD);
}
}
@ -93,7 +93,7 @@ namespace RegTestNames
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIApplication::RIApplication(int& argc, char** argv)
RiaApplication::RiaApplication(int& argc, char** argv)
: QApplication(argc, argv)
{
// USed to get registry settings in the right place
@ -106,7 +106,7 @@ RIApplication::RIApplication(int& argc, char** argv)
//cvf::Trace::enable(false);
m_preferences = new RIPreferences;
m_preferences = new RiaPreferences;
readPreferences();
applyPreferences();
@ -140,7 +140,7 @@ RIApplication::RIApplication(int& argc, char** argv)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIApplication::~RIApplication()
RiaApplication::~RiaApplication()
{
delete m_preferences;
}
@ -149,16 +149,16 @@ RIApplication::~RIApplication()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIApplication* RIApplication::instance()
RiaApplication* RiaApplication::instance()
{
return static_cast<RIApplication*>qApp;
return static_cast<RiaApplication*>qApp;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::setWindowCaptionFromAppState()
void RiaApplication::setWindowCaptionFromAppState()
{
RIMainWindow* mainWnd = RIMainWindow::instance();
if (!mainWnd) return;
@ -186,7 +186,7 @@ void RIApplication::setWindowCaptionFromAppState()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::processNonGuiEvents()
void RiaApplication::processNonGuiEvents()
{
processEvents(QEventLoop::ExcludeUserInputEvents);
}
@ -195,7 +195,7 @@ void RIApplication::processNonGuiEvents()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const char* RIApplication::getVersionStringApp(bool includeCrtInfo)
const char* RiaApplication::getVersionStringApp(bool includeCrtInfo)
{
// Use static buf so we can return ptr
static char szBuf[1024];
@ -221,7 +221,7 @@ const char* RIApplication::getVersionStringApp(bool includeCrtInfo)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::loadProject(const QString& projectFileName)
bool RiaApplication::loadProject(const QString& projectFileName)
{
// First Close the current project
@ -330,7 +330,7 @@ bool RIApplication::loadProject(const QString& projectFileName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::loadLastUsedProject()
bool RiaApplication::loadLastUsedProject()
{
return loadProject(m_preferences->lastUsedProjectFileName);
}
@ -339,7 +339,7 @@ bool RIApplication::loadLastUsedProject()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::saveProject()
bool RiaApplication::saveProject()
{
CVF_ASSERT(m_project.notNull());
@ -357,11 +357,11 @@ bool RIApplication::saveProject()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::saveProjectPromptForFileName()
bool RiaApplication::saveProjectPromptForFileName()
{
//if (m_project.isNull()) return true;
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString startPath;
if (!m_project->fileName().isEmpty())
@ -396,7 +396,7 @@ bool RIApplication::saveProjectPromptForFileName()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::saveProjectAs(const QString& fileName)
bool RiaApplication::saveProjectAs(const QString& fileName)
{
m_project->fileName = fileName;
m_project->writeFile();
@ -411,7 +411,7 @@ bool RIApplication::saveProjectAs(const QString& fileName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::closeProject(bool askToSaveIfDirty)
bool RiaApplication::closeProject(bool askToSaveIfDirty)
{
RIMainWindow* mainWnd = RIMainWindow::instance();
@ -451,7 +451,7 @@ bool RIApplication::closeProject(bool askToSaveIfDirty)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::onProjectOpenedOrClosed()
void RiaApplication::onProjectOpenedOrClosed()
{
RIMainWindow* mainWnd = RIMainWindow::instance();
if (!mainWnd) return;
@ -466,7 +466,7 @@ void RIApplication::onProjectOpenedOrClosed()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RIApplication::currentProjectFileName() const
QString RiaApplication::currentProjectFileName() const
{
return m_project->fileName();
}
@ -475,7 +475,7 @@ QString RIApplication::currentProjectFileName() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::openEclipseCaseFromFile(const QString& fileName)
bool RiaApplication::openEclipseCaseFromFile(const QString& fileName)
{
if (!QFile::exists(fileName)) return false;
@ -489,7 +489,7 @@ bool RIApplication::openEclipseCaseFromFile(const QString& fileName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::openEclipseCase(const QString& caseName, const QString& caseFileName)
bool RiaApplication::openEclipseCase(const QString& caseName, const QString& caseFileName)
{
QFileInfo gridFileName(caseFileName);
QString casePath = gridFileName.absolutePath();
@ -527,7 +527,7 @@ bool RIApplication::openEclipseCase(const QString& caseName, const QString& case
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::openInputEclipseCase(const QString& caseName, const QStringList& caseFileNames)
bool RiaApplication::openInputEclipseCase(const QString& caseName, const QStringList& caseFileNames)
{
RimInputCase* rimInputReservoir = new RimInputCase();
rimInputReservoir->caseName = caseName;
@ -557,7 +557,7 @@ bool RIApplication::openInputEclipseCase(const QString& caseName, const QStringL
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::createMockModel()
void RiaApplication::createMockModel()
{
openEclipseCase("Result Mock Debug Model Simple", "Result Mock Debug Model Simple");
}
@ -565,7 +565,7 @@ void RIApplication::createMockModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::createResultsMockModel()
void RiaApplication::createResultsMockModel()
{
openEclipseCase("Result Mock Debug Model With Results", "Result Mock Debug Model With Results");
}
@ -574,7 +574,7 @@ void RIApplication::createResultsMockModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::createLargeResultsMockModel()
void RiaApplication::createLargeResultsMockModel()
{
openEclipseCase("Result Mock Debug Model Large With Results", "Result Mock Debug Model Large With Results");
}
@ -582,7 +582,7 @@ void RIApplication::createLargeResultsMockModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::createInputMockModel()
void RiaApplication::createInputMockModel()
{
openInputEclipseCase("Input Mock Debug Model Simple", QStringList("Input Mock Debug Model Simple"));
}
@ -590,7 +590,7 @@ void RIApplication::createInputMockModel()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const RimReservoirView* RIApplication::activeReservoirView() const
const RimReservoirView* RiaApplication::activeReservoirView() const
{
return m_activeReservoirView;
}
@ -598,7 +598,7 @@ const RimReservoirView* RIApplication::activeReservoirView() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimReservoirView* RIApplication::activeReservoirView()
RimReservoirView* RiaApplication::activeReservoirView()
{
return m_activeReservoirView;
}
@ -606,7 +606,7 @@ RimReservoirView* RIApplication::activeReservoirView()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::setActiveReservoirView(RimReservoirView* rv)
void RiaApplication::setActiveReservoirView(RimReservoirView* rv)
{
m_activeReservoirView = rv;
}
@ -614,7 +614,7 @@ void RIApplication::setActiveReservoirView(RimReservoirView* rv)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::setUseShaders(bool enable)
void RiaApplication::setUseShaders(bool enable)
{
m_preferences->useShaders = enable;
writePreferences();
@ -623,7 +623,7 @@ void RIApplication::setUseShaders(bool enable)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::useShaders() const
bool RiaApplication::useShaders() const
{
if (!m_preferences->useShaders) return false;
@ -637,7 +637,7 @@ bool RIApplication::useShaders() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIApplication::RINavigationPolicy RIApplication::navigationPolicy() const
RiaApplication::RINavigationPolicy RiaApplication::navigationPolicy() const
{
return m_preferences->navigationPolicy();
}
@ -646,7 +646,7 @@ RIApplication::RINavigationPolicy RIApplication::navigationPolicy() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::setShowPerformanceInfo(bool enable)
void RiaApplication::setShowPerformanceInfo(bool enable)
{
m_preferences->showHud = enable;
writePreferences();
@ -656,7 +656,7 @@ void RIApplication::setShowPerformanceInfo(bool enable)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::showPerformanceInfo() const
bool RiaApplication::showPerformanceInfo() const
{
return m_preferences->showHud;
}
@ -665,7 +665,7 @@ bool RIApplication::showPerformanceInfo() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::parseArguments()
bool RiaApplication::parseArguments()
{
QStringList arguments = QCoreApplication::arguments();
@ -885,7 +885,7 @@ bool RIApplication::parseArguments()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RIApplication::scriptDirectory() const
QString RiaApplication::scriptDirectory() const
{
return m_preferences->scriptDirectory();
}
@ -893,7 +893,7 @@ QString RIApplication::scriptDirectory() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RIApplication::scriptEditorPath() const
QString RiaApplication::scriptEditorPath() const
{
return m_preferences->scriptEditorExecutable();
}
@ -901,7 +901,7 @@ QString RIApplication::scriptEditorPath() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RIApplication::octavePath() const
QString RiaApplication::octavePath() const
{
return m_preferences->octaveExecutable();
}
@ -909,7 +909,7 @@ QString RIApplication::octavePath() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
void RiaApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus exitStatus)
{
RIMainWindow::instance()->processMonitor()->stopMonitorWorkProcess();
@ -943,7 +943,7 @@ void RIApplication::slotWorkerProcessFinished(int exitCode, QProcess::ExitStatus
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RIApplication::launchProcess(const QString& program, const QStringList& arguments)
bool RiaApplication::launchProcess(const QString& program, const QStringList& arguments)
{
if (m_workerProcess == NULL)
{
@ -977,7 +977,7 @@ bool RIApplication::launchProcess(const QString& program, const QStringList& arg
//--------------------------------------------------------------------------------------------------
/// Read fields of a Pdm object using QSettings
//--------------------------------------------------------------------------------------------------
void RIApplication::readPreferences()
void RiaApplication::readPreferences()
{
QSettings settings;
std::vector<caf::PdmFieldHandle*> fields;
@ -999,7 +999,7 @@ void RIApplication::readPreferences()
//--------------------------------------------------------------------------------------------------
/// Write fields of a Pdm object using QSettings
//--------------------------------------------------------------------------------------------------
void RIApplication::writePreferences()
void RiaApplication::writePreferences()
{
QSettings settings;
@ -1018,7 +1018,7 @@ void RIApplication::writePreferences()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIPreferences* RIApplication::preferences()
RiaPreferences* RiaApplication::preferences()
{
return m_preferences;
}
@ -1026,7 +1026,7 @@ RIPreferences* RIApplication::preferences()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::applyPreferences()
void RiaApplication::applyPreferences()
{
if (m_activeReservoirView && m_activeReservoirView->viewer())
{
@ -1063,7 +1063,7 @@ void RIApplication::applyPreferences()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::terminateProcess()
void RiaApplication::terminateProcess()
{
if (m_workerProcess)
{
@ -1076,7 +1076,7 @@ void RIApplication::terminateProcess()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RIApplication::defaultFileDialogDirectory(const QString& dialogName)
QString RiaApplication::defaultFileDialogDirectory(const QString& dialogName)
{
QString defaultDirectory = m_startupDefaultDirectory;
std::map<QString, QString>::iterator it;
@ -1093,7 +1093,7 @@ QString RIApplication::defaultFileDialogDirectory(const QString& dialogName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::setDefaultFileDialogDirectory(const QString& dialogName, const QString& defaultDirectory)
void RiaApplication::setDefaultFileDialogDirectory(const QString& dialogName, const QString& defaultDirectory)
{
m_fileDialogDefaultDirectories[dialogName] = defaultDirectory;
}
@ -1101,7 +1101,7 @@ void RIApplication::setDefaultFileDialogDirectory(const QString& dialogName, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::saveSnapshotPromtpForFilename()
void RiaApplication::saveSnapshotPromtpForFilename()
{
QString startPath;
if (!m_project->fileName().isEmpty())
@ -1131,7 +1131,7 @@ void RIApplication::saveSnapshotPromtpForFilename()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::saveSnapshotAs(const QString& fileName)
void RiaApplication::saveSnapshotAs(const QString& fileName)
{
if (m_activeReservoirView && m_activeReservoirView->viewer())
{
@ -1150,7 +1150,7 @@ void RIApplication::saveSnapshotAs(const QString& fileName)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::copySnapshotToClipboard()
void RiaApplication::copySnapshotToClipboard()
{
if (m_activeReservoirView && m_activeReservoirView->viewer())
{
@ -1167,7 +1167,7 @@ void RIApplication::copySnapshotToClipboard()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
{
RIMainWindow* mainWnd = RIMainWindow::instance();
if (!mainWnd) return;
@ -1229,7 +1229,7 @@ void removeDirectoryWithContent(QDir dirToDelete )
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::runRegressionTest(const QString& testRootPath)
void RiaApplication::runRegressionTest(const QString& testRootPath)
{
QString generatedFolderName = RegTestNames::generatedFolderName;
QString diffFolderName = RegTestNames::diffFolderName;
@ -1317,7 +1317,7 @@ void RIApplication::runRegressionTest(const QString& testRootPath)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIApplication::updateRegressionTest(const QString& testRootPath)
void RiaApplication::updateRegressionTest(const QString& testRootPath)
{
// Find all sub folders
@ -1352,7 +1352,7 @@ void RIApplication::updateRegressionTest(const QString& testRootPath)
//--------------------------------------------------------------------------------------------------
/// Make sure changes in this functions is validated to RimIdenticalGridCaseGroup::initAfterRead()
//--------------------------------------------------------------------------------------------------
bool RIApplication::addEclipseCases(const QStringList& fileNames)
bool RiaApplication::addEclipseCases(const QStringList& fileNames)
{
if (fileNames.size() == 0) return true;

14
ApplicationCode/Application/RIApplication.h
View File

@ -34,7 +34,7 @@ class RigCaseData;
class RimCase;
class Drawable;
class RiaSocketServer;
class RIPreferences;
class RiaPreferences;
namespace caf
{
@ -46,7 +46,7 @@ namespace caf
//
//
//==================================================================================================
class RIApplication : public QApplication
class RiaApplication : public QApplication
{
Q_OBJECT
@ -58,9 +58,9 @@ public:
};
public:
RIApplication(int& argc, char** argv);
~RIApplication();
static RIApplication* instance();
RiaApplication(int& argc, char** argv);
~RiaApplication();
static RiaApplication* instance();
bool parseArguments();
@ -116,7 +116,7 @@ public:
bool launchProcess(const QString& program, const QStringList& arguments);
void terminateProcess();
RIPreferences* preferences();
RiaPreferences* preferences();
void readPreferences();
void writePreferences();
void applyPreferences();
@ -139,7 +139,7 @@ private:
caf::UiProcess* m_workerProcess;
RIPreferences* m_preferences;
RiaPreferences* m_preferences;
std::map<QString, QString> m_fileDialogDefaultDirectories;
QString m_startupDefaultDirectory;

12
ApplicationCode/Application/RIPreferences.cpp
View File

@ -20,13 +20,13 @@
#include "RIPreferences.h"
#include "cafPdmUiFilePathEditor.h"
CAF_PDM_SOURCE_INIT(RIPreferences, "RIPreferences");
CAF_PDM_SOURCE_INIT(RiaPreferences, "RIPreferences");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIPreferences::RIPreferences(void)
RiaPreferences::RiaPreferences(void)
{
CAF_PDM_InitField(&navigationPolicy, "navigationPolicy", caf::AppEnum<RIApplication::RINavigationPolicy>(RIApplication::NAVIGATION_POLICY_CAD), "Navigation mode", "", "", "");
CAF_PDM_InitField(&navigationPolicy, "navigationPolicy", caf::AppEnum<RiaApplication::RINavigationPolicy>(RiaApplication::NAVIGATION_POLICY_CAD), "Navigation mode", "", "", "");
CAF_PDM_InitFieldNoDefault(&scriptDirectory, "scriptDirectory", "Shared Script Folder", "", "", "");
scriptDirectory.setUiEditorTypeName(caf::PdmUiFilePathEditor::uiEditorTypeName());
@ -53,7 +53,7 @@ RIPreferences::RIPreferences(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RIPreferences::~RIPreferences(void)
RiaPreferences::~RiaPreferences(void)
{
}
@ -61,7 +61,7 @@ RIPreferences::~RIPreferences(void)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
void RiaPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute * attribute)
{
if (field == &scriptDirectory)
{
@ -76,7 +76,7 @@ void RIPreferences::defineEditorAttribute(const caf::PdmFieldHandle* field, QStr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RIPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) const
void RiaPreferences::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) const
{
uiOrdering.add(&navigationPolicy);

8
ApplicationCode/Application/RIPreferences.h
View File

@ -21,16 +21,16 @@
#include "cafPdmObject.h"
#include "RIApplication.h"
class RIPreferences : public caf::PdmObject
class RiaPreferences : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
RIPreferences(void);
virtual ~RIPreferences(void);
RiaPreferences(void);
virtual ~RiaPreferences(void);
public: // Pdm Fields
caf::PdmField<caf::AppEnum< RIApplication::RINavigationPolicy > > navigationPolicy;
caf::PdmField<caf::AppEnum< RiaApplication::RINavigationPolicy > > navigationPolicy;
caf::PdmField<QString> scriptDirectory;
caf::PdmField<QString> scriptEditorExecutable;

2
ApplicationCode/ProjectDataModel/RimInputReservoir.cpp
View File

@ -188,7 +188,7 @@ bool RimInputCase::openEclipseGridFile()
}
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
if (app->preferences()->autocomputeDepthRelatedProperties)
{
RimReservoirCellResultsStorage* matrixResults = results(RifReaderInterface::MATRIX_RESULTS);

2
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -82,7 +82,7 @@ void RimProject::initAfterRead()
//
// TODO : Must store content of scripts in project file and notify user if stored content is different from disk on execute and edit
//
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString scriptDirectory = app->scriptDirectory();
this->setUserScriptPath(scriptDirectory);

2
ApplicationCode/ProjectDataModel/RimReservoirCellResultsCacher.cpp
View File

@ -188,7 +188,7 @@ QString RimReservoirCellResultsStorage::getValidCacheFileName()
QString RimReservoirCellResultsStorage::getCacheDirectoryPath()
{
QString cacheDirPath;
QString projectFileName = RIApplication::instance()->project()->fileName();
QString projectFileName = RiaApplication::instance()->project()->fileName();
QFileInfo fileInfo(projectFileName);
cacheDirPath = fileInfo.canonicalPath();
cacheDirPath += "/" + fileInfo.completeBaseName() + "_cache";

12
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -82,8 +82,8 @@ CAF_PDM_SOURCE_INIT(RimReservoirView, "ReservoirView");
//--------------------------------------------------------------------------------------------------
RimReservoirView::RimReservoirView()
{
RIApplication* app = RIApplication::instance();
RIPreferences* preferences = app->preferences();
RiaApplication* app = RiaApplication::instance();
RiaPreferences* preferences = app->preferences();
CVF_ASSERT(preferences);
CAF_PDM_InitObject("Reservoir View", ":/ReservoirView.png", "", "");
@ -192,7 +192,7 @@ void RimReservoirView::updateViewerWidget()
if (!m_viewer)
{
QGLFormat glFormat;
glFormat.setDirectRendering(RIApplication::instance()->useShaders());
glFormat.setDirectRendering(RiaApplication::instance()->useShaders());
m_viewer = new RIViewer(glFormat, NULL);
m_viewer->setOwnerReservoirView(this);
@ -204,7 +204,7 @@ void RimReservoirView::updateViewerWidget()
m_viewer->setColorLegend1(this->cellResult()->legendConfig->legend());
m_viewer->setColorLegend2(this->cellEdgeResult()->legendConfig->legend());
if (RIApplication::instance()->navigationPolicy() == RIApplication::NAVIGATION_POLICY_CEETRON)
if (RiaApplication::instance()->navigationPolicy() == RiaApplication::NAVIGATION_POLICY_CEETRON)
{
m_viewer->setNavigationPolicy(new caf::CeetronNavigation);
}
@ -213,7 +213,7 @@ void RimReservoirView::updateViewerWidget()
m_viewer->setNavigationPolicy(new caf::CadNavigation);
}
m_viewer->enablePerfInfoHud(RIApplication::instance()->showPerformanceInfo());
m_viewer->enablePerfInfoHud(RiaApplication::instance()->showPerformanceInfo());
//m_viewer->layoutWidget()->showMaximized();
@ -708,7 +708,7 @@ void RimReservoirView::loadDataAndUpdate()
}
else
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
if (app->preferences()->autocomputeSOIL)
{
RimReservoirCellResultsStorage* results = currentGridCellResults();

10
ApplicationCode/ProjectDataModel/RimUiTreeModelPdm.cpp
View File

@ -238,7 +238,7 @@ void RimUiTreeModelPdm::deleteReservoir(RimCase* reservoir)
}
else
{
RimProject* proj = RIApplication::instance()->project();
RimProject* proj = RiaApplication::instance()->project();
proj->removeCaseFromAllGroups(reservoir);
}
@ -388,7 +388,7 @@ RimReservoirView* RimUiTreeModelPdm::addReservoirView(const QModelIndex& itemInd
//--------------------------------------------------------------------------------------------------
void RimUiTreeModelPdm::updateScriptPaths()
{
RimProject* proj = RIApplication::instance()->project();
RimProject* proj = RiaApplication::instance()->project();
if (!proj || !proj->scriptCollection()) return;
@ -408,7 +408,7 @@ void RimUiTreeModelPdm::updateScriptPaths()
//--------------------------------------------------------------------------------------------------
void RimUiTreeModelPdm::slotRefreshScriptTree(QString path)
{
RimProject* proj = RIApplication::instance()->project();
RimProject* proj = RiaApplication::instance()->project();
if (!proj || !proj->scriptCollection()) return;
@ -535,7 +535,7 @@ RimStatisticsCase* RimUiTreeModelPdm::addStatisticalCalculation(const QModelInde
//--------------------------------------------------------------------------------------------------
RimIdenticalGridCaseGroup* RimUiTreeModelPdm::addCaseGroup(const QModelIndex& itemIndex, QModelIndex& insertedModelIndex)
{
RimProject* proj = RIApplication::instance()->project();
RimProject* proj = RiaApplication::instance()->project();
CVF_ASSERT(proj);
caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);
@ -570,7 +570,7 @@ RimIdenticalGridCaseGroup* RimUiTreeModelPdm::addCaseGroup(const QModelIndex& it
//--------------------------------------------------------------------------------------------------
void RimUiTreeModelPdm::addObjects(const QModelIndex& itemIndex, caf::PdmObjectGroup& pdmObjects)
{
RimProject* proj = RIApplication::instance()->project();
RimProject* proj = RiaApplication::instance()->project();
CVF_ASSERT(proj);
caf::PdmUiTreeItem* currentItem = getTreeItemFromIndex(itemIndex);

18
ApplicationCode/ProjectDataModel/RimUiTreeView.cpp
View File

@ -117,7 +117,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
}
else if (dynamic_cast<RimCalcScript*>(uiItem->dataObject().p()))
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QMenu menu;
{
@ -425,7 +425,7 @@ void RimUiTreeView::slotEditScript()
{
RimCalcScript* calcScript = dynamic_cast<RimCalcScript*>(uiItem->dataObject().p());
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString scriptEditor = app->scriptEditorPath();
if (!scriptEditor.isEmpty())
{
@ -482,7 +482,7 @@ void RimUiTreeView::slotNewScript()
num++;
}
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString scriptEditor = app->scriptEditorPath();
if (!scriptEditor.isEmpty())
{
@ -512,7 +512,7 @@ void RimUiTreeView::slotExecuteScript()
{
RimCalcScript* calcScript = dynamic_cast<RimCalcScript*>(uiItem->dataObject().p());
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString octavePath = app->octavePath();
if (!octavePath.isEmpty())
{
@ -539,7 +539,7 @@ void RimUiTreeView::slotExecuteScript()
arguments.append("-q");
arguments << calcScript->absolutePath();
RIApplication::instance()->launchProcess(octavePath, arguments);
RiaApplication::instance()->launchProcess(octavePath, arguments);
}
}
}
@ -568,7 +568,7 @@ void RimUiTreeView::slotDeleteView()
{
myModel->deleteReservoirView(currentIndex());
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->setActiveReservoirView(NULL);
}
}
@ -618,7 +618,7 @@ void RimUiTreeView::setModel(QAbstractItemModel* model)
//--------------------------------------------------------------------------------------------------
void RimUiTreeView::slotAddInputProperty()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->defaultFileDialogDirectory("INPUT_FILES");
QStringList fileNames = QFileDialog::getOpenFileNames(this, "Select Eclipse Input Property Files", defaultDir, "All Files (*.* *)");
@ -707,7 +707,7 @@ void RimUiTreeView::slotWriteInputProperty()
{
QString projectFolder;
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString projectFileName = app->currentProjectFileName();
if (!projectFileName.isEmpty())
{
@ -760,7 +760,7 @@ void RimUiTreeView::slotWriteBinaryResultAsInputProperty()
{
QString projectFolder;
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString projectFileName = app->currentProjectFileName();
if (!projectFileName.isEmpty())
{

2
ApplicationCode/RIMain.cpp
View File

@ -23,7 +23,7 @@
int main(int argc, char *argv[])
{
RIApplication app(argc, argv);
RiaApplication app(argc, argv);
QLocale::setDefault(QLocale(QLocale::English, QLocale::UnitedStates));

6
ApplicationCode/SocketInterface/RiaSocketServer.cpp
View File

@ -155,14 +155,14 @@ RimCase* RiaSocketServer::findReservoir(const QString& caseName)
{
if (caseName.isEmpty())
{
if (RIApplication::instance()->activeReservoirView())
if (RiaApplication::instance()->activeReservoirView())
{
return RIApplication::instance()->activeReservoirView()->eclipseCase();
return RiaApplication::instance()->activeReservoirView()->eclipseCase();
}
}
else
{
RimProject* project = RIApplication::instance()->project();
RimProject* project = RiaApplication::instance()->project();
if (!project) return NULL;
bool isInt = false;

102
ApplicationCode/UserInterface/RIMainWindow.cpp
View File

@ -96,7 +96,7 @@ RIMainWindow::RIMainWindow()
slotRefreshEditActions();
// Set pdm root so scripts are displayed
setPdmRoot(RIApplication::instance()->project());
setPdmRoot(RiaApplication::instance()->project());
}
@ -116,7 +116,7 @@ void RIMainWindow::initializeGuiNewProjectLoaded()
slotRefreshFileActions();
slotRefreshEditActions();
refreshAnimationActions();
setPdmRoot(RIApplication::instance()->project());
setPdmRoot(RiaApplication::instance()->project());
}
//--------------------------------------------------------------------------------------------------
@ -157,7 +157,7 @@ void RIMainWindow::refreshToolbars()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::closeEvent(QCloseEvent* event)
{
if (!RIApplication::instance()->closeProject(true))
if (!RiaApplication::instance()->closeProject(true))
{
event->ignore();
return;
@ -486,7 +486,7 @@ void RIMainWindow::setResultInfo(const QString& info) const
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotRefreshFileActions()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
bool projectExists = true;
m_saveProjectAction->setEnabled(projectExists);
@ -528,9 +528,9 @@ void RIMainWindow::slotRefreshViewActions()
void RIMainWindow::refreshAnimationActions()
{
caf::FrameAnimationControl* ac = NULL;
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
ac = RIApplication::instance()->activeReservoirView()->viewer()->animationControl();
ac = RiaApplication::instance()->activeReservoirView()->viewer()->animationControl();
}
m_animationToolBar->connectAnimationControl(ac);
@ -538,7 +538,7 @@ void RIMainWindow::refreshAnimationActions()
QStringList timeStepStrings;
int currentTimeStepIndex = 0;
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
bool enableAnimControls = false;
if (app->activeReservoirView() &&
@ -573,7 +573,7 @@ void RIMainWindow::refreshAnimationActions()
{
timeStepStrings += timeStepDates[i].toString(formatString);
}
currentTimeStepIndex = RIApplication::instance()->activeReservoirView()->currentTimeStep();
currentTimeStepIndex = RiaApplication::instance()->activeReservoirView()->currentTimeStep();
}
else
{
@ -598,7 +598,7 @@ void RIMainWindow::slotAbout()
cvfqt::BasicAboutDialog dlg(this);
dlg.setApplicationName(RI_APPLICATION_NAME);
dlg.setApplicationVersion(RIApplication::getVersionStringApp(true));
dlg.setApplicationVersion(RiaApplication::getVersionStringApp(true));
dlg.setCopyright("Copyright 2012 Statoil ASA, Ceetron AS");
dlg.showCeeVizVersion(false);
@ -630,7 +630,7 @@ void RIMainWindow::slotOpenBinaryGridFiles()
{
if (checkForDocumentModifications())
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->defaultFileDialogDirectory("BINARY_GRID");
QStringList fileNames = QFileDialog::getOpenFileNames(this, "Open Eclipse File", defaultDir, "Eclipse Grid Files (*.GRID *.EGRID)");
@ -658,7 +658,7 @@ void RIMainWindow::slotOpenInputFiles()
{
if (checkForDocumentModifications())
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->defaultFileDialogDirectory("INPUT_FILES");
QStringList fileNames = QFileDialog::getOpenFileNames(this, "Open Eclipse Input Files", defaultDir, "Eclipse Input Files and Input Properties (*.GRDECL *)");
@ -679,7 +679,7 @@ void RIMainWindow::slotOpenProject()
{
if (checkForDocumentModifications())
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
QString defaultDir = app->defaultFileDialogDirectory("BINARY_GRID");
QString fileName = QFileDialog::getOpenFileName(this, "Open ResInsight Project", defaultDir, "ResInsight project (*.rip)");
@ -699,7 +699,7 @@ void RIMainWindow::slotOpenProject()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotOpenLastUsedProject()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->loadLastUsedProject();
}
@ -708,7 +708,7 @@ void RIMainWindow::slotOpenLastUsedProject()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotMockModel()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->createMockModel();
//m_mainViewer->setDefaultView();
@ -719,7 +719,7 @@ void RIMainWindow::slotMockModel()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotMockResultsModel()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->createResultsMockModel();
//m_mainViewer->setDefaultView();
@ -731,7 +731,7 @@ void RIMainWindow::slotMockResultsModel()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotMockLargeResultsModel()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->createLargeResultsMockModel();
}
@ -741,7 +741,7 @@ void RIMainWindow::slotMockLargeResultsModel()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotInputMockModel()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->createInputMockModel();
}
@ -751,7 +751,7 @@ void RIMainWindow::slotInputMockModel()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSetCurrentFrame(int frameIndex)
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
// app->setTimeStep(frameIndex);
}
@ -760,7 +760,7 @@ void RIMainWindow::slotSetCurrentFrame(int frameIndex)
//--------------------------------------------------------------------------------------------------
bool RIMainWindow::checkForDocumentModifications()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
// RISceneManager* project = app->sceneManager();
// if (project && project->isModified())
// {
@ -790,7 +790,7 @@ bool RIMainWindow::checkForDocumentModifications()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotCloseProject()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
bool ret = app->closeProject(true);
}
@ -854,7 +854,7 @@ void RIMainWindow::addViewer(RIViewer* viewer)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSaveProject()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->saveProject();
}
@ -864,7 +864,7 @@ void RIMainWindow::slotSaveProject()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSaveProjectAs()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->saveProjectPromptForFileName();
}
@ -893,9 +893,9 @@ void RIMainWindow::setPdmRoot(caf::PdmObject* pdmRoot)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromNorth()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,-1,0), cvf::Vec3d(0,0,1));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,-1,0), cvf::Vec3d(0,0,1));
}
}
@ -904,9 +904,9 @@ void RIMainWindow::slotViewFromNorth()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromSouth()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,1,0), cvf::Vec3d(0,0,1));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,1,0), cvf::Vec3d(0,0,1));
}
}
@ -915,9 +915,9 @@ void RIMainWindow::slotViewFromSouth()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromEast()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(-1,0,0), cvf::Vec3d(0,0,1));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(-1,0,0), cvf::Vec3d(0,0,1));
}
}
@ -926,9 +926,9 @@ void RIMainWindow::slotViewFromEast()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromWest()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(1,0,0), cvf::Vec3d(0,0,1));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(1,0,0), cvf::Vec3d(0,0,1));
}
}
@ -937,9 +937,9 @@ void RIMainWindow::slotViewFromWest()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromAbove()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,0,-1), cvf::Vec3d(0,1,0));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,0,-1), cvf::Vec3d(0,1,0));
}
}
@ -948,9 +948,9 @@ void RIMainWindow::slotViewFromAbove()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotViewFromBelow()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,0,1), cvf::Vec3d(0,1,0));
RiaApplication::instance()->activeReservoirView()->viewer()->setView(cvf::Vec3d(0,0,1), cvf::Vec3d(0,1,0));
}
}
@ -959,9 +959,9 @@ void RIMainWindow::slotViewFromBelow()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotZoomAll()
{
if (RIApplication::instance()->activeReservoirView() && RIApplication::instance()->activeReservoirView()->viewer())
if (RiaApplication::instance()->activeReservoirView() && RiaApplication::instance()->activeReservoirView()->viewer())
{
RIApplication::instance()->activeReservoirView()->viewer()->zoomAll();
RiaApplication::instance()->activeReservoirView()->viewer()->zoomAll();
}
}
@ -970,7 +970,7 @@ void RIMainWindow::slotZoomAll()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
{
RimProject * proj = RIApplication::instance()->project();
RimProject * proj = RiaApplication::instance()->project();
if (!proj) return;
size_t i;
@ -989,8 +989,8 @@ void RIMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
riv->viewer()->layoutWidget() &&
riv->viewer()->layoutWidget()->parent() == subWindow)
{
RimReservoirView* previousActiveReservoirView = RIApplication::instance()->activeReservoirView();
RIApplication::instance()->setActiveReservoirView(riv);
RimReservoirView* previousActiveReservoirView = RiaApplication::instance()->activeReservoirView();
RiaApplication::instance()->setActiveReservoirView(riv);
if (previousActiveReservoirView && previousActiveReservoirView != riv)
{
QModelIndex previousViewModelIndex = m_treeModelPdm->getModelIndexFromPdmObject(previousActiveReservoirView);
@ -1052,7 +1052,7 @@ void RIMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotUseShaders(bool enable)
{
RIApplication::instance()->setUseShaders(enable);
RiaApplication::instance()->setUseShaders(enable);
}
//--------------------------------------------------------------------------------------------------
@ -1060,7 +1060,7 @@ void RIMainWindow::slotUseShaders(bool enable)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotShowPerformanceInfo(bool enable)
{
RIApplication::instance()->setShowPerformanceInfo(enable);
RiaApplication::instance()->setShowPerformanceInfo(enable);
}
//--------------------------------------------------------------------------------------------------
@ -1068,7 +1068,7 @@ void RIMainWindow::slotShowPerformanceInfo(bool enable)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotRefreshDebugActions()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
}
//--------------------------------------------------------------------------------------------------
@ -1076,7 +1076,7 @@ void RIMainWindow::slotRefreshDebugActions()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotEditPreferences()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
RIPreferencesDialog preferencesDialog(this, app->preferences(), "Preferences");
if (preferencesDialog.exec() == QDialog::Accepted)
{
@ -1105,9 +1105,9 @@ void RIMainWindow::setActiveViewer(RIViewer* viewer)
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotFramerateChanged(double frameRate)
{
if (RIApplication::instance()->activeReservoirView() != NULL)
if (RiaApplication::instance()->activeReservoirView() != NULL)
{
RIApplication::instance()->activeReservoirView()->maximumFrameRate.setValueFromUi(QVariant(frameRate));
RiaApplication::instance()->activeReservoirView()->maximumFrameRate.setValueFromUi(QVariant(frameRate));
}
}
@ -1141,7 +1141,7 @@ void RIMainWindow::slotBuildWindowActions()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotCurrentChanged(const QModelIndex & current, const QModelIndex & previous)
{
RimReservoirView* activeReservoirView = RIApplication::instance()->activeReservoirView();
RimReservoirView* activeReservoirView = RiaApplication::instance()->activeReservoirView();
QModelIndex activeViewModelIndex = m_treeModelPdm->getModelIndexFromPdmObject(activeReservoirView);
QModelIndex tmp = current;
@ -1159,7 +1159,7 @@ void RIMainWindow::slotCurrentChanged(const QModelIndex & current, const QModelI
// show new reservoir view and set this as activate view
if (rimReservoirView != activeReservoirView)
{
RIApplication::instance()->setActiveReservoirView(rimReservoirView);
RiaApplication::instance()->setActiveReservoirView(rimReservoirView);
// Set focus in MDI area to this window if it exists
if (rimReservoirView->viewer())
@ -1225,7 +1225,7 @@ void RIMainWindow::slotNewObjectPropertyView()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSnapshotToFile()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->saveSnapshotPromtpForFilename();
}
@ -1235,7 +1235,7 @@ void RIMainWindow::slotSnapshotToFile()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSnapshotToClipboard()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->copySnapshotToClipboard();
}
@ -1245,7 +1245,7 @@ void RIMainWindow::slotSnapshotToClipboard()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotSnapshotAllViewsToFile()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->saveSnapshotForAllViews("snapshots");
}
@ -1269,7 +1269,7 @@ void RIMainWindow::hideAllDockWindows()
//--------------------------------------------------------------------------------------------------
void RIMainWindow::slotOpenMultipleCases()
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
/*
RiuMultiCaseImportDialog dialog;

2
ApplicationCode/UserInterface/RIProcessMonitor.cpp
View File

@ -192,7 +192,7 @@ void RIProcessMonitor::slotTerminateProcess()
{
addStringToLog("Process terminated by user\n");
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
app->terminateProcess();
}

4
ApplicationCode/UserInterface/RIViewer.cpp
View File

@ -219,7 +219,7 @@ void RIViewer::mouseReleaseEvent(QMouseEvent* event)
// Get the currently set button press action
// We get it here since left click performs it, while we let a clean right click cancel it
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
// Picking
if (event->button() == Qt::LeftButton)
@ -248,7 +248,7 @@ void RIViewer::keyPressEvent(QKeyEvent* event)
//--------------------------------------------------------------------------------------------------
void RIViewer::handlePickAction(int winPosX, int winPosY)
{
RIApplication* app = RIApplication::instance();
RiaApplication* app = RiaApplication::instance();
RIMainWindow* mainWnd = RIMainWindow::instance();
if (!mainWnd) return;

4
ApplicationCode/UserInterface/RiuMultiCaseImportDialog.cpp
View File

@ -95,7 +95,7 @@ RiuMultiCaseImportDialog::~RiuMultiCaseImportDialog()
//--------------------------------------------------------------------------------------------------
void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
{
QString selectedFolder = QFileDialog::getExistingDirectory(this, "Select an Eclipse case search folder", RIApplication::instance()->defaultFileDialogDirectory("MULTICASEIMPORT"));
QString selectedFolder = QFileDialog::getExistingDirectory(this, "Select an Eclipse case search folder", RiaApplication::instance()->defaultFileDialogDirectory("MULTICASEIMPORT"));
QStringList folderNames = m_searchFolders->stringList();
if (!folderNames.contains(selectedFolder))
@ -105,7 +105,7 @@ void RiuMultiCaseImportDialog::on_m_addSearchFolderButton_clicked()
updateGridFileList();
}
RIApplication::instance()->setDefaultFileDialogDirectory("MULTICASEIMPORT", selectedFolder);
RiaApplication::instance()->setDefaultFileDialogDirectory("MULTICASEIMPORT", selectedFolder);
}
//--------------------------------------------------------------------------------------------------