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

Fix missing update of export well name

Browse Source
This commit is contained in:
Magne Sjaastad 2022-09-08 16:14:05 +02:00
parent 129c4a0e34
commit a8fbb4f70e
5 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/Application/Tools/RiaWellNameComparer.cpp
View File

@ -102,6 +102,18 @@ void RiaWellNameComparer::clearCache()
sm_matchedName.clear(); sm_matchedName.clear();
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RiaWellNameComparer::removeSpacesFromName( const QString& wellName )
{
// Eclipse do not support spaces in names in text files. Use this function whenever a string is used in export to
// text files for Eclipse
QString tmp = wellName;
return tmp.remove( ' ' );
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/Application/Tools/RiaWellNameComparer.h
View File

@ -38,6 +38,8 @@ public:
static void clearCache(); static void clearCache();
static QString removeSpacesFromName( const QString& wellName );
private: private:
static QString tryMatchName( QString searchName, static QString tryMatchName( QString searchName,
const std::vector<QString>& nameList, const std::vector<QString>& nameList,

2
ApplicationLibCode/Commands/WellPathCommands/RicPasteModeledWellPathFeature.cpp
View File

@ -152,7 +152,7 @@ RimModeledWellPath* RicPasteModeledWellPathFeature::duplicateAndInitializeWellPa
auto* destinationWellPath = dynamic_cast<RimModeledWellPath*>( auto* destinationWellPath = dynamic_cast<RimModeledWellPath*>(
sourceWellPath->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) ); sourceWellPath->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
QString name = sourceWellPath->name() + " (copy)"; QString name = sourceWellPath->name() + "(copy)";
destinationWellPath->setName( name ); destinationWellPath->setName( name );
wpc->addWellPath( destinationWellPath, false ); wpc->addWellPath( destinationWellPath, false );

13
ApplicationLibCode/ProjectDataModel/Completions/RimWellPathCompletionSettings.cpp
View File

@ -18,9 +18,11 @@
#include "RimWellPathCompletionSettings.h" #include "RimWellPathCompletionSettings.h"
#include "RiaStdStringTools.h" #include "RiaStdStringTools.h"
#include "RimMswCompletionParameters.h" #include "RiaWellNameComparer.h"
#include "RimMswCompletionParameters.h"
#include "RimWellPath.h" #include "RimWellPath.h"
#include "cafPdmDoubleStringValidator.h" #include "cafPdmDoubleStringValidator.h"
#include "cafPdmUiLineEditor.h" #include "cafPdmUiLineEditor.h"
#include "cafPdmUiOrdering.h" #include "cafPdmUiOrdering.h"
@ -131,8 +133,7 @@ RimWellPathCompletionSettings& RimWellPathCompletionSettings::operator=( const R
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimWellPathCompletionSettings::setWellNameForExport( const QString& name ) void RimWellPathCompletionSettings::setWellNameForExport( const QString& name )
{ {
auto n = name; m_wellNameForExport = RiaWellNameComparer::removeSpacesFromName( name );
m_wellNameForExport = n.remove( ' ' );
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -141,9 +142,11 @@ void RimWellPathCompletionSettings::setWellNameForExport( const QString& name )
void RimWellPathCompletionSettings::updateWellPathNameHasChanged( const QString& newWellPathName, void RimWellPathCompletionSettings::updateWellPathNameHasChanged( const QString& newWellPathName,
const QString& previousWellPathName ) const QString& previousWellPathName )
{ {
if ( m_wellNameForExport().isEmpty() || m_wellNameForExport == previousWellPathName ) auto previousWellNameWithoutSpaces = RiaWellNameComparer::removeSpacesFromName( previousWellPathName );
if ( m_wellNameForExport().isEmpty() || m_wellNameForExport == previousWellNameWithoutSpaces )
{ {
m_wellNameForExport = newWellPathName; setWellNameForExport( newWellPathName );
} }
} }

5
ApplicationLibCode/ProjectDataModel/WellPath/RimWellPathGroup.cpp
View File

@ -18,6 +18,7 @@
#include "RimWellPathGroup.h" #include "RimWellPathGroup.h"
#include "RiaTextStringTools.h" #include "RiaTextStringTools.h"
#include "RiaWellNameComparer.h"
#include "RigWellPath.h" #include "RigWellPath.h"
#include "RimModeledWellPath.h" #include "RimModeledWellPath.h"
@ -326,9 +327,7 @@ QString RimWellPathGroup::createGroupName() const
} }
fullName += trimmedCommonSuffix; fullName += trimmedCommonSuffix;
QString nameWithoutSpaces = fullName; QString nameWithoutSpaces = RiaWellNameComparer::removeSpacesFromName( fullName );
nameWithoutSpaces.remove( ' ' );
if ( nameWithoutSpaces.length() > 8 ) fullName = trimmedCommonRoot + trimmedCommonSuffix; if ( nameWithoutSpaces.length() > 8 ) fullName = trimmedCommonRoot + trimmedCommonSuffix;
if ( fullName.isEmpty() ) fullName = "Well 1"; if ( fullName.isEmpty() ) fullName = "Well 1";