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

Several minor issues (#8948)

Browse Source 
* #8947 Plot Template : Split export dialog into file path and name
* #8946  Update multi plot title when curve is appended by copy/paste
* #8946 Separate axis object name and axis title text
* If multi plot auto name is empty, use plot title "Plot N"
* QwtPlotWidget: Double click activates Zoom All
* More testing on valid main window before use
* Return false if event is not handeled
* Improve fallback plot name
* Tree View Editor: Early exit if selected object is unchanged
Resetting selection causes flickering
* Summary Plot : Select curve object in project tree when clicking on curve
This commit is contained in:
Magne Sjaastad
2022-05-24 15:24:38 +02:00
committed by GitHub
parent 1aa41968a5
commit f91fe41f1d
25 changed files with 294 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ApplicationLibCode/ProjectDataModel/RimPlotAxisProperties.cpp
View File

@@ -61,8 +61,11 @@ RimPlotAxisProperties::RimPlotAxisProperties()
CAF_PDM_InitField( &m_isActive, "Active", true, "Active" );
m_isActive.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_name, "Name", "Name" );
m_name.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_objectName, "Name", "Name" );
m_objectName.uiCapability()->setUiHidden( true );
CAF_PDM_InitFieldNoDefault( &m_axisTitle, "AxisTitle", "Axis Title" );
m_objectName.uiCapability()->setUiReadOnly( true );
CAF_PDM_InitField( &isAutoTitle, "AutoTitle", true, "Auto Title" );
@@ -145,7 +148,7 @@ void RimPlotAxisProperties::setNameForUnusedAxis()
else if ( m_plotAxis() == RiaDefines::PlotAxis::PLOT_AXIS_RIGHT )
name += "Right";
m_name = name;
m_objectName = name;
}
//--------------------------------------------------------------------------------------------------
@@ -153,7 +156,7 @@ void RimPlotAxisProperties::setNameForUnusedAxis()
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimPlotAxisProperties::userDescriptionField()
{
return &m_name;
return &m_objectName;
}
//--------------------------------------------------------------------------------------------------
@@ -259,9 +262,13 @@ void RimPlotAxisProperties::defineUiOrdering( QString uiConfigName, caf::PdmUiOr
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimPlotAxisProperties::setNameAndAxis( const QString& name, RiaDefines::PlotAxis axis, int axisIndex )
void RimPlotAxisProperties::setNameAndAxis( const QString& objectName,
const QString& axistTitle,
RiaDefines::PlotAxis axis,
int axisIndex )
{
m_name = name;
m_objectName = objectName;
m_axisTitle = axistTitle;
m_plotAxis = axis;
m_plotAxisIndex = axisIndex;
@@ -298,9 +305,17 @@ int RimPlotAxisProperties::valuesFontSize() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString& RimPlotAxisProperties::name() const
const QString RimPlotAxisProperties::objectName() const
{
return m_name();
return m_objectName;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
const QString RimPlotAxisProperties::axisTitleText() const
{
return m_axisTitle;
}
//--------------------------------------------------------------------------------------------------