#859 Added time from start of simulation option

This commit is contained in:
Jacob Støren
2016-11-22 11:13:34 +01:00
parent 3a0e7d098f
commit 5d04ac198b
13 changed files with 445 additions and 46 deletions

View File

@@ -23,6 +23,7 @@
#include "cafPdmUiLineEditor.h"
#include "qwt_date.h"
#include "cvfAssert.h"
namespace caf
@@ -35,12 +36,35 @@ void caf::AppEnum< RimSummaryTimeAxisProperties::AxisTitlePositionType >::setUp(
setDefault(RimSummaryTimeAxisProperties::AXIS_TITLE_CENTER);
}
template<>
void caf::AppEnum< RimSummaryTimeAxisProperties::TimeModeType >::setUp()
{
addItem(RimSummaryTimeAxisProperties::DATE, "DATE", "Date");
addItem(RimSummaryTimeAxisProperties::TIME_FROM_SIMULATION_START, "TIME_FROM_SIMULATION_START", "Time From Simulation Start");
setDefault(RimSummaryTimeAxisProperties::DATE);
}
template<>
void caf::AppEnum< RimSummaryTimeAxisProperties::TimeUnitType >::setUp()
{
addItem(RimSummaryTimeAxisProperties::SECONDS, "SECONDS", "Seconds");
addItem(RimSummaryTimeAxisProperties::MINUTES, "MINUTES", "Minutes");
addItem(RimSummaryTimeAxisProperties::HOURS, "HOURS", "Hours");
addItem(RimSummaryTimeAxisProperties::DAYS, "DAYS ", "Days");
addItem(RimSummaryTimeAxisProperties::YEARS, "YEARS", "Years");
setDefault(RimSummaryTimeAxisProperties::YEARS);
}
}
CAF_PDM_SOURCE_INIT(RimSummaryTimeAxisProperties, "SummaryTimeAxisProperties");
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -57,11 +81,21 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
CAF_PDM_InitField(&fontSize, "FontSize", 11, "Font Size", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_visibleRangeMax, "VisibleRangeMax", "Max", "", "", "");
m_visibleRangeMax.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_timeMode, "TimeMode", "Time Mode", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_timeUnit, "TimeUnit", "Time Unit", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_visibleDateRangeMax, "VisibleRangeMax", "Max", "", "", "");
m_visibleDateRangeMax.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_visibleDateRangeMin, "VisibleRangeMin", "Min", "", "", "");
m_visibleDateRangeMin.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_visibleTimeRangeMax, "VisibleTimeModeRangeMax", "Max", "", "", "");
m_visibleDateRangeMax.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_visibleTimeRangeMin, "VisibleTimeModeRangeMin", "Min", "", "", "");
m_visibleDateRangeMin.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
CAF_PDM_InitFieldNoDefault(&m_visibleRangeMin, "VisibleRangeMin", "Min", "", "", "");
m_visibleRangeMin.uiCapability()->setUiEditorTypeName(caf::PdmUiLineEditor::uiEditorTypeName());
}
//--------------------------------------------------------------------------------------------------
@@ -69,7 +103,10 @@ RimSummaryTimeAxisProperties::RimSummaryTimeAxisProperties()
//--------------------------------------------------------------------------------------------------
double RimSummaryTimeAxisProperties::visibleRangeMin() const
{
return QwtDate::toDouble(m_visibleRangeMin());
if ( m_timeMode() == DATE )
return QwtDate::toDouble(m_visibleDateRangeMin());
else
return m_visibleTimeRangeMin();
}
//--------------------------------------------------------------------------------------------------
@@ -77,7 +114,10 @@ double RimSummaryTimeAxisProperties::visibleRangeMin() const
//--------------------------------------------------------------------------------------------------
double RimSummaryTimeAxisProperties::visibleRangeMax() const
{
return QwtDate::toDouble(m_visibleRangeMax());
if ( m_timeMode() == DATE )
return QwtDate::toDouble(m_visibleDateRangeMax());
else
return m_visibleTimeRangeMax();
}
//--------------------------------------------------------------------------------------------------
@@ -85,7 +125,16 @@ double RimSummaryTimeAxisProperties::visibleRangeMax() const
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::setVisibleRangeMin(double value)
{
m_visibleRangeMin = QwtDate::toDateTime(value);
if ( m_timeMode() == DATE )
{
m_visibleDateRangeMin = QwtDate::toDateTime(value);
m_visibleTimeRangeMin = fromDateToDisplayTime(m_visibleDateRangeMin());
}
else
{
m_visibleTimeRangeMin = value;
m_visibleDateRangeMin = fromDisplayTimeToDate(value);
}
}
//--------------------------------------------------------------------------------------------------
@@ -93,9 +142,68 @@ void RimSummaryTimeAxisProperties::setVisibleRangeMin(double value)
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::setVisibleRangeMax(double value)
{
m_visibleRangeMax = QwtDate::toDateTime(value);
if ( m_timeMode() == DATE )
{
m_visibleDateRangeMax = QwtDate::toDateTime(value);
m_visibleTimeRangeMax = fromDateToDisplayTime(m_visibleDateRangeMax());
}
else
{
m_visibleTimeRangeMax = value;
m_visibleDateRangeMax = fromDisplayTimeToDate(value);
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::updateTimeVisibleRange()
{
m_visibleTimeRangeMax = fromDateToDisplayTime(m_visibleDateRangeMax());
m_visibleTimeRangeMin = fromDateToDisplayTime(m_visibleDateRangeMin());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::updateDateVisibleRange()
{
m_visibleDateRangeMin = fromDisplayTimeToDate(m_visibleTimeRangeMin());
m_visibleDateRangeMax = fromDisplayTimeToDate(m_visibleTimeRangeMax());
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QDateTime RimSummaryTimeAxisProperties::fromDisplayTimeToDate(double displayTime)
{
RimSummaryPlot* rimSummaryPlot = nullptr;
this->firstAncestorOrThisOfType(rimSummaryPlot);
time_t startOfSimulation = rimSummaryPlot->firstTimeStepOfFirstCurve();
time_t secsSinceSimulationStart = displayTime/fromTimeTToDisplayUnitScale();
QDateTime date;
date.setTime_t(startOfSimulation + secsSinceSimulationStart);
return date;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimSummaryTimeAxisProperties::fromDateToDisplayTime(const QDateTime& displayTime)
{
time_t secsSinceEpoc = displayTime.toTime_t();
RimSummaryPlot* rimSummaryPlot = nullptr;
this->firstAncestorOrThisOfType(rimSummaryPlot);
time_t startOfSimulation = rimSummaryPlot->firstTimeStepOfFirstCurve();
return fromTimeTToDisplayUnitScale()*(secsSinceEpoc - startOfSimulation);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -140,6 +248,62 @@ caf::PdmFieldHandle* RimSummaryTimeAxisProperties::objectToggleField()
return &m_isActive;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RimSummaryTimeAxisProperties::fromTimeTToDisplayUnitScale()
{
double scale = 1.0;
switch (m_timeUnit())
{
case SECONDS:
break;
case MINUTES:
scale = 1.0/60.0;
break;
case HOURS:
scale = 1.0/(60.0*60.0);
break;
case DAYS:
scale = 1.0/(60.0*60.0*24.0);
break;
case YEARS:
scale = 1.0/31556952.0;
break;
default:
CVF_ASSERT(false);
break;
}
return scale;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSummaryTimeAxisProperties::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
uiOrdering.add(&showTitle);
uiOrdering.add(&title);
uiOrdering.add(&titlePositionEnum);
uiOrdering.add(&fontSize);
caf::PdmUiGroup* timeGroup = uiOrdering.addNewGroup("Time");
timeGroup->add(&m_timeMode);
if (m_timeMode() == DATE)
{
timeGroup->add( &m_visibleDateRangeMax);
timeGroup->add(&m_visibleDateRangeMin);
}
else
{
timeGroup->add(&m_timeUnit);
timeGroup->add(&m_visibleTimeRangeMax);
timeGroup->add(&m_visibleTimeRangeMin);
}
uiOrdering.setForgetRemainingFields(true);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -148,26 +312,43 @@ void RimSummaryTimeAxisProperties::fieldChangedByUi(const caf::PdmFieldHandle* c
RimSummaryPlot* rimSummaryPlot = nullptr;
this->firstAncestorOrThisOfType(rimSummaryPlot);
if (changedField == &m_visibleRangeMax)
if (changedField == &m_visibleDateRangeMax)
{
QDateTime test = newValue.toDateTime();
if (!test.isValid())
{
m_visibleRangeMax = oldValue.toDateTime();
m_visibleDateRangeMax = oldValue.toDateTime();
}
updateTimeVisibleRange();
rimSummaryPlot->disableAutoZoom();
}
else if (changedField == &m_visibleRangeMin)
else if (changedField == &m_visibleDateRangeMin)
{
QDateTime test = newValue.toDateTime();
if (!test.isValid())
{
m_visibleRangeMin = oldValue.toDateTime();
m_visibleDateRangeMin = oldValue.toDateTime();
}
updateTimeVisibleRange();
rimSummaryPlot->disableAutoZoom();
}
else if (changedField == &m_visibleTimeRangeMin || changedField == &m_visibleTimeRangeMax)
{
updateDateVisibleRange();
rimSummaryPlot->disableAutoZoom();
}
else if (changedField == &m_timeMode)
{
rimSummaryPlot->loadDataAndUpdate();
}
else if (changedField == &m_timeUnit)
{
updateTimeVisibleRange(); // Use the stored max min dates to update the visible time range to new unit
rimSummaryPlot->loadDataAndUpdate();
updateDateVisibleRange();
}
rimSummaryPlot->updateAxes();
}