OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

(#490) Added group for visible X axis range. Renamed fields.

Browse Source
This commit is contained in:
Pål Hagen committed 2015-09-18 11:41:14 +02:00
1 parent 59efb31523
commit efc62a65f9
2 files changed
+22 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/ProjectDataModel/RimWellLogPlotTrace.cpp
+19 -6
View File
@@ -45,6 +45,7 @@ RimWellLogPlotTrace::RimWellLogPlotTrace()
CAF_PDM_InitObject("Trace", "", "", ""); CAF_PDM_InitObject("Trace", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_userName, "TrackDescription", "Name", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_userName, "TrackDescription", "Name", "", "", "");
m_userName.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitField(&m_show, "Show", true, "Show trace", "", "", ""); CAF_PDM_InitField(&m_show, "Show", true, "Show trace", "", "", "");
m_show.uiCapability()->setUiHidden(true); m_show.uiCapability()->setUiHidden(true);
@@ -52,8 +53,8 @@ RimWellLogPlotTrace::RimWellLogPlotTrace()
CAF_PDM_InitFieldNoDefault(&curves, "Curves", "", "", "", ""); CAF_PDM_InitFieldNoDefault(&curves, "Curves", "", "", "", "");
curves.uiCapability()->setUiHidden(true); curves.uiCapability()->setUiHidden(true);
CAF_PDM_InitField(&m_minimumValue, "MinimumValue", RI_LOGPLOTTRACE_MINX_DEFAULT, "Minimum value", "", "", ""); CAF_PDM_InitField(&m_visibleXRangeMin, "VisibleXRangeMin", RI_LOGPLOTTRACE_MINX_DEFAULT, "Min", "", "", "");
CAF_PDM_InitField(&m_maximumValue, "MaximumValue", RI_LOGPLOTTRACE_MAXX_DEFAULT, "Maximum value", "", "", ""); CAF_PDM_InitField(&m_visibleXRangeMax, "VisibleXRangeMax", RI_LOGPLOTTRACE_MAXX_DEFAULT, "Max", "", "", "");
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -81,9 +82,9 @@ void RimWellLogPlotTrace::fieldChangedByUi(const caf::PdmFieldHandle* changedFie
{ {
if (m_viewer) m_viewer->setVisible(m_show()); if (m_viewer) m_viewer->setVisible(m_show());
} }
else if (changedField == &m_minimumValue || changedField == &m_maximumValue) else if (changedField == &m_visibleXRangeMin || changedField == &m_visibleXRangeMax)
{ {
m_viewer->setAxisScale(QwtPlot::xTop, m_minimumValue, m_maximumValue); m_viewer->setAxisScale(QwtPlot::xTop, m_visibleXRangeMin, m_visibleXRangeMax);
m_viewer->replot(); m_viewer->replot();
} }
} }
@@ -289,8 +290,8 @@ void RimWellLogPlotTrace::updateXAxisRangeFromCurves()
if (rangeUpdated) if (rangeUpdated)
{ {
m_minimumValue = minValue; m_visibleXRangeMin = minValue;
m_maximumValue = maxValue; m_visibleXRangeMax = maxValue;
updateConnectedEditors(); updateConnectedEditors();
} }
@@ -311,3 +312,15 @@ RimWellLogPlotCurve* RimWellLogPlotTrace::curveDefinitionFromCurve(const QwtPlot
return NULL; return NULL;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimWellLogPlotTrace::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&m_userName);
caf::PdmUiGroup* gridGroup = uiOrdering.addNewGroup("Visible X Axis Range");
gridGroup->add(&m_visibleXRangeMin);
gridGroup->add(&m_visibleXRangeMax);
}
ApplicationCode/ProjectDataModel/RimWellLogPlotTrace.h
+3 -2
View File
@@ -67,13 +67,14 @@ protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual caf::PdmFieldHandle* objectToggleField(); virtual caf::PdmFieldHandle* objectToggleField();
virtual caf::PdmFieldHandle* userDescriptionField(); virtual caf::PdmFieldHandle* userDescriptionField();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering);
private: private:
caf::PdmField<bool> m_show; caf::PdmField<bool> m_show;
caf::PdmField<QString> m_userName; caf::PdmField<QString> m_userName;
caf::PdmChildArrayField<RimWellLogPlotCurve*> curves; caf::PdmChildArrayField<RimWellLogPlotCurve*> curves;
caf::PdmField<double> m_minimumValue; caf::PdmField<double> m_visibleXRangeMin;
caf::PdmField<double> m_maximumValue; caf::PdmField<double> m_visibleXRangeMax;
QPointer<RiuWellLogTracePlot> m_viewer; QPointer<RiuWellLogTracePlot> m_viewer;
}; };