ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-04-09 06:17:26 +05:00
Code Issues Packages Projects Releases Wiki Activity

Python3 porting: python3 instead python and deepcopy.

Browse Source
This commit is contained in:
rnv 2017-06-01 17:07:32 +03:00
parent 21c9336a4d
commit bf9ebfec9f
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SMESH/SMESH_Mesh.cxx
View File

@ -1475,7 +1475,7 @@ void SMESH_Mesh::ExportSAUV(const char *file,
#ifdef WIN32 #ifdef WIN32
cmd = "%PYTHONBIN% "; cmd = "%PYTHONBIN% ";
#else #else
cmd = "python "; cmd = "python3 ";
#endif #endif
cmd += "-c \""; cmd += "-c \"";
cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')"; cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";
@ -1487,7 +1487,7 @@ void SMESH_Mesh::ExportSAUV(const char *file,
#ifdef WIN32 #ifdef WIN32
cmd = "%PYTHONBIN% "; cmd = "%PYTHONBIN% ";
#else #else
cmd = "python "; cmd = "python3 ";
#endif #endif
cmd += "-c \""; cmd += "-c \"";
cmd += "from medutilities import convert ; convert(r'" + medfilename + "', 'MED', 'GIBI', 1, r'" + file + "')"; cmd += "from medutilities import convert ; convert(r'" + medfilename + "', 'MED', 'GIBI', 1, r'" + file + "')";
@ -1496,7 +1496,7 @@ void SMESH_Mesh::ExportSAUV(const char *file,
#ifdef WIN32 #ifdef WIN32
cmd = "%PYTHONBIN% "; cmd = "%PYTHONBIN% ";
#else #else
cmd = "python "; cmd = "python3 ";
#endif #endif
cmd += "-c \""; cmd += "-c \"";
cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')"; cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";

4
src/SMESH_I/SMESH_Gen_i.cxx
View File

@ -1283,7 +1283,7 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromSAUV( const char* theFileName,
#ifdef WIN32 #ifdef WIN32
cmd = "%PYTHONBIN% "; cmd = "%PYTHONBIN% ";
#else #else
cmd = "python "; cmd = "python3 ";
#endif #endif
cmd += "-c \""; cmd += "-c \"";
cmd += "from medutilities import convert ; convert(r'" + sauvfilename + "', 'GIBI', 'MED', 1, r'" + medfilename + "')"; cmd += "from medutilities import convert ; convert(r'" + sauvfilename + "', 'GIBI', 'MED', 1, r'" + medfilename + "')";
@ -1293,7 +1293,7 @@ SMESH::mesh_array* SMESH_Gen_i::CreateMeshesFromSAUV( const char* theFileName,
#ifdef WIN32 #ifdef WIN32
cmd = "%PYTHONBIN% "; cmd = "%PYTHONBIN% ";
#else #else
cmd = "python "; cmd = "python3 ";
#endif #endif
cmd += "-c \""; cmd += "-c \"";
cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')"; cmd += "from medutilities import my_remove ; my_remove(r'" + medfilename + "')";

6
src/SMESH_SWIG/smeshBuilder.py
View File

@ -5124,7 +5124,7 @@ class meshProxy(SMESH._objref_SMESH_Mesh):
def __init__(self, *args): def __init__(self, *args):
SMESH._objref_SMESH_Mesh.__init__(self, *args) SMESH._objref_SMESH_Mesh.__init__(self, *args)
def __deepcopy__(self, memo=None): def __deepcopy__(self, memo=None):
new = self.__class__() new = self.__class__(self)
return new return new
def CreateDimGroup(self,*args): # 2 args added: nbCommonNodes, underlyingOnly def CreateDimGroup(self,*args): # 2 args added: nbCommonNodes, underlyingOnly
if len( args ) == 3: if len( args ) == 3:
@ -5141,7 +5141,7 @@ class submeshProxy(SMESH._objref_SMESH_subMesh):
SMESH._objref_SMESH_subMesh.__init__(self, *args) SMESH._objref_SMESH_subMesh.__init__(self, *args)
self.mesh = None self.mesh = None
def __deepcopy__(self, memo=None): def __deepcopy__(self, memo=None):
new = self.__class__() new = self.__class__(self)
return new return new
## Compute the sub-mesh and return the status of the computation ## Compute the sub-mesh and return the status of the computation
@ -5187,7 +5187,7 @@ class meshEditor(SMESH._objref_SMESH_MeshEditor):
print("meshEditor: attribute '%s' NOT FOUND" % name) print("meshEditor: attribute '%s' NOT FOUND" % name)
return None return None
def __deepcopy__(self, memo=None): def __deepcopy__(self, memo=None):
new = self.__class__() new = self.__class__(self)
return new return new
def FindCoincidentNodes(self,*args): # a 2nd arg added (SeparateCornerAndMediumNodes) def FindCoincidentNodes(self,*args): # a 2nd arg added (SeparateCornerAndMediumNodes)
if len( args ) == 1: args += False, if len( args ) == 1: args += False,