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

Whitepace

Browse Source
This commit is contained in:
Magne Sjaastad 2017-12-12 07:42:16 +01:00
parent e7c08223b6
commit 96b1fc9160
2 changed files with 86 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,16 +18,16 @@
#include "RimSummaryAxisProperties.h" #include "RimSummaryAxisProperties.h"
#include "RimSummaryPlot.h"
#include "RiaDefines.h" #include "RiaDefines.h"
#include "RimSummaryPlot.h"
#include "cafPdmUiSliderEditor.h" #include "cafPdmUiSliderEditor.h"
#include <cmath> #include <cmath>
namespace caf namespace caf
{ {
// clang-format off
template<> template<>
void caf::AppEnum<RimSummaryAxisProperties::NumberFormatType>::setUp() void caf::AppEnum<RimSummaryAxisProperties::NumberFormatType>::setUp()
{ {
@ -37,10 +37,7 @@ namespace caf
setDefault(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO); setDefault(RimSummaryAxisProperties::NUMBER_FORMAT_AUTO);
} }
}
namespace caf
{
template<> template<>
void caf::AppEnum<RimSummaryAxisProperties::AxisTitlePositionType>::setUp() void caf::AppEnum<RimSummaryAxisProperties::AxisTitlePositionType>::setUp()
{ {
@ -49,8 +46,8 @@ void caf::AppEnum< RimSummaryAxisProperties::AxisTitlePositionType >::setUp()
setDefault(RimSummaryAxisProperties::AXIS_TITLE_CENTER); setDefault(RimSummaryAxisProperties::AXIS_TITLE_CENTER);
} }
} // clang-format on
} // namespace caf
CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties"); CAF_PDM_SOURCE_INIT(RimSummaryAxisProperties, "SummaryYAxisProperties");
@ -108,13 +105,13 @@ caf::PdmFieldHandle* RimSummaryAxisProperties::userDescriptionField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryAxisProperties::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;
if (&titleFontSize == fieldNeedingOptions || if (&titleFontSize == fieldNeedingOptions || &valuesFontSize == fieldNeedingOptions)
&valuesFontSize == fieldNeedingOptions)
{ {
std::vector<int> fontSizes; std::vector<int> fontSizes;
fontSizes.push_back(8); fontSizes.push_back(8);
@ -137,9 +134,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryAxisProperties::calculateValueOptions(co
{ {
for (int exp = -12; exp <= 12; exp += 3) for (int exp = -12; exp <= 12; exp += 3)
{ {
QString uiText = QString uiText = exp == 0 ? "1" : QString("10 ^ %1").arg(exp);
exp == 0 ? "1" :
QString("10 ^ %1").arg(exp);
double value = std::pow(10, exp); double value = std::pow(10, exp);
options.push_back(caf::PdmOptionItemInfo(uiText, value)); options.push_back(caf::PdmOptionItemInfo(uiText, value));
@ -265,9 +260,9 @@ bool RimSummaryAxisProperties::isActive() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryAxisProperties::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)
{ {
updateOptionSensitivity(); updateOptionSensitivity();
@ -324,4 +319,3 @@ caf::PdmFieldHandle* RimSummaryAxisProperties::objectToggleField()
{ {
return &m_isActive; return &m_isActive;
} }

17
ApplicationCode/ProjectDataModel/Summary/RimSummaryAxisProperties.h
View File

@ -16,22 +16,19 @@
// //
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#pragma once #pragma once
#include "RiaDefines.h" #include "RiaDefines.h"
#include "cafPdmObject.h"
#include "cafPdmField.h"
#include "cafPdmChildArrayField.h"
#include "cafAppEnum.h" #include "cafAppEnum.h"
#include "cafPdmChildArrayField.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "qwt_plot.h" #include "qwt_plot.h"
#include <QString> #include <QString>
//================================================================================================== //==================================================================================================
/// ///
/// ///
@ -60,7 +57,6 @@ public:
void setNameAndAxis(const QString& name, QwtPlot::Axis axis); void setNameAndAxis(const QString& name, QwtPlot::Axis axis);
QwtPlot::Axis qwtPlotAxisType() const; QwtPlot::Axis qwtPlotAxisType() const;
RiaDefines::PlotAxis plotAxisType() const; RiaDefines::PlotAxis plotAxisType() const;
bool useAutoTitle() const; bool useAutoTitle() const;
bool showDescription() const; bool showDescription() const;
bool showAcronym() const; bool showAcronym() const;
@ -85,10 +81,13 @@ protected:
virtual void initAfterRead() override; virtual void initAfterRead() override;
virtual caf::PdmFieldHandle* userDescriptionField() override; virtual caf::PdmFieldHandle* userDescriptionField() override;
virtual caf::PdmFieldHandle* objectToggleField() override; virtual caf::PdmFieldHandle* objectToggleField() override;
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override; virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue,
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override; const QVariant& newValue) override;
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override; virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly) override;
private: private:
void updateOptionSensitivity(); void updateOptionSensitivity();