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

#2243 Summary Plot : Reorganize axis properties fields

Browse Source
This commit is contained in:
Magne Sjaastad
2017-12-12 08:35:37 +01:00
parent 96b1fc9160
commit ab53135f91
3 changed files with 40 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.cpp
View File

@@ -25,9 +25,9 @@
#include <cmath> #include <cmath>
// clang-format off
namespace caf namespace caf
{ {
// clang-format off
template<> template<>
void caf::AppEnum<RimSummaryAxisProperties::NumberFormatType>::setUp() void caf::AppEnum<RimSummaryAxisProperties::NumberFormatType>::setUp()
{ {
@@ -46,7 +46,6 @@ void caf::AppEnum<RimSummaryAxisProperties::AxisTitlePositionType>::setUp()
setDefault(RimSummaryAxisProperties::AXIS_TITLE_CENTER); setDefault(RimSummaryAxisProperties::AXIS_TITLE_CENTER);
} }
// clang-format on
} // namespace caf } // namespace caf
CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties"); CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties");
@@ -56,8 +55,6 @@ CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties");
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryAxisProperties::RimSummaryAxisProperties() RimSummaryAxisProperties::RimSummaryAxisProperties()
{ {
// clang-format off
CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", ""); CAF_PDM_InitObject("Y-Axis Properties", ":/LeftAxis16x16.png", "", "");
CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", ""); CAF_PDM_InitField(&m_isActive, "Active", true, "Active", "", "", "");
@@ -68,32 +65,31 @@ RimSummaryAxisProperties::RimSummaryAxisProperties()
CAF_PDM_InitField(&isAutoTitle, "AutoTitle", true, "Auto Title", "", "", ""); CAF_PDM_InitField(&isAutoTitle, "AutoTitle", true, "Auto Title", "", "", "");
CAF_PDM_InitField(&m_displayLongName, "DisplayLongName", true, "Title Names", "", "", ""); CAF_PDM_InitField(&m_displayLongName, "DisplayLongName", true, " Names", "", "", "");
CAF_PDM_InitField(&m_displayShortName, "DisplayShortName", false, "Title Acronymes", "", "", ""); CAF_PDM_InitField(&m_displayShortName, "DisplayShortName", false, " Acronymes", "", "", "");
CAF_PDM_InitField(&m_displayUnitText, "DisplayUnitText", true, "Title Units", "", "", ""); CAF_PDM_InitField(&m_displayUnitText, "DisplayUnitText", true, " Units", "", "", "");
CAF_PDM_InitFieldNoDefault(&customTitle, "CustomTitle", "Title", "", "", ""); CAF_PDM_InitFieldNoDefault(&customTitle, "CustomTitle", "Title", "", "", "");
CAF_PDM_InitFieldNoDefault(&titlePositionEnum, "TitlePosition", "Title Position", "", "", ""); CAF_PDM_InitFieldNoDefault(&titlePositionEnum, "TitlePosition", "Title Position", "", "", "");
CAF_PDM_InitField(&titleFontSize, "FontSize", 11, "Font Size", "", "", ""); CAF_PDM_InitField(&titleFontSize, "FontSize", 11, "Font Size", "", "", "");
CAF_PDM_InitField(&visibleRangeMax, "VisibleRangeMax", RiaDefines::maximumDefaultValuePlot(), "Max", "", "", ""); CAF_PDM_InitField(&visibleRangeMax, "VisibleRangeMax", RiaDefines::maximumDefaultValuePlot(), "Max", "", "", "");
CAF_PDM_InitField(&visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min", "", "", ""); CAF_PDM_InitField(&visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min", "", "", "");
CAF_PDM_InitFieldNoDefault(&numberFormat, "NumberFormat", "Number Format", "", "", ""); CAF_PDM_InitFieldNoDefault(&numberFormat, "NumberFormat", "Number Format", "", "", "");
CAF_PDM_InitField(&numberOfDecimals, "Decimals", 2, "Number of Decimals", "", "", ""); CAF_PDM_InitField(&numberOfDecimals, "Decimals", 2, "Number of Decimals", "", "", "");
CAF_PDM_InitField(&scaleFactor, "ScaleFactor", 1.0, "Scale Factor", "", "", ""); CAF_PDM_InitField(&scaleFactor, "ScaleFactor", 1.0, "Scale Factor", "", "", "");
CAF_PDM_InitField(&valuesFontSize, "ValuesFontSize", 11, "Font Size", "", "", ""); CAF_PDM_InitField(&valuesFontSize, "ValuesFontSize", 11, "Font Size", "", "", "");
numberOfDecimals.uiCapability()->setUiEditorTypeName(caf::PdmUiSliderEditor::uiEditorTypeName()); numberOfDecimals.uiCapability()->setUiEditorTypeName(caf::PdmUiSliderEditor::uiEditorTypeName());
CAF_PDM_InitField(&isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale", "", "", ""); CAF_PDM_InitField(&isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale", "", "", "");
updateOptionSensitivity(); updateOptionSensitivity();
// clang-format on
} }
// clang-format on
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -149,25 +145,31 @@ QList<caf::PdmOptionItemInfo> RimSummaryAxisProperties::calculateValueOptions(co
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) void RimSummaryAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{ {
caf::PdmUiGroup& titleGroup = *(uiOrdering.addNewGroup("Axis Title"));
titleGroup.add(&isAutoTitle);
titleGroup.add(&customTitle);
if (isAutoTitle())
{ {
titleGroup.add(&m_displayShortName); caf::PdmUiGroup* titleTextGroup = uiOrdering.addNewGroup("Title Text");
titleGroup.add(&m_displayLongName);
titleGroup.add(&m_displayUnitText);
customTitle.uiCapability()->setUiReadOnly(true); titleTextGroup->add(&isAutoTitle);
}
else if (isAutoTitle())
{ {
customTitle.uiCapability()->setUiReadOnly(false); titleTextGroup->add(&m_displayLongName);
titleTextGroup->add(&m_displayShortName);
titleTextGroup->add(&m_displayUnitText);
customTitle.uiCapability()->setUiReadOnly(true);
}
else
{
titleTextGroup->add(&customTitle);
customTitle.uiCapability()->setUiReadOnly(false);
}
} }
titleGroup.add(&titlePositionEnum); {
titleGroup.add(&titleFontSize); caf::PdmUiGroup* titleGroup = uiOrdering.addNewGroup("Title Layout");
titleGroup->add(&titlePositionEnum);
titleGroup->add(&titleFontSize);
}
caf::PdmUiGroup& scaleGroup = *(uiOrdering.addNewGroup("Axis Values")); caf::PdmUiGroup& scaleGroup = *(uiOrdering.addNewGroup("Axis Values"));
scaleGroup.add(&isLogarithmicScaleEnabled); scaleGroup.add(&isLogarithmicScaleEnabled);

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

@@ -156,7 +156,7 @@ void RimSummaryPlot::updateAxes()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimSummaryPlot::isLogarithmicScaleEnabled(RiaDefines::PlotAxis plotAxis) const bool RimSummaryPlot::isLogarithmicScaleEnabled(RiaDefines::PlotAxis plotAxis) const
{ {
return yAxisPropertiesForAxis(plotAxis)->isLogarithmicScaleEnabled(); return yAxisPropertiesLeftOrRight(plotAxis)->isLogarithmicScaleEnabled();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -516,7 +516,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis)
qwtAxis = QwtPlot::yRight; qwtAxis = QwtPlot::yRight;
} }
RimSummaryAxisProperties* yAxisProperties = yAxisPropertiesForAxis(plotAxis); RimSummaryAxisProperties* yAxisProperties = yAxisPropertiesLeftOrRight(plotAxis);
if (yAxisProperties->isActive() && hasVisibleCurvesForAxis(plotAxis)) if (yAxisProperties->isActive() && hasVisibleCurvesForAxis(plotAxis))
{ {
m_qwtPlot->enableAxis(qwtAxis, true); m_qwtPlot->enableAxis(qwtAxis, true);
@@ -545,7 +545,7 @@ void RimSummaryPlot::updateAxis(RiaDefines::PlotAxis plotAxis)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis) void RimSummaryPlot::updateZoomForAxis(RiaDefines::PlotAxis plotAxis)
{ {
RimSummaryAxisProperties* yAxisProps = yAxisPropertiesForAxis(plotAxis); RimSummaryAxisProperties* yAxisProps = yAxisPropertiesLeftOrRight(plotAxis);
if (yAxisProps->isLogarithmicScaleEnabled) if (yAxisProps->isLogarithmicScaleEnabled)
{ {
@@ -648,11 +648,11 @@ bool RimSummaryPlot::hasVisibleCurvesForAxis(RiaDefines::PlotAxis plotAxis) cons
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryAxisProperties* RimSummaryPlot::yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const RimSummaryAxisProperties* RimSummaryPlot::yAxisPropertiesLeftOrRight(RiaDefines::PlotAxis leftOrRightPlotAxis) const
{ {
RimSummaryAxisProperties* yAxisProps = nullptr; RimSummaryAxisProperties* yAxisProps = nullptr;
if (plotAxis == RiaDefines::PLOT_AXIS_LEFT) if (leftOrRightPlotAxis == RiaDefines::PLOT_AXIS_LEFT)
{ {
yAxisProps = m_leftYAxisProperties(); yAxisProps = m_leftYAxisProperties();
} }

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

@@ -134,7 +134,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;
RimSummaryAxisProperties* yAxisPropertiesForAxis(RiaDefines::PlotAxis plotAxis) const; RimSummaryAxisProperties* yAxisPropertiesLeftOrRight(RiaDefines::PlotAxis leftOrRightPlotAxis) const;
void updateAxis(RiaDefines::PlotAxis plotAxis); void updateAxis(RiaDefines::PlotAxis plotAxis);
void updateZoomForAxis(RiaDefines::PlotAxis plotAxis); void updateZoomForAxis(RiaDefines::PlotAxis plotAxis);