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 simplified syntax for options in RimMultiSnapshotDefentition calculateValueOptions

Browse Source
This commit is contained in:
astridkbjorke
2016-12-15 14:22:39 +01:00
parent 8ce9c2300f
commit 4d1b083a5f
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@@ -89,12 +89,11 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
for (RimCase* c : cases)
{
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(c))));
// options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c));
// TODO: Update to simpler implementation
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c));
}
options.push_back(caf::PdmOptionItemInfo("-- All cases --", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
options.push_back(caf::PdmOptionItemInfo("-- All cases --", nullptr));
}
else if (fieldNeedingOptions == &viewObject)
{
@@ -122,10 +121,9 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
for (RimView* view : views)
{
options.push_back(caf::PdmOptionItemInfo(view->name(), QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(view))));
//options.push_back(caf::PdmOptionItemInfo(view->name(), view));
options.push_back(caf::PdmOptionItemInfo(view->name(), view));
}
options.push_back(caf::PdmOptionItemInfo("-- All views --", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
options.push_back(caf::PdmOptionItemInfo("-- All views --", nullptr));
}
else if (fieldNeedingOptions == &timeStepEnd)
{

3
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h
View File

@@ -18,10 +18,10 @@
#pragma once
#include "cafAppEnum.h"
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPtrField.h"
#include "cafAppEnum.h"
class RimCase;
class RimView;
@@ -59,7 +59,6 @@ public:
void getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
};