#3979 #3980 Contour Maps: Fix GeoMech crash and make limit to POR-result optional.

This commit is contained in:
Gaute Lindkvist committed 2019-01-22 14:00:09 +01:00
1 parent 8814ae9902
commit 810a991ba4
8 files changed
+93 -43

No files matched your search

@@ -2261,6 +2261,19 @@ void RigFemPartResultsCollection::deleteResult(const RigFemResultAddress& resVar
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFemPartResultsCollection::deleteResultFrame(const RigFemResultAddress& resVarAddr, int partIndex, int frameIndex)
{
CVF_ASSERT(resVarAddr.isValid());
RigFemScalarResultFrames* frames = m_femPartResults[partIndex]->findScalarResult(resVarAddr);
if (frames)
{
std::vector<float>().swap(frames->frameData(frameIndex));
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -67,7 +67,7 @@ public:
std::vector<std::string> filteredStepNames() const;
bool assertResultsLoaded(const RigFemResultAddress& resVarAddr);
void deleteResult(const RigFemResultAddress& resVarAddr);
void deleteResultFrame(const RigFemResultAddress& resVarAddr, int partIndex, int frameIndex);
std::vector<RigFemResultAddress> loadedResults() const;
const std::vector<float>& resultValues(const RigFemResultAddress& resVarAddr, int partIndex, int frameIndex);