#1018 Added option for taking snapshots of all cases

This commit is contained in:
astridkbjorke 2016-12-15 13:45:34 +01:00
parent 2ee20257a8
commit 8ce9c2300f
2 changed files with 104 additions and 39 deletions

View File

@ -100,35 +100,70 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
QString timeStepString; QString timeStepString;
QString rangeFilterString; QString rangeFilterString;
std::vector<RimView*> ViewsToPlot; std::vector<RimCase*> casesToPlot;
std::vector<std::pair<RimCase*, RimView*>> casesViewsPairs;
for (RimMultiSnapshotDefinition* msd : project->multiSnapshotDefinitions()) for (RimMultiSnapshotDefinition* msd : project->multiSnapshotDefinitions())
{ {
activeCase = msd->caseObject(); activeCase = msd->caseObject();
if (!activeCase) continue;
activeView = msd->viewObject(); if (activeCase)
if (activeView)
{ {
ViewsToPlot.push_back(activeView); casesToPlot.push_back(activeCase);
} }
else //nullptr is value used for "All" else //nullptr is value used for "All"
{ {
for (RimView* view : activeCase->views()) RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
for (RimCase* thisCase : cases)
{ {
ViewsToPlot.push_back(view); casesToPlot.push_back(thisCase);
} }
} }
for (RimView* thisView : ViewsToPlot)
for (RimCase* rimCase : casesToPlot)
{ {
if (thisView && thisView->viewer()) activeView = msd->viewObject();
if (activeView)
{ {
timeSteps = activeCase->timeStepStrings(); casesViewsPairs.push_back(std::make_pair(rimCase, activeView));
RiuViewer* viewer = thisView->viewer();
}
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(); int initialFramIndex = viewer->currentFrameIndex();
for (int i = msd->timeStepStart(); i <= msd->timeStepEnd(); i++) for (int i = msd->timeStepStart(); i <= msd->timeStepEnd(); i++)
@ -142,23 +177,23 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
if (msd->sliceDirection == RimMultiSnapshotDefinition::NO_RANGEFILTER) if (msd->sliceDirection == RimMultiSnapshotDefinition::NO_RANGEFILTER)
{ {
QString fileName = activeCase->caseUserDescription() + "_" + thisView->name() + "_" + timeStepString; QString fileName = rimCase->caseUserDescription() + "_" + rimView->name() + "_" + timeStepString;
fileName.replace(" ", "-"); fileName.replace(" ", "-");
QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png"); QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png");
RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, thisView); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView);
} }
else else
{ {
RimCellRangeFilter* rangeFilter = new RimCellRangeFilter; RimCellRangeFilter* rangeFilter = new RimCellRangeFilter;
thisView->rangeFilterCollection()->rangeFilters.push_back(rangeFilter); rimView->rangeFilterCollection()->rangeFilters.push_back(rangeFilter);
bool rangeFilterInitState = thisView->rangeFilterCollection()->isActive(); bool rangeFilterInitState = rimView->rangeFilterCollection()->isActive();
thisView->rangeFilterCollection()->isActive = true; rimView->rangeFilterCollection()->isActive = true;
for (int i = msd->startSliceIndex(); i <= msd->endSliceIndex(); i++) for (int i = msd->startSliceIndex(); i <= msd->endSliceIndex(); i++)
{ {
rangeFilterString = msd->sliceDirection().text() + "-" + QString::number(i); rangeFilterString = msd->sliceDirection().text() + "-" + QString::number(i);
QString fileName = activeCase->caseUserDescription() + "_" + thisView->name() + "_" + timeStepString + "_" + rangeFilterString; QString fileName = rimCase->caseUserDescription() + "_" + rimView->name() + "_" + timeStepString + "_" + rangeFilterString;
fileName.replace(" ", "-"); fileName.replace(" ", "-");
rangeFilter->setDefaultValues(); rangeFilter->setDefaultValues();
@ -178,19 +213,19 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
rangeFilter->startIndexK = i; rangeFilter->startIndexK = i;
} }
thisView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews(rangeFilter); rimView->rangeFilterCollection()->updateDisplayModeNotifyManagedViews(rangeFilter);
// Make sure the redraw is processed // Make sure the redraw is processed
QCoreApplication::instance()->processEvents(); QCoreApplication::instance()->processEvents();
QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png"); QString absoluteFileName = caf::Utils::constructFullFileName(folder, fileName, ".png");
RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, thisView); RicSnapshotViewToFileFeature::saveSnapshotAs(absoluteFileName, rimView);
} }
thisView->rangeFilterCollection()->rangeFilters.removeChildObject(rangeFilter); rimView->rangeFilterCollection()->rangeFilters.removeChildObject(rangeFilter);
delete rangeFilter; delete rangeFilter;
thisView->rangeFilterCollection()->isActive = rangeFilterInitState; rimView->rangeFilterCollection()->isActive = rangeFilterInitState;
thisView->scheduleCreateDisplayModelAndRedraw(); rimView->scheduleCreateDisplayModelAndRedraw();
QCoreApplication::instance()->processEvents(); QCoreApplication::instance()->processEvents();
} }
} }
@ -199,12 +234,7 @@ void RicExportMultipleSnapshotsFeature::exportMultipleSnapshots(const QString& f
viewer->animationControl()->setCurrentFrameOnly(initialFramIndex); viewer->animationControl()->setCurrentFrameOnly(initialFramIndex);
} }
} }
} }
} }

View File

@ -94,33 +94,48 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
// TODO: Update to simpler implementation // TODO: Update to simpler implementation
} }
//options.push_back(caf::PdmOptionItemInfo("All", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr)))); options.push_back(caf::PdmOptionItemInfo("-- All cases --", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
} }
else if (fieldNeedingOptions == &viewObject) else if (fieldNeedingOptions == &viewObject)
{ {
std::vector<RimView*> views;
if (caseObject()) if (caseObject())
{ {
std::vector<RimView*> views = caseObject()->views(); views = caseObject()->views();
for (RimView* view : views) }
else
{
RimProject* proj = RiaApplication::instance()->project();
std::vector<RimCase*> cases;
proj->allCases(cases);
if (cases.size() > 0)
{ {
options.push_back(caf::PdmOptionItemInfo(view->name(), QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(view)))); RimCase* rimCase = cases[0];
//options.push_back(caf::PdmOptionItemInfo(view->name(), view)); if (rimCase->views().size() > 0)
{
views = rimCase->views();
}
} }
} }
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("-- All views --", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr)))); options.push_back(caf::PdmOptionItemInfo("-- All views --", QVariant::fromValue(caf::PdmPointer<caf::PdmObjectHandle>(nullptr))));
} }
else if (fieldNeedingOptions == &timeStepEnd) else if (fieldNeedingOptions == &timeStepEnd)
{ {
getTimeStepStrings(options); getTimeStepStrings(options);
} }
else if (fieldNeedingOptions == &timeStepStart) else if (fieldNeedingOptions == &timeStepStart)
{ {
getTimeStepStrings(options); getTimeStepStrings(options);
} }
return options; return options;
} }
@ -129,14 +144,33 @@ QList<caf::PdmOptionItemInfo> RimMultiSnapshotDefinition::calculateValueOptions(
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options) void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo> &options)
{ {
if (!caseObject()) return; QStringList timeSteps;
QStringList timeSteps = caseObject()->timeStepStrings(); 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();
}
for (int i = 0; i < timeSteps.size(); i++) for (int i = 0; i < timeSteps.size(); i++)
{ {
options.push_back(caf::PdmOptionItemInfo(timeSteps[i], i)); options.push_back(caf::PdmOptionItemInfo(timeSteps[i], i));
} }
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -144,6 +178,7 @@ void RimMultiSnapshotDefinition::getTimeStepStrings(QList<caf::PdmOptionItemInfo
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimMultiSnapshotDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
if (changedField == &sliceDirection) if (changedField == &sliceDirection)
{ {
const cvf::StructGridInterface* mainGrid = nullptr; const cvf::StructGridInterface* mainGrid = nullptr;