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

#1007 System : Fixed issue reported on GCC 5.4.0

Browse Source
This commit is contained in:
Magne Sjaastad 2016-11-28 11:30:03 +01:00
parent 11e3ee418c
commit e5e423f3c2
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/Application/RiaProjectModifier.cpp
View File

@ -42,7 +42,7 @@ RiaProjectModifier::RiaProjectModifier()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceCaseFirstOccurrence(QString newGridFileName) void RiaProjectModifier::setReplaceCaseFirstOccurrence(QString newGridFileName)
{ {
m_caseIdToGridFileNameMap[FIRST_OCCURENCE] = makeFilePathAbsolute(newGridFileName); m_caseIdToGridFileNameMap[RiaProjectModifier::firstOccurrenceId()] = makeFilePathAbsolute(newGridFileName);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -61,7 +61,7 @@ void RiaProjectModifier::setReplaceCase(int caseIdToReplace, QString newGridFile
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RiaProjectModifier::setReplaceSourceCasesFirstOccurrence(std::vector<QString> newGridFileNames) void RiaProjectModifier::setReplaceSourceCasesFirstOccurrence(std::vector<QString> newGridFileNames)
{ {
m_groupIdToGridFileNamesMap[FIRST_OCCURENCE] = newGridFileNames; m_groupIdToGridFileNamesMap[RiaProjectModifier::firstOccurrenceId()] = newGridFileNames;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -108,7 +108,7 @@ void RiaProjectModifier::replaceSourceCases(RimProject* project)
for (auto item : m_groupIdToGridFileNamesMap) for (auto item : m_groupIdToGridFileNamesMap)
{ {
int groupIdToReplace = item.first; int groupIdToReplace = item.first;
if (groupIdToReplace == FIRST_OCCURENCE) if (groupIdToReplace == RiaProjectModifier::firstOccurrenceId())
{ {
groupIdToReplace = firstGroupId(project); groupIdToReplace = firstGroupId(project);
} }
@ -151,7 +151,7 @@ void RiaProjectModifier::replaceCase(RimProject* project)
for (auto item : m_caseIdToGridFileNameMap) for (auto item : m_caseIdToGridFileNameMap)
{ {
int caseIdToReplace = item.first; int caseIdToReplace = item.first;
if (caseIdToReplace == FIRST_OCCURENCE) if (caseIdToReplace == RiaProjectModifier::firstOccurrenceId())
{ {
caseIdToReplace = firstCaseId(project); caseIdToReplace = firstCaseId(project);
} }
@ -236,3 +236,11 @@ int RiaProjectModifier::firstGroupId(RimProject* project)
return -1; return -1;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
int RiaProjectModifier::firstOccurrenceId()
{
return -999;
}

4
ApplicationCode/Application/RiaProjectModifier.h
View File

@ -58,10 +58,10 @@ private:
static int firstCaseId(RimProject* project); static int firstCaseId(RimProject* project);
static int firstGroupId(RimProject* project); static int firstGroupId(RimProject* project);
static int firstOccurrenceId();
private: private:
std::map<int, QString> m_caseIdToGridFileNameMap; std::map<int, QString> m_caseIdToGridFileNameMap;
std::map<int, std::vector<QString> > m_groupIdToGridFileNamesMap; std::map<int, std::vector<QString> > m_groupIdToGridFileNamesMap;
static const int FIRST_OCCURENCE = -999;
}; };