OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-03 20:57:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#6941 Rename and move RimHistogramData to RigHistogramData.

Browse Source
This commit is contained in:
Kristian Bendiksen 2020-12-09 09:54:20 +01:00
parent 90aad9533d
commit dbc2899f46
11 changed files with 45 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -172,7 +172,7 @@ void RicGridStatisticsDialog::setHistogramData( RimGridView* view )
aggr->setStyle( QwtPlotCurve::Steps ); aggr->setStyle( QwtPlotCurve::Steps );
aggr->setCurveAttribute( QwtPlotCurve::Inverted ); aggr->setCurveAttribute( QwtPlotCurve::Inverted );
RimHistogramData histogramData = overlayInfo->histogramData(); RigHistogramData histogramData = overlayInfo->histogramData();
if ( histogramData.isHistogramVectorValid() ) if ( histogramData.isHistogramVectorValid() )
{ {
@ -257,7 +257,7 @@ void RicGridStatisticsDialog::deletePlotItems( QwtPlot* plot )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicGridStatisticsDialog::setMarkers( const RimHistogramData& histData, QwtPlot* plot ) void RicGridStatisticsDialog::setMarkers( const RigHistogramData& histData, QwtPlot* plot )
{ {
QwtPlotMarker* marker; QwtPlotMarker* marker;

4
ApplicationCode/Commands/RicGridStatisticsDialog.h
View File

@ -31,7 +31,7 @@ class QMainWindow;
class QToolBar; class QToolBar;
class RimEclipseView; class RimEclipseView;
class RimGridView; class RimGridView;
class RimHistogramData; class RigHistogramData;
//================================================================================================== //==================================================================================================
/// ///
@ -56,7 +56,7 @@ private:
private: private:
void createAndConnectToolbarActions(); void createAndConnectToolbarActions();
void deletePlotItems( QwtPlot* plot ); void deletePlotItems( QwtPlot* plot );
static void setMarkers( const RimHistogramData& histData, QwtPlot* plot ); static void setMarkers( const RigHistogramData& histData, QwtPlot* plot );
static QwtPlotMarker* createVerticalPlotMarker( const QColor& color, double xValue ); static QwtPlotMarker* createVerticalPlotMarker( const QColor& color, double xValue );
void adjustTextEditHeightToContent(); void adjustTextEditHeightToContent();

2
ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
View File

@ -38,7 +38,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimCalcScript.h
${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.h ${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.h
${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.h ${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.h
${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.h ${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.h
${CMAKE_CURRENT_LIST_DIR}/RimHistogramData.h
${CMAKE_CURRENT_LIST_DIR}/RimHistogramCalculator.h ${CMAKE_CURRENT_LIST_DIR}/RimHistogramCalculator.h
${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.h ${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.h
${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.h ${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.h
@ -198,7 +197,6 @@ ${CMAKE_CURRENT_LIST_DIR}/RimCalcScript.cpp
${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.cpp ${CMAKE_CURRENT_LIST_DIR}/RimExportInputPropertySettings.cpp
${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.cpp ${CMAKE_CURRENT_LIST_DIR}/RimBinaryExportSettings.cpp
${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.cpp ${CMAKE_CURRENT_LIST_DIR}/Rim3dOverlayInfoConfig.cpp
${CMAKE_CURRENT_LIST_DIR}/RimHistogramData.cpp
${CMAKE_CURRENT_LIST_DIR}/RimHistogramCalculator.cpp ${CMAKE_CURRENT_LIST_DIR}/RimHistogramCalculator.cpp
${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.cpp ${CMAKE_CURRENT_LIST_DIR}/RimTensorResults.cpp
${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.cpp ${CMAKE_CURRENT_LIST_DIR}/RimReservoirCellResultsStorage.cpp

14
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -156,7 +156,7 @@ void Rim3dOverlayInfoConfig::setPosition( cvf::Vec2ui position )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData Rim3dOverlayInfoConfig::histogramData() RigHistogramData Rim3dOverlayInfoConfig::histogramData()
{ {
auto eclipseView = dynamic_cast<RimEclipseView*>( m_viewDef.p() ); auto eclipseView = dynamic_cast<RimEclipseView*>( m_viewDef.p() );
auto geoMechView = dynamic_cast<RimGeoMechView*>( m_viewDef.p() ); auto geoMechView = dynamic_cast<RimGeoMechView*>( m_viewDef.p() );
@ -171,7 +171,7 @@ RimHistogramData Rim3dOverlayInfoConfig::histogramData()
return m_histogramCalculator->histogramData( eclipseView, m_statisticsCellRange(), m_statisticsTimeRange() ); return m_histogramCalculator->histogramData( eclipseView, m_statisticsCellRange(), m_statisticsTimeRange() );
else if ( geoMechView ) else if ( geoMechView )
return m_histogramCalculator->histogramData( geoMechView, m_statisticsCellRange(), m_statisticsTimeRange() ); return m_histogramCalculator->histogramData( geoMechView, m_statisticsCellRange(), m_statisticsTimeRange() );
return RimHistogramData(); return RigHistogramData();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -203,7 +203,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString Rim3dOverlayInfoConfig::resultInfoText( const RimHistogramData& histData ) QString Rim3dOverlayInfoConfig::resultInfoText( const RigHistogramData& histData )
{ {
auto eclipseView = dynamic_cast<RimEclipseView*>( m_viewDef.p() ); auto eclipseView = dynamic_cast<RimEclipseView*>( m_viewDef.p() );
auto geoMechView = dynamic_cast<RimGeoMechView*>( m_viewDef.p() ); auto geoMechView = dynamic_cast<RimGeoMechView*>( m_viewDef.p() );
@ -394,7 +394,7 @@ QString Rim3dOverlayInfoConfig::caseInfoText( RimGeoMechView* geoMechView )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString Rim3dOverlayInfoConfig::resultInfoText( const RimHistogramData& histData, QString Rim3dOverlayInfoConfig::resultInfoText( const RigHistogramData& histData,
RimEclipseView* eclipseView, RimEclipseView* eclipseView,
bool showVolumeWeightedMean ) bool showVolumeWeightedMean )
{ {
@ -544,7 +544,7 @@ QString Rim3dOverlayInfoConfig::resultInfoText( const RimHistogramData& histData
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString Rim3dOverlayInfoConfig::resultInfoText( const RimHistogramData& histData, RimGeoMechView* geoMechView ) QString Rim3dOverlayInfoConfig::resultInfoText( const RigHistogramData& histData, RimGeoMechView* geoMechView )
{ {
QString infoText; QString infoText;
@ -831,7 +831,7 @@ void Rim3dOverlayInfoConfig::setReservoirView( RimGridView* ownerReservoirView )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Rim3dOverlayInfoConfig::updateEclipse3DInfo( RimEclipseView* eclipseView ) void Rim3dOverlayInfoConfig::updateEclipse3DInfo( RimEclipseView* eclipseView )
{ {
RimHistogramData histData; RigHistogramData histData;
if ( m_showHistogram() || m_showResultInfo() ) if ( m_showHistogram() || m_showResultInfo() )
{ {
@ -873,7 +873,7 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo( RimEclipseView* eclipseView )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void Rim3dOverlayInfoConfig::updateGeoMech3DInfo( RimGeoMechView* geoMechView ) void Rim3dOverlayInfoConfig::updateGeoMech3DInfo( RimGeoMechView* geoMechView )
{ {
RimHistogramData histData; RigHistogramData histData;
if ( m_showResultInfo() || m_showHistogram() ) if ( m_showResultInfo() || m_showHistogram() )
{ {

10
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@ -18,7 +18,7 @@
#pragma once #pragma once
#include "RimHistogramData.h" #include "RigHistogramData.h"
#include "RimHistogramCalculator.h" #include "RimHistogramCalculator.h"
@ -60,10 +60,10 @@ public:
void setPosition( cvf::Vec2ui position ); void setPosition( cvf::Vec2ui position );
RimHistogramData histogramData(); RigHistogramData histogramData();
QString timeStepText(); QString timeStepText();
QString caseInfoText(); QString caseInfoText();
QString resultInfoText( const RimHistogramData& histData ); QString resultInfoText( const RigHistogramData& histData );
RicGridStatisticsDialog* getOrCreateGridStatisticsDialog(); RicGridStatisticsDialog* getOrCreateGridStatisticsDialog();
void showStatisticsInfoDialog( bool raise = true ); void showStatisticsInfoDialog( bool raise = true );
@ -87,8 +87,8 @@ private:
QString timeStepText( RimGeoMechView* geoMechView ); QString timeStepText( RimGeoMechView* geoMechView );
QString caseInfoText( RimEclipseView* eclipseView ); QString caseInfoText( RimEclipseView* eclipseView );
QString caseInfoText( RimGeoMechView* geoMechView ); QString caseInfoText( RimGeoMechView* geoMechView );
QString resultInfoText( const RimHistogramData& histData, RimEclipseView* eclipseView, bool showVolumeWeightedMean ); QString resultInfoText( const RigHistogramData& histData, RimEclipseView* eclipseView, bool showVolumeWeightedMean );
QString resultInfoText( const RimHistogramData& histData, RimGeoMechView* geoMechView ); QString resultInfoText( const RigHistogramData& histData, RimGeoMechView* geoMechView );
void displayPropertyFilteredStatisticsMessage( bool showSwitchToCurrentTimestep ); void displayPropertyFilteredStatisticsMessage( bool showSwitchToCurrentTimestep );
bool hasInvalidStatisticsCombination(); bool hasInvalidStatisticsCombination();

6
ApplicationCode/ProjectDataModel/RimGridStatisticsPlot.cpp
View File

@ -29,12 +29,14 @@
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimGridView.h" #include "RimGridView.h"
#include "RimHistogramCalculator.h" #include "RimHistogramCalculator.h"
#include "RimHistogramData.h"
#include "RimPlot.h" #include "RimPlot.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimTools.h" #include "RimTools.h"
#include "RiuPlotMainWindow.h" #include "RiuPlotMainWindow.h"
#include "RigHistogramData.h"
#include "cafPdmFieldScriptingCapability.h" #include "cafPdmFieldScriptingCapability.h"
#include "cafPdmObjectScriptingCapability.h" #include "cafPdmObjectScriptingCapability.h"
#include "cafPdmUiComboBoxEditor.h" #include "cafPdmUiComboBoxEditor.h"
@ -345,7 +347,7 @@ void RimGridStatisticsPlot::updatePlots()
std::unique_ptr<RimHistogramCalculator> histogramCalculator; std::unique_ptr<RimHistogramCalculator> histogramCalculator;
histogramCalculator.reset( new RimHistogramCalculator ); histogramCalculator.reset( new RimHistogramCalculator );
RimHistogramData histogramData; RigHistogramData histogramData;
RimHistogramCalculator::StatisticsCellRangeType cellRange = RimHistogramCalculator::StatisticsCellRangeType cellRange =
RimHistogramCalculator::StatisticsCellRangeType::ALL_CELLS; RimHistogramCalculator::StatisticsCellRangeType::ALL_CELLS;

20
ApplicationCode/ProjectDataModel/RimHistogramCalculator.cpp
View File

@ -81,9 +81,9 @@ void RimHistogramCalculator::invalidateVisibleCellsCache()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData RimHistogramCalculator::histogramData( RimEclipseContourMapView* contourMap ) RigHistogramData RimHistogramCalculator::histogramData( RimEclipseContourMapView* contourMap )
{ {
RimHistogramData histData; RigHistogramData histData;
if ( contourMap ) if ( contourMap )
{ {
@ -103,9 +103,9 @@ RimHistogramData RimHistogramCalculator::histogramData( RimEclipseContourMapView
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData RimHistogramCalculator::histogramData( RimGeoMechContourMapView* contourMap ) RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechContourMapView* contourMap )
{ {
RimHistogramData histData; RigHistogramData histData;
if ( contourMap ) if ( contourMap )
{ {
@ -125,7 +125,7 @@ RimHistogramData RimHistogramCalculator::histogramData( RimGeoMechContourMapView
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData RimHistogramCalculator::histogramData( RimEclipseView* eclipseView, RigHistogramData RimHistogramCalculator::histogramData( RimEclipseView* eclipseView,
StatisticsCellRangeType cellRange, StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange ) StatisticsTimeRangeType timeRange )
{ {
@ -152,14 +152,14 @@ RimHistogramData RimHistogramCalculator::histogramData( RimEclipseView*
} }
// //
RimHistogramData data; RigHistogramData data;
return data; return data;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData RimHistogramCalculator::histogramData( RimEclipseView* eclipseView, RigHistogramData RimHistogramCalculator::histogramData( RimEclipseView* eclipseView,
RimEclipseResultDefinition* eclResultDefinition, RimEclipseResultDefinition* eclResultDefinition,
StatisticsCellRangeType cellRange, StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange, StatisticsTimeRangeType timeRange,
@ -167,7 +167,7 @@ RimHistogramData RimHistogramCalculator::histogramData( RimEclipseView*
{ {
CVF_ASSERT( eclResultDefinition ); CVF_ASSERT( eclResultDefinition );
RimHistogramData histData; RigHistogramData histData;
eclResultDefinition->loadResult(); eclResultDefinition->loadResult();
@ -260,11 +260,11 @@ RimHistogramData RimHistogramCalculator::histogramData( RimEclipseView*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData RimHistogramCalculator::histogramData( RimGeoMechView* geoMechView, RigHistogramData RimHistogramCalculator::histogramData( RimGeoMechView* geoMechView,
StatisticsCellRangeType cellRange, StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange ) StatisticsTimeRangeType timeRange )
{ {
RimHistogramData histData; RigHistogramData histData;
if ( geoMechView ) if ( geoMechView )
{ {

12
ApplicationCode/ProjectDataModel/RimHistogramCalculator.h
View File

@ -20,7 +20,7 @@
#include "RigEclipseResultAddress.h" #include "RigEclipseResultAddress.h"
#include "RimHistogramData.h" #include "RigHistogramData.h"
#include "RigStatisticsDataCache.h" #include "RigStatisticsDataCache.h"
@ -53,15 +53,15 @@ public:
RimHistogramCalculator(); RimHistogramCalculator();
RimHistogramData histogramData( RimEclipseContourMapView* contourMap ); RigHistogramData histogramData( RimEclipseContourMapView* contourMap );
RimHistogramData histogramData( RimGeoMechContourMapView* contourMap ); RigHistogramData histogramData( RimGeoMechContourMapView* contourMap );
RimHistogramData RigHistogramData
histogramData( RimEclipseView* eclipseView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange ); histogramData( RimEclipseView* eclipseView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange );
RimHistogramData RigHistogramData
histogramData( RimGeoMechView* geoMechView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange ); histogramData( RimGeoMechView* geoMechView, StatisticsCellRangeType cellRange, StatisticsTimeRangeType timeRange );
RimHistogramData histogramData( RimEclipseView* eclipseView, RigHistogramData histogramData( RimEclipseView* eclipseView,
RimEclipseResultDefinition* eclResultDefinition, RimEclipseResultDefinition* eclResultDefinition,
StatisticsCellRangeType cellRange, StatisticsCellRangeType cellRange,
StatisticsTimeRangeType timeRange, StatisticsTimeRangeType timeRange,

2
ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
View File

@ -81,6 +81,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.h
${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.h
${CMAKE_CURRENT_LIST_DIR}/RigGocadData.h ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.h
${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.h ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.h
${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.h
) )
@ -159,6 +160,7 @@ ${CMAKE_CURRENT_LIST_DIR}/RigNncConnection.cpp
${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp ${CMAKE_CURRENT_LIST_DIR}/RigWellDiskData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigGocadData.cpp ${CMAKE_CURRENT_LIST_DIR}/RigGocadData.cpp
${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.cpp ${CMAKE_CURRENT_LIST_DIR}/RigElasticProperties.cpp
${CMAKE_CURRENT_LIST_DIR}/RigHistogramData.cpp
) )
list(APPEND CODE_HEADER_FILES list(APPEND CODE_HEADER_FILES

10
ApplicationCode/ProjectDataModel/RimHistogramData.cpp → ApplicationCode/ReservoirDataModel/RigHistogramData.cpp
View File

@ -16,14 +16,14 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimHistogramData.h" #include "RigHistogramData.h"
#include <limits> #include <limits>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimHistogramData::RimHistogramData() RigHistogramData::RigHistogramData()
: min( std::numeric_limits<double>::max() ) : min( std::numeric_limits<double>::max() )
, max( std::numeric_limits<double>::max() ) , max( std::numeric_limits<double>::max() )
, p10( std::numeric_limits<double>::max() ) , p10( std::numeric_limits<double>::max() )
@ -38,7 +38,7 @@ RimHistogramData::RimHistogramData()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimHistogramData::isMinMaxValid() const bool RigHistogramData::isMinMaxValid() const
{ {
return isValid( min ) && isValid( max ); return isValid( min ) && isValid( max );
} }
@ -46,7 +46,7 @@ bool RimHistogramData::isMinMaxValid() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimHistogramData::isValid( double parameter ) const bool RigHistogramData::isValid( double parameter ) const
{ {
return parameter != std::numeric_limits<double>::max() && parameter != -std::numeric_limits<double>::max(); return parameter != std::numeric_limits<double>::max() && parameter != -std::numeric_limits<double>::max();
} }
@ -54,7 +54,7 @@ bool RimHistogramData::isValid( double parameter ) const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimHistogramData::isHistogramVectorValid() const bool RigHistogramData::isHistogramVectorValid() const
{ {
return histogram && histogram->size() > 0 && isMinMaxValid(); return histogram && histogram->size() > 0 && isMinMaxValid();
} }

4
ApplicationCode/ProjectDataModel/RimHistogramData.h → ApplicationCode/ReservoirDataModel/RigHistogramData.h
View File

@ -24,10 +24,10 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimHistogramData class RigHistogramData
{ {
public: public:
RimHistogramData(); RigHistogramData();
double min; double min;
double max; double max;