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

Clean up after review

Browse Source 
* Disable grid lines and tick marks if x range is empty.
* Rename intervals to intervalCount when it is an integer count.
* Fix some compile warnings.
This commit is contained in:
Gaute Lindkvist
2018-07-02 09:49:05 +02:00
parent 0a0cb584b5
commit ff84d81e44
6 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimWellLogTrack.cpp
View File

@@ -285,6 +285,10 @@ void RimWellLogTrack::fieldChangedByUi(const caf::PdmFieldHandle* changedField,
m_wellLogTrackPlotWidget->setXRange(m_visibleXRangeMin, m_visibleXRangeMax);
m_wellLogTrackPlotWidget->replot();
m_isAutoScaleXEnabled = false;
bool emptyRange = std::abs(m_visibleXRangeMax() - m_visibleXRangeMin) < 1.0e-6 * std::max(1.0, std::max(m_visibleXRangeMax(), m_visibleXRangeMin()));
m_explicitTickIntervals.uiCapability()->setUiReadOnly(emptyRange);
m_showXGridLines.uiCapability()->setUiReadOnly(emptyRange);
updateEditors();
updateParentPlotLayout();
updateAxisAndGridTickIntervals();
@@ -465,7 +469,7 @@ void RimWellLogTrack::updateAxisAndGridTickIntervals()
xMinorTickIntervals = 10;
break;
}
m_wellLogTrackPlotWidget->setAutoTickIntervals(xMajorTickIntervals, xMinorTickIntervals);
m_wellLogTrackPlotWidget->setAutoTickIntervalCounts(xMajorTickIntervals, xMinorTickIntervals);
}
switch (m_showXGridLines())
@@ -685,11 +689,15 @@ void RimWellLogTrack::loadDataAndUpdate()
this->updateAxisScaleEngine();
this->updateFormationNamesOnPlot();
this->applyXZoomFromVisibleRange();
this->updateAxisAndGridTickIntervals();
}
this->updateAxisAndGridTickIntervals();
m_majorTickInterval.uiCapability()->setUiHidden(!m_explicitTickIntervals());
m_minorTickInterval.uiCapability()->setUiHidden(!m_explicitTickIntervals());
bool emptyRange = std::abs(m_visibleXRangeMax() - m_visibleXRangeMin) < 1.0e-6 * std::max(1.0, std::max(m_visibleXRangeMax(), m_visibleXRangeMin()));
m_explicitTickIntervals.uiCapability()->setUiReadOnly(emptyRange);
m_showXGridLines.uiCapability()->setUiReadOnly(emptyRange);
}
//--------------------------------------------------------------------------------------------------