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 Snapshots : Show both case name and view name in view description

Browse Source
This commit is contained in:
Magne Sjaastad 2016-12-19 08:49:41 +01:00
parent 432dbcdeac
commit 3d08b453c4
4 changed files with 25 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ApplicationCode/Commands/RicExportMultipleSnapshotsFeature.cpp
View File

@ -93,76 +93,23 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
if (!snapshotPath.mkpath(".")) return;
}
RimCase* activeCase = nullptr;
RimView* activeView = nullptr;
QStringList timeSteps;
QString timeStepString;
QString rangeFilterString;
std::vector<RimCase*> casesToPlot;
std::vector<std::pair<RimCase*, RimView*>> casesViewsPairs;
for (RimMultiSnapshotDefinition* msd : project->multiSnapshotDefinitions())
{
activeCase = msd->caseObject();
if (activeCase)
RimView* rimView = msd->viewObject();
{
casesToPlot.push_back(activeCase);
}
else //nullptr is value used for "All"
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
for (RimCase* thisCase : cases)
if (rimView && rimView->viewer())
{
casesToPlot.push_back(thisCase);
}
}
RimCase* rimCase = rimView->ownerCase();
if (!rimCase) continue;
for (RimCase* rimCase : casesToPlot)
{
activeView = msd->viewObject();
if (activeView)
{
casesViewsPairs.push_back(std::make_pair(rimCase, activeView));
}
else //nullptr is value used for "All"
{
for (RimView* rimView : rimCase->views())
{
casesViewsPairs.push_back(std::make_pair(rimCase, rimView));
}
}
}
RimView* rimView = nullptr;
RimCase* rimCase = nullptr;
bool pairExists = false;
for (auto caseViewPair : casesViewsPairs)
{
rimCase = caseViewPair.first;
rimView = caseViewPair.second;
pairExists = false;
for (auto viewToCheck : rimCase->views())
{
if (viewToCheck == rimView) pairExists = true;
}
if (pairExists && rimView && rimView->viewer())
{
timeSteps = rimCase->timeStepStrings();
RiuViewer* viewer = rimView->viewer();
int initialFramIndex = viewer->currentFrameIndex();

83
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.cpp
View File

@ -53,7 +53,6 @@ RimMultiSnapshotDefinition::RimMultiSnapshotDefinition()
//CAF_PDM_InitObject("MultiSnapshotDefinition", ":/Well.png", "", "");
CAF_PDM_InitObject("MultiSnapshotDefinition", "", "", "");
CAF_PDM_InitFieldNoDefault(&caseObject, "Case", "Case", "", "", "");
CAF_PDM_InitFieldNoDefault(&viewObject, "View", "View", "", "", "");
CAF_PDM_InitField(&timeStepStart, "TimeStepStart", 0, "Timestep Start", "", "", "");
CAF_PDM_InitField(&timeStepEnd, "TimeStepEnd", 0, "Timestep End", "", "", "");
@ -82,46 +81,26 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
RimProject* proj = RiaApplication::instance()->project();
if (fieldNeedingOptions == &caseObject && proj)
{
std::vector<RimCase*> cases;
proj->allCases(cases);
for (RimCase* c : cases)
{
options.push_back(caf::PdmOptionItemInfo(c->caseUserDescription(), c));
}
options.push_back(caf::PdmOptionItemInfo("-- All cases --", nullptr));
}
else if (fieldNeedingOptions == &viewObject)
if (fieldNeedingOptions == &viewObject)
{
std::vector<RimView*> views;
if (caseObject())
{
views = caseObject()->views();
}
else
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
if (cases.size() > 0)
for (RimCase* rimCase : cases)
{
for (RimView* rimView : rimCase->views())
{
RimCase* rimCase = cases[0];
if (rimCase->views().size() > 0)
{
views = rimCase->views();
}
views.push_back(rimView);
}
}
for (RimView* view : views)
{
options.push_back(caf::PdmOptionItemInfo(view->name(), view));
QString caseAndView = view->ownerCase()->caseUserDescription() + " - " + view->name();
options.push_back(caf::PdmOptionItemInfo(caseAndView, view));
}
options.push_back(caf::PdmOptionItemInfo("-- All views --", nullptr));
}
@ -144,31 +123,12 @@ void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo
{
QStringList timeSteps;
if (!caseObject())
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
if (cases.size() > 0)
{
RimCase* rimCase = cases[0];
if (rimCase->views().size() > 0)
{
timeSteps = rimCase->timeStepStrings();
}
}
}
else
{
timeSteps = caseObject()->timeStepStrings();
}
timeSteps = viewObject->ownerCase()->timeStepStrings();
for (int i = 0; i < timeSteps.size(); i++)
{
options.push_back(caf::PdmOptionItemInfo(timeSteps[i], i));
}
}
//--------------------------------------------------------------------------------------------------
@ -181,24 +141,7 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
{
const cvf::StructGridInterface* mainGrid = nullptr;
RigActiveCellInfo* actCellInfo = nullptr;
if (!viewObject()) {
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
if (cases.size() > 0)
{
RimCase* activeCase = cases[0];
if (activeCase->views().size() > 0)
{
RimView* firstView = activeCase->views()[0];
mainGrid = firstView->rangeFilterCollection()->gridByIndex(0);
actCellInfo = firstView->rangeFilterCollection()->activeCellInfo();
}
}
}
if (viewObject())
{
mainGrid = viewObject()->rangeFilterCollection()->gridByIndex(0);
@ -241,7 +184,7 @@ void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
startSliceIndex = minInt;
endSliceIndex = maxInt;
}
}
startSliceIndex.uiCapability()->updateConnectedEditors();
}

2
ApplicationCode/ProjectDataModel/RimMultiSnapshotDefinition.h
View File

@ -37,7 +37,6 @@ public:
RimMultiSnapshotDefinition();
virtual ~RimMultiSnapshotDefinition();
caf::PdmPtrField<RimCase*> caseObject;
caf::PdmPtrField<RimView*> viewObject;
caf::PdmField<int> timeStepStart;
@ -60,5 +59,4 @@ public:
void getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) override;
};

22
ApplicationCode/UserInterface/RiuExportMultipleSnapshotsWidget.cpp
View File

@ -194,42 +194,34 @@ void RiuExportMultipleSnapshotsWidget::addSnapshotItem()
RimMultiSnapshotDefinition* multiSnapshot = new RimMultiSnapshotDefinition();
//Getting default value from last entered line:
if (m_rimProject->multiSnapshotDefinitions.size() > 0)
{
//Getting default value from last entered line:
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());
}
else
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
RimCase* CaseExample = nullptr;
RimView* ViewExample = nullptr;
if (cases.size() > 0)
{
CaseExample = cases.at(0);
multiSnapshot->caseObject = CaseExample;
RimCase* caseExample = cases.at(0);
std::vector<RimView*> viewExamples;
viewExamples = CaseExample->views();
viewExamples = caseExample->views();
if (viewExamples.size() > 0)
{
ViewExample = viewExamples.at(0);
multiSnapshot->viewObject = ViewExample;
RimView* viewExample = viewExamples.at(0);
multiSnapshot->viewObject = viewExample;
multiSnapshot->timeStepStart = viewExample->currentTimeStep();
multiSnapshot->timeStepEnd = viewExample->currentTimeStep();
}
}
}