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

Now handling compilation both with and without ODB api

Browse Source
This commit is contained in:
Jacob Støren
2015-04-29 09:26:29 +02:00
parent 936d6553cf
commit a7e38bcda1
4 changed files with 90 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -386,8 +386,10 @@ void RiuMainWindow::createMenus()
importMenu->addAction(m_importInputEclipseFileAction);
importMenu->addAction(m_openMultipleEclipseCasesAction);
importMenu->addSeparator();
#ifdef USE_ODB_API
importMenu->addAction(m_importGeoMechCaseAction);
importMenu->addSeparator();
#endif
importMenu->addAction(m_importWellPathsFromFileAction);
importMenu->addAction(m_importWellPathsFromSSIHubAction);
@@ -1045,6 +1047,10 @@ void RiuMainWindow::slotOpenRecentFile()
{
loadingSucceded = RiaApplication::instance()->openEclipseCaseFromFile(filename);
}
else if (filename.contains(".odb", Qt::CaseInsensitive) )
{
loadingSucceded = RiaApplication::instance()->openOdbCaseFromFile(filename);
}
if (loadingSucceded)
{
@@ -2049,7 +2055,9 @@ void RiuMainWindow::appendActionsContextMenuForPdmObject(caf::PdmObject* pdmObje
}
else if (dynamic_cast<RimGeoMechModels*>(pdmObject))
{
#ifdef USE_ODB_API
menu->addAction(m_importGeoMechCaseAction);
#endif
}
}