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

#2310 Add isProjectFileVersionEqualOrOlderThan to RimProject and use from summary plot

Browse Source
This commit is contained in:
Magne Sjaastad 2018-01-04 13:12:07 +01:00
parent dbc1061a59
commit 96a900fe0f
4 changed files with 24 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/RimProject.cpp
View File

@ -21,6 +21,7 @@
#include "RimProject.h" #include "RimProject.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "RiaProjectFileVersionTools.h"
#include "RiaVersionInfo.h" #include "RiaVersionInfo.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
@ -412,6 +413,15 @@ QString RimProject::projectFileVersionString() const
return m_projectFileVersionString; return m_projectFileVersionString;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RimProject::isProjectFileVersionEqualOrOlderThan(const QString& otherProjectFileVersion) const
{
QString candidateProjectFileVersion = projectFileVersionString();
return RiaProjectFileVersionTools::isCandidateVersionNewerThanOther(candidateProjectFileVersion, otherProjectFileVersion);
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

1
ApplicationCode/ProjectDataModel/RimProject.h
View File

@ -94,6 +94,7 @@ public:
void setScriptDirectories(const QString& scriptDirectories); void setScriptDirectories(const QString& scriptDirectories);
QString projectFileVersionString() const; QString projectFileVersionString() const;
bool isProjectFileVersionEqualOrOlderThan(const QString& otherProjectFileVersion) const;
void close(); void close();
void setProjectFileNameAndUpdateDependencies(const QString& fileName); void setProjectFileNameAndUpdateDependencies(const QString& fileName);

11
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -23,6 +23,7 @@
#include "RimAsciiDataCurve.h" #include "RimAsciiDataCurve.h"
#include "RimGridTimeHistoryCurve.h" #include "RimGridTimeHistoryCurve.h"
#include "RimProject.h"
#include "RimSummaryAxisProperties.h" #include "RimSummaryAxisProperties.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCurve.h" #include "RimSummaryCurve.h"
@ -1327,6 +1328,16 @@ void RimSummaryPlot::initAfterRead()
{ {
m_summaryCurveCollection->addCurve(curve); m_summaryCurveCollection->addCurve(curve);
} }
RimProject* proj = nullptr;
this->firstAncestorOrThisOfType(proj);
if (proj)
{
if (proj->isProjectFileVersionEqualOrOlderThan("2017.0.0"))
{
m_useAutoPlotTitle = false;
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

62
ApplicationCode/UnitTests/RiaProjectFileVersionTools-Test.cpp
View File

@ -1,66 +1,9 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "RiaProjectFileVersionTools.h" #include "RiaProjectFileVersionTools.h"
#include <QStringList> #include <QStringList>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
TEST(RiaProjectFileVersionTools, BasicUsage)
{
/*
{
QString projectFileVersionString = "2017.05.1";
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 0;
int developmentId = 0;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber, developmentId);
EXPECT_TRUE(isNewer);
}
{
QString projectFileVersionString = "2017.05.1.text.13";
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 14;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_FALSE(isNewer);
}
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 13;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_TRUE(isNewer);
}
{
int majorVersion = 2017;
int minorVersion = 5;
int patchNumber = 1;
int developmentId = 12;
bool isNewer = RiaProjectFileVersionTools::isProjectFileVersionNewerThan(projectFileVersionString, majorVersion,
minorVersion, patchNumber,
developmentId); EXPECT_TRUE(isNewer);
}
}
*/
}
TEST(RiaProjectFileVersionTools, DecodeProjectVersionString) TEST(RiaProjectFileVersionTools, DecodeProjectVersionString)
{ {
{ {
@ -202,8 +145,7 @@ TEST(RiaProjectFileVersionTools, OrderKnownVersionStrings)
QStringList sortedVersionList = versionStrings; QStringList sortedVersionList = versionStrings;
{ {
qSort(sortedVersionList.begin(), sortedVersionList.end(), qSort(sortedVersionList.begin(), sortedVersionList.end(), RiaProjectFileVersionTools::isCandidateVersionNewerThanOther);
RiaProjectFileVersionTools::isCandidateVersionNewerThanOther);
} }
for (const auto& s : sortedVersionList) for (const auto& s : sortedVersionList)