From 550595c56d5b751ffdf10d997ed2520fa45da1d4 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 Mar 2019 09:58:47 +0300 Subject: [PATCH 1/4] Increment version: 9.3.0 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 13f7a4532..37fa5d94d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,11 +33,11 @@ ENDIF(WIN32) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) -SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) -SET(${PROJECT_NAME_UC}_PATCH_VERSION 2) +SET(${PROJECT_NAME_UC}_MINOR_VERSION 3) +SET(${PROJECT_NAME_UC}_PATCH_VERSION 0) SET(${PROJECT_NAME_UC}_VERSION ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION}) -SET(${PROJECT_NAME_UC}_VERSION_DEV 1) +SET(${PROJECT_NAME_UC}_VERSION_DEV 0) # Common CMake macros # =================== From 3421298e040728675198d280425ba99395ca9641 Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 28 Mar 2019 14:54:46 +0300 Subject: [PATCH 2/4] Issue !16751: [CEA16749] import MED 3.0 files in SMESH: exception --- src/MEDWrapper/MED_Factory.cxx | 4 ++-- src/MEDWrapper/MED_Wrapper.cxx | 21 +++++++++------------ src/MEDWrapper/MED_Wrapper.hxx | 2 +- 3 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/MEDWrapper/MED_Factory.cxx b/src/MEDWrapper/MED_Factory.cxx index 12c0f597a..c6d62d253 100644 --- a/src/MEDWrapper/MED_Factory.cxx +++ b/src/MEDWrapper/MED_Factory.cxx @@ -211,7 +211,7 @@ namespace MED if (!CheckCompatibility(fileName)) { EXCEPTION(std::runtime_error, "Cannot open file '"<Open(eLECTURE_ECRITURE, &aRet); - // if (aRet < 0) - // myFile->Close(); - // myFile->Open(eLECTURE_AJOUT, &aRet); - // } - if (aRet < 0) { - myFile->Close(); - myFile->Open(eLECTURE, &aRet); + if ( write ) { + myFile->Open(eLECTURE_ECRITURE, &aRet); + if (aRet < 0) { + myFile->Close(); + myFile->Open(eCREATION, &aRet); + } } - if (aRet < 0) { - myFile->Close(); - myFile->Open(eCREATION, &aRet); + else { + myFile->Open(eLECTURE, &aRet); } } diff --git a/src/MEDWrapper/MED_Wrapper.hxx b/src/MEDWrapper/MED_Wrapper.hxx index 7acbf4ce0..e236f206c 100644 --- a/src/MEDWrapper/MED_Wrapper.hxx +++ b/src/MEDWrapper/MED_Wrapper.hxx @@ -52,7 +52,7 @@ namespace MED TWrapper& operator=(const TWrapper&); public: - TWrapper(const std::string& theFileName, TInt theVersion=-1); + TWrapper(const std::string& theFileName, bool write, TInt theVersion=-1); virtual ~TWrapper(); From bf3fbe8dd4a34128a24fc3a2100bac3b17cddc12 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Mon, 8 Apr 2019 20:23:25 +0200 Subject: [PATCH 3/4] debug for SMESH plugin padder --- src/Tools/padder/spadderpy/gui/inputdata.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/src/Tools/padder/spadderpy/gui/inputdata.py b/src/Tools/padder/spadderpy/gui/inputdata.py index b3edb1a73..bbc1c5a02 100644 --- a/src/Tools/padder/spadderpy/gui/inputdata.py +++ b/src/Tools/padder/spadderpy/gui/inputdata.py @@ -36,6 +36,8 @@ class InputData(DataModeler): 'STEELBAR' ]) + maListe=MESHTYPES.listvalues() + def __init__(self): DataModeler.__init__(self) self.addAttribute( @@ -44,20 +46,22 @@ class InputData(DataModeler): ) self.addAttribute( name = "meshName", - type = TypeString, - range = None + a_type = TypeString, + a_range = None ) self.addAttribute( name = "meshType", - type = TypeInteger, - range = self.MESHTYPES.listvalues() + a_type = TypeInteger, + #range = self.MESHTYPES.listvalues() + a_range = [0,1] ) self.addAttribute( name = "groupName", - type = TypeString, - range = None + a_type = TypeString, + a_range = None ) + # # ============================================================================== # Basic use cases and unit tests From 62c6ecf7ae764a8c0c91f02f1ab227e6dedec052 Mon Sep 17 00:00:00 2001 From: Paul RASCLE Date: Tue, 9 Apr 2019 10:23:32 +0200 Subject: [PATCH 4/4] fix for plugin padder --- src/Tools/padder/spadderpy/gui/inputdata.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Tools/padder/spadderpy/gui/inputdata.py b/src/Tools/padder/spadderpy/gui/inputdata.py index bbc1c5a02..0bfb44f3d 100644 --- a/src/Tools/padder/spadderpy/gui/inputdata.py +++ b/src/Tools/padder/spadderpy/gui/inputdata.py @@ -52,7 +52,6 @@ class InputData(DataModeler): self.addAttribute( name = "meshType", a_type = TypeInteger, - #range = self.MESHTYPES.listvalues() a_range = [0,1] ) self.addAttribute( @@ -61,7 +60,6 @@ class InputData(DataModeler): a_range = None ) - # # ============================================================================== # Basic use cases and unit tests