mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#1767 Add UI for selection of subset of time steps
This commit is contained in:
Magne Sjaastad
parent
c443aefa5e
commit
380b939897
@ -146,31 +146,27 @@ bool RimEclipseResultCase::importGridAndResultMetaData(bool showTimeStepFilter)
|
||||
|
||||
// Show GUI to select time steps
|
||||
|
||||
RimTimeStepFilter myTimeStepFilter;
|
||||
myTimeStepFilter.setCustomTimeSteps(timeSteps);
|
||||
m_timeStepFilter->setTimeStepsFromFile(timeSteps);
|
||||
|
||||
caf::PdmUiPropertyViewDialog propertyDialog(NULL, &myTimeStepFilter, "Time Step Filter", "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
propertyDialog.resize(QSize(400, 200));
|
||||
caf::PdmUiPropertyViewDialog propertyDialog(NULL, m_timeStepFilter, "Time Step Filter", "", QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
|
||||
propertyDialog.resize(QSize(400, 600));
|
||||
|
||||
if (propertyDialog.exec() != QDialog::Accepted)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
m_timeStepFilter->clearTimeStepsFromFile();
|
||||
|
||||
// Set cursor in wait state to continue display of progress dialog including
|
||||
// wait cursor
|
||||
QApplication::setOverrideCursor(QCursor(Qt::WaitCursor));
|
||||
|
||||
m_timeStepFilter->setSelectedTimeStepIndices(myTimeStepFilter.selectedTimeStepIndices());
|
||||
}
|
||||
|
||||
readerEclipseOutput->setFileDataAccess(restartDataAccess.p());
|
||||
}
|
||||
|
||||
if (!m_timeStepFilter->selectedTimeStepIndices().empty())
|
||||
{
|
||||
readerEclipseOutput->setTimeStepFilter(m_timeStepFilter->selectedTimeStepIndices());
|
||||
}
|
||||
readerEclipseOutput->setTimeStepFilter(m_timeStepFilter->selectedTimeStepIndices());
|
||||
|
||||
cvf::ref<RigEclipseCaseData> eclipseCase = new RigEclipseCaseData;
|
||||
if (!readerEclipseOutput->open(caseFileName(), eclipseCase.p()))
|
||||
|
||||
@ -18,12 +18,36 @@
|
||||
|
||||
#include "RimTimeStepFilter.h"
|
||||
|
||||
#include "RimCase.h"
|
||||
#include "RifReaderEclipseOutput.h"
|
||||
|
||||
#include "RimEclipseResultCase.h"
|
||||
#include "RimReservoirCellResultsStorage.h"
|
||||
#include "RimTools.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include "cafPdmUiTextEditor.h"
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimTimeStepFilter, "TimeStepFilter");
|
||||
#include <QDateTime>
|
||||
#include "cafPdmUiPushButtonEditor.h"
|
||||
|
||||
namespace caf {
|
||||
|
||||
template<>
|
||||
void caf::AppEnum< RimTimeStepFilter::TimeStepFilterTypeEnum >::setUp()
|
||||
{
|
||||
addItem(RimTimeStepFilter::TS_ALL, "TS_ALL", "All");
|
||||
addItem(RimTimeStepFilter::TS_INTERVAL_DAYS, "TS_INTERVAL_DAYS", "Skip by Days");
|
||||
addItem(RimTimeStepFilter::TS_INTERVAL_WEEKS, "TS_INTERVAL_WEEKS", "Skip by Weeks");
|
||||
addItem(RimTimeStepFilter::TS_INTERVAL_MONTHS, "TS_INTERVAL_MONTHS", "Skip by Months");
|
||||
addItem(RimTimeStepFilter::TS_INTERVAL_QUARTERS, "TS_INTERVAL_QUARTERS", "Skip by Quarters");
|
||||
addItem(RimTimeStepFilter::TS_INTERVAL_YEARS, "TS_INTERVAL_YEARS", "Skip by Years");
|
||||
|
||||
setDefault(RimTimeStepFilter::TS_ALL);
|
||||
}
|
||||
|
||||
} // End namespace caf
|
||||
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimTimeStepFilter, "RimTimeStepFilter");
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
@ -32,15 +56,50 @@ RimTimeStepFilter::RimTimeStepFilter()
|
||||
{
|
||||
CAF_PDM_InitObject("Time Step Filter", "", "", "");
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_selectedTimeStepIndices, "TimeStepIndicesToImport", "Values", "", "", "");
|
||||
CAF_PDM_InitFieldNoDefault(&m_selectedTimeStepIndices, "TimeStepIndicesToImport", "Values", "", "", "");
|
||||
|
||||
CAF_PDM_InitField(&m_firstTimeStep, "FirstTimeStep", 0, "First Time Step", "", "", "");
|
||||
CAF_PDM_InitField(&m_lastTimeStep, "LastTimeStep", 0, "Last Time Step", "", "", "");
|
||||
|
||||
caf::AppEnum< RimTimeStepFilter::TimeStepFilterTypeEnum > filterType = TS_ALL;
|
||||
CAF_PDM_InitField(&m_filterType, "FilterType", filterType, "Filter type", "", "", "");
|
||||
|
||||
CAF_PDM_InitField(&m_interval, "Interval", 1, "Interval", "", "", "");
|
||||
|
||||
CAF_PDM_InitField(&m_filteredTimeStepsText, "FilteredTimeSteps", QString(), "Filtered TimeSteps", "", "", "");
|
||||
m_filteredTimeStepsText.uiCapability()->setUiEditorTypeName(caf::PdmUiTextEditor::uiEditorTypeName());
|
||||
m_filteredTimeStepsText.uiCapability()->setUiReadOnly(true);
|
||||
m_filteredTimeStepsText.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::HIDDEN);
|
||||
|
||||
m_filteredTimeStepsText.xmlCapability()->setIOReadable(false);
|
||||
m_filteredTimeStepsText.xmlCapability()->setIOWritable(false);
|
||||
|
||||
CAF_PDM_InitFieldNoDefault(&m_applyReloadOfCase, "ApplyReloadOfCase", "", "", "", "");
|
||||
m_applyReloadOfCase.xmlCapability()->setIOWritable(false);
|
||||
m_applyReloadOfCase.xmlCapability()->setIOReadable(false);
|
||||
m_applyReloadOfCase.uiCapability()->setUiEditorTypeName(caf::PdmUiPushButtonEditor::uiEditorTypeName());
|
||||
m_applyReloadOfCase.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::LEFT);
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::setCustomTimeSteps(const std::vector<QDateTime>& timeSteps)
|
||||
void RimTimeStepFilter::setTimeStepsFromFile(const std::vector<QDateTime>& timeSteps)
|
||||
{
|
||||
m_customTimeSteps = timeSteps;
|
||||
m_timeStepsFromFile = timeSteps;
|
||||
|
||||
m_lastTimeStep = static_cast<int>(timeSteps.size()) - 1;
|
||||
|
||||
updateSelectedTimeStepIndices();
|
||||
updateDerivedData();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::clearTimeStepsFromFile()
|
||||
{
|
||||
m_timeStepsFromFile.clear();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
@ -50,10 +109,10 @@ std::vector<size_t> RimTimeStepFilter::selectedTimeStepIndices() const
|
||||
{
|
||||
std::vector<size_t> indices;
|
||||
|
||||
// Convert vector from int to size_t
|
||||
// Convert vector from int to size_t
|
||||
for (auto intValue : m_selectedTimeStepIndices.v())
|
||||
{
|
||||
indices.push_back(intValue);
|
||||
indices.push_back(intValue);
|
||||
}
|
||||
|
||||
return indices;
|
||||
@ -62,13 +121,26 @@ std::vector<size_t> RimTimeStepFilter::selectedTimeStepIndices() const
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::setSelectedTimeStepIndices(const std::vector<size_t>& indices)
|
||||
void RimTimeStepFilter::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
|
||||
{
|
||||
m_selectedTimeStepIndices.v().clear();
|
||||
RimEclipseResultCase* rimEclipseResultCase = parentEclipseResultCase();
|
||||
|
||||
for (auto sizetValue : indices)
|
||||
if (changedField == &m_applyReloadOfCase)
|
||||
{
|
||||
m_selectedTimeStepIndices.v().push_back(static_cast<int>(sizetValue));
|
||||
if (rimEclipseResultCase)
|
||||
{
|
||||
rimEclipseResultCase->reloadDataAndUpdate();
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
updateSelectedTimeStepIndices();
|
||||
updateDerivedData();
|
||||
|
||||
if (rimEclipseResultCase)
|
||||
{
|
||||
rimEclipseResultCase->updateConnectedEditors();
|
||||
}
|
||||
}
|
||||
|
||||
@ -79,29 +151,197 @@ QList<caf::PdmOptionItemInfo> RimTimeStepFilter::calculateValueOptions(const caf
|
||||
{
|
||||
QList<caf::PdmOptionItemInfo> optionItems;
|
||||
|
||||
if (fieldNeedingOptions == &m_selectedTimeStepIndices)
|
||||
if (fieldNeedingOptions == &m_firstTimeStep ||
|
||||
fieldNeedingOptions == &m_lastTimeStep)
|
||||
{
|
||||
RimCase* rimCase = nullptr;
|
||||
this->firstAncestorOrThisOfType(rimCase);
|
||||
if (rimCase)
|
||||
{
|
||||
QStringList timeSteps = rimCase->timeStepStrings();
|
||||
std::vector<QDateTime> timeSteps = allTimeSteps();
|
||||
|
||||
for (int i = 0; i < timeSteps.size(); i++)
|
||||
{
|
||||
optionItems.push_back(caf::PdmOptionItemInfo(timeSteps[i], static_cast<int>(i)));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
QString formatString = RimTools::createTimeFormatStringFromDates(m_customTimeSteps);
|
||||
QString formatString = RimTools::createTimeFormatStringFromDates(timeSteps);
|
||||
|
||||
for (size_t i = 0; i < m_customTimeSteps.size(); i++)
|
||||
{
|
||||
optionItems.push_back(caf::PdmOptionItemInfo(m_customTimeSteps[i].toString(formatString), static_cast<int>(i)));
|
||||
}
|
||||
for (size_t i = 0; i < timeSteps.size(); i++)
|
||||
{
|
||||
optionItems.push_back(caf::PdmOptionItemInfo(timeSteps[i].toString(formatString), static_cast<int>(i)));
|
||||
}
|
||||
}
|
||||
|
||||
return optionItems;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute)
|
||||
{
|
||||
if (field == &m_applyReloadOfCase)
|
||||
{
|
||||
caf::PdmUiPushButtonEditorAttribute* attrib = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>(attribute);
|
||||
if (attrib)
|
||||
{
|
||||
attrib->m_buttonText = "Reload Case";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
QString RimTimeStepFilter::filteredTimeStepsAsText() const
|
||||
{
|
||||
QString text;
|
||||
|
||||
std::vector<QDateTime> timeSteps = allTimeSteps();
|
||||
|
||||
QString formatString = RimTools::createTimeFormatStringFromDates(timeSteps);
|
||||
|
||||
for (auto index : m_selectedTimeStepIndices.v())
|
||||
{
|
||||
QString stepText = timeSteps[static_cast<size_t>(index)].toString(formatString);
|
||||
text += stepText;
|
||||
text += "\n";
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::updateDerivedData()
|
||||
{
|
||||
m_filteredTimeStepsText = filteredTimeStepsAsText();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::updateSelectedTimeStepIndices()
|
||||
{
|
||||
m_selectedTimeStepIndices = selectedTimeStepIndicesFromUi();
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<QDateTime> RimTimeStepFilter::allTimeSteps() const
|
||||
{
|
||||
RimEclipseResultCase* rimEclipseResultCase = parentEclipseResultCase();
|
||||
if (rimEclipseResultCase && rimEclipseResultCase->results(RiaDefines::MATRIX_MODEL))
|
||||
{
|
||||
const RifReaderEclipseOutput* rifReaderOutput = dynamic_cast<const RifReaderEclipseOutput*>(rimEclipseResultCase->results(RiaDefines::MATRIX_MODEL)->readerInterface());
|
||||
if (rifReaderOutput)
|
||||
{
|
||||
return rifReaderOutput->allTimeSteps();
|
||||
}
|
||||
}
|
||||
|
||||
return m_timeStepsFromFile;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
std::vector<int> RimTimeStepFilter::selectedTimeStepIndicesFromUi() const
|
||||
{
|
||||
std::vector<int> indices;
|
||||
|
||||
if (m_filterType == TS_ALL)
|
||||
{
|
||||
for (int i = m_firstTimeStep; i <= m_lastTimeStep; i++)
|
||||
{
|
||||
indices.push_back(i);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int intervalFactor = 1;
|
||||
|
||||
if (m_filterType == TS_INTERVAL_WEEKS)
|
||||
{
|
||||
intervalFactor = 7;
|
||||
}
|
||||
else if (m_filterType == TS_INTERVAL_MONTHS)
|
||||
{
|
||||
intervalFactor = 30;
|
||||
}
|
||||
else if (m_filterType == TS_INTERVAL_QUARTERS)
|
||||
{
|
||||
intervalFactor = 90;
|
||||
}
|
||||
else if (m_filterType == TS_INTERVAL_YEARS)
|
||||
{
|
||||
intervalFactor = 365;
|
||||
}
|
||||
|
||||
int daysToSkip = m_interval * intervalFactor;
|
||||
|
||||
|
||||
std::vector<QDateTime> timeSteps = allTimeSteps();
|
||||
|
||||
indices.push_back(m_firstTimeStep);
|
||||
QDateTime d = timeSteps[m_firstTimeStep].addDays(daysToSkip);
|
||||
|
||||
for (int i = m_firstTimeStep + 1; i <= m_lastTimeStep; i++)
|
||||
{
|
||||
if (timeSteps[i] > d)
|
||||
{
|
||||
d = d.addDays(daysToSkip);
|
||||
indices.push_back(i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return indices;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::updateFieldVisibility()
|
||||
{
|
||||
if (m_filterType == TS_ALL)
|
||||
{
|
||||
m_interval.uiCapability()->setUiHidden(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_interval.uiCapability()->setUiHidden(false);
|
||||
}
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
RimEclipseResultCase* RimTimeStepFilter::parentEclipseResultCase() const
|
||||
{
|
||||
RimEclipseResultCase* rimEclipseResultCase = nullptr;
|
||||
this->firstAncestorOrThisOfType(rimEclipseResultCase);
|
||||
|
||||
return rimEclipseResultCase;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
void RimTimeStepFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
|
||||
{
|
||||
uiOrdering.add(&m_firstTimeStep);
|
||||
uiOrdering.add(&m_lastTimeStep);
|
||||
uiOrdering.add(&m_filterType);
|
||||
uiOrdering.add(&m_interval);
|
||||
|
||||
if (m_timeStepsFromFile.size() == 0)
|
||||
{
|
||||
uiOrdering.add(&m_applyReloadOfCase);
|
||||
}
|
||||
|
||||
QString displayUiName = QString("Filtered Time Steps (%1)").arg(m_selectedTimeStepIndices().size());
|
||||
|
||||
caf::PdmUiGroup* group = uiOrdering.addNewGroupWithKeyword(displayUiName, "FilteredTimeStepKeyword");
|
||||
group->add(&m_filteredTimeStepsText);
|
||||
group->setCollapsedByDefault(true);
|
||||
|
||||
updateDerivedData();
|
||||
updateFieldVisibility();
|
||||
|
||||
uiOrdering.skipRemainingFields();
|
||||
}
|
||||
|
||||
@ -24,6 +24,7 @@
|
||||
#include <vector>
|
||||
|
||||
class QDateTime;
|
||||
class RimEclipseResultCase;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
///
|
||||
@ -31,18 +32,57 @@ class QDateTime;
|
||||
class RimTimeStepFilter : public caf::PdmObject
|
||||
{
|
||||
CAF_PDM_HEADER_INIT;
|
||||
|
||||
public:
|
||||
enum TimeStepFilterTypeEnum
|
||||
{
|
||||
TS_ALL,
|
||||
TS_INTERVAL_DAYS,
|
||||
TS_INTERVAL_WEEKS,
|
||||
TS_INTERVAL_MONTHS,
|
||||
TS_INTERVAL_QUARTERS,
|
||||
TS_INTERVAL_YEARS
|
||||
};
|
||||
|
||||
public:
|
||||
RimTimeStepFilter();
|
||||
|
||||
void setCustomTimeSteps(const std::vector<QDateTime>& timeSteps);
|
||||
|
||||
std::vector<size_t> selectedTimeStepIndices() const;
|
||||
void setSelectedTimeStepIndices(const std::vector<size_t>& indices);
|
||||
void setTimeStepsFromFile(const std::vector<QDateTime>& timeSteps);
|
||||
void clearTimeStepsFromFile();
|
||||
|
||||
private:
|
||||
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
|
||||
std::vector<size_t> selectedTimeStepIndices() const;
|
||||
|
||||
private:
|
||||
caf::PdmField< std::vector<int> > m_selectedTimeStepIndices;
|
||||
std::vector<QDateTime> m_customTimeSteps;
|
||||
QString filteredTimeStepsAsText() const;
|
||||
|
||||
void updateDerivedData();
|
||||
void updateSelectedTimeStepIndices();
|
||||
|
||||
std::vector<QDateTime> allTimeSteps() const;
|
||||
std::vector<int> selectedTimeStepIndicesFromUi() const;
|
||||
|
||||
void updateFieldVisibility();
|
||||
|
||||
RimEclipseResultCase* parentEclipseResultCase() const;
|
||||
|
||||
// PDM overrides
|
||||
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
|
||||
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
|
||||
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) override;
|
||||
virtual void defineEditorAttribute(const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute) override;
|
||||
|
||||
private:
|
||||
caf::PdmField< std::vector<int> > m_selectedTimeStepIndices;
|
||||
|
||||
caf::PdmField< caf::AppEnum< TimeStepFilterTypeEnum > > m_filterType;
|
||||
|
||||
caf::PdmField<int> m_firstTimeStep;
|
||||
caf::PdmField<int> m_lastTimeStep;
|
||||
caf::PdmField<int> m_interval;
|
||||
|
||||
caf::PdmField<QString> m_filteredTimeStepsText;
|
||||
|
||||
caf::PdmField<bool> m_applyReloadOfCase;
|
||||
|
||||
std::vector<QDateTime> m_timeStepsFromFile;
|
||||
};
|
||||
|
||||
Loading…
Reference in New Issue
Block a user