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

#4629 Fix setting and reading of summary time values

Browse Source
This commit is contained in:
Gaute Lindkvist 2019-08-26 11:17:20 +02:00
parent 222f230687
commit 1009f1ff45
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ProjectDataModel/Summary/RimSummaryTimeAxisProperties.cpp
View File

@ -301,8 +301,7 @@ bool RimSummaryTimeAxisProperties::isActive() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QDateTime RimSummaryTimeAxisProperties::visibleDateTimeMin() const QDateTime RimSummaryTimeAxisProperties::visibleDateTimeMin() const
{ {
QDateTime fullMin(m_visibleDateRangeMin(), m_visibleTimeRangeMin()); return RiaQDateTimeTools::createUtcDateTime(m_visibleDateRangeMin(), m_visibleTimeRangeMin());
return fullMin;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -310,8 +309,7 @@ QDateTime RimSummaryTimeAxisProperties::visibleDateTimeMin() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QDateTime RimSummaryTimeAxisProperties::visibleDateTimeMax() const QDateTime RimSummaryTimeAxisProperties::visibleDateTimeMax() const
{ {
QDateTime fullMax(m_visibleDateRangeMax(), m_visibleTimeRangeMax()); return RiaQDateTimeTools::createUtcDateTime(m_visibleDateRangeMax(), m_visibleTimeRangeMax());
return fullMax;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

16
Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.cpp
View File

@ -47,7 +47,6 @@
#include "cafQShortenedLabel.h" #include "cafQShortenedLabel.h"
#include <QApplication> #include <QApplication>
#include <QDate>
#include <QGridLayout> #include <QGridLayout>
#include <QIntValidator> #include <QIntValidator>
#include <QLabel> #include <QLabel>
@ -87,7 +86,7 @@ namespace caf
m_timeEdit->setDisplayFormat(m_attributes.timeFormat); m_timeEdit->setDisplayFormat(m_attributes.timeFormat);
} }
m_timeEdit->setDate(uiField()->uiValue().toDate()); m_timeEdit->setTime(uiField()->uiValue().toTime());
} }
@ -98,9 +97,10 @@ namespace caf
{ {
m_timeEdit = new QTimeEdit(parent); m_timeEdit = new QTimeEdit(parent);
connect(m_timeEdit, SIGNAL(editingFinished()), this, SLOT(slotEditingFinished())); connect(m_timeEdit, SIGNAL(editingFinished()), this, SLOT(slotEditingFinished()));
connect(m_timeEdit, SIGNAL(timeChanged(QTime)), this, SLOT(slotTimeChanged(QTime)));
return m_timeEdit; return m_timeEdit;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -115,7 +115,15 @@ namespace caf
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void PdmUiTimeEditor::slotEditingFinished() void PdmUiTimeEditor::slotEditingFinished()
{ {
this->setValueToField(m_timeEdit->date()); this->setValueToField(m_timeEdit->time());
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmUiTimeEditor::slotTimeChanged(const QTime& time)
{
this->setValueToField(m_timeEdit->time());
}
} // end namespace caf } // end namespace caf

1
Fwk/AppFwk/cafUserInterface/cafPdmUiTimeEditor.h
View File

@ -81,6 +81,7 @@ namespace caf
protected slots: protected slots:
void slotEditingFinished(); void slotEditingFinished();
void slotTimeChanged(const QTime& time);
private: private:
QPointer<QTimeEdit> m_timeEdit; QPointer<QTimeEdit> m_timeEdit;