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

#5379 Surface : Move enum to RiaDefines

Browse Source
This commit is contained in:
Magne Sjaastad 2020-04-28 08:06:07 +02:00
parent e66f937c29
commit 4d114e36f8
5 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationCode/Application/RiaDefines.cpp
View File

@ -103,6 +103,17 @@ void caf::AppEnum<RiaDefines::MeshModeType>::setUp()
addItem( RiaDefines::MeshModeType::NO_MESH, "NO_MESH", "None" ); addItem( RiaDefines::MeshModeType::NO_MESH, "NO_MESH", "None" );
setDefault( RiaDefines::MeshModeType::FULL_MESH ); setDefault( RiaDefines::MeshModeType::FULL_MESH );
} }
template <>
void caf::AppEnum<RiaDefines::GridCaseAxis>::setUp()
{
addItem( RiaDefines::GridCaseAxis::UNDEFINED_AXIS, "None", "None" );
addItem( RiaDefines::GridCaseAxis::AXIS_I, "I", "I" );
addItem( RiaDefines::GridCaseAxis::AXIS_J, "J", "J" );
addItem( RiaDefines::GridCaseAxis::AXIS_K, "K", "K" );
setDefault( RiaDefines::GridCaseAxis::AXIS_K );
}
} // namespace caf } // namespace caf
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

8
ApplicationCode/Application/RiaDefines.h
View File

@ -204,4 +204,12 @@ enum class FontSettingType
PLOT_FONT PLOT_FONT
}; };
enum class GridCaseAxis
{
AXIS_I,
AXIS_J,
AXIS_K,
UNDEFINED_AXIS
};
}; // namespace RiaDefines }; // namespace RiaDefines

8
ApplicationCode/Commands/ExportCommands/RicAdvancedSnapshotExportFeature.cpp
View File

@ -250,7 +250,7 @@ void RicAdvancedSnapshotExportFeature::exportViewVariationsToFolder( RimGridView
viewer->animationControl()->setCurrentFrameOnly( i ); viewer->animationControl()->setCurrentFrameOnly( i );
} }
if ( msd->sliceDirection == RimAdvancedSnapshotExportDefinition::NO_RANGEFILTER ) if ( msd->sliceDirection == RiaDefines::GridCaseAxis::UNDEFINED_AXIS )
{ {
QString fileName = viewCaseResultString + "_" + timeStepString; QString fileName = viewCaseResultString + "_" + timeStepString;
fileName.replace( " ", "_" ); fileName.replace( " ", "_" );
@ -273,17 +273,17 @@ void RicAdvancedSnapshotExportFeature::exportViewVariationsToFolder( RimGridView
QString fileName = viewCaseResultString + "_" + timeStepString + "_" + rangeFilterString; QString fileName = viewCaseResultString + "_" + timeStepString + "_" + rangeFilterString;
rangeFilter->setDefaultValues(); rangeFilter->setDefaultValues();
if ( msd->sliceDirection == RimAdvancedSnapshotExportDefinition::RANGEFILTER_I ) if ( msd->sliceDirection == RiaDefines::GridCaseAxis::AXIS_I )
{ {
rangeFilter->cellCountI = 1; rangeFilter->cellCountI = 1;
rangeFilter->startIndexI = sliceIndex; rangeFilter->startIndexI = sliceIndex;
} }
else if ( msd->sliceDirection == RimAdvancedSnapshotExportDefinition::RANGEFILTER_J ) else if ( msd->sliceDirection == RiaDefines::GridCaseAxis::AXIS_J )
{ {
rangeFilter->cellCountJ = 1; rangeFilter->cellCountJ = 1;
rangeFilter->startIndexJ = sliceIndex; rangeFilter->startIndexJ = sliceIndex;
} }
else if ( msd->sliceDirection == RimAdvancedSnapshotExportDefinition::RANGEFILTER_K ) else if ( msd->sliceDirection == RiaDefines::GridCaseAxis::AXIS_K )
{ {
rangeFilter->cellCountK = 1; rangeFilter->cellCountK = 1;
rangeFilter->startIndexK = sliceIndex; rangeFilter->startIndexK = sliceIndex;

63
ApplicationCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp
View File

@ -34,51 +34,40 @@
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
// clang-format off CAF_PDM_SOURCE_INIT( RimAdvancedSnapshotExportDefinition, "MultiSnapshotDefinition" );
namespace caf
{
template<>
void caf::AppEnum< RimAdvancedSnapshotExportDefinition::SnapShotDirectionEnum >::setUp()
{
addItem(RimAdvancedSnapshotExportDefinition::NO_RANGEFILTER, "None", "None");
addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_I, "I", "I");
addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_J, "J", "J");
addItem(RimAdvancedSnapshotExportDefinition::RANGEFILTER_K, "K", "K");
setDefault(RimAdvancedSnapshotExportDefinition::RANGEFILTER_K);
}
}
CAF_PDM_SOURCE_INIT(RimAdvancedSnapshotExportDefinition, "MultiSnapshotDefinition");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimAdvancedSnapshotExportDefinition::RimAdvancedSnapshotExportDefinition() RimAdvancedSnapshotExportDefinition::RimAdvancedSnapshotExportDefinition()
{ {
//CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.png", "", ""); // CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.png", "", "");
CAF_PDM_InitObject("MultiSnapshotDefinition", "", "", ""); CAF_PDM_InitObject( "MultiSnapshotDefinition", "", "", "" );
CAF_PDM_InitField(&isActive, "IsActive", true, "Active", "", "", ""); CAF_PDM_InitField( &isActive, "IsActive", true, "Active", "", "", "" );
CAF_PDM_InitFieldNoDefault(&view, "View", "View", "", "", "");
CAF_PDM_InitFieldNoDefault(&eclipseResultType, "EclipseResultType", "Result Type", "", "", ""); CAF_PDM_InitFieldNoDefault( &view, "View", "View", "", "", "" );
CAF_PDM_InitFieldNoDefault(&selectedEclipseResults, "SelectedEclipseResults", "Properties", "", "", "");
CAF_PDM_InitField(&timeStepStart, "TimeStepStart", 0, "Start Time", "", "", ""); CAF_PDM_InitFieldNoDefault( &eclipseResultType, "EclipseResultType", "Result Type", "", "", "" );
CAF_PDM_InitField(&timeStepEnd, "TimeStepEnd", 0, "End Time", "", "", ""); CAF_PDM_InitFieldNoDefault( &selectedEclipseResults, "SelectedEclipseResults", "Properties", "", "", "" );
CAF_PDM_InitField(&sliceDirection, "SnapShotDirection", caf::AppEnum<SnapShotDirectionEnum>(NO_RANGEFILTER), "Range Filter Slice", "", "", ""); CAF_PDM_InitField( &timeStepStart, "TimeStepStart", 0, "Start Time", "", "", "" );
CAF_PDM_InitField(&startSliceIndex, "RangeFilterStart", 1, "Range Start", "", "", ""); CAF_PDM_InitField( &timeStepEnd, "TimeStepEnd", 0, "End Time", "", "", "" );
CAF_PDM_InitField(&endSliceIndex, "RangeFilterEnd", 1, "Range End", "", "", "");
CAF_PDM_InitFieldNoDefault(&additionalCases, "AdditionalCases", "Cases", "", "", ""); CAF_PDM_InitField( &sliceDirection,
"SnapShotDirection",
caf::AppEnum<RiaDefines::GridCaseAxis>( RiaDefines::GridCaseAxis::UNDEFINED_AXIS ),
"Range Filter Slice",
"",
"",
"" );
CAF_PDM_InitField( &startSliceIndex, "RangeFilterStart", 1, "Range Start", "", "", "" );
CAF_PDM_InitField( &endSliceIndex, "RangeFilterEnd", 1, "Range End", "", "", "" );
CAF_PDM_InitFieldNoDefault( &additionalCases, "AdditionalCases", "Cases", "", "", "" );
} }
// clang-format on
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -216,17 +205,17 @@ void RimAdvancedSnapshotExportDefinition::fieldChangedByUi( const caf::PdmFieldH
int maxInt = 0; int maxInt = 0;
int minInt = 0; int minInt = 0;
if ( newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_I ) if ( sliceDirection == RiaDefines::GridCaseAxis::AXIS_I )
{ {
maxInt = static_cast<int>( max.x() ); maxInt = static_cast<int>( max.x() );
minInt = static_cast<int>( min.x() ); minInt = static_cast<int>( min.x() );
} }
else if ( newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_J ) else if ( sliceDirection == RiaDefines::GridCaseAxis::AXIS_J )
{ {
maxInt = static_cast<int>( max.y() ); maxInt = static_cast<int>( max.y() );
minInt = static_cast<int>( min.y() ); minInt = static_cast<int>( min.y() );
} }
else if ( newValue == RimAdvancedSnapshotExportDefinition::RANGEFILTER_K ) else if ( sliceDirection == RiaDefines::GridCaseAxis::AXIS_K )
{ {
maxInt = static_cast<int>( max.z() ); maxInt = static_cast<int>( max.z() );
minInt = static_cast<int>( min.z() ); minInt = static_cast<int>( min.z() );
@ -297,7 +286,7 @@ void RimAdvancedSnapshotExportDefinition::defineUiOrdering( QString uiConfigName
additionalCases.uiCapability()->setUiReadOnly( false ); additionalCases.uiCapability()->setUiReadOnly( false );
bool rangeReadOnly = false; bool rangeReadOnly = false;
if ( sliceDirection() == NO_RANGEFILTER ) if ( sliceDirection() == RiaDefines::GridCaseAxis::UNDEFINED_AXIS )
{ {
rangeReadOnly = true; rangeReadOnly = true;
} }

14
ApplicationCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.h
View File

@ -51,17 +51,9 @@ public:
caf::PdmField<int> timeStepStart; caf::PdmField<int> timeStepStart;
caf::PdmField<int> timeStepEnd; caf::PdmField<int> timeStepEnd;
enum SnapShotDirectionEnum caf::PdmField<caf::AppEnum<RiaDefines::GridCaseAxis>> sliceDirection;
{ caf::PdmField<int> startSliceIndex;
RANGEFILTER_I, caf::PdmField<int> endSliceIndex;
RANGEFILTER_J,
RANGEFILTER_K,
NO_RANGEFILTER
};
caf::PdmField<caf::AppEnum<SnapShotDirectionEnum>> sliceDirection;
caf::PdmField<int> startSliceIndex;
caf::PdmField<int> endSliceIndex;
caf::PdmPtrArrayField<RimCase*> additionalCases; caf::PdmPtrArrayField<RimCase*> additionalCases;