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

Regression Test : Avoid display of UI for custom mock model in reg test

Browse Source
This commit is contained in:
Magne Sjaastad 2018-10-09 13:54:38 +02:00
parent d2b658e4cd
commit 1f9dfd67aa
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@ -18,6 +18,8 @@
#include "RimDialogData.h"
#include "RimMockModelSettings.h"
#include "ExportCommands/RicExportCarfinUi.h"
#include "CompletionExportCommands/RicExportCompletionDataSettingsUi.h"
#include "FractureCommands/RicCreateMultipleFracturesUi.h"
@ -51,6 +53,9 @@ RimDialogData::RimDialogData()
CAF_PDM_InitFieldNoDefault(&m_exportLgrData, "ExportLgr", "LGR Export", "", "", "");
m_exportLgrData = new RicExportLgrUi();
CAF_PDM_InitFieldNoDefault(&m_mockModelSettings, "MockModelSettings", "Mock Model Settings", "", "", "");
m_mockModelSettings = new RimMockModelSettings();
}
//--------------------------------------------------------------------------------------------------
@ -126,3 +131,11 @@ RicExportLgrUi* RimDialogData::exportLgrData() const
return m_exportLgrData;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimMockModelSettings* RimDialogData::mockModelSettings() const
{
return m_mockModelSettings;
}

3
ApplicationCode/ProjectDataModel/RimDialogData.h
View File

@ -27,6 +27,7 @@ class RiuCreateMultipleFractionsUi;
class RicHoloLensExportToFolderUi;
class RicExportWellPathsUi;
class RicExportLgrUi;
class RimMockModelSettings;
//==================================================================================================
///
@ -57,6 +58,7 @@ public:
RicHoloLensExportToFolderUi* holoLensExportToFolderData() const;
RicExportWellPathsUi* wellPathsExportData() const;
RicExportLgrUi* exportLgrData() const;
RimMockModelSettings* mockModelSettings() const;
private:
caf::PdmChildField<RicExportCarfinUi*> m_exportCarfin;
@ -65,4 +67,5 @@ private:
caf::PdmChildField<RicHoloLensExportToFolderUi*> m_holoLenseExportToFolderData;
caf::PdmChildField<RicExportWellPathsUi*> m_exportWellPathsData;
caf::PdmChildField<RicExportLgrUi*> m_exportLgrData;
caf::PdmChildField<RimMockModelSettings*> m_mockModelSettings;
};

29
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -22,6 +22,8 @@
#include "RiaLogging.h"
#include "RiaPreferences.h"
#include "RiaRegressionTestRunner.h"
#include "RiaApplication.h"
#include "RifEclipseOutputFileTools.h"
#include "RifReaderEclipseOutput.h"
@ -34,11 +36,13 @@
#include "RigFlowDiagSolverInterface.h"
#include "RigMainGrid.h"
#include "RimDialogData.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseView.h"
#include "RimFlowDiagSolution.h"
#include "RimMockModelSettings.h"
#include "RimProject.h"
#include "RimProject.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimTimeStepFilter.h"
#include "RimTools.h"
@ -387,16 +391,17 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel(QString model
{
QApplication::setOverrideCursor(QCursor(Qt::ArrowCursor));
RimMockModelSettings rimMockModelSettings;
caf::PdmSettings::readFieldsFromApplicationStore(&rimMockModelSettings);
RimMockModelSettings* mockModelSettings = RiaApplication::instance()->project()->dialogData()->mockModelSettings();
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, &rimMockModelSettings, "Customize Mock Model", "");
if (propertyDialog.exec() == QDialog::Accepted)
if (!RiaRegressionTestRunner::instance()->isRunningRegressionTests())
{
QApplication::restoreOverrideCursor();
caf::PdmSettings::writeFieldsToApplicationStore(&rimMockModelSettings);
caf::PdmUiPropertyViewDialog propertyDialog(nullptr, mockModelSettings, "Customize Mock Model", "");
if (propertyDialog.exec() == QDialog::Accepted)
{
}
}
{
double startX = 0;
double startY = 0;
double startZ = 0;
@ -411,16 +416,14 @@ cvf::ref<RifReaderInterface> RimEclipseResultCase::createMockModel(QString model
double offsetZ = 0;
mockFileInterface->setWorldCoordinates(cvf::Vec3d(startX + offsetX, startY + offsetY, startZ + offsetZ), cvf::Vec3d(startX + widthX + offsetX, startY + widthY + offsetY, startZ + widthZ + offsetZ));
mockFileInterface->setGridPointDimensions(cvf::Vec3st(rimMockModelSettings.cellCountX + 1, rimMockModelSettings.cellCountY + 1, rimMockModelSettings.cellCountZ + 1));
mockFileInterface->setResultInfo(rimMockModelSettings.resultCount, rimMockModelSettings.timeStepCount);
mockFileInterface->setGridPointDimensions(cvf::Vec3st(mockModelSettings->cellCountX + 1, mockModelSettings->cellCountY + 1, mockModelSettings->cellCountZ + 1));
mockFileInterface->setResultInfo(mockModelSettings->resultCount, mockModelSettings->timeStepCount);
mockFileInterface->enableWellData(false);
mockFileInterface->open("", reservoir.p());
}
else
{
QApplication::restoreOverrideCursor();
}
QApplication::restoreOverrideCursor();
}
this->setReservoirData( reservoir.p() );