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

Move function to RiaProjectFileTools

Browse Source 
Rename to RiaProjectFileTools
This commit is contained in:
Magne Sjaastad 2024-06-05 10:59:04 +02:00
parent 27339a91fa
commit a952fbce7e
7 changed files with 81 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationLibCode/Application/Tools/CMakeLists_files.cmake
View File

@ -18,7 +18,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.h
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaTextStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaTextFileCompare.h
@ -77,7 +77,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaInterpolationTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryAddressAnalyzer.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSimWellBranchTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaStringEncodingTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTextStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaTextFileCompare.cpp

60
ApplicationLibCode/Application/Tools/RiaProjectFileVersionTools.cpp → ApplicationLibCode/Application/Tools/RiaProjectFileTools.cpp
View File

@ -16,51 +16,47 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaProjectFileVersionTools.h"
#include "RiaProjectFileTools.h"
#include <QStringList>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaProjectFileVersionTools::isCandidateVersionNewerThanOther( const QString& candidateProjectFileVersion, const QString& projectFileVersion )
bool RiaProjectFileTools::isCandidateVersionNewerThanOther( const QString& candidateProjectFileVersion, const QString& projectFileVersion )
{
int candidateMajorVersion = 0;
int candidateMinorVersion = 0;
int candidatePatchNumber = -1;
int candidateDevelopmentId = -1;
RiaProjectFileVersionTools::decodeVersionString( candidateProjectFileVersion,
&candidateMajorVersion,
&candidateMinorVersion,
&candidatePatchNumber,
&candidateDevelopmentId );
RiaProjectFileTools::decodeVersionString( candidateProjectFileVersion,
&candidateMajorVersion,
&candidateMinorVersion,
&candidatePatchNumber,
&candidateDevelopmentId );
int majorVersion = 0;
int minorVersion = 0;
int patchNumber = -1;
int developmentId = -1;
RiaProjectFileVersionTools::decodeVersionString( projectFileVersion, &majorVersion, &minorVersion, &patchNumber, &developmentId );
RiaProjectFileTools::decodeVersionString( projectFileVersion, &majorVersion, &minorVersion, &patchNumber, &developmentId );
return RiaProjectFileVersionTools::isCandidateNewerThanOther( candidateMajorVersion,
candidateMinorVersion,
candidatePatchNumber,
candidateDevelopmentId,
majorVersion,
minorVersion,
patchNumber,
developmentId );
return RiaProjectFileTools::isCandidateNewerThanOther( candidateMajorVersion,
candidateMinorVersion,
candidatePatchNumber,
candidateDevelopmentId,
majorVersion,
minorVersion,
patchNumber,
developmentId );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFileVersion,
int* majorVersion,
int* minorVersion,
int* patch,
int* developmentId )
void RiaProjectFileTools::decodeVersionString( const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId )
{
if ( projectFileVersion.isEmpty() ) return;
@ -79,7 +75,7 @@ void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFile
if ( subStrings.size() > 2 )
{
QString candidate = subStrings[2];
QString candidateDigitsOnly = RiaProjectFileVersionTools::stringOfDigits( candidate );
QString candidateDigitsOnly = RiaProjectFileTools::stringOfDigits( candidate );
*patch = candidateDigitsOnly.toInt();
}
@ -87,7 +83,7 @@ void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFile
if ( subStrings.size() > 3 )
{
QString candidate = subStrings.back();
QString candidateDigitsOnly = RiaProjectFileVersionTools::stringOfDigits( candidate );
QString candidateDigitsOnly = RiaProjectFileTools::stringOfDigits( candidate );
*developmentId = candidateDigitsOnly.toInt();
}
@ -96,14 +92,14 @@ void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFile
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiaProjectFileVersionTools::isCandidateNewerThanOther( int candidateMajorVersion,
int candidateMinorVersion,
int candidatePatchNumber,
int candidateDevelopmentId,
int otherMajorVersion,
int otherMinorVersion,
int otherPatchNumber,
int otherDevelopmentId )
bool RiaProjectFileTools::isCandidateNewerThanOther( int candidateMajorVersion,
int candidateMinorVersion,
int candidatePatchNumber,
int candidateDevelopmentId,
int otherMajorVersion,
int otherMinorVersion,
int otherPatchNumber,
int otherDevelopmentId )
{
if ( candidateMajorVersion != otherMajorVersion )
{
@ -137,7 +133,7 @@ bool RiaProjectFileVersionTools::isCandidateNewerThanOther( int candidateMajorVe
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaProjectFileVersionTools::stringOfDigits( const QString& string )
QString RiaProjectFileTools::stringOfDigits( const QString& string )
{
QString digitsOnly;

40
ApplicationLibCode/Application/Tools/RiaProjectFileVersionTools.h → ApplicationLibCode/Application/Tools/RiaProjectFileTools.h
View File

@ -18,12 +18,17 @@
#pragma once
#include "cafPdmField.h"
#include "cafPdmObjectHandle.h"
#include <QString>
#include <vector>
//==================================================================================================
//
//==================================================================================================
class RiaProjectFileVersionTools
class RiaProjectFileTools
{
public:
static bool isCandidateVersionNewerThanOther( const QString& candidateProjectFileVersion, const QString& otherProjectFileVersion );
@ -31,6 +36,39 @@ public:
// Public to be able to unit test function, not intended to be used
static void decodeVersionString( const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId );
template <typename T>
static void fieldContentsByType( const caf::PdmObjectHandle* object, std::vector<T*>& fieldContents )
{
if ( !object ) return;
std::vector<caf::PdmFieldHandle*> allFieldsInObject = object->fields();
std::vector<caf::PdmObjectHandle*> children;
for ( const auto& field : allFieldsInObject )
{
caf::PdmField<T>* typedField = dynamic_cast<caf::PdmField<T>*>( field );
if ( typedField ) fieldContents.push_back( &typedField->v() );
caf::PdmField<std::vector<T>>* typedFieldInVector = dynamic_cast<caf::PdmField<std::vector<T>>*>( field );
if ( typedFieldInVector )
{
for ( T& typedFieldFromVector : typedFieldInVector->v() )
{
fieldContents.push_back( &typedFieldFromVector );
}
}
auto other = field->children();
children.insert( children.end(), other.begin(), other.end() );
}
for ( const auto& child : children )
{
fieldContentsByType( child, fieldContents );
}
}
private:
static bool isCandidateNewerThanOther( int candidateMajorVersion,
int candidateMinorVersion,

6
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@ -26,7 +26,7 @@
#include "RiaGuiApplication.h"
#include "RiaPreferences.h"
#include "RiaProjectBackupTools.h"
#include "RiaProjectFileVersionTools.h"
#include "RiaProjectFileTools.h"
#include "RiaTextStringTools.h"
#include "RiaVersionInfo.h"
@ -479,7 +479,7 @@ bool RimProject::isProjectFileVersionEqualOrOlderThan( const QString& otherProje
{
QString candidateProjectFileVersion = projectFileVersionString();
return !RiaProjectFileVersionTools::isCandidateVersionNewerThanOther( candidateProjectFileVersion, otherProjectFileVersion );
return !RiaProjectFileTools::isCandidateVersionNewerThanOther( candidateProjectFileVersion, otherProjectFileVersion );
}
//--------------------------------------------------------------------------------------------------
@ -1336,7 +1336,7 @@ RimPlotTemplateFolderItem* RimProject::rootPlotTemplateItem() const
std::vector<caf::FilePath*> RimProject::allFilePaths() const
{
std::vector<caf::FilePath*> filePaths;
fieldContentsByType( this, filePaths );
RiaProjectFileTools::fieldContentsByType( this, filePaths );
return filePaths;
}

42
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@ -204,9 +204,6 @@ protected:
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
private:
template <typename T>
static void fieldContentsByType( const caf::PdmObjectHandle* object, std::vector<T*>& fieldContents );
void transferPathsToGlobalPathList();
void distributePathsFromGlobalPathList();
@ -239,42 +236,3 @@ private:
caf::PdmChildArrayField<RimEclipseCase*> casesObsolete; // obsolete
caf::PdmChildArrayField<RimIdenticalGridCaseGroup*> caseGroupsObsolete; // obsolete
};
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
template <typename T>
void RimProject::fieldContentsByType( const caf::PdmObjectHandle* object, std::vector<T*>& fieldContents )
{
if ( !object ) return;
std::vector<caf::PdmFieldHandle*> allFieldsInObject = object->fields();
std::vector<caf::PdmObjectHandle*> children;
for ( const auto& field : allFieldsInObject )
{
auto xmlFieldCapability = field->xmlCapability();
if ( xmlFieldCapability && !xmlFieldCapability->isIOWritable() ) continue;
caf::PdmField<T>* typedField = dynamic_cast<caf::PdmField<T>*>( field );
if ( typedField ) fieldContents.push_back( &typedField->v() );
caf::PdmField<std::vector<T>>* typedFieldInVector = dynamic_cast<caf::PdmField<std::vector<T>>*>( field );
if ( typedFieldInVector )
{
for ( T& typedFieldFromVector : typedFieldInVector->v() )
{
fieldContents.push_back( &typedFieldFromVector );
}
}
auto other = field->children();
children.insert( children.end(), other.begin(), other.end() );
}
for ( const auto& child : children )
{
fieldContentsByType( child, fieldContents );
}
}

2
ApplicationLibCode/UnitTests/CMakeLists.txt
View File

@ -34,7 +34,7 @@ set(SOURCE_UNITTEST_FILES
${CMAKE_CURRENT_LIST_DIR}/FixedWidthDataParser-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigTimeCurveHistoryMerger-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/ListKeywordsForObjectsAndFields-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileVersionTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaProjectFileTools-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RifElementPropertyTableReader-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RimRelocatePath-Test.cpp
${CMAKE_CURRENT_LIST_DIR}/RigTransmissibilityCondenser-Test.cpp

16
ApplicationLibCode/UnitTests/RiaProjectFileVersionTools-Test.cpp → ApplicationLibCode/UnitTests/RiaProjectFileTools-Test.cpp
View File

@ -1,10 +1,10 @@
#include "gtest/gtest.h"
#include "RiaProjectFileVersionTools.h"
#include "RiaProjectFileTools.h"
#include <QStringList>
TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
TEST( RiaProjectFileTools, DecodeProjectVersionString )
{
{
int majorVersion = -1;
@ -13,7 +13,7 @@ TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
int developmentId = -1;
QString projectFileVersionString = "2017.05.1";
RiaProjectFileVersionTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
RiaProjectFileTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
EXPECT_EQ( 2017, majorVersion );
EXPECT_EQ( 5, minorVersion );
@ -28,7 +28,7 @@ TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
int developmentId = -1;
QString projectFileVersionString = "";
RiaProjectFileVersionTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
RiaProjectFileTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
EXPECT_EQ( -1, majorVersion );
EXPECT_EQ( -1, minorVersion );
@ -43,7 +43,7 @@ TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
int developmentId = -1;
QString projectFileVersionString = "2017.05.2-dev.23";
RiaProjectFileVersionTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
RiaProjectFileTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
EXPECT_EQ( 2017, majorVersion );
EXPECT_EQ( 5, minorVersion );
@ -58,7 +58,7 @@ TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
int developmentId = -1;
QString projectFileVersionString = "2017.05.2-dev.long.text..23";
RiaProjectFileVersionTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
RiaProjectFileTools::decodeVersionString( projectFileVersionString, &majorVersion, &minorVersion, &patchNumber, &developmentId );
EXPECT_EQ( 2017, majorVersion );
EXPECT_EQ( 5, minorVersion );
@ -67,7 +67,7 @@ TEST( RiaProjectFileVersionTools, DecodeProjectVersionString )
}
}
TEST( RiaProjectFileVersionTools, OrderKnownVersionStrings )
TEST( RiaProjectFileTools, OrderKnownVersionStrings )
{
QStringList versionStrings;
{
@ -141,7 +141,7 @@ TEST( RiaProjectFileVersionTools, OrderKnownVersionStrings )
QStringList sortedVersionList = versionStrings;
{
std::sort( sortedVersionList.begin(), sortedVersionList.end(), RiaProjectFileVersionTools::isCandidateVersionNewerThanOther );
std::sort( sortedVersionList.begin(), sortedVersionList.end(), RiaProjectFileTools::isCandidateVersionNewerThanOther );
}
/*