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

Cleanup whitespace and includes

Browse Source
This commit is contained in:
Magne Sjaastad 2017-10-19 07:44:21 +02:00
parent 215eb58de0
commit 66ff7d91bb
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -27,6 +27,8 @@
#include "RigFemPartCollection.h"
#include "RigFemPartResultsCollection.h"
#include "RigFemResultAddress.h"
#include "RigFlowDiagResults.h"
#include "RigFlowDiagVisibleCellsStatCalc.h"
#include "RigGeoMechCaseData.h"
#include "RigMainGrid.h"
#include "RigStatisticsDataCache.h"
@ -37,17 +39,18 @@
#include "RimEclipseFaultColors.h"
#include "RimEclipsePropertyFilterCollection.h"
#include "RimEclipseView.h"
#include "RimSimWellInViewCollection.h"
#include "RimFaultInViewCollection.h"
#include "RimGeoMechCase.h"
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechView.h"
#include "RimReservoirCellResultsStorage.h"
#include "RimSimWellInViewCollection.h"
#include "RimView.h"
#include "RiuViewer.h"
#include "RigFlowDiagResults.h"
#include "RigFlowDiagVisibleCellsStatCalc.h"
#include <QMessageBox>
CAF_PDM_SOURCE_INIT(Rim3dOverlayInfoConfig, "View3dOverlayInfoConfig");
//--------------------------------------------------------------------------------------------------
@ -203,7 +206,7 @@ void Rim3dOverlayInfoConfig::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
caf::PdmUiGroup* statGroup = uiOrdering.addNewGroup("Statistics Options");
RimEclipseView * eclipseView = dynamic_cast<RimEclipseView*>(m_viewDef.p());
if (!eclipseView || !eclipseView->cellResult()->isFlowDiagOrInjectionFlooding()) //
if (!eclipseView || !eclipseView->cellResult()->isFlowDiagOrInjectionFlooding())
{
statGroup->add(&m_statisticsTimeRange);
}
@ -649,8 +652,9 @@ void Rim3dOverlayInfoConfig::updateVisCellStatsIfNeeded()
}
}
#include <QMessageBox>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void Rim3dOverlayInfoConfig::displayPropertyFilteredStatisticsMessage(bool showSwitchToCurrentTimestep)
{
static bool isShowing = false;
@ -674,4 +678,4 @@ void Rim3dOverlayInfoConfig::displayPropertyFilteredStatisticsMessage(bool showS
+ switchString);
isShowing = false;
}
}
}

3
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@ -40,6 +40,7 @@ class RigStatisticsDataCache;
class Rim3dOverlayInfoConfig : public caf::PdmObject
{
CAF_PDM_HEADER_INIT;
public:
Rim3dOverlayInfoConfig();
virtual ~Rim3dOverlayInfoConfig();
@ -69,7 +70,6 @@ protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
void updateEclipse3DInfo(RimEclipseView * reservoirView);
void updateGeoMech3DInfo(RimGeoMechView * geoMechView);
@ -90,5 +90,4 @@ private:
void displayPropertyFilteredStatisticsMessage(bool showSwitchToCurrentTimestep);
bool m_isVisCellStatUpToDate;
cvf::ref<RigStatisticsDataCache> m_visibleCellStatistics;
};