Fix pb. of merge

This commit is contained in:
jfa 2007-08-24 12:44:39 +00:00
parent 856524def1
commit 8407274e7b

View File

@ -457,7 +457,7 @@ class Mesh_Algorithm:
def Create(self, mesh, geom, hypo, so="libStdMeshersEngine.so"): def Create(self, mesh, geom, hypo, so="libStdMeshersEngine.so"):
if geom is None: if geom is None:
raise RuntimeError, "Attemp to create " + hypo + " algoritm on None shape" raise RuntimeError, "Attemp to create " + hypo + " algoritm on None shape"
algo = smesh.CreateHypothesis(hypo, so) algo = self.mesh.smeshpyD.CreateHypothesis(hypo, so)
self.Assign(algo, mesh, geom) self.Assign(algo, mesh, geom)
return self.algo return self.algo
@ -489,7 +489,7 @@ class Mesh_Algorithm:
if hypo!=None: CreateNew = 0 if hypo!=None: CreateNew = 0
pass pass
if CreateNew: if CreateNew:
hypo = smesh.CreateHypothesis(hyp, so) hypo = self.mesh.smeshpyD.CreateHypothesis(hyp, so)
key = "%s %s %s" % (self.__class__.__name__, hyp, args) key = "%s %s %s" % (self.__class__.__name__, hyp, args)
Mesh_Algorithm.hypos[key] = hypo Mesh_Algorithm.hypos[key] = hypo
a = "" a = ""