ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-11-11 16:19:16 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'V9_3_BR'

Browse Source
This commit is contained in:
vsr 2019-05-06 14:10:42 +03:00
commit ecea056f61
5 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -33,8 +33,8 @@ ENDIF(WIN32)
STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC) STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9) SET(${PROJECT_NAME_UC}_MAJOR_VERSION 9)
SET(${PROJECT_NAME_UC}_MINOR_VERSION 2) SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
SET(${PROJECT_NAME_UC}_PATCH_VERSION 2) SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
SET(${PROJECT_NAME_UC}_VERSION SET(${PROJECT_NAME_UC}_VERSION
${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_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 1)

4
src/MEDWrapper/MED_Factory.cxx
View File

@ -211,7 +211,7 @@ namespace MED
if (!CheckCompatibility(fileName)) { if (!CheckCompatibility(fileName)) {
EXCEPTION(std::runtime_error, "Cannot open file '"<<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) PWrapper CrWrapperW(const std::string& fileName, int theVersion)
@ -251,6 +251,6 @@ namespace MED
CreateEmptyMEDFile(fileName, theVersion); CreateEmptyMEDFile(fileName, theVersion);
} }
} }
return new MED::TWrapper(fileName, minor); return new MED::TWrapper(fileName, true, minor);
} }
} }

15
src/MEDWrapper/MED_Wrapper.cxx
View File

@ -187,25 +187,22 @@ namespace MED
//--------------------------------------------------------------- //---------------------------------------------------------------
TWrapper TWrapper
::TWrapper(const std::string& theFileName, TInt theMinor): ::TWrapper(const std::string& theFileName, bool write, TInt theMinor):
myFile(new TFile(theFileName, theMinor)), myFile(new TFile(theFileName, theMinor)),
myMinor(theMinor) myMinor(theMinor)
{ {
TErr aRet; TErr aRet;
if ( write ) {
myFile->Open(eLECTURE_ECRITURE, &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 (aRet < 0) { if (aRet < 0) {
myFile->Close(); myFile->Close();
myFile->Open(eCREATION, &aRet); myFile->Open(eCREATION, &aRet);
} }
} }
else {
myFile->Open(eLECTURE, &aRet);
}
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
TWrapper:: TWrapper::

2
src/MEDWrapper/MED_Wrapper.hxx
View File

@ -52,7 +52,7 @@ namespace MED
TWrapper& operator=(const TWrapper&); TWrapper& operator=(const TWrapper&);
public: public:
TWrapper(const std::string& theFileName, TInt theVersion=-1); TWrapper(const std::string& theFileName, bool write, TInt theVersion=-1);
virtual virtual
~TWrapper(); ~TWrapper();

14
src/Tools/padder/spadderpy/gui/inputdata.py
View File

@ -36,6 +36,8 @@ class InputData(DataModeler):
'STEELBAR' 'STEELBAR'
]) ])
maListe=MESHTYPES.listvalues()
def __init__(self): def __init__(self):
DataModeler.__init__(self) DataModeler.__init__(self)
self.addAttribute( self.addAttribute(
@ -44,18 +46,18 @@ class InputData(DataModeler):
) )
self.addAttribute( self.addAttribute(
name = "meshName", name = "meshName",
type = TypeString, a_type = TypeString,
range = None a_range = None
) )
self.addAttribute( self.addAttribute(
name = "meshType", name = "meshType",
type = TypeInteger, a_type = TypeInteger,
range = self.MESHTYPES.listvalues() a_range = [0,1]
) )
self.addAttribute( self.addAttribute(
name = "groupName", name = "groupName",
type = TypeString, a_type = TypeString,
range = None a_range = None
) )
# #