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

#1018 Added fields fos specifying start/stop/direction for range filtered snapshots. Added clear functionality and defaults for new lines in table for the MultipleSnapshotsWidgets.

Browse Source
This commit is contained in:
astridkbjorke 2016-12-13 09:52:05 +01:00
parent 89278dc6c8
commit 6583c43f1b
4 changed files with 107 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@ -25,6 +25,18 @@
#include "cafPdmPointer.h"
namespace caf
{
template<>
void caf::AppEnum< RimMultiSnapshotDefinition::SnapShotDirectionEnum >::setUp()
{
addItem(RimMultiSnapshotDefinition::RANGEFILTER_I, "I", "i-direction");
addItem(RimMultiSnapshotDefinition::RANGEFILTER_J, "J", "j-direction");
addItem(RimMultiSnapshotDefinition::RANGEFILTER_K, "K", "k-direction");
setDefault(RimMultiSnapshotDefinition::RANGEFILTER_K);
}
}
CAF_PDM_SOURCE_INIT(RimMultiSnapshotDefinition, "MultiSnapshotDefinition");
@ -40,6 +52,12 @@ RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
CAF_PDM_InitFieldNoDefault(&viewObject, "View", "View", "", "", "");
CAF_PDM_InitField(&timeStepStart, "TimeStepStart", 0, "Timestep Start", "", "", "");
CAF_PDM_InitField(&timeStepEnd, "TimeStepEnd", 0, "Timestep End", "", "", "");
CAF_PDM_InitField(&sliceDirection, "SnapShotDirection", caf::AppEnum<SnapShotDirectionEnum>(RANGEFILTER_K), "Range Filter direction", "", "", "");
CAF_PDM_InitField(&startSliceIndex, "RangeFilterStart", 0, "RangeFilter Start", "", "", "");
CAF_PDM_InitField(&endSliceIndex, "RangeFilterEnd", 0, "RangeFilter End", "", "", "");
}
@ -69,7 +87,7 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(c))));
}
options.push_back(caf::PdmOptionItemInfo("All", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
//options.push_back(caf::PdmOptionItemInfo("All", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
}
else if (fieldNeedingOptions == &viewObject)
{
@ -82,8 +100,31 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
}
}
options.push_back(caf::PdmOptionItemInfo("All", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
//options.push_back(caf::PdmOptionItemInfo("All", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
}
else if (fieldNeedingOptions == &timeStepEnd)
{
if (caseObject())
{
QStringList timeSteps = caseObject()->timeStepStrings();
for (int i = 0; i < timeSteps.size(); i++)
{
options.push_back(caf::PdmOptionItemInfo(timeSteps[i], i));
}
}
}
else if (fieldNeedingOptions == &timeStepStart)
{
if (caseObject())
{
QStringList timeSteps = caseObject()->timeStepStrings();
for (int i = 0; i < timeSteps.size(); i++)
{
options.push_back(caf::PdmOptionItemInfo(timeSteps[i], i));
}
}
}
return options;
}

12
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h
View File

@ -21,6 +21,7 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include "cafAppEnum.h"
class RimCase;
class RimView;
@ -42,6 +43,17 @@ public:
caf::PdmField<int> timeStepStart;
caf::PdmField<int> timeStepEnd;
enum SnapShotDirectionEnum
{
RANGEFILTER_I,
RANGEFILTER_J,
RANGEFILTER_K
};
caf::PdmField< caf::AppEnum< SnapShotDirectionEnum > > sliceDirection;
caf::PdmField<int> startSliceIndex;
caf::PdmField<int> endSliceIndex;
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) override;
};

53
ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp
View File

@ -20,6 +20,8 @@
#include "RimMultiSnapshotDefinition.h"
#include "RimProject.h"
#include "RimCase.h"
#include "RimView.h"
#include "cafCmdFeatureManager.h"
#include "cafPdmUiTableView.h"
@ -31,6 +33,7 @@
#include <QMenu>
#include <QTableView>
#include <QWidget>
#include "RiaApplication.h"
//--------------------------------------------------------------------------------------------------
@ -86,9 +89,14 @@ void RiuExportMultipleSnapshotsWidget::customMenuRequested(QPoint pos)
QMenu menu;
menu.addAction(commandManager->action("PdmListField_DeleteItem","Delete row"));
QAction* newRowAction = new QAction("Add new row", this);
QAction* newRowAction = new QAction("New row", this);
connect(newRowAction, SIGNAL(triggered()), SLOT(addSnapshotItem()));
menu.addAction(newRowAction);
QAction* clearAllRows = new QAction("Clear", this);
connect(clearAllRows, SIGNAL(triggered()), SLOT(deleteAllSnapshotItems()));
menu.addAction(clearAllRows);
// Qt doc: QAbstractScrollArea and its subclasses that map the context menu event to coordinates of the viewport().
QPoint globalPos = m_pdmTableView->tableView()->viewport()->mapToGlobal(pos);
@ -96,6 +104,20 @@ void RiuExportMultipleSnapshotsWidget::customMenuRequested(QPoint pos)
menu.exec(globalPos);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuExportMultipleSnapshotsWidget::deleteAllSnapshotItems()
{
if (!m_rimProject) return;
m_rimProject->multiSnapshotDefinitions.deleteAllChildObjects();
m_rimProject->multiSnapshotDefinitions.uiCapability()->updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -104,7 +126,34 @@ void RiuExportMultipleSnapshotsWidget::addSnapshotItem()
if (!m_rimProject) return;
RimMultiSnapshotDefinition* multiSnapshot = new RimMultiSnapshotDefinition();
// TODO: init with available time step from
//Getting default value from last entered line:
if (m_rimProject->multiSnapshotDefinitions.size() > 0)
{
RimMultiSnapshotDefinition* other = m_rimProject->multiSnapshotDefinitions[m_rimProject->multiSnapshotDefinitions.size() - 1];
multiSnapshot->caseObject = other->caseObject();
multiSnapshot->viewObject = other->viewObject();
multiSnapshot->timeStepStart = other->timeStepStart();
multiSnapshot->timeStepEnd = other->timeStepEnd();
// Variant using copy based on xml string
// QString copyOfOriginalObject = other->writeObjectToXmlString();
// multiSnapshot->readObjectFromXmlString(copyOfOriginalObject, caf::PdmDefaultObjectFactory::instance());
}
//Getting new default values (if no earlier entry):
// TODO
// RimProject* proj = RiaApplication::instance()->project();
// std::vector<RimCase*> cases;
// proj->allCases(cases);
// //multiSnapshot->caseObject() = cases[0];
m_rimProject->multiSnapshotDefinitions.push_back(multiSnapshot);
m_rimProject->multiSnapshotDefinitions.uiCapability()->updateConnectedEditors();

1
ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.h
View File

@ -38,6 +38,7 @@ public:
private slots:
void customMenuRequested(QPoint pos);
void addSnapshotItem();
void deleteAllSnapshotItems();
private:
RimProject* m_rimProject;