Merge branch 'V9_3_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13f7a4532f87173ff5a1d590687a8f5a5270f332..95d1ef7e281d3731fc87536266c0f48930c1ea0c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,8 +33,8 @@ 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)

diff --git a/src/MEDWrapper/MED_Factory.cxx b/src/MEDWrapper/MED_Factory.cxx
index 12c0f597a768ef08bee659864d3903eceed2a1cb..c6d62d253e4b7352de16efddc2031f3405429e90 100644 (file)
--- 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 '"<<fileName<<"'.");
     }
-    return new MED::TWrapper(fileName);
+    return new MED::TWrapper(fileName, false);
   }
 
   PWrapper CrWrapperW(const std::string& fileName, int theVersion)
@@ -251,6 +251,6 @@ namespace MED
           CreateEmptyMEDFile(fileName, theVersion);
       }
     }
-    return new MED::TWrapper(fileName, minor);
+    return new MED::TWrapper(fileName, true, minor);
   }
 }

diff --git a/src/MEDWrapper/MED_Wrapper.cxx b/src/MEDWrapper/MED_Wrapper.cxx
index 117ab89f6da8532fff99c42bb6aa5e74e437abf7..157f9834285bc7cb20ace11d84957ed797257e68 100644 (file)
--- a/src/MEDWrapper/MED_Wrapper.cxx
+++ b/src/MEDWrapper/MED_Wrapper.cxx
@@ -187,23 +187,20 @@ namespace MED
 
   //---------------------------------------------------------------
   TWrapper
-  ::TWrapper(const std::string& theFileName, TInt theMinor):
+  ::TWrapper(const std::string& theFileName, bool write, TInt theMinor):
     myFile(new TFile(theFileName, theMinor)),
     myMinor(theMinor)
   {
     TErr aRet;
-    myFile->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 7acbf4ce004f9d9249e5e29e216fae6f8c348fae..e236f206cb09240db23736801c9ac29597498db0 100644 (file)
--- 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();

diff --git a/src/Tools/padder/spadderpy/gui/inputdata.py b/src/Tools/padder/spadderpy/gui/inputdata.py
index b3edb1a73a4f8e13080105642e762f5be4842f4a..0bfb44f3da3bc592100484a5e93d2bd940f783b7 100644 (file)
--- 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,18 +46,18 @@ 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,
+            a_range = [0,1] 
             )
         self.addAttribute(
             name  = "groupName",
-            type  = TypeString,
-            range = None
+            a_type  = TypeString,
+            a_range = None
             )
 
 #