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

Fix wrong use of macros in constructor causing crash triggered by regression tests

Browse Source
This commit is contained in:
Magne Sjaastad
2018-03-16 13:41:41 +01:00
parent ecfb827b41
commit 9656883c92
3 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.cpp
View File

@@ -76,16 +76,6 @@ RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi()
m_displayForSimWell = true;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicExportCompletionDataSettingsUi::RicExportCompletionDataSettingsUi(bool onlyWellPathCollectionSelected)
{
RicExportCompletionDataSettingsUi();
setOnlyWellPathCollectionSelected(onlyWellPathCollectionSelected);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/Commands/CompletionExportCommands/RicExportCompletionDataSettingsUi.h
View File

@@ -53,7 +53,6 @@ public:
RicExportCompletionDataSettingsUi();
RicExportCompletionDataSettingsUi(bool onlyWellPathCollectionSelected);
caf::PdmField<ExportSplitType> fileSplit;
caf::PdmField<WellSelectionType> wellSelection;

3
ApplicationCode/ProjectDataModel/RimDialogData.cpp
View File

@@ -34,7 +34,8 @@ RimDialogData::RimDialogData()
m_exportCarfin = new RicExportCarfinUi;
CAF_PDM_InitFieldNoDefault(&m_exportCompletionData, "ExportCompletionData", "Export Completion Data", "", "", "");
m_exportCompletionData = new RicExportCompletionDataSettingsUi(false);
m_exportCompletionData = new RicExportCompletionDataSettingsUi();
m_exportCompletionData->setOnlyWellPathCollectionSelected(false);
}
//--------------------------------------------------------------------------------------------------