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

Merge branch 'dev' into hdf-prototype

Browse Source
This commit is contained in:
Magne Sjaastad
2017-08-14 10:47:44 +02:00
parent e6fda31255 a99eae7c24
commit 5eb4eafb6e
443 changed files with 20467 additions and 3429 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.cpp
View File

@@ -24,7 +24,7 @@
#include "RigSummaryCaseData.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@@ -95,7 +95,7 @@ const std::vector<time_t>& RimAsciiDataCurve::timeSteps() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAsciiDataCurve::setYAxis(RimDefines::PlotAxis plotAxis)
void RimAsciiDataCurve::setYAxis(RiaDefines::PlotAxis plotAxis)
{
m_plotAxis = plotAxis;
}
@@ -103,7 +103,7 @@ void RimAsciiDataCurve::setYAxis(RimDefines::PlotAxis plotAxis)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDefines::PlotAxis RimAsciiDataCurve::yAxis() const
RiaDefines::PlotAxis RimAsciiDataCurve::yAxis() const
{
return m_plotAxis();
}
@@ -187,7 +187,7 @@ void RimAsciiDataCurve::updateQwtPlotAxis()
{
if (m_qwtPlotCurve)
{
if (this->yAxis() == RimDefines::PLOT_AXIS_LEFT)
if (this->yAxis() == RiaDefines::PLOT_AXIS_LEFT)
{
m_qwtPlotCurve->setYAxis(QwtPlot::yLeft);
}

8
ApplicationCode/ProjectDataModel/Summary/RimAsciiDataCurve.h
View File

@@ -26,7 +26,7 @@
#include "cafPdmChildField.h"
#include "RifEclipseSummaryAddress.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimPlotCurve.h"
#include "cafAppEnum.h"
@@ -54,8 +54,8 @@ public:
std::vector<double> yValues() const;
const std::vector<time_t>& timeSteps() const;
void setYAxis(RimDefines::PlotAxis plotAxis);
RimDefines::PlotAxis yAxis() const;
void setYAxis(RiaDefines::PlotAxis plotAxis);
RiaDefines::PlotAxis yAxis() const;
void updateQwtPlotAxis();
void setTimeSteps(const std::vector<QDateTime>& timeSteps);
@@ -74,7 +74,7 @@ private:
private:
// Fields
caf::PdmField< caf::AppEnum< RimDefines::PlotAxis > > m_plotAxis;
caf::PdmField< caf::AppEnum< RiaDefines::PlotAxis > > m_plotAxis;
caf::PdmField< std::vector<QDateTime> > m_timeSteps;
caf::PdmField< std::vector<double> > m_values;

10
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@@ -24,7 +24,7 @@
#include "RigSummaryCaseData.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@@ -267,7 +267,7 @@ const std::vector<time_t>& RimSummaryCurve::timeSteps() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurve::setYAxis(RimDefines::PlotAxis plotAxis)
void RimSummaryCurve::setYAxis(RiaDefines::PlotAxis plotAxis)
{
m_plotAxis = plotAxis;
}
@@ -275,7 +275,7 @@ void RimSummaryCurve::setYAxis(RimDefines::PlotAxis plotAxis)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDefines::PlotAxis RimSummaryCurve::yAxis() const
RiaDefines::PlotAxis RimSummaryCurve::yAxis() const
{
return m_plotAxis();
}
@@ -331,7 +331,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::
}
}
options.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount));
options.push_front(caf::PdmOptionItemInfo(RiaDefines::undefinedResultName(), addressCount));
if(useOptionsOnly) *useOptionsOnly = true;
}
@@ -470,7 +470,7 @@ void RimSummaryCurve::updateQwtPlotAxis()
{
if (m_qwtPlotCurve)
{
if (this->yAxis() == RimDefines::PLOT_AXIS_LEFT)
if (this->yAxis() == RiaDefines::PLOT_AXIS_LEFT)
{
m_qwtPlotCurve->setYAxis(QwtPlot::yLeft);
}

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.h
View File

@@ -26,7 +26,7 @@
#include "cafPdmChildField.h"
#include "RifEclipseSummaryAddress.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimPlotCurve.h"
#include "cafAppEnum.h"
@@ -87,8 +87,8 @@ public:
std::vector<double> yValues() const;
const std::vector<time_t>& timeSteps() const;
void setYAxis(RimDefines::PlotAxis plotAxis);
RimDefines::PlotAxis yAxis() const;
void setYAxis(RiaDefines::PlotAxis plotAxis);
RiaDefines::PlotAxis yAxis() const;
void updateQwtPlotAxis();
void applyCurveAutoNameSettings(const RimSummaryCurveAutoName& autoNameSettings);
@@ -118,7 +118,7 @@ private:
caf::PdmChildField<RimSummaryCurveAutoName*> m_curveNameConfig;
caf::PdmField< caf::AppEnum< RimDefines::PlotAxis > > m_plotAxis;
caf::PdmField< caf::AppEnum< RiaDefines::PlotAxis > > m_plotAxis;
// Filter fields
caf::PdmChildField<RimSummaryFilter*> m_summaryFilter;

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@@ -24,7 +24,7 @@
#include "RigSummaryCaseData.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimEclipseResultCase.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@@ -586,7 +586,7 @@ void RimSummaryCurveFilter::updateCaseNameHasChanged()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDefines::PlotAxis RimSummaryCurveFilter::associatedPlotAxis() const
RiaDefines::PlotAxis RimSummaryCurveFilter::associatedPlotAxis() const
{
return m_plotAxis();
}
@@ -594,7 +594,7 @@ RimDefines::PlotAxis RimSummaryCurveFilter::associatedPlotAxis() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryCurveFilter::setPlotAxis(RimDefines::PlotAxis plotAxis)
void RimSummaryCurveFilter::setPlotAxis(RiaDefines::PlotAxis plotAxis)
{
m_plotAxis = plotAxis;
updateConnectedEditors();

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.h
View File

@@ -30,7 +30,7 @@
#include "RifEclipseSummaryAddress.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimSummaryCurveAppearanceCalculator.h"
class QwtPlot;
@@ -70,8 +70,8 @@ public:
void updateCaseNameHasChanged();
RimDefines::PlotAxis associatedPlotAxis() const;
void setPlotAxis(RimDefines::PlotAxis plotAxis);
RiaDefines::PlotAxis associatedPlotAxis() const;
void setPlotAxis(RiaDefines::PlotAxis plotAxis);
void updateCompleteVariableStringFilterChanged();
@@ -109,7 +109,7 @@ private:
caf::PdmPtrArrayField<RimSummaryCase*> m_selectedSummaryCases;
caf::PdmChildArrayField<RimSummaryCurve*> m_curves;
caf::PdmField< caf::AppEnum< RimDefines::PlotAxis > > m_plotAxis;
caf::PdmField< caf::AppEnum< RiaDefines::PlotAxis > > m_plotAxis;
caf::PdmField<bool> m_showLegend;

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp
View File

@@ -20,7 +20,7 @@
#include "RigStatisticsCalculator.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryYAxisProperties.h"
@@ -276,8 +276,8 @@ void RimSummaryPlotYAxisRangeCalculator::computeYRange(double* min, double* max)
if (minValue == HUGE_VAL)
{
minValue = RimDefines::minimumDefaultValuePlot();
maxValue = RimDefines::maximumDefaultValuePlot();
minValue = RiaDefines::minimumDefaultValuePlot();
maxValue = RiaDefines::maximumDefaultValuePlot();
}
// For logarithmic auto scaling, compute positive curve value closest to zero and use

26
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@@ -117,8 +117,8 @@ RimSummaryPlot::~RimSummaryPlot()
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateAxes()
{
updateAxis(RimDefines::PLOT_AXIS_LEFT);
updateAxis(RimDefines::PLOT_AXIS_RIGHT);
updateAxis(RiaDefines::PLOT_AXIS_LEFT);
updateAxis(RiaDefines::PLOT_AXIS_RIGHT);
updateZoomInQwt();
@@ -128,7 +128,7 @@ void RimSummaryPlot::updateAxes()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::isLogarithmicScaleEnabled(RimDefines::PlotAxis plotAxis) const
bool RimSummaryPlot::isLogarithmicScaleEnabled(RiaDefines::PlotAxis plotAxis) const
{
return yAxisPropertiesForAxis(plotAxis)->isLogarithmicScaleEnabled();
}
@@ -431,12 +431,12 @@ QString RimSummaryPlot::asciiDataForPlotExport() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateAxis(RimDefines::PlotAxis plotAxis)
void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis)
{
if (!m_qwtPlot) return;
QwtPlot::Axis qwtAxis = QwtPlot::yLeft;
if (plotAxis == RimDefines::PLOT_AXIS_LEFT)
if (plotAxis == RiaDefines::PLOT_AXIS_LEFT)
{
qwtAxis = QwtPlot::yLeft;
}
@@ -469,7 +469,7 @@ void RimSummaryPlot::updateAxis(RimDefines::PlotAxis plotAxis)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateZoomForAxis(RimDefines::PlotAxis plotAxis)
void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis)
{
RimSummaryYAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis);
@@ -507,7 +507,7 @@ void RimSummaryPlot::updateZoomForAxis(RimDefines::PlotAxis plotAxis)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCurve*> RimSummaryPlot::visibleSummaryCurvesForAxis(RimDefines::PlotAxis plotAxis) const
std::vector<RimSummaryCurve*> RimSummaryPlot::visibleSummaryCurvesForAxis(RiaDefines::PlotAxis plotAxis) const
{
std::vector<RimSummaryCurve*> curves;
@@ -539,7 +539,7 @@ std::vector<RimSummaryCurve*> RimSummaryPlot::visibleSummaryCurvesForAxis(RimDef
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::hasVisibleCurvesForAxis(RimDefines::PlotAxis plotAxis) const
bool RimSummaryPlot::hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) const
{
if (visibleSummaryCurvesForAxis(plotAxis).size() > 0)
{
@@ -557,11 +557,11 @@ bool RimSummaryPlot::hasVisibleCurvesForAxis(RimDefines::PlotAxis plotAxis) cons
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryYAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RimDefines::PlotAxis plotAxis) const
RimSummaryYAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const
{
RimSummaryYAxisProperties* yAxisProps = nullptr;
if (plotAxis == RimDefines::PLOT_AXIS_LEFT)
if (plotAxis == RiaDefines::PLOT_AXIS_LEFT)
{
yAxisProps = m_leftYAxisProperties();
}
@@ -578,7 +578,7 @@ RimSummaryYAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RimDefines::Pl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimGridTimeHistoryCurve*> RimSummaryPlot::visibleTimeHistoryCurvesForAxis(RimDefines::PlotAxis plotAxis) const
std::vector<RimGridTimeHistoryCurve*> RimSummaryPlot::visibleTimeHistoryCurvesForAxis(RiaDefines::PlotAxis plotAxis) const
{
std::vector<RimGridTimeHistoryCurve*> curves;
@@ -699,8 +699,8 @@ void RimSummaryPlot::zoomAll()
{
m_qwtPlot->setAxisAutoScale(QwtPlot::xBottom, true);
updateZoomForAxis(RimDefines::PLOT_AXIS_LEFT);
updateZoomForAxis(RimDefines::PLOT_AXIS_RIGHT);
updateZoomForAxis(RiaDefines::PLOT_AXIS_LEFT);
updateZoomForAxis(RiaDefines::PLOT_AXIS_RIGHT);
m_qwtPlot->replot();
}

16
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h
View File

@@ -25,7 +25,7 @@
#include "cafAppEnum.h"
#include "cafPdmChildField.h"
#include "RimDefines.h"
#include "RiaDefines.h"
#include "RimViewWindow.h"
#include <QPointer>
@@ -82,7 +82,7 @@ public:
void updateZoomWindowFromQwt();
void disableAutoZoom();
bool isLogarithmicScaleEnabled(RimDefines::PlotAxis plotAxis) const;
bool isLogarithmicScaleEnabled(RiaDefines::PlotAxis plotAxis) const;
RimSummaryTimeAxisProperties* timeAxisProperties();
time_t firstTimeStepOfFirstCurve();
@@ -103,13 +103,13 @@ protected:
virtual QImage snapshotWindowContent() override;
private:
std::vector<RimSummaryCurve*> visibleSummaryCurvesForAxis(RimDefines::PlotAxis plotAxis) const;
std::vector<RimGridTimeHistoryCurve*> visibleTimeHistoryCurvesForAxis(RimDefines::PlotAxis plotAxis) const;
bool hasVisibleCurvesForAxis(RimDefines::PlotAxis plotAxis) const;
std::vector<RimSummaryCurve*> visibleSummaryCurvesForAxis(RiaDefines::PlotAxis plotAxis) const;
std::vector<RimGridTimeHistoryCurve*> visibleTimeHistoryCurvesForAxis(RiaDefines::PlotAxis plotAxis) const;
bool hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) const;
RimSummaryYAxisProperties* yAxisPropertiesForAxis(RimDefines::PlotAxis plotAxis) const;
void updateAxis(RimDefines::PlotAxis plotAxis);
void updateZoomForAxis(RimDefines::PlotAxis plotAxis);
RimSummaryYAxisProperties* yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const;
void updateAxis(RiaDefines::PlotAxis plotAxis);
void updateZoomForAxis(RiaDefines::PlotAxis plotAxis);
void updateTimeAxis();
void setZoomIntervalsInQwtPlot();

12
ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp
View File

@@ -19,7 +19,7 @@
#include "RimSummaryYAxisProperties.h"
#include "RimSummaryPlot.h"
#include "RimDefines.h"
#include "RiaDefines.h"
namespace caf
@@ -68,8 +68,8 @@ RimSummaryYAxisProperties::RimSummaryYAxisProperties()
CAF_PDM_InitFieldNoDefault(&titlePositionEnum, "TitlePosition", "Title Position", "", "", "");
CAF_PDM_InitField(&fontSize, "FontSize", 11, "Font Size", "", "", "");
CAF_PDM_InitField(&visibleRangeMax, "VisibleRangeMax", RimDefines::maximumDefaultValuePlot(), "Max", "", "", "");
CAF_PDM_InitField(&visibleRangeMin, "VisibleRangeMin", RimDefines::minimumDefaultValuePlot(), "Min", "", "", "");
CAF_PDM_InitField(&visibleRangeMax, "VisibleRangeMax", RiaDefines::maximumDefaultValuePlot(), "Max", "", "", "");
CAF_PDM_InitField(&visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min", "", "", "");
CAF_PDM_InitFieldNoDefault(&numberFormat, "NumberFormat", "Number Format", "", "", "");
@@ -154,11 +154,11 @@ QwtPlot::Axis RimSummaryYAxisProperties::qwtPlotAxisType() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimDefines::PlotAxis RimSummaryYAxisProperties::plotAxisType() const
RiaDefines::PlotAxis RimSummaryYAxisProperties::plotAxisType() const
{
if (m_axis == QwtPlot::yRight) return RimDefines::PLOT_AXIS_RIGHT;
if (m_axis == QwtPlot::yRight) return RiaDefines::PLOT_AXIS_RIGHT;
return RimDefines::PLOT_AXIS_LEFT;
return RiaDefines::PLOT_AXIS_LEFT;
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h
View File

@@ -19,7 +19,7 @@
#pragma once
#include "RimDefines.h"
#include "RiaDefines.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
@@ -59,7 +59,7 @@ public:
void setNameAndAxis(const QString& name, QwtPlot::Axis axis);
QwtPlot::Axis qwtPlotAxisType() const;
RimDefines::PlotAxis plotAxisType() const;
RiaDefines::PlotAxis plotAxisType() const;
caf::PdmField<bool> isAutoTitle;
caf::PdmField<QString> customTitle;