From: akk Date: Wed, 23 Nov 2005 11:50:00 +0000 (+0000) Subject: Fix for 10531 X-Git-Tag: T_2_2_7pre~2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=b44c67ea05d487252294bbaf52ff8e3cab552e0a;p=modules%2Fvisu.git Fix for 10531 --- diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py index fc023764..33688a4e 100644 --- a/src/VISU_SWIG/visu.py +++ b/src/VISU_SWIG/visu.py @@ -316,13 +316,14 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print " ", anEntityName, aMeshName, aMesh = theVisu.MeshOnEntity(theResult,aMeshName,anEntity) if aMesh is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aMesh) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName); - theView.SavePicture(aPictureName) - aVISUObjList.append(aMesh) + else : + print ",OK" + theView.DisplayOnly(aMesh) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName); + theView.SavePicture(aPictureName) + aVISUObjList.append(aMesh) anFamilyIter = myLocalStudy.NewChildIterator(anEntitySObj); while anFamilyIter.More() : @@ -335,13 +336,14 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print " ", anFamilyName, aMesh = theVisu.FamilyMeshOnEntity(theResult,aMeshName,anEntity,anFamilyName) if aMesh is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aMesh) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + anFamilyName + "." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName); - theView.SavePicture(aPictureName) - aVISUObjList.append(aMesh) + else : + print ",OK" + theView.DisplayOnly(aMesh) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + anFamilyName + "." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName); + theView.SavePicture(aPictureName) + aVISUObjList.append(aMesh) if aFolderName == 'Groups' : aGroupIter = myLocalStudy.NewChildIterator(aFolderSObj); @@ -355,13 +357,14 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print " ", aGroupName, aMesh = theVisu.GroupMesh(theResult,aMeshName,aGroupName) if aMesh is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aMesh) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + aGroupName + "." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName); - theView.SavePicture(aPictureName) - aVISUObjList.append(aMesh) + else : + print ",OK" + theView.DisplayOnly(aMesh) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + aGroupName + "." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName); + theView.SavePicture(aPictureName) + aVISUObjList.append(aMesh) if aFolderName == 'Fields' : aFieldIter = myLocalStudy.NewChildIterator(aFolderSObj); @@ -403,52 +406,56 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print " Creating ScalarMapOnField", aPrsObj = theVisu.ScalarMapOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TSCALARMAP." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName); - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TSCALARMAP." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName); + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) if HasValue(thePrsTypeList,VISU.TISOSURFACE) : print " Creating IsoSurfacesOnField", aPrsObj = theVisu.IsoSurfacesOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TISOSURFACE." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName); - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TISOSURFACE." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName); + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) if HasValue(thePrsTypeList,VISU.TCUTPLANES) : print " Creating CutPlanesOnField", aPrsObj = theVisu.CutPlanesOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - aPrsObj.SetOrientation(VISU.CutPlanes.ZX,aPrsObj.GetRotateX(),aPrsObj.GetRotateY()) - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TCUTPLANES." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName) - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + aPrsObj.SetOrientation(VISU.CutPlanes.ZX,aPrsObj.GetRotateX(),aPrsObj.GetRotateY()) + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TCUTPLANES." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) if HasValue(thePrsTypeList,VISU.TCUTLINES) : print " Creating CutLinesOnField", aPrsObj = theVisu.CutLinesOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - aPrsObj.SetOrientation(VISU.CutPlanes.XY,aPrsObj.GetRotateX(),aPrsObj.GetRotateY()) - aPrsObj.SetOrientation2(VISU.CutPlanes.ZX,aPrsObj.GetRotateX2(),aPrsObj.GetRotateY2()) - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TCUTLINES." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName) - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + aPrsObj.SetOrientation(VISU.CutPlanes.XY,aPrsObj.GetRotateX(),aPrsObj.GetRotateY()) + aPrsObj.SetOrientation2(VISU.CutPlanes.ZX,aPrsObj.GetRotateX2(),aPrsObj.GetRotateY2()) + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TCUTLINES." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) aNumComponent = atoi(aMap["myNumComponent"]) if aNumComponent > 1 : @@ -456,37 +463,40 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print " Creating DeformedShapeOnField", aPrsObj = theVisu.DeformedShapeOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TDEFORMEDSHAPE." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName) - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TDEFORMEDSHAPE." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) if HasValue(thePrsTypeList,VISU.TVECTORS) : print " Creating VectorsOnField", aPrsObj = theVisu.VectorsOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TVECTORS." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName) - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TVECTORS." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) if HasValue(thePrsTypeList,VISU.TSTREAMLINES) : print " Creating StreamLinesOnField", aPrsObj = theVisu.StreamLinesOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" - else : print ",OK" - theView.DisplayOnly(aPrsObj) - theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TSTREAMLINES." + thePictureExt - aPictureName = re.sub("\s+","_", aPictureName) - theView.SavePicture(aPictureName) - aVISUObjList.append(aPrsObj) + else : + print ",OK" + theView.DisplayOnly(aPrsObj) + theView.FitAll() + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TSTREAMLINES." + thePictureExt + aPictureName = re.sub("\s+","_", aPictureName) + theView.SavePicture(aPictureName) + aVISUObjList.append(aPrsObj) return aVISUObjList