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

Avoid use of time_t when using sliders in GUI

Browse Source 
* Avoid use of time_t when using sliders in GUI
Sliders use int as internal representation of values, and time_t can cause overflow
This commit is contained in:
Magne Sjaastad
2023-10-12 10:02:58 +02:00
committed by GitHub
parent cdda7480f3
commit 4a3cdc4e94
7 changed files with 199 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryRegressionAnalysisCurve.cpp
View File

@@ -107,11 +107,11 @@ RimSummaryRegressionAnalysisCurve::RimSummaryRegressionAnalysisCurve()
CAF_PDM_InitField( &m_polynomialDegree, "PolynomialDegree", 3, "Degree" );
CAF_PDM_InitFieldNoDefault( &m_timeRangeSelection, "TimeRangeSelection", "Time Range" );
CAF_PDM_InitFieldNoDefault( &m_minTimeStep, "MinTimeStep", "From" );
m_minTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_minTimeSliderPosition, "MinTimeSliderPosition", "From" );
m_minTimeSliderPosition.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_maxTimeStep, "MaxTimeStep", "To" );
m_maxTimeStep.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
CAF_PDM_InitFieldNoDefault( &m_maxTimeSliderPosition, "MaxTimeSliderPosition", "To" );
m_maxTimeSliderPosition.uiCapability()->setUiEditorTypeName( caf::PdmUiSliderEditor::uiEditorTypeName() );
CAF_PDM_InitField( &m_showTimeSelectionInPlot, "ShowTimeSelectionInPlot", false, "Show In Plot" );
@@ -349,7 +349,8 @@ std::tuple<std::vector<time_t>, std::vector<double>, QString>
{
if ( values.empty() || timeSteps.empty() ) return { timeSteps, values, "" };
auto [timeStepsInRange, valuesInRange] = getInRangeValues( timeSteps, values, m_minTimeStep, m_maxTimeStep );
auto [minTimeStep, maxTimeStep] = selectedTimeStepRange();
auto [timeStepsInRange, valuesInRange] = getInRangeValues( timeSteps, values, minTimeStep, maxTimeStep );
if ( timeStepsInRange.empty() || valuesInRange.empty() ) return {};
@@ -473,8 +474,8 @@ void RimSummaryRegressionAnalysisCurve::defineUiOrdering( QString uiConfigName,
timeSelectionGroup->add( &m_timeRangeSelection );
if ( m_timeRangeSelection() == RangeType::USER_DEFINED_RANGE )
{
timeSelectionGroup->add( &m_minTimeStep );
timeSelectionGroup->add( &m_maxTimeStep );
timeSelectionGroup->add( &m_minTimeSliderPosition );
timeSelectionGroup->add( &m_maxTimeSliderPosition );
}
timeSelectionGroup->add( &m_showTimeSelectionInPlot );
}
@@ -511,14 +512,14 @@ void RimSummaryRegressionAnalysisCurve::fieldChangedByUi( const caf::PdmFieldHan
{
RimSummaryCurve::fieldChangedByUi( changedField, oldValue, newValue );
if ( &m_minTimeStep == changedField && m_minTimeStep > m_maxTimeStep )
if ( &m_minTimeSliderPosition == changedField && m_minTimeSliderPosition > m_maxTimeSliderPosition )
{
m_maxTimeStep = m_minTimeStep;
m_maxTimeSliderPosition = m_minTimeSliderPosition;
}
if ( &m_maxTimeStep == changedField && m_maxTimeStep < m_minTimeStep )
if ( &m_maxTimeSliderPosition == changedField && m_maxTimeSliderPosition < m_minTimeSliderPosition )
{
m_minTimeStep = m_maxTimeStep;
m_minTimeSliderPosition = m_maxTimeSliderPosition;
}
loadAndUpdateDataAndPlot();
@@ -552,16 +553,12 @@ void RimSummaryRegressionAnalysisCurve::defineEditorAttribute( const caf::PdmFie
lineEditorAttr->validator = new QIntValidator( 0, 50, nullptr );
}
}
else if ( field == &m_minTimeStep || field == &m_maxTimeStep )
else if ( field == &m_minTimeSliderPosition || field == &m_maxTimeSliderPosition )
{
if ( auto* myAttr = dynamic_cast<caf::PdmUiSliderEditorAttribute*>( attribute ) )
{
auto timeSteps = m_sourceTimeStepsY;
if ( !timeSteps.empty() )
{
myAttr->m_minimum = *timeSteps.begin();
myAttr->m_maximum = *timeSteps.rbegin();
}
myAttr->m_minimum = 0;
myAttr->m_maximum = 100;
myAttr->m_showSpinBox = false;
}
}
@@ -716,6 +713,35 @@ void RimSummaryRegressionAnalysisCurve::appendTimeSteps( std::vector<time_t>& de
destinationTimeSteps.push_back( RiaTimeTTools::fromQDateTime( t ) );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<time_t, time_t> RimSummaryRegressionAnalysisCurve::fullTimeStepRange() const
{
auto timeSteps = RimSummaryCurve::timeStepsY();
if ( !timeSteps.empty() )
{
return std::make_pair( *timeSteps.begin(), *timeSteps.rbegin() );
}
return {};
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::pair<time_t, time_t> RimSummaryRegressionAnalysisCurve::selectedTimeStepRange() const
{
// Scale the slider values to the full time step range
auto [min, max] = fullTimeStepRange();
auto range = max - min;
auto selectedMin = min + static_cast<time_t>( range * ( m_minTimeSliderPosition / 100.0 ) );
auto selectedMax = min + static_cast<time_t>( range * ( m_maxTimeSliderPosition / 100.0 ) );
return { selectedMin, selectedMax };
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -843,7 +869,8 @@ void RimSummaryRegressionAnalysisCurve::updateTimeAnnotations()
if ( m_showTimeSelectionInPlot && isChecked() )
{
m_timeRangeAnnotation = plot->addTimeRangeAnnotation( m_minTimeStep, m_maxTimeStep );
auto [minTimeStep, maxTimeStep] = selectedTimeStepRange();
m_timeRangeAnnotation = plot->addTimeRangeAnnotation( minTimeStep, maxTimeStep );
m_timeRangeAnnotation->setColor( color() );
}
}
@@ -855,8 +882,8 @@ void RimSummaryRegressionAnalysisCurve::updateDefaultValues()
{
if ( !m_sourceTimeStepsY.empty() && m_timeRangeSelection() == RangeType::FULL_RANGE )
{
m_minTimeStep = m_sourceTimeStepsY.front();
m_maxTimeStep = m_sourceTimeStepsY.back();
m_minTimeSliderPosition = 0;
m_maxTimeSliderPosition = 100;
}
if ( !m_sourceValuesX.empty() && m_xRangeSelection() == RangeType::FULL_RANGE )