diff --git a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake index fd80b70323..0ac2b102b4 100644 --- a/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake +++ b/ApplicationCode/ProjectDataModel/Summary/CMakeLists_files.cmake @@ -22,7 +22,7 @@ ${CEE_CURRENT_LIST_DIR}RimSummaryPlot.h ${CEE_CURRENT_LIST_DIR}RimSummaryPlotCollection.h ${CEE_CURRENT_LIST_DIR}RimSummaryCrossPlotCollection.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}RimObservedDataCollection.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}RimSummaryCrossPlotCollection.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}RimObservedDataCollection.cpp ${CEE_CURRENT_LIST_DIR}RimSummaryObservedDataFile.cpp diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.cpp similarity index 78% rename from ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.cpp index b063c76406..7b6c20a73d 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.cpp @@ -16,7 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// -#include "RimSummaryYAxisProperties.h" +#include "RimSummaryAxisProperties.h" #include "RimSummaryPlot.h" #include "RiaDefines.h" @@ -25,35 +25,35 @@ namespace caf { template<> - void caf::AppEnum< RimSummaryYAxisProperties::NumberFormatType >::setUp() + void caf::AppEnum< RimSummaryAxisProperties::NumberFormatType >::setUp() { - addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_AUTO, "NUMBER_FORMAT_AUTO", "Auto"); - addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_DECIMAL, "NUMBER_FORMAT_DECIMAL", "Decimal"); - addItem(RimSummaryYAxisProperties::NUMBER_FORMAT_SCIENTIFIC,"NUMBER_FORMAT_SCIENTIFIC", "Scientific"); + addItem(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO, "NUMBER_FORMAT_AUTO", "Auto"); + addItem(RimSummaryAxisProperties::NUMBER_FORMAT_DECIMAL, "NUMBER_FORMAT_DECIMAL", "Decimal"); + addItem(RimSummaryAxisProperties::NUMBER_FORMAT_SCIENTIFIC,"NUMBER_FORMAT_SCIENTIFIC", "Scientific"); - setDefault(RimSummaryYAxisProperties::NUMBER_FORMAT_AUTO); + setDefault(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO); } } namespace caf { template<> -void caf::AppEnum< RimSummaryYAxisProperties::AxisTitlePositionType >::setUp() +void caf::AppEnum< RimSummaryAxisProperties::AxisTitlePositionType >::setUp() { - addItem(RimSummaryYAxisProperties::AXIS_TITLE_CENTER, "AXIS_TITLE_CENTER", "Center"); - addItem(RimSummaryYAxisProperties::AXIS_TITLE_END, "AXIS_TITLE_END", "At End"); + addItem(RimSummaryAxisProperties::AXIS_TITLE_CENTER, "AXIS_TITLE_CENTER", "Center"); + 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", "", ""); @@ -81,7 +81,7 @@ RimSummaryYAxisProperties::RimSummaryYAxisProperties() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmFieldHandle* RimSummaryYAxisProperties::userDescriptionField() +caf::PdmFieldHandle* RimSummaryAxisProperties::userDescriptionField() { return &m_name; } @@ -89,7 +89,7 @@ caf::PdmFieldHandle* RimSummaryYAxisProperties::userDescriptionField() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -QList RimSummaryYAxisProperties::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) +QList RimSummaryAxisProperties::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) { QList options; *useOptionsOnly = true; @@ -116,7 +116,7 @@ QList 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")); 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_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; } @@ -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; @@ -164,7 +164,7 @@ RiaDefines::PlotAxis RimSummaryYAxisProperties::plotAxisType() const //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -bool RimSummaryYAxisProperties::isActive() const +bool RimSummaryAxisProperties::isActive() const { 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) @@ -211,7 +211,7 @@ void RimSummaryYAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* chan //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryYAxisProperties::updateOptionSensitivity() +void RimSummaryAxisProperties::updateOptionSensitivity() { customTitle.uiCapability()->setUiReadOnly(isAutoTitle); } @@ -219,7 +219,7 @@ void RimSummaryYAxisProperties::updateOptionSensitivity() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -void RimSummaryYAxisProperties::initAfterRead() +void RimSummaryAxisProperties::initAfterRead() { updateOptionSensitivity(); } @@ -227,7 +227,7 @@ void RimSummaryYAxisProperties::initAfterRead() //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -caf::PdmFieldHandle* RimSummaryYAxisProperties::objectToggleField() +caf::PdmFieldHandle* RimSummaryAxisProperties::objectToggleField() { return &m_isActive; } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.h similarity index 97% rename from ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h rename to ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.h index 42e961796f..f86be9008e 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryYAxisProperties.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.h @@ -36,7 +36,7 @@ /// /// //================================================================================================== -class RimSummaryYAxisProperties : public caf::PdmObject +class RimSummaryAxisProperties : public caf::PdmObject { CAF_PDM_HEADER_INIT; @@ -55,7 +55,7 @@ public: }; public: - RimSummaryYAxisProperties(); + RimSummaryAxisProperties(); void setNameAndAxis(const QString& name, QwtPlot::Axis axis); QwtPlot::Axis qwtPlotAxisType() const; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp index 35cd13b8ab..fd097e72bf 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.cpp @@ -22,7 +22,7 @@ #include "RiaDefines.h" #include "RimSummaryCurve.h" -#include "RimSummaryYAxisProperties.h" +#include "RimSummaryAxisProperties.h" #include "RimAsciiDataCurve.h" #include "RiuSummaryQwtPlot.h" @@ -97,7 +97,7 @@ public: //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- -RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter(RimSummaryYAxisProperties* axisProperties, +RimSummaryPlotYAxisFormatter::RimSummaryPlotYAxisFormatter(RimSummaryAxisProperties* axisProperties, const std::vector& summaryCurves, const std::vector& asciiCurves, const std::set& timeHistoryCurveQuantities) @@ -131,10 +131,10 @@ void RimSummaryPlotYAxisFormatter::applyYAxisPropertiesToPlot(RiuSummaryQwtPlot* switch (m_axisProperties->titlePositionEnum()) { - case RimSummaryYAxisProperties::AXIS_TITLE_CENTER: + case RimSummaryAxisProperties::AXIS_TITLE_CENTER: axisTitleY.setRenderFlags(Qt::AlignCenter); break; - case RimSummaryYAxisProperties::AXIS_TITLE_END: + case RimSummaryAxisProperties::AXIS_TITLE_END: axisTitleY.setRenderFlags(Qt::AlignRight); 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); } - 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); } - 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()); } diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h index ddbc5ab2d4..21d97cdae2 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryCurvesCalculator.h @@ -24,7 +24,7 @@ class RimAsciiDataCurve; class RimSummaryCurve; -class RimSummaryYAxisProperties; +class RimSummaryAxisProperties; class RiuSummaryQwtPlot; @@ -33,7 +33,7 @@ class QwtPlotCurve; class RimSummaryPlotYAxisFormatter { public: - RimSummaryPlotYAxisFormatter(RimSummaryYAxisProperties* axisProperties, + RimSummaryPlotYAxisFormatter(RimSummaryAxisProperties* axisProperties, const std::vector& summaryCurves, const std::vector& asciiCurves, const std::set& timeHistoryCurveQuantities); @@ -44,7 +44,7 @@ private: QString autoAxisTitle() const; private: - RimSummaryYAxisProperties* m_axisProperties; + RimSummaryAxisProperties* m_axisProperties; const std::vector m_summaryCurves; const std::vector m_asciiDataCurves; const std::set m_timeHistoryCurveQuantities; diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp index 469cb33bc4..c5609233ff 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp @@ -29,7 +29,7 @@ #include "RimSummaryCurvesCalculator.h" #include "RimSummaryPlotCollection.h" #include "RimSummaryTimeAxisProperties.h" -#include "RimSummaryYAxisProperties.h" +#include "RimSummaryAxisProperties.h" #include "RiuMainPlotWindow.h" #include "RiuSummaryQwtPlot.h" @@ -85,17 +85,17 @@ RimSummaryPlot::RimSummaryPlot() CAF_PDM_InitFieldNoDefault(&m_leftYAxisProperties, "LeftYAxisProperties", "Left Y Axis", "", "", ""); m_leftYAxisProperties.uiCapability()->setUiTreeHidden(true); - m_leftYAxisProperties = new RimSummaryYAxisProperties; + m_leftYAxisProperties = new RimSummaryAxisProperties; m_leftYAxisProperties->setNameAndAxis("Left Y-Axis", QwtPlot::yLeft); CAF_PDM_InitFieldNoDefault(&m_rightYAxisProperties, "RightYAxisProperties", "Right Y Axis", "", "", ""); m_rightYAxisProperties.uiCapability()->setUiTreeHidden(true); - m_rightYAxisProperties = new RimSummaryYAxisProperties; + m_rightYAxisProperties = new RimSummaryAxisProperties; m_rightYAxisProperties->setNameAndAxis("Right Y-Axis", QwtPlot::yRight); CAF_PDM_InitFieldNoDefault(&m_bottomAxisProperties, "BottomAxisProperties", "Bottom X Axis", "", "", ""); m_bottomAxisProperties.uiCapability()->setUiTreeHidden(true); - m_bottomAxisProperties = new RimSummaryYAxisProperties; + m_bottomAxisProperties = new RimSummaryAxisProperties; m_bottomAxisProperties->setNameAndAxis("Bottom X-Axis", QwtPlot::xBottom); CAF_PDM_InitFieldNoDefault(&m_timeAxisProperties, "TimeAxisProperties", "Time Axis", "", "", ""); @@ -501,7 +501,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis) qwtAxis = QwtPlot::yRight; } - RimSummaryYAxisProperties* yAxisProperties = yAxisPropertiesForAxis(plotAxis); + RimSummaryAxisProperties* yAxisProperties = yAxisPropertiesForAxis(plotAxis); if (yAxisProperties->isActive() && hasVisibleCurvesForAxis(plotAxis)) { m_qwtPlot->enableAxis(qwtAxis, true); @@ -530,7 +530,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis) //-------------------------------------------------------------------------------------------------- void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis) { - RimSummaryYAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis); + RimSummaryAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis); 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) { diff --git a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h index b08989edea..cdee6f762b 100644 --- a/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h +++ b/ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.h @@ -34,7 +34,7 @@ class RimSummaryCurve; class RimSummaryCurveCollection; class RimSummaryCurveFilter; class RimSummaryTimeAxisProperties; -class RimSummaryYAxisProperties; +class RimSummaryAxisProperties; class RiuSummaryQwtPlot; class QwtInterval; @@ -128,7 +128,7 @@ private: std::vector visibleAsciiDataCurvesForAxis(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 updateZoomForAxis(RiaDefines::PlotAxis plotAxis); @@ -145,10 +145,10 @@ private: caf::PdmChildArrayField m_asciiDataCurves; caf::PdmField m_isAutoZoom; - caf::PdmChildField m_leftYAxisProperties; - caf::PdmChildField m_rightYAxisProperties; + caf::PdmChildField m_leftYAxisProperties; + caf::PdmChildField m_rightYAxisProperties; - caf::PdmChildField m_bottomAxisProperties; + caf::PdmChildField m_bottomAxisProperties; caf::PdmChildField m_timeAxisProperties; QPointer m_qwtPlot;