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

#829 Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2016-09-08 10:43:26 +02:00
parent 0f88475fd8
commit 1180db39f7
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
View File

@ -644,7 +644,7 @@ RigFemScalarResultFrames* RigFemPartResultsCollection::calculateDerivedResult(in
if (resVarAddr.resultPosType == RIG_FORMATION_NAMES)
{
RigFemScalarResultFrames* resFrames = m_femPartResults[partIndex]->createScalarResult(resVarAddr);
resFrames->setSingleFrameResultData();
resFrames->enableAsSingleFrameResult();
const RigFemPart * femPart = m_femParts->part(partIndex);
std::vector<float>& dstFrameData = resFrames->frameData(0);

8
ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.cpp
View File

@ -28,7 +28,7 @@
RigFemScalarResultFrames::RigFemScalarResultFrames(int frameCount)
{
m_dataForEachFrame.resize(frameCount);
m_singleFrameResultData = false;
m_isSingleFrameResult = false;
}
//--------------------------------------------------------------------------------------------------
@ -42,9 +42,9 @@ RigFemScalarResultFrames::~RigFemScalarResultFrames()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RigFemScalarResultFrames::setSingleFrameResultData()
void RigFemScalarResultFrames::enableAsSingleFrameResult()
{
m_singleFrameResultData = true;
m_isSingleFrameResult = true;
}
//--------------------------------------------------------------------------------------------------
@ -61,7 +61,7 @@ int RigFemScalarResultFrames::frameCount()
//--------------------------------------------------------------------------------------------------
std::vector<float>& RigFemScalarResultFrames::frameData(size_t frameIndex)
{
if (m_singleFrameResultData)
if (m_isSingleFrameResult)
{
return m_dataForEachFrame[0];
}

4
ApplicationCode/GeoMech/GeoMechDataModel/RigFemScalarResultFrames.h
View File

@ -33,12 +33,12 @@ public:
RigFemScalarResultFrames(int frameCount);
virtual ~RigFemScalarResultFrames();
void setSingleFrameResultData();
void enableAsSingleFrameResult();
std::vector<float>& frameData(size_t frameIndex);
int frameCount();
private:
std::vector< std::vector<float> > m_dataForEachFrame;
bool m_singleFrameResultData;
bool m_isSingleFrameResult;
};