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

Merge pull request #8614 from OPM/minor-adjustments

Browse Source
This commit is contained in:
Magne Sjaastad
2022-03-04 12:24:15 +01:00
committed by GitHub
parent abff06d2d5
commit 1563ae7b58
9 changed files with 59 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.h
View File

@@ -58,6 +58,8 @@ public:
public:
RimPlotAxisProperties();
void setAlwaysRequired( bool enable );
void setEnableTitleTextSettings( bool enable );
void enableRangeSettings( bool enable );
void setNameAndAxis( const QString& name, RiaDefines::PlotAxis axis, int axisIndex = 0 );
@@ -79,7 +81,6 @@ public:
bool isDeletable() const override;
std::vector<RimPlotAxisAnnotation*> annotations() const override;
void appendAnnotation( RimPlotAxisAnnotation* annotation ) override;
void removeAllAnnotations() override;
@@ -136,6 +137,7 @@ private:
bool m_enableTitleTextSettings;
bool m_isRangeSettingsEnabled;
bool m_isAlwaysRequired;
caf::PdmField<caf::FontTools::RelativeSizeEnum> m_titleFontSize;
caf::PdmField<caf::AppEnum<AxisTitlePositionType>> m_titlePositionEnum;