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

#969, #2240 Summary curve axis. New fields, scaleFactor and numberOfDigits

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2017-12-11 11:37:31 +01:00
parent 09c09a7386
commit ca91409002
3 changed files with 77 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,6 +21,10 @@
#include "RimSummaryPlot.h"
#include "RiaDefines.h"
#include "cafPdmUiSliderEditor.h"
#include <cmath>
namespace caf
{
@@ -72,6 +76,11 @@ RimSummaryAxisProperties::RimSummaryAxisProperties()
CAF_PDM_InitField(&visibleRangeMin, "VisibleRangeMin", RiaDefines::minimumDefaultValuePlot(), "Min", "", "", "");
CAF_PDM_InitFieldNoDefault(&numberFormat, "NumberFormat", "Number Format", "", "", "");
CAF_PDM_InitField(&numberOfDecimals, "Decimals", 2, "Number of Decimals", "", "", "");
CAF_PDM_InitField(&scaleFactor, "ScaleFactor", 1.0, "Scale Factor", "", "", "");
numberOfDecimals.uiCapability()->setUiEditorTypeName(caf::PdmUiSliderEditor::uiEditorTypeName());
CAF_PDM_InitField(&isLogarithmicScaleEnabled, "LogarithmicScale", false, "Logarithmic Scale", "", "", "");
@@ -109,6 +118,18 @@ QList<caf::PdmOptionItemInfo> RimSummaryAxisProperties::calculateValueOptions(co
options.push_back(caf::PdmOptionItemInfo(text, value));
}
}
else if (fieldNeedingOptions == &scaleFactor)
{
for (int exp = -12; exp <= 12; exp += 3)
{
QString uiText =
exp == 0 ? "1" :
QString("10 ^ %1").arg(exp);
double value = std::pow(10, exp);
options.push_back(caf::PdmOptionItemInfo(uiText, value));
}
}
return options;
}
@@ -127,9 +148,17 @@ void RimSummaryAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUi
caf::PdmUiGroup& scaleGroup = *(uiOrdering.addNewGroup("Axis Values"));
scaleGroup.add(&isLogarithmicScaleEnabled);
scaleGroup.add(&numberFormat);
if (numberFormat() != NUMBER_FORMAT_AUTO)
{
scaleGroup.add(&numberOfDecimals);
scaleGroup.add(&scaleFactor);
}
scaleGroup.add(&visibleRangeMin);
scaleGroup.add(&visibleRangeMax);
uiOrdering.skipRemainingFields(true);
}
//--------------------------------------------------------------------------------------------------