From a25f38a6c17547e3723211869c5d5237231c7c4f Mon Sep 17 00:00:00 2001 From: apo Date: Thu, 31 May 2007 11:57:57 +0000 Subject: [PATCH] Fix for Bug IPAL16061 - IOLS. AttributeError on load script dumped from the attached study To fix the bug the VISU IDL was changed. TISOSURFACE enumeration item was changed to TISOSURFACES ("S" - was put on the back). It was done as from lexical, as from consistency with persistent mechanism point of views. By the way, TPRSMERGER enumeration item was removed at all, because all functionality of this class was moved to ScalarMap and the item has no sense anymore. --- idl/VISU_Gen.idl | 3 +-- src/VISUGUI/VisuGUI.cxx | 18 +++++++++--------- src/VISUGUI/VisuGUI_ActionsDef.h | 2 +- src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx | 6 +++--- src/VISUGUI/VisuGUI_PopupTools.cxx | 2 +- src/VISUGUI/VisuGUI_TimeAnimation.cxx | 16 ++++++++-------- src/VISUGUI/VisuGUI_Tools.cxx | 2 +- src/VISU_I/VISUConfig.cc | 2 +- src/VISU_I/VISU_ColoredPrs3dFactory.cc | 8 ++++---- src/VISU_I/VISU_ColoredPrs3dFactory.hh | 2 +- src/VISU_I/VISU_DumpPython.cc | 2 +- src/VISU_I/VISU_IsoSurfaces_i.hh | 2 +- src/VISU_I/VISU_TimeAnimation.cxx | 10 +++++----- src/VISU_SWIG/VISU_Example_04.py | 2 +- src/VISU_SWIG/batchmode_visu_view3d.py | 2 +- src/VISU_SWIG/visu.py | 4 ++-- src/VISU_SWIG/visu_cache.py | 2 +- src/VISU_SWIG/visu_change_input.py | 4 ++-- src/VISU_SWIG/visu_view3d.py | 2 +- 19 files changed, 45 insertions(+), 46 deletions(-) diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 66ccdce5..909a6d58 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -74,11 +74,10 @@ module VISU { TCONTAINER, /*!< Container object used for storing a set of curve lines */ TMESH, /*!< Meshing object */ TSCALARMAP, /*!< Scalarmap 3D presentation object */ - TISOSURFACE, /*!< Iso surface 3D presentation object */ + TISOSURFACES, /*!< Iso surface 3D presentation object */ TDEFORMEDSHAPE, /*!< Deformed shape 3D presentation object */ TSCALARMAPONDEFORMEDSHAPE, /*!< Scalar map on deformed shape 3D presentation object */ TGAUSSPOINTS, /*!< Gauss Points 3D presentation object */ - TPRSMERGER, /*!< PRS merger 3D presentation object */ TPLOT3D, /*!< Plot3D 3D presentation object */ TCUTPLANES, /*!< Cut planes 3D presentation object */ TCUTLINES, /*!< Cut lines 3D presentation object */ diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 96610a36..68aee346 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -1783,8 +1783,8 @@ VisuGUI case VISU::TCUTLINES: TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp); break; - case VISU::TISOSURFACE: - TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp); + case VISU::TISOSURFACES: + TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp); break; case VISU::TSTREAMLINES: TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp); @@ -2213,7 +2213,7 @@ VisuGUI tr("MEN_EDIT_PRS"), "", 0, aParent, false, this, SLOT(OnEditCutLines())); - createAction( VISU_EDIT_ISOSURFACE, tr("MEN_EDIT_PRS"), QIconSet(), + createAction( VISU_EDIT_ISOSURFACES, tr("MEN_EDIT_PRS"), QIconSet(), tr("MEN_EDIT_PRS"), "", 0, aParent, false, this, SLOT(OnEditIsoSurfaces())); @@ -2413,7 +2413,7 @@ VisuGUI mgr->insert( action( VISU_EDIT_DEFORMEDSHAPE ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_CUTPLANES ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_CUTLINES ), -1, -1, -1 ); - mgr->insert( action( VISU_EDIT_ISOSURFACE ), -1, -1, -1 ); + mgr->insert( action( VISU_EDIT_ISOSURFACES ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_VECTORS ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_STREAMLINES ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_PLOT3D ), -1, -1, -1 ); @@ -2499,7 +2499,7 @@ VisuGUI // Rules - QString aPrsAll ("'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " + QString aPrsAll ("'VISU::TSCALARMAP' 'VISU::TISOSURFACES' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " "'VISU::TCUTLINES' 'VISU::TVECTORS' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' " "'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TCOLOREDPRS3DHOLDER'"); @@ -2565,10 +2565,10 @@ VisuGUI QString aPrsType = " and $type in {'VISU::TMESH' " + aPrsAll + "}"; QString aInsideType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE'}"; QString aSurfFrameType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP''VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " + QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACES' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " " 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aLineType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACE' 'VISU::TDEFORMEDSHAPE' " + QString aLineType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACES' 'VISU::TDEFORMEDSHAPE' " "'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' }"; aRule = "selcount=1"; @@ -2631,8 +2631,8 @@ VisuGUI "selcount=1 and type='VISU::TCUTPLANES'", true ); mgr->setRule( action( VISU_EDIT_CUTLINES ), "selcount=1 and type='VISU::TCUTLINES'", true ); - mgr->setRule( action( VISU_EDIT_ISOSURFACE ), - "selcount=1 and type='VISU::TISOSURFACE'", true ); + mgr->setRule( action( VISU_EDIT_ISOSURFACES ), + "selcount=1 and type='VISU::TISOSURFACES'", true ); mgr->setRule( action( VISU_EDIT_VECTORS ), "selcount=1 and type='VISU::TVECTORS'", true ); mgr->setRule( action( VISU_EDIT_STREAMLINES ), diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index 5c2f4211..33e2a811 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -86,7 +86,7 @@ #define VISU_EDIT_DEFORMEDSHAPE 40621 #define VISU_EDIT_CUTPLANES 40622 #define VISU_EDIT_CUTLINES 40623 -#define VISU_EDIT_ISOSURFACE 40624 +#define VISU_EDIT_ISOSURFACES 40624 #define VISU_EDIT_VECTORS 40625 #define VISU_EDIT_STREAMLINES 40626 #define VISU_EDIT_PLOT3D 40627 diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx index 9b629c45..e043866a 100644 --- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx +++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx @@ -183,7 +183,7 @@ VisuGUI_IsoSurfacesDlg::VisuGUI_IsoSurfacesDlg (SalomeApp_Module* theModule) myScalarPane = new VisuGUI_ScalarBarPane(this, false); myIsoPane->setScalarBarPane(myScalarPane); myScalarPane->setMargin( 5 ); - myInputPane = new VisuGUI_InputPane(VISU::TISOSURFACE, theModule, this); + myInputPane = new VisuGUI_InputPane(VISU::TISOSURFACES, theModule, this); myTabBox->addTab(myScalarPane, "Scalar Bar"); myTabBox->addTab(myInputPane, "Input"); @@ -240,7 +240,7 @@ void VisuGUI_IsoSurfacesDlg::reject() void VisuGUI_IsoSurfacesDlg::initFromPrsObject(VISU::ColoredPrs3d_i* thePrs, bool theInit) { if( theInit ) - myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); + myPrsCopy = VISU::TSameAsFactory().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish); myScalarPane->initFromPrsObject(myPrsCopy); myIsoPane->initFromPrsObject(myPrsCopy); @@ -261,7 +261,7 @@ int VisuGUI_IsoSurfacesDlg::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) anIsOk &= myScalarPane->storeToPrsObject( myPrsCopy ); anIsOk &= myIsoPane->storeToPrsObject( myPrsCopy ); - VISU::TSameAsFactory().Copy(thePrs, myPrsCopy); + VISU::TSameAsFactory().Copy(thePrs, myPrsCopy); return anIsOk; } diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx index 2ce90f0c..43c66585 100644 --- a/src/VISUGUI/VisuGUI_PopupTools.cxx +++ b/src/VISUGUI/VisuGUI_PopupTools.cxx @@ -100,7 +100,7 @@ QString VisuGUI_Selection::type( const int ind ) const ENUM2STRING( aResStr, VISU::TCONTAINER ); ENUM2STRING( aResStr, VISU::TMESH ); ENUM2STRING( aResStr, VISU::TSCALARMAP ); - ENUM2STRING( aResStr, VISU::TISOSURFACE ); + ENUM2STRING( aResStr, VISU::TISOSURFACES ); ENUM2STRING( aResStr, VISU::TDEFORMEDSHAPE ); ENUM2STRING( aResStr, VISU::TSCALARMAPONDEFORMEDSHAPE ); ENUM2STRING( aResStr, VISU::TCUTPLANES ); diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index 1b0a471f..4f90b86e 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -605,7 +605,7 @@ SetupDlg::SetupDlg (QWidget* theParent, //------------------------------------------------------------------------ enum PrsComboItem { TSCALARMAP_ITEM = 0, // VISU::TSCALARMAP - TISOSURFACE_ITEM = 1, // VISU::TISOSURFACE + TISOSURFACES_ITEM = 1, // VISU::TISOSURFACES TCUTPLANES_ITEM = 2, // VISU::TCUTPLANES TCUTLINES_ITEM = 3, // VISU::TCUTLINES TPLOT3D_ITEM = 4, // VISU::TPLOT3D @@ -629,8 +629,8 @@ void SetupDlg::onFieldChange (int theIndex) myComboId2TypeId.push_back(TSCALARMAP_ITEM);; myTypeCombo->insertItem("Iso Surfaces"); // item 1 - myTypeId2ComboId[TISOSURFACE_ITEM] = myComboId2TypeId.size(); - myComboId2TypeId.push_back(TISOSURFACE_ITEM);; + myTypeId2ComboId[TISOSURFACES_ITEM] = myComboId2TypeId.size(); + myComboId2TypeId.push_back(TISOSURFACES_ITEM);; myTypeCombo->insertItem("Cut Planes"); // item 2 myTypeId2ComboId[TCUTPLANES_ITEM] = myComboId2TypeId.size(); @@ -705,8 +705,8 @@ void SetupDlg::onFieldChange (int theIndex) case VISU::TSCALARMAP: //Scalar Map myTypeCombo->setCurrentItem(myTypeId2ComboId[TSCALARMAP_ITEM]); break; - case VISU::TISOSURFACE: //Iso Surfaces - myTypeCombo->setCurrentItem(myTypeId2ComboId[TISOSURFACE_ITEM]); + case VISU::TISOSURFACES: //Iso Surfaces + myTypeCombo->setCurrentItem(myTypeId2ComboId[TISOSURFACES_ITEM]); break; case VISU::TCUTPLANES: //Cut Planes myTypeCombo->setCurrentItem(myTypeId2ComboId[TCUTPLANES_ITEM]); @@ -750,8 +750,8 @@ void SetupDlg::onTypeChanged (int theIndex) case TSCALARMAP_ITEM: //Scalar Map aData.myPrsType = VISU::TSCALARMAP; break; - case TISOSURFACE_ITEM: //Iso Surfaces - aData.myPrsType = VISU::TISOSURFACE; + case TISOSURFACES_ITEM: //Iso Surfaces + aData.myPrsType = VISU::TISOSURFACES; break; case TCUTPLANES_ITEM: //Cut Planes aData.myPrsType = VISU::TCUTPLANES; @@ -853,7 +853,7 @@ void SetupDlg::onPreferencesDlg() c.suspend(); EditPrs(myModule,aData,myAnimator); break; - case TISOSURFACE_ITEM: //Iso Surfaces + case TISOSURFACES_ITEM: //Iso Surfaces c.suspend(); EditPrs(myModule,aData,myAnimator); break; diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index 45ffaa58..187a1205 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -1273,7 +1273,7 @@ namespace VISU VISU::VISUType aType = aVisuObj->GetType(); switch (aType) { case VISU::TSCALARMAP: - case VISU::TISOSURFACE: + case VISU::TISOSURFACES: case VISU::TDEFORMEDSHAPE: case VISU::TCUTPLANES: case VISU::TCUTLINES: diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index 02ea2d14..acacfce5 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -153,7 +153,7 @@ namespace VISU{ else if ( aComment == "PRSMERGER" ) aVISUType = VISU::TSCALARMAP; else if ( aComment == "ISOSURFACE" ) - aVISUType = VISU::TISOSURFACE; + aVISUType = VISU::TISOSURFACES; else if ( aComment == "DEFORMEDSHAPE" ) aVISUType = VISU::TDEFORMEDSHAPE; else if ( aComment == "SCALARMAPONDEFORMEDSHAPE" ) diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.cc b/src/VISU_I/VISU_ColoredPrs3dFactory.cc index 427eb46e..fa3f05ab 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc @@ -115,8 +115,8 @@ namespace VISU return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TSCALARMAPONDEFORMEDSHAPE: return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); - case TISOSURFACE: - return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); + case TISOSURFACES: + return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TSTREAMLINES: return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TPLOT3D: @@ -220,8 +220,8 @@ namespace VISU case TSCALARMAPONDEFORMEDSHAPE: aMemory = CheckIsPossible(theInput, theMemoryCheck); break; - case TISOSURFACE: - aMemory = CheckIsPossible(theInput, theMemoryCheck); + case TISOSURFACES: + aMemory = CheckIsPossible(theInput, theMemoryCheck); break; case TSTREAMLINES: aMemory = CheckIsPossible(theInput, theMemoryCheck); diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh index 5ae97c37..140377ff 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh @@ -69,7 +69,7 @@ namespace VISU TList, TList, TList, - TList, + TList, TList, TList, TList, diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index 84c40f76..bc2ed067 100644 --- a/src/VISU_I/VISU_DumpPython.cc +++ b/src/VISU_I/VISU_DumpPython.cc @@ -857,7 +857,7 @@ namespace VISU theStr<(GetServant(anObj).in())){ thePrefix = ScalarMapToPython(theSObject,aServant,theStr,aName,"IsoSurfacesOnField",theArgumentName,thePrefix); theStr<GetNbSurfaces()<<")"<(theData.myPrs[aFrameId])) aPrs->SetSubRange(aMin, aMax); @@ -456,7 +456,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { myTimeMinVal, myTimeMaxVal); break; - case VISU::TISOSURFACE: // Iso Surfaces + case VISU::TISOSURFACES: // Iso Surfaces GeneratePresentations(myStudy, aData, aResult, @@ -547,7 +547,7 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { double aMax = getMaxFieldsValue(myFieldsLst); for (int i = 0; i < getNbFields(); i++) for(long aFrameId = 0; aFrameId < myFieldsLst[i].myNbFrames; aFrameId++) - if (aData.myPrsType == VISU::TISOSURFACE) { + if (aData.myPrsType == VISU::TISOSURFACES) { if (VISU::IsoSurfaces_i* aPrs = dynamic_cast(myFieldsLst[i].myPrs[aFrameId])) aPrs->SetSubRange(aMin, aMax); } @@ -1480,7 +1480,7 @@ std::string GetPresentationComment (VISU::VISUType thePrsType) case VISU::TSCALARMAP: aPrsCmt = VISU::ScalarMap_i::myComment; break; - case VISU::TISOSURFACE: + case VISU::TISOSURFACES: aPrsCmt = VISU::IsoSurfaces_i::myComment; break; case VISU::TCUTPLANES: @@ -1669,7 +1669,7 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField) if (strName == VISU::ScalarMap_i::myComment.c_str()) aData.myPrsType = VISU::TSCALARMAP; else if (strName == VISU::IsoSurfaces_i::myComment.c_str()) - aData.myPrsType = VISU::TISOSURFACE; + aData.myPrsType = VISU::TISOSURFACES; else if (strName == VISU::CutPlanes_i::myComment.c_str()) aData.myPrsType = VISU::TCUTPLANES; else if (strName == VISU::CutLines_i::myComment.c_str()) diff --git a/src/VISU_SWIG/VISU_Example_04.py b/src/VISU_SWIG/VISU_Example_04.py index 0d4d0551..088f7335 100644 --- a/src/VISU_SWIG/VISU_Example_04.py +++ b/src/VISU_SWIG/VISU_Example_04.py @@ -258,7 +258,7 @@ aSObj = aSObj.FindSubObject(1)[1] aSObj = aSObj.FindSubObject(3)[1] aSObj = aSObj.FindSubObject(2)[1] anAnim.addField(aSObj) -anAnim.setPresentationType(0,VISU.TISOSURFACE) +anAnim.setPresentationType(0,VISU.TISOSURFACES) print "Generate presentations" anAnim.generatePresentations(0) print "Generate frames" diff --git a/src/VISU_SWIG/batchmode_visu_view3d.py b/src/VISU_SWIG/batchmode_visu_view3d.py index a08a91b0..927feab8 100644 --- a/src/VISU_SWIG/batchmode_visu_view3d.py +++ b/src/VISU_SWIG/batchmode_visu_view3d.py @@ -264,7 +264,7 @@ aSObj = aSObj.FindSubObject(1)[1] aSObj = aSObj.FindSubObject(3)[1] aSObj = aSObj.FindSubObject(2)[1] anAnim.addField(aSObj) -anAnim.setPresentationType(0,VISU.TISOSURFACE) +anAnim.setPresentationType(0,VISU.TISOSURFACES) print "Generate presentations" anAnim.generatePresentations(0) print "Generate frames" diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py index 6399836b..abc7e831 100644 --- a/src/VISU_SWIG/visu.py +++ b/src/VISU_SWIG/visu.py @@ -507,7 +507,7 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi else : aVISUObjList.append(aPrsObj) - if HasValue(thePrsTypeList,VISU.TISOSURFACE) : + if HasValue(thePrsTypeList,VISU.TISOSURFACES) : print " Creating IsoSurfacesOnField", aPrsObj = theVisu.IsoSurfacesOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" @@ -515,7 +515,7 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi print ",OK" theView.DisplayOnly(aPrsObj) theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TISOSURFACE." + thePictureExt + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TISOSURFACES." + thePictureExt aPictureName = re.sub("\s+","_", aPictureName); theView.SavePicture(aPictureName) if theIsAutoDelete : diff --git a/src/VISU_SWIG/visu_cache.py b/src/VISU_SWIG/visu_cache.py index 36c61f6c..bdd01bde 100644 --- a/src/VISU_SWIG/visu_cache.py +++ b/src/VISU_SWIG/visu_cache.py @@ -48,7 +48,7 @@ def WalkTroughTimeStamps(theVISUType, PRS3D_TYPE_LIST = [] PRS3D_TYPE_LIST.append(VISU.TGAUSSPOINTS) PRS3D_TYPE_LIST.append(VISU.TSCALARMAP) -PRS3D_TYPE_LIST.append(VISU.TISOSURFACE) +PRS3D_TYPE_LIST.append(VISU.TISOSURFACES) PRS3D_TYPE_LIST.append(VISU.TCUTPLANES) PRS3D_TYPE_LIST.append(VISU.TCUTLINES) PRS3D_TYPE_LIST.append(VISU.TPLOT3D) diff --git a/src/VISU_SWIG/visu_change_input.py b/src/VISU_SWIG/visu_change_input.py index 44233a3c..06f66af9 100644 --- a/src/VISU_SWIG/visu_change_input.py +++ b/src/VISU_SWIG/visu_change_input.py @@ -10,7 +10,7 @@ def GetPrsType2OldFactoryMethod(theVISUType): return myVisu.GaussPointsOnField if theVISUType == VISU.TSCALARMAP: return myVisu.ScalarMapOnField - if theVISUType == VISU.TISOSURFACE: + if theVISUType == VISU.TISOSURFACES: return myVisu.IsoSurfacesOnField if theVISUType == VISU.TCUTPLANES: return myVisu.CutPlanesOnField @@ -71,7 +71,7 @@ def WalkTroughTimeStamps(theVISUType, PRS3D_TYPE_LIST = [] PRS3D_TYPE_LIST.append(VISU.TGAUSSPOINTS) PRS3D_TYPE_LIST.append(VISU.TSCALARMAP) -PRS3D_TYPE_LIST.append(VISU.TISOSURFACE) +PRS3D_TYPE_LIST.append(VISU.TISOSURFACES) PRS3D_TYPE_LIST.append(VISU.TCUTPLANES) PRS3D_TYPE_LIST.append(VISU.TCUTLINES) PRS3D_TYPE_LIST.append(VISU.TPLOT3D) diff --git a/src/VISU_SWIG/visu_view3d.py b/src/VISU_SWIG/visu_view3d.py index 8d1c94a0..adc461e8 100644 --- a/src/VISU_SWIG/visu_view3d.py +++ b/src/VISU_SWIG/visu_view3d.py @@ -271,7 +271,7 @@ aSObj = aSObj.FindSubObject(1)[1] aSObj = aSObj.FindSubObject(3)[1] aSObj = aSObj.FindSubObject(2)[1] anAnim.addField(aSObj) -anAnim.setPresentationType(0,VISU.TISOSURFACE) +anAnim.setPresentationType(0,VISU.TISOSURFACES) print "Generate presentations" anAnim.generatePresentations(0) print "Generate frames" -- 2.39.2