From af3894e22a443c66a4263b176488402ab2c56869 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 31 Jan 2014 14:45:37 +0000 Subject: [PATCH] 22470: EDF 2824 HEXOTICPLUGIN: Working directory is not taking into account with an imported mesh Add a trailing slash --- src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx b/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx index 7a0c94c..43ea38e 100644 --- a/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx +++ b/src/HexoticPlugin/HexoticPlugin_Hypothesis.cxx @@ -76,14 +76,14 @@ void HexoticPlugin_Hypothesis::SetHexesMaxLevel(int theVal) { void HexoticPlugin_Hypothesis::SetMinSize(double theVal) { if (theVal != _minSize) { - _minSize = theVal; + _minSize = theVal; NotifySubMeshesHypothesisModification(); } } void HexoticPlugin_Hypothesis::SetMaxSize(double theVal) { if (theVal != _maxSize) { - _maxSize = theVal; + _maxSize = theVal; NotifySubMeshesHypothesisModification(); } } @@ -120,6 +120,16 @@ void HexoticPlugin_Hypothesis::SetHexoticWorkingDirectory(const std::string& pat { if ( _hexoticWorkingDirectory != path ) { _hexoticWorkingDirectory = path; + if ( !path.empty() ) + { +#ifdef WIN32 + if( path[ path.size()-1 ] != '\\') + _hexoticWorkingDirectory += '\\'; +#else + if( path[ path.size()-1 ] != '/') + _hexoticWorkingDirectory += '/'; +#endif + } NotifySubMeshesHypothesisModification(); } } -- 2.39.2