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.

diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl
index 66ccdce587d06a40a4d8c18b30c86db34fe8422e..909a6d581cd4b20c1a3513542b24285331333666 100644 (file)
--- 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 96610a36773aac86e1dcea0a1f7e7c1656317b8f..68aee34699008538ea17306e465aabfe1c43fd0d 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -1783,8 +1783,8 @@ VisuGUI
     case VISU::TCUTLINES:
       TSameAsFactory<VISU::TCUTLINES>().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp);
       break;
-    case VISU::TISOSURFACE:
-      TSameAsFactory<VISU::TISOSURFACE>().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp);
+    case VISU::TISOSURFACES:
+      TSameAsFactory<VISU::TISOSURFACES>().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp);
       break;
     case VISU::TSTREAMLINES:
       TSameAsFactory<VISU::TSTREAMLINES>().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 5c2f42112b0b04d6d78218cc828d862849fd5b9c..33e2a81192a6ffa6b19277257c683a626e3cc060 100644 (file)
--- 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 9b629c450ebb80c190d15d88782071aeb301884e..e043866a10f3595ab131c0d546d88ac6f2be4b73 100644 (file)
--- 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<VISU::TISOSURFACE>().Create(thePrs, VISU::ColoredPrs3d_i::EDoNotPublish);
+    myPrsCopy = VISU::TSameAsFactory<VISU::TISOSURFACES>().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<VISU::TISOSURFACE>().Copy(thePrs, myPrsCopy);
+  VISU::TSameAsFactory<VISU::TISOSURFACES>().Copy(thePrs, myPrsCopy);
 
   return anIsOk;
 }

diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx
index 2ce90f0c8f361ee72ae0a53f55681d282fbf68e8..43c665852fbf36fac0bef8a9ecf2e07627527c12 100644 (file)
--- 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 1b0a471fd22d195d5143a6bab81c7b4f840c21ef..4f90b86ee0869a69012098de3a73b4fcfa46a65c 100644 (file)
--- 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<VISU::ScalarMap_i,VisuGUI_ScalarBarDlg>(myModule,aData,myAnimator);
     break;
-  case TISOSURFACE_ITEM: //Iso Surfaces
+  case TISOSURFACES_ITEM: //Iso Surfaces
     c.suspend();
     EditPrs<VISU::IsoSurfaces_i,VisuGUI_IsoSurfacesDlg>(myModule,aData,myAnimator);
     break;

diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 45ffaa58c2a24b3bbb822772bdbfdd2c919f3b40..187a120594626d7aedc3ecc13438b034e9be68b4 100644 (file)
--- 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 02ea2d14866817b615d851c5cf2903b9c4f2dff9..acacfce5e50708d3dbf96a8f9d5d2d29369abcd0 100644 (file)
--- 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 427eb46e058a2f0bb8de40816b451931bf6205fb..fa3f05abb784f1c55b436f2e93bf75059e83b766 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc
@@ -115,8 +115,8 @@ namespace VISU
       return VISU::CreatePrs3dByEnum<TDEFORMEDSHAPE>(theStudy, thePublishInStudyMode);
     case TSCALARMAPONDEFORMEDSHAPE:
       return VISU::CreatePrs3dByEnum<TSCALARMAPONDEFORMEDSHAPE>(theStudy, thePublishInStudyMode);
-    case TISOSURFACE:
-      return VISU::CreatePrs3dByEnum<TISOSURFACE>(theStudy, thePublishInStudyMode);
+    case TISOSURFACES:
+      return VISU::CreatePrs3dByEnum<TISOSURFACES>(theStudy, thePublishInStudyMode);
     case TSTREAMLINES:
       return VISU::CreatePrs3dByEnum<TSTREAMLINES>(theStudy, thePublishInStudyMode);
     case TPLOT3D:
@@ -220,8 +220,8 @@ namespace VISU
     case TSCALARMAPONDEFORMEDSHAPE:
       aMemory = CheckIsPossible<TSCALARMAPONDEFORMEDSHAPE>(theInput, theMemoryCheck);
       break;
-    case TISOSURFACE:
-      aMemory = CheckIsPossible<TISOSURFACE>(theInput, theMemoryCheck);
+    case TISOSURFACES:
+      aMemory = CheckIsPossible<TISOSURFACES>(theInput, theMemoryCheck);
       break;
     case TSTREAMLINES:
       aMemory = CheckIsPossible<TSTREAMLINES>(theInput, theMemoryCheck);

diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
index 5ae97c373e498bd2e45e902b0cf38f07d63c0bd2..140377ffb16bd9a6517fd783fc1fa2adc3d556ce 100644 (file)
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
@@ -69,7 +69,7 @@ namespace VISU
                        TList<TInt2Type<TSTREAMLINES>,
                              TList<TInt2Type<TGAUSSPOINTS>,
                                    TList<TInt2Type<TSCALARMAP>,
-                                         TList<TInt2Type<TISOSURFACE>,
+                                         TList<TInt2Type<TISOSURFACES>,
                                                TList<TInt2Type<TCUTPLANES>,
                                                      TList<TInt2Type<TCUTLINES>,
                                                            TList<TInt2Type<TVECTORS>,

diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index 84c40f7664eb09400cd1db833c6fcf8ce27964c0..bc2ed067550aa9b3c69811ee2d1fefa5109d77b0 100644 (file)
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -857,7 +857,7 @@ namespace VISU
            theStr<<thePrefix<<"pass"<<endl<<endl;
           }
           return;
-        case VISU::TISOSURFACE:
+        case VISU::TISOSURFACES:
           if(IsoSurfaces_i* aServant = dynamic_cast<IsoSurfaces_i*>(GetServant(anObj).in())){
            thePrefix = ScalarMapToPython(theSObject,aServant,theStr,aName,"IsoSurfacesOnField",theArgumentName,thePrefix);
            theStr<<thePrefix<<aName<<".SetNbSurfaces("<<aServant->GetNbSurfaces()<<")"<<endl;

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.hh b/src/VISU_I/VISU_IsoSurfaces_i.hh
index 7046e99713ffb03baea65c8ac078e828755bba8b..c3820a131f3a43b5463cff7dac00228821ac67e8 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.hh
+++ b/src/VISU_I/VISU_IsoSurfaces_i.hh
@@ -55,7 +55,7 @@ namespace VISU
     VISU::VISUType 
     GetType() 
     { 
-      return VISU::TISOSURFACE;
+      return VISU::TISOSURFACES;
     }
 
     virtual

diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index be2046f8ee3635a9482b7a723103fea6df302a9d..eabc3e222c791ff8c94a1f55a900210fc14172ef 100644 (file)
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -388,7 +388,7 @@ namespace
          }
        }
       }
-      if (theData.myPrsType == VISU::TISOSURFACE)
+      if (theData.myPrsType == VISU::TISOSURFACES)
        for (long aFrameId = 0; aFrameId < theData.myNbFrames; aFrameId++)
          if (VISU::IsoSurfaces_i* aPrs = dynamic_cast<VISU::IsoSurfaces_i*>(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<IsoSurfaces_i>(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<VISU::IsoSurfaces_i*>(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 0d4d0551a610efa9cbff1ce2427b245d859cb471..088f7335e5d60abebd81b078020e6e0fc18fd873 100644 (file)
--- 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 a08a91b0349ae750e28cb47cf21ad014f7f50183..927feab8f3fc0e4af64cfb40a149ecd7a52b322b 100644 (file)
--- 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 6399836b39d47fa94af053864725501cf4f19d99..abc7e83197cc036442c82040d16e0a29d3f5c32d 100644 (file)
--- 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 36c61f6c681bd905af60a5ddb3b3b88876e3532f..bdd01bde5bc203a74da671c7165c3ab964c23562 100644 (file)
--- 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 44233a3c1301348522e01b6f3cfd60fab859b4aa..06f66af91db6802a4f1a2e5243fb82825edc8695 100644 (file)
--- 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 8d1c94a003771349d3c3b125a09623f3da6b83fe..adc461e8b71d04090cd6a20ca5791dcc9e233907 100644 (file)
--- 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"