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

#2092 Cross Plot : Rename to RimSummaryAxisProperties

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-14 12:33:24 +01:00
parent b72ce60379
commit df9e0de39c
7 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake
View File

@@ -22,7 +22,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h
${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.h ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.h
${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.h ${CEE_CURRENT_LIST_DIR}RimSummaryAxisProperties.h
${CEE_CURRENT_LIST_DIR}RimObservedData.h ${CEE_CURRENT_LIST_DIR}RimObservedData.h
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h ${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.h
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h ${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.h
@@ -50,7 +50,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryTimeAxisProperties.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryYAxisProperties.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryAxisProperties.cpp
${CEE_CURRENT_LIST_DIR}RimObservedData.cpp ${CEE_CURRENT_LIST_DIR}RimObservedData.cpp
${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp ${CEE_CURRENT_LIST_DIR}RimObservedDataCollection.cpp
${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp

46
ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp → ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.cpp
View File

@@ -16,7 +16,7 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RimSummaryYAxisProperties.h" #include "RimSummaryAxisProperties.h"
#include "RimSummaryPlot.h" #include "RimSummaryPlot.h"
#include "RiaDefines.h" #include "RiaDefines.h"
@@ -25,35 +25,35 @@
namespace caf namespace caf
{ {
template<> template<>
void caf::AppEnum< RimSummaryYAxisProperties::NumberFormatType >::setUp() void caf::AppEnum< RimSummaryAxisProperties::NumberFormatType >::setUp()
{ {
addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_AUTO, "NUMBER_FORMAT_AUTO", "Auto"); addItem(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO, "NUMBER_FORMAT_AUTO", "Auto");
addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_DECIMAL, "NUMBER_FORMAT_DECIMAL", "Decimal"); addItem(RimSummaryAxisProperties::NUMBER_FORMAT_DECIMAL, "NUMBER_FORMAT_DECIMAL", "Decimal");
addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_SCIENTIFIC,"NUMBER_FORMAT_SCIENTIFIC", "Scientific"); addItem(RimSummaryAxisProperties::NUMBER_FORMAT_SCIENTIFIC,"NUMBER_FORMAT_SCIENTIFIC", "Scientific");
setDefault(RimSummaryYAxisProperties::NUMBER_FORMAT_AUTO); setDefault(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO);
} }
} }
namespace caf namespace caf
{ {
template<> template<>
void caf::AppEnum< RimSummaryYAxisProperties::AxisTitlePositionType >::setUp() void caf::AppEnum< RimSummaryAxisProperties::AxisTitlePositionType >::setUp()
{ {
addItem(RimSummaryYAxisProperties::AXIS_TITLE_CENTER, "AXIS_TITLE_CENTER", "Center"); addItem(RimSummaryAxisProperties::AXIS_TITLE_CENTER, "AXIS_TITLE_CENTER", "Center");
addItem(RimSummaryYAxisProperties::AXIS_TITLE_END, "AXIS_TITLE_END", "At End"); addItem(RimSummaryAxisProperties::AXIS_TITLE_END, "AXIS_TITLE_END", "At End");
setDefault(RimSummaryYAxisProperties::AXIS_TITLE_CENTER); setDefault(RimSummaryAxisProperties::AXIS_TITLE_CENTER);
} }
} }
CAF_PDM_SOURCE_INIT(RimSummaryYAxisProperties, "SummaryYAxisProperties"); CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryYAxisProperties::RimSummaryYAxisProperties() RimSummaryAxisProperties::RimSummaryAxisProperties()
{ {
CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", ""); CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", "");
@@ -81,7 +81,7 @@ RimSummaryYAxisProperties::RimSummaryYAxisProperties()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimSummaryYAxisProperties::userDescriptionField() caf::PdmFieldHandle* RimSummaryAxisProperties::userDescriptionField()
{ {
return &m_name; return &m_name;
} }
@@ -89,7 +89,7 @@ caf::PdmFieldHandle* RimSummaryYAxisProperties::userDescriptionField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryYAxisProperties::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RimSummaryAxisProperties::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> options; QList<caf::PdmOptionItemInfo> options;
*useOptionsOnly = true; *useOptionsOnly = true;
@@ -116,7 +116,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryYAxisProperties::calculateValueOptions(c
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryYAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimSummaryAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup& titleGroup = *(uiOrdering.addNewGroup("Axis Title")); caf::PdmUiGroup& titleGroup = *(uiOrdering.addNewGroup("Axis Title"));
titleGroup.add(&isAutoTitle); titleGroup.add(&isAutoTitle);
@@ -135,7 +135,7 @@ void RimSummaryYAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmU
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryYAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axis axis) void RimSummaryAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axis axis)
{ {
m_name = name; m_name = name;
m_axis = axis; m_axis = axis;
@@ -146,7 +146,7 @@ void RimSummaryYAxisProperties::setNameAndAxis(const QString& name, QwtPlot::Axi
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QwtPlot::Axis RimSummaryYAxisProperties::qwtPlotAxisType() const QwtPlot::Axis RimSummaryAxisProperties::qwtPlotAxisType() const
{ {
return m_axis; return m_axis;
} }
@@ -154,7 +154,7 @@ QwtPlot::Axis RimSummaryYAxisProperties::qwtPlotAxisType() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaDefines::PlotAxis RimSummaryYAxisProperties::plotAxisType() const RiaDefines::PlotAxis RimSummaryAxisProperties::plotAxisType() const
{ {
if (m_axis == QwtPlot::yRight) return RiaDefines::PLOT_AXIS_RIGHT; if (m_axis == QwtPlot::yRight) return RiaDefines::PLOT_AXIS_RIGHT;
@@ -164,7 +164,7 @@ RiaDefines::PlotAxis RimSummaryYAxisProperties::plotAxisType() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimSummaryYAxisProperties::isActive() const bool RimSummaryAxisProperties::isActive() const
{ {
return m_isActive; return m_isActive;
} }
@@ -172,7 +172,7 @@ bool RimSummaryYAxisProperties::isActive() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimSummaryAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &isAutoTitle) if (changedField == &isAutoTitle)
@@ -211,7 +211,7 @@ void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* chan
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryYAxisProperties::updateOptionSensitivity() void RimSummaryAxisProperties::updateOptionSensitivity()
{ {
customTitle.uiCapability()->setUiReadOnly(isAutoTitle); customTitle.uiCapability()->setUiReadOnly(isAutoTitle);
} }
@@ -219,7 +219,7 @@ void RimSummaryYAxisProperties::updateOptionSensitivity()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryYAxisProperties::initAfterRead() void RimSummaryAxisProperties::initAfterRead()
{ {
updateOptionSensitivity(); updateOptionSensitivity();
} }
@@ -227,7 +227,7 @@ void RimSummaryYAxisProperties::initAfterRead()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimSummaryYAxisProperties::objectToggleField() caf::PdmFieldHandle* RimSummaryAxisProperties::objectToggleField()
{ {
return &m_isActive; return &m_isActive;
} }

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

@@ -36,7 +36,7 @@
/// ///
/// ///
//================================================================================================== //==================================================================================================
class RimSummaryYAxisProperties : public caf::PdmObject class RimSummaryAxisProperties : public caf::PdmObject
{ {
CAF_PDM_HEADER_INIT; CAF_PDM_HEADER_INIT;
@@ -55,7 +55,7 @@ public:
}; };
public: public:
RimSummaryYAxisProperties(); RimSummaryAxisProperties();
void setNameAndAxis(const QString& name, QwtPlot::Axis axis); void setNameAndAxis(const QString& name, QwtPlot::Axis axis);
QwtPlot::Axis qwtPlotAxisType() const; QwtPlot::Axis qwtPlotAxisType() const;

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

@@ -22,7 +22,7 @@
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
#include "RimSummaryYAxisProperties.h" #include "RimSummaryAxisProperties.h"
#include "RimAsciiDataCurve.h" #include "RimAsciiDataCurve.h"
#include "RiuSummaryQwtPlot.h" #include "RiuSummaryQwtPlot.h"
@@ -97,7 +97,7 @@ public:
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter(RimSummaryYAxisProperties* axisProperties, RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter(RimSummaryAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves, const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities) const std::set<QString>& timeHistoryCurveQuantities)
@@ -131,10 +131,10 @@ void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot(RiuSummaryQwtPlot*
switch (m_axisProperties->titlePositionEnum()) switch (m_axisProperties->titlePositionEnum())
{ {
case RimSummaryYAxisProperties::AXIS_TITLE_CENTER: case RimSummaryAxisProperties::AXIS_TITLE_CENTER:
axisTitleY.setRenderFlags(Qt::AlignCenter); axisTitleY.setRenderFlags(Qt::AlignCenter);
break; break;
case RimSummaryYAxisProperties::AXIS_TITLE_END: case RimSummaryAxisProperties::AXIS_TITLE_END:
axisTitleY.setRenderFlags(Qt::AlignRight); axisTitleY.setRenderFlags(Qt::AlignRight);
break; break;
} }
@@ -150,15 +150,15 @@ void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot(RiuSummaryQwtPlot*
} }
{ {
if (m_axisProperties->numberFormat == RimSummaryYAxisProperties::NUMBER_FORMAT_AUTO) if (m_axisProperties->numberFormat == RimSummaryAxisProperties::NUMBER_FORMAT_AUTO)
{ {
qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new QwtScaleDraw); qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new QwtScaleDraw);
} }
else if (m_axisProperties->numberFormat == RimSummaryYAxisProperties::NUMBER_FORMAT_DECIMAL) else if (m_axisProperties->numberFormat == RimSummaryAxisProperties::NUMBER_FORMAT_DECIMAL)
{ {
qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new DecimalScaleDraw); qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new DecimalScaleDraw);
} }
else if (m_axisProperties->numberFormat == RimSummaryYAxisProperties::NUMBER_FORMAT_SCIENTIFIC) else if (m_axisProperties->numberFormat == RimSummaryAxisProperties::NUMBER_FORMAT_SCIENTIFIC)
{ {
qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new ScientificScaleDraw()); qwtPlot->setAxisScaleDraw(m_axisProperties->qwtPlotAxisType(), new ScientificScaleDraw());
} }

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

@@ -24,7 +24,7 @@
class RimAsciiDataCurve; class RimAsciiDataCurve;
class RimSummaryCurve; class RimSummaryCurve;
class RimSummaryYAxisProperties; class RimSummaryAxisProperties;
class RiuSummaryQwtPlot; class RiuSummaryQwtPlot;
@@ -33,7 +33,7 @@ class QwtPlotCurve;
class RimSummaryPlotYAxisFormatter class RimSummaryPlotYAxisFormatter
{ {
public: public:
RimSummaryPlotYAxisFormatter(RimSummaryYAxisProperties* axisProperties, RimSummaryPlotYAxisFormatter(RimSummaryAxisProperties* axisProperties,
const std::vector<RimSummaryCurve*>& summaryCurves, const std::vector<RimSummaryCurve*>& summaryCurves,
const std::vector<RimAsciiDataCurve*>& asciiCurves, const std::vector<RimAsciiDataCurve*>& asciiCurves,
const std::set<QString>& timeHistoryCurveQuantities); const std::set<QString>& timeHistoryCurveQuantities);
@@ -44,7 +44,7 @@ private:
QString autoAxisTitle() const; QString autoAxisTitle() const;
private: private:
RimSummaryYAxisProperties* m_axisProperties; RimSummaryAxisProperties* m_axisProperties;
const std::vector<RimSummaryCurve*> m_summaryCurves; const std::vector<RimSummaryCurve*> m_summaryCurves;
const std::vector<RimAsciiDataCurve*> m_asciiDataCurves; const std::vector<RimAsciiDataCurve*> m_asciiDataCurves;
const std::set<QString> m_timeHistoryCurveQuantities; const std::set<QString> m_timeHistoryCurveQuantities;

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

@@ -29,7 +29,7 @@
#include "RimSummaryCurvesCalculator.h" #include "RimSummaryCurvesCalculator.h"
#include "RimSummaryPlotCollection.h" #include "RimSummaryPlotCollection.h"
#include "RimSummaryTimeAxisProperties.h" #include "RimSummaryTimeAxisProperties.h"
#include "RimSummaryYAxisProperties.h" #include "RimSummaryAxisProperties.h"
#include "RiuMainPlotWindow.h" #include "RiuMainPlotWindow.h"
#include "RiuSummaryQwtPlot.h" #include "RiuSummaryQwtPlot.h"
@@ -85,17 +85,17 @@ RimSummaryPlot::RimSummaryPlot()
CAF_PDM_InitFieldNoDefault(&m_leftYAxisProperties, "LeftYAxisProperties", "Left Y Axis", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_leftYAxisProperties, "LeftYAxisProperties", "Left Y Axis", "", "", "");
m_leftYAxisProperties.uiCapability()->setUiTreeHidden(true); m_leftYAxisProperties.uiCapability()->setUiTreeHidden(true);
m_leftYAxisProperties = new RimSummaryYAxisProperties; m_leftYAxisProperties = new RimSummaryAxisProperties;
m_leftYAxisProperties->setNameAndAxis("Left Y-Axis", QwtPlot::yLeft); m_leftYAxisProperties->setNameAndAxis("Left Y-Axis", QwtPlot::yLeft);
CAF_PDM_InitFieldNoDefault(&m_rightYAxisProperties, "RightYAxisProperties", "Right Y Axis", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_rightYAxisProperties, "RightYAxisProperties", "Right Y Axis", "", "", "");
m_rightYAxisProperties.uiCapability()->setUiTreeHidden(true); m_rightYAxisProperties.uiCapability()->setUiTreeHidden(true);
m_rightYAxisProperties = new RimSummaryYAxisProperties; m_rightYAxisProperties = new RimSummaryAxisProperties;
m_rightYAxisProperties->setNameAndAxis("Right Y-Axis", QwtPlot::yRight); m_rightYAxisProperties->setNameAndAxis("Right Y-Axis", QwtPlot::yRight);
CAF_PDM_InitFieldNoDefault(&m_bottomAxisProperties, "BottomAxisProperties", "Bottom X Axis", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_bottomAxisProperties, "BottomAxisProperties", "Bottom X Axis", "", "", "");
m_bottomAxisProperties.uiCapability()->setUiTreeHidden(true); m_bottomAxisProperties.uiCapability()->setUiTreeHidden(true);
m_bottomAxisProperties = new RimSummaryYAxisProperties; m_bottomAxisProperties = new RimSummaryAxisProperties;
m_bottomAxisProperties->setNameAndAxis("Bottom X-Axis", QwtPlot::xBottom); m_bottomAxisProperties->setNameAndAxis("Bottom X-Axis", QwtPlot::xBottom);
CAF_PDM_InitFieldNoDefault(&m_timeAxisProperties, "TimeAxisProperties", "Time Axis", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_timeAxisProperties, "TimeAxisProperties", "Time Axis", "", "", "");
@@ -501,7 +501,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis)
qwtAxis = QwtPlot::yRight; qwtAxis = QwtPlot::yRight;
} }
RimSummaryYAxisProperties* yAxisProperties = yAxisPropertiesForAxis(plotAxis); RimSummaryAxisProperties* yAxisProperties = yAxisPropertiesForAxis(plotAxis);
if (yAxisProperties->isActive() && hasVisibleCurvesForAxis(plotAxis)) if (yAxisProperties->isActive() && hasVisibleCurvesForAxis(plotAxis))
{ {
m_qwtPlot->enableAxis(qwtAxis, true); m_qwtPlot->enableAxis(qwtAxis, true);
@@ -530,7 +530,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis) void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis)
{ {
RimSummaryYAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis); RimSummaryAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis);
if (yAxisProps->isLogarithmicScaleEnabled) if (yAxisProps->isLogarithmicScaleEnabled)
{ {
@@ -639,9 +639,9 @@ bool RimSummaryPlot::hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryYAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const RimSummaryAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const
{ {
RimSummaryYAxisProperties* yAxisProps = nullptr; RimSummaryAxisProperties* yAxisProps = nullptr;
if (plotAxis == RiaDefines::PLOT_AXIS_LEFT) if (plotAxis == RiaDefines::PLOT_AXIS_LEFT)
{ {

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

@@ -34,7 +34,7 @@ class RimSummaryCurve;
class RimSummaryCurveCollection; class RimSummaryCurveCollection;
class RimSummaryCurveFilter; class RimSummaryCurveFilter;
class RimSummaryTimeAxisProperties; class RimSummaryTimeAxisProperties;
class RimSummaryYAxisProperties; class RimSummaryAxisProperties;
class RiuSummaryQwtPlot; class RiuSummaryQwtPlot;
class QwtInterval; class QwtInterval;
@@ -128,7 +128,7 @@ private:
std::vector<RimAsciiDataCurve*> visibleAsciiDataCurvesForAxis(RiaDefines::PlotAxis plotAxis) const; std::vector<RimAsciiDataCurve*> visibleAsciiDataCurvesForAxis(RiaDefines::PlotAxis plotAxis) const;
bool hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) const; bool hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) const;
RimSummaryYAxisProperties* yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const; RimSummaryAxisProperties* yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const;
void updateAxis(RiaDefines::PlotAxis plotAxis); void updateAxis(RiaDefines::PlotAxis plotAxis);
void updateZoomForAxis(RiaDefines::PlotAxis plotAxis); void updateZoomForAxis(RiaDefines::PlotAxis plotAxis);
@@ -145,10 +145,10 @@ private:
caf::PdmChildArrayField<RimAsciiDataCurve*> m_asciiDataCurves; caf::PdmChildArrayField<RimAsciiDataCurve*> m_asciiDataCurves;
caf::PdmField<bool> m_isAutoZoom; caf::PdmField<bool> m_isAutoZoom;
caf::PdmChildField<RimSummaryYAxisProperties*> m_leftYAxisProperties; caf::PdmChildField<RimSummaryAxisProperties*> m_leftYAxisProperties;
caf::PdmChildField<RimSummaryYAxisProperties*> m_rightYAxisProperties; caf::PdmChildField<RimSummaryAxisProperties*> m_rightYAxisProperties;
caf::PdmChildField<RimSummaryYAxisProperties*> m_bottomAxisProperties; caf::PdmChildField<RimSummaryAxisProperties*> m_bottomAxisProperties;
caf::PdmChildField<RimSummaryTimeAxisProperties*> m_timeAxisProperties; caf::PdmChildField<RimSummaryTimeAxisProperties*> m_timeAxisProperties;
QPointer<RiuSummaryQwtPlot> m_qwtPlot; QPointer<RiuSummaryQwtPlot> m_qwtPlot;