modification of dependences tree

diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl
index 999f31152e008041232bf0ee64a601858e339a9e..903ee96b751fc2a7a3d6eb1fbd238103d39d309a 100644 (file)
--- a/idl/VISU_Gen.idl
+++ b/idl/VISU_Gen.idl
@@ -539,6 +539,38 @@ module VISU {
     Orientation GetBarOrientation();
   };
 
+  /*! \brief Presentation merger interface
+   *
+   * Presentation parameters of the prsmerger shape presentation.
+   */
+  interface PrsMerger : ScalarMap {
+    
+    void SetMeshOnGroup(in string theMeshName,
+                       in string theGroupName);
+
+    long AddMeshOnGroup(in string theMeshName,
+                       in string theGroupName);
+
+    void RemoveGeometryById(in long theId);
+
+    string_array getGroupNames();
+
+    void SetFamilyOnEntity(in string theMeshName,
+                          in Entity theEntity,
+                          in string theFamilyName);
+
+    void SetMeshOnEntity(in string theMeshName,
+                        in Entity theEntity);
+
+    void SetScalarMap(in string theMeshName,
+                     in Entity theEntity,
+                     in string theFieldName,
+                     in long theStampsNum);
+    
+    long GetMeshGeometryPlace(in long theId);
+
+  };
+
   //-------------------------------------------------------
   /*! \brief Gauss Points presentation interface
    *
@@ -552,7 +584,7 @@ module VISU {
    *
    * Presentation parameters of the deformed shape presentation.
    */
-  interface DeformedShape : ScalarMap {
+  interface DeformedShape : PrsMerger {
     /*!
      * Sets the scale of the presentatable object.
      * \param theScale Double value defining the scale of this presentable object.
@@ -587,44 +619,12 @@ module VISU {
   };
 
 
-  /*! \brief Presentation merger interface
-   *
-   * Presentation parameters of the prsmerger shape presentation.
-   */
-  interface PrsMerger : ScalarMap {
-    
-    void SetMeshOnGroup(in string theMeshName,
-                       in string theGroupName);
-
-    long AddMeshOnGroup(in string theMeshName,
-                       in string theGroupName);
-
-    void RemoveGeometryById(in long theId);
-
-    string_array getGroupNames();
-
-    void SetFamilyOnEntity(in string theMeshName,
-                          in Entity theEntity,
-                          in string theFamilyName);
-
-    void SetMeshOnEntity(in string theMeshName,
-                        in Entity theEntity);
-
-    void SetScalarMap(in string theMeshName,
-                     in Entity theEntity,
-                     in string theFieldName,
-                     in long theStampsNum);
-    
-    long GetMeshGeometryPlace(in long theId);
-
-  };
-
   //-------------------------------------------------------
   /*! \brief Scalar Map on Deformed shape presentation interface
    *
    * Presentation parameters of the scalar map on deformed shape presentation.
    */
-  interface ScalarMapOnDeformedShape : ScalarMap {
+  interface ScalarMapOnDeformedShape : PrsMerger {
     
     /*!
      * Sets the source ranges of pipeline
@@ -690,7 +690,7 @@ module VISU {
    *  consists of deforming initial planar mesh according to values assigned to the mesh elements.
    *  If mesh not planar but volumic one, it is possible to generate intermediate planar mesh.
    */
-  interface Plot3D : ScalarMap {
+  interface Plot3D : PrsMerger {
     /*!
      *  This enumeration contains a set of elements defining
      *  the type of orientation in 3D space of the cutting plane.
@@ -788,7 +788,7 @@ module VISU {
    * consists of cutting your initial mesh by a definite number of planes. As the
    * result you will see these planes which will be cutted by the borders of the mesh.
    */
-  interface CutPlanes : ScalarMap {
+  interface CutPlanes : PrsMerger {
     /*!
      * This enumeration contains a set of elements defining the type of orientation in 3D space
      * of the cut planes.
@@ -890,7 +890,7 @@ module VISU {
    *      operation is a regular array of lines in space, belonging to the same plane
    *      and having the same orientation. They are located inside or on the mesh.
    */
-  interface CutLines : ScalarMap {
+  interface CutLines : PrsMerger {
     /*!
      * Sets the type of orientation in 3D space of the base plane of a cut lines presentation.
      * \param theOrientation The orientation of the base plane in 3D space.
@@ -1102,7 +1102,7 @@ module VISU {
    * values on the cells and on the basis of them constructs
    * isobaric surfaces, which form this presentation.
    */
-  interface IsoSurfaces : ScalarMap {
+  interface IsoSurfaces : PrsMerger {
     /*!
      * Sets the number of isometric surfaces.
      * \param theNb A long value defining the number of isometric surfaces

diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx
index a7561e48721ccd0a10fd1927e45c0f2d6a139f18..3da0ca4a2f96a78d554e1a21e760080303091322 100644 (file)
--- a/src/PIPELINE/VISU_CutLinesPL.cxx
+++ b/src/PIPELINE/VISU_CutLinesPL.cxx
@@ -151,7 +151,7 @@ VISU_CutLinesPL
   
   CorrectPnt(myBasePnt,aBaseBounds);
 
-  VISU_ScalarMapPL::Update();
+  VISU_PrsMergerPL::Update();
 }
 
 

diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index c1780194a75ac10a7406e36702feed48612b0cbe..91a2f6492ad2b70716c57bf7f68adcbdddeadb8f 100644 (file)
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -74,14 +74,14 @@ VISU_CutPlanesPL
     for (int i = 0, iend = GetNbParts(); i < iend; i++)
       if(!aPipeLine->IsPartDefault(i))         SetPartPosition(i, aPipeLine->GetPartPosition(i));
   }
-  VISU_ScalarMapPL::ShallowCopy(thePipeLine);
+  Superclass::ShallowCopy(thePipeLine);
 }
 
 void
 VISU_CutPlanesPL
 ::Init()
 {
-  VISU_ScalarMapPL::Init();
+  Superclass::Init();
 
   SetNbParts(10);
   myBasePlane[0] = YZ;
@@ -110,7 +110,7 @@ VISU_CutPlanesPL
   CutWithPlanes(myAppendPolyData,aDataSet,myNbParts,aDir,aBounds,
                myPartPosition,myPartCondition,myDisplacement[0]);
 
-  VISU_ScalarMapPL::Update();
+  Superclass::Update();
 }
 
 void

diff --git a/src/PIPELINE/VISU_CutPlanesPL.hxx b/src/PIPELINE/VISU_CutPlanesPL.hxx
index cea06cb220c4f9927e603eb01f4e7b70458cc99e..671a53308fa17c51ce49d204ad77b8e0531752c3 100644 (file)
--- a/src/PIPELINE/VISU_CutPlanesPL.hxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.hxx
@@ -27,18 +27,18 @@
 #ifndef VISU_CutPlanesPL_HeaderFile
 #define VISU_CutPlanesPL_HeaderFile
 
-#include "VISU_ScalarMapPL.hxx"
+#include "VISU_PrsMergerPL.hxx"
 
 #include <vector>
 
 class vtkAppendPolyData;
 
-class VISU_CutPlanesPL : public VISU_ScalarMapPL{
+class VISU_CutPlanesPL : public VISU_PrsMergerPL{
 protected:
   VISU_CutPlanesPL();
   VISU_CutPlanesPL(const VISU_CutPlanesPL&);
 public:
-  vtkTypeMacro(VISU_CutPlanesPL,VISU_ScalarMapPL);
+  vtkTypeMacro(VISU_CutPlanesPL,VISU_PrsMergerPL);
   static VISU_CutPlanesPL* New();
 
   virtual

diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index 43314db9b910c8c28d50a718016feece030331d1..0a69dc9b838cd412785c0c357076da0e4f44d89a 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -57,7 +57,7 @@ VISU_DeformedShapePL
   if(VISU_DeformedShapePL *aPipeLine = dynamic_cast<VISU_DeformedShapePL*>(thePipeLine)){
     SetScale(aPipeLine->GetScale());
   }
-  VISU_ScalarMapPL::ShallowCopy(thePipeLine);
+  TSupperClass::ShallowCopy(thePipeLine);
 }
 
 vtkFloatingPointType
@@ -103,11 +103,12 @@ void
 VISU_DeformedShapePL
 ::Init()
 {
-  VISU_ScalarMapPL::Init();
+  TSupperClass::Init();
   vtkFloatingPointType aScalarRange[2];
   GetSourceRange(aScalarRange);
 
   vtkDataSet* aDataSet = GetInput2();
+  //vtkDataSet* aDataSet = GetScalars()->GetInput();
   vtkFloatingPointType aScaleFactor = VISU_DeformedShapePL::GetScaleFactor( aDataSet );
 
   static double EPS = 1.0 / VTK_LARGE_FLOAT;
@@ -129,14 +130,14 @@ void
 VISU_DeformedShapePL
 ::Update()
 {
-  VISU_ScalarMapPL::Update();
+  TSupperClass::Update();
 }
 
 void
 VISU_DeformedShapePL
 ::SetMapScale(vtkFloatingPointType theMapScale)
 {
-  VISU_ScalarMapPL::SetMapScale(theMapScale);
+  TSupperClass::SetMapScale(theMapScale);
 
   myWarpVector->SetScaleFactor(myScaleFactor*theMapScale);
   Modified();

diff --git a/src/PIPELINE/VISU_DeformedShapePL.hxx b/src/PIPELINE/VISU_DeformedShapePL.hxx
index 96c3d0ebe7ea62e18f21561abd8b88404930a2d5..4cb3aa8b2a4743cc46788a7d19388933c9615e6c 100644 (file)
--- a/src/PIPELINE/VISU_DeformedShapePL.hxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.hxx
@@ -27,14 +27,16 @@
 #ifndef VISU_DeformedShapePL_HeaderFile
 #define VISU_DeformedShapePL_HeaderFile
 
-#include "VISU_ScalarMapPL.hxx"
+#include "VISU_PrsMergerPL.hxx"
 
 class vtkCellDataToPointData;
 class SALOME_Transform;
 class vtkWarpVector;
 
-class VISU_DeformedShapePL : public VISU_ScalarMapPL
+class VISU_DeformedShapePL : public VISU_PrsMergerPL
 {
+  typedef VISU_PrsMergerPL TSupperClass;
+  
 protected:
   VISU_DeformedShapePL();
   VISU_DeformedShapePL(const VISU_DeformedShapePL&);
@@ -43,7 +45,7 @@ protected:
   ~VISU_DeformedShapePL();
 
 public:
-  vtkTypeMacro(VISU_DeformedShapePL,VISU_ScalarMapPL);
+  vtkTypeMacro(VISU_DeformedShapePL,TSupperClass);
 
   static
   VISU_DeformedShapePL* 

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
index 2d0be6cc83452081ab4c9762f4c50bee04728b05..c8b9eaeaf1b1717356cd0e55d21d7ddc06b29cfa 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
@@ -60,7 +60,7 @@ VISU_IsoSurfacesPL
     vtkFloatingPointType aRange[2] = {aPipeLine->GetMin(), aPipeLine->GetMax()};
     SetRange(aRange);
   }
-  VISU_ScalarMapPL::ShallowCopy(thePipeLine);
+  TSupperClass::ShallowCopy(thePipeLine);
 }
 
 int
@@ -82,7 +82,7 @@ void
 VISU_IsoSurfacesPL
 ::SetScaling(int theScaling) 
 {
-  VISU_ScalarMapPL::SetScaling(theScaling);
+  TSupperClass::SetScaling(theScaling);
   SetRange(myRange);
 }
 void
@@ -118,7 +118,7 @@ void
 VISU_IsoSurfacesPL
 ::Init()
 {
-  VISU_ScalarMapPL::Init();
+  TSupperClass::Init();
 
   SetNbParts(10);
   vtkFloatingPointType aScalarRange[2];
@@ -139,14 +139,14 @@ void
 VISU_IsoSurfacesPL
 ::Update()
 {
-  VISU_ScalarMapPL::Update();
+  TSupperClass::Update();
 }
 
 void
 VISU_IsoSurfacesPL
 ::SetMapScale(vtkFloatingPointType theMapScale)
 {
-  VISU_ScalarMapPL::SetMapScale(theMapScale);
+  TSupperClass::SetMapScale(theMapScale);
 
   vtkFloatingPointType aRange[2] = {GetMax() - theMapScale*(GetMax()-GetMin()), GetMax()};
   vtkFloatingPointType aNewRange[2] = {aRange[0], aRange[1]};

diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.hxx b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
index 2049a761a832a6fd97594048077f6b02fb19e798..bd29bbb905243c53ce30f56c16641bdec474018f 100644 (file)
--- a/src/PIPELINE/VISU_IsoSurfacesPL.hxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
@@ -27,13 +27,15 @@
 #ifndef VISU_IsoSurfacesPL_HeaderFile
 #define VISU_IsoSurfacesPL_HeaderFile
 
-#include "VISU_ScalarMapPL.hxx"
+#include "VISU_PrsMergerPL.hxx"
 
 class vtkContourFilter;
 class vtkCellDataToPointData;
 
-class VISU_IsoSurfacesPL : public VISU_ScalarMapPL
+class VISU_IsoSurfacesPL : public VISU_PrsMergerPL
 {
+  typedef VISU_ScalarMapPL TSupperClass;
+
 protected:
   VISU_IsoSurfacesPL();
   VISU_IsoSurfacesPL(const VISU_IsoSurfacesPL&);
@@ -42,7 +44,7 @@ protected:
   ~VISU_IsoSurfacesPL();
 
 public:
-  vtkTypeMacro(VISU_IsoSurfacesPL,VISU_ScalarMapPL);
+  vtkTypeMacro(VISU_IsoSurfacesPL,TSupperClass);
 
   static
   VISU_IsoSurfacesPL* 

diff --git a/src/PIPELINE/VISU_Plot3DPL.cxx b/src/PIPELINE/VISU_Plot3DPL.cxx
index 2b87e56f32ba96130af4c7a0868ce2f8f0164a7b..e5de36c4356c48f243145fb98dc10021b95a2a2c 100644 (file)
--- a/src/PIPELINE/VISU_Plot3DPL.cxx
+++ b/src/PIPELINE/VISU_Plot3DPL.cxx
@@ -77,7 +77,7 @@ ShallowCopy(VISU_PipeLine *thePipeLine)
     SetContourPrs( aPipeLine->GetIsContourPrs() );
     SetNumberOfContours( aPipeLine->GetNumberOfContours() );
   }
-  VISU_ScalarMapPL::ShallowCopy(thePipeLine);
+  TSupperClass::ShallowCopy(thePipeLine);
 }
 
 VISU_CutPlanesPL::PlaneOrientation
@@ -133,7 +133,7 @@ void
 VISU_Plot3DPL::
 Init()
 {
-  VISU_ScalarMapPL::Init();
+  TSupperClass::Init();
 
   myOrientation = GetOrientation(GetInput2());
   SetScaleFactor(GetScaleFactor(GetInput2()));
@@ -213,7 +213,7 @@ Update()
 
   myWarpScalar->SetNormal(aPlaneNormal);
 
-  VISU_ScalarMapPL::Update();
+  TSupperClass::Update();
 }
 
 void
@@ -388,7 +388,7 @@ void VISU_Plot3DPL::GetMinMaxPosition( vtkFloatingPointType& minPos,
 
 void VISU_Plot3DPL::SetMapScale(vtkFloatingPointType theMapScale)
 {
-  VISU_ScalarMapPL::SetMapScale(theMapScale);
+  TSupperClass::SetMapScale(theMapScale);
 
   if ( myIsContour ) {
     vtkFloatingPointType aRange[2];

diff --git a/src/PIPELINE/VISU_Plot3DPL.hxx b/src/PIPELINE/VISU_Plot3DPL.hxx
index cb237fa78a8261c6d4e6ff57e7bde9ea1efa2738..59012133176a60081829a22d068bd45b8348be1a 100644 (file)
--- a/src/PIPELINE/VISU_Plot3DPL.hxx
+++ b/src/PIPELINE/VISU_Plot3DPL.hxx
@@ -27,7 +27,7 @@
 #ifndef VISU_Plot3DPL_HeaderFile
 #define VISU_Plot3DPL_HeaderFile
 
-#include "VISU_ScalarMapPL.hxx"
+#include "VISU_PrsMergerPL.hxx"
 #include "VISU_CutPlanesPL.hxx"
 
 class vtkWarpScalar;
@@ -35,13 +35,14 @@ class vtkContourFilter;
 class vtkGeometryFilter;
 class vtkCellDataToPointData;
 
-class VISU_Plot3DPL : public VISU_ScalarMapPL{
+class VISU_Plot3DPL : public VISU_PrsMergerPL{
+  typedef VISU_ScalarMapPL TSupperClass;
 protected:
   VISU_Plot3DPL();
   VISU_Plot3DPL(const VISU_Plot3DPL&);
 
 public:
-  vtkTypeMacro(VISU_Plot3DPL,VISU_ScalarMapPL);
+  vtkTypeMacro(VISU_Plot3DPL,TSupperClass);
   static VISU_Plot3DPL* New();
   virtual ~VISU_Plot3DPL();
 

diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
index 16759ec68e6c385467bbb2310d33cc38461d4213..41dd9936d3efc092b2a9ba7be60e94e2bc81a1af 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx
@@ -84,7 +84,7 @@ void
 VISU_ScalarMapOnDeformedShapePL
 ::Init()
 {
-  if (GetScalars() == NULL) SetScalars(GetInput2());
+  if (GetScalarsUnstructuredGrid() == NULL) SetScalars(GetInput2());
   
   Superclass::Init();
   
@@ -173,7 +173,7 @@ VISU_ScalarMapOnDeformedShapePL
   VISU_ScalarMapOnDeformedShapePL *aPipeLine = dynamic_cast<VISU_ScalarMapOnDeformedShapePL*>(thePipeLine);
   if(aPipeLine){
      SetScale(aPipeLine->GetScale());
-     SetScalars(aPipeLine->GetScalars());
+     SetScalars(aPipeLine->GetScalarsUnstructuredGrid());
      vtkFloatingPointType aRange[2];
      aPipeLine->GetSourceRange(aRange);
      SetScalarRange(aRange);
@@ -190,7 +190,7 @@ VISU_ScalarMapOnDeformedShapePL
 ::SetScalars(vtkDataSet *theScalars)
 {
   myScalars = theScalars;
-  vtkUnstructuredGrid* aScalars = GetScalars();
+  vtkUnstructuredGrid* aScalars = GetScalarsUnstructuredGrid();
   vtkCellData *aInCellData = GetInput()->GetCellData();
 
   if(aScalars->GetPointData()->GetScalars())
@@ -215,7 +215,7 @@ VISU_ScalarMapOnDeformedShapePL
  */
 vtkUnstructuredGrid* 
 VISU_ScalarMapOnDeformedShapePL
-::GetScalars()
+::GetScalarsUnstructuredGrid()
 {
   return myScalars.GetPointer();
 }

diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
index 66553b302f784eff7437cb32db54b8e31ce4dfd3..7e537df6bc03e1b83c8303c1dd142ec3b7988870 100644 (file)
--- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
+++ b/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx
@@ -27,7 +27,7 @@
 #ifndef VISU_ScalarMapOnDeformedShapePL_HeaderFile
 #define VISU_ScalarMapOnDeformedShapePL_HeaderFile
 
-#include "VISU_ScalarMapPL.hxx"
+#include "VISU_PrsMergerPL.hxx"
 
 class vtkMergeFilter;
 class vtkWarpVector;
@@ -35,7 +35,7 @@ class vtkUnstructuredGrid;
 class vtkCellDataToPointData;
 class vtkPointDataToCellData;
 
-class VISU_ScalarMapOnDeformedShapePL : public VISU_ScalarMapPL
+class VISU_ScalarMapOnDeformedShapePL : public VISU_PrsMergerPL
 {
 protected:
   VISU_ScalarMapOnDeformedShapePL();
@@ -44,7 +44,7 @@ protected:
   
   VISU_ScalarMapOnDeformedShapePL(const VISU_ScalarMapOnDeformedShapePL&);
 public:
-  vtkTypeMacro(VISU_ScalarMapOnDeformedShapePL,VISU_ScalarMapPL);
+  vtkTypeMacro(VISU_ScalarMapOnDeformedShapePL,VISU_PrsMergerPL);
 
   static VISU_ScalarMapOnDeformedShapePL* New();
 
@@ -59,7 +59,7 @@ public:
   virtual void GetSourceRange(vtkFloatingPointType theRange[2]);
 
   virtual void SetScalars(vtkDataSet *theScalars);
-  virtual vtkUnstructuredGrid* GetScalars();
+  virtual vtkUnstructuredGrid* GetScalarsUnstructuredGrid();
 
 public:
   //! Redefined method for initialization of the pipeline.

diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index b1f7471c04b8d540d5f190538a026d99222f5164..cea287a7ccb1ffecd183aa1f970fe6ff4ee6a9af 100644 (file)
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -494,7 +494,7 @@ void
 VISU_StreamLinesPL
 ::Init()
 {
-  VISU_ScalarMapPL::Init();
+  VISU_PrsMergerPL::Init();
   vtkPointSet* aDataSet = myExtractor->GetOutput();
   vtkFloatingPointType anIntStep = GetBaseIntegrationStep(aDataSet);
   vtkFloatingPointType aPropagationTime = GetBasePropagationTime(aDataSet);
@@ -519,7 +519,7 @@ void
 VISU_StreamLinesPL
 ::Update()
 {
-  VISU_ScalarMapPL::Update();
+  VISU_PrsMergerPL::Update();
 }
 
 void

diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc
index a44b5216b7274eb92ac8c2745cb447cf854a5442..5115bbb82c6b382a078365279dd5969254e62c79 100644 (file)
--- a/src/VISU_I/VISU_CutLines_i.cc
+++ b/src/VISU_I/VISU_CutLines_i.cc
@@ -50,7 +50,7 @@ static int MYDEBUG = 0;
 int VISU::CutLines_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, 
                                 const char* theFieldName, int theIteration, int isMemoryCheck)
 {
-  return VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
+  return TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
 }
 
 int VISU::CutLines_i::myNbPresent = 0;
@@ -67,6 +67,7 @@ CutLines_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myCutLinesPL(NULL)
 {}
 
@@ -78,6 +79,7 @@ CutLines_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myCutLinesPL(NULL)
 {
 }
@@ -93,7 +95,7 @@ void VISU::CutLines_i::CopyCurvesInverted(const TCurvesInv& theCurves){
 VISU::Storable* VISU::CutLines_i::Create(const char* theMeshName, VISU::Entity theEntity, 
                                         const char* theFieldName, int theIteration)
 {
-  return ScalarMap_i::Create(theMeshName,theEntity,theFieldName,theIteration);
+  return TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration);
 }
 
 
@@ -140,7 +142,7 @@ VISU::Storable* VISU::CutLines_i::Restore(const Storable::TRestoringMap& theMap)
 
 
 void VISU::CutLines_i::ToStream(std::ostringstream& theStr){
-  ScalarMap_i::ToStream(theStr);
+  TSuperClass::ToStream(theStr);
 
   int aNbLines = GetNbLines();
   
@@ -304,14 +306,14 @@ void VISU::CutLines_i::DoHook(){
   if(!myPipeLine) myPipeLine = VISU_CutLinesPL::New();
   myCutLinesPL = dynamic_cast<VISU_CutLinesPL*>(myPipeLine);
 
-  ScalarMap_i::DoHook();
+  TSuperClass::DoHook();
 }
 
 VISU_Actor* 
 VISU::CutLines_i
 ::CreateActor(const Handle(SALOME_InteractiveObject)& theIO)
 {
-  if(VISU_Actor* anActor = ScalarMap_i::CreateActor(theIO)){
+  if(VISU_Actor* anActor = TSuperClass::CreateActor(theIO)){
     anActor->SetVTKMapping(true);
     SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
     int aDispMode = aResourceMgr->integerValue("VISU" , "cut_lines_represent", 2);

diff --git a/src/VISU_I/VISU_CutLines_i.hh b/src/VISU_I/VISU_CutLines_i.hh
index 6464d210f074838a299d6fe1edb4c6a37d9b0c25..2c56f04434c0f2e6c8984e1e80c502648eaafa5f 100644 (file)
--- a/src/VISU_I/VISU_CutLines_i.hh
+++ b/src/VISU_I/VISU_CutLines_i.hh
@@ -27,20 +27,20 @@
 #ifndef VISU_CutLines_i_HeaderFile
 #define VISU_CutLines_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_CutLinesPL;
 
 namespace VISU{
   class CutLines_i : public virtual POA_VISU::CutLines,
-                     public virtual ScalarMap_i
+                     public virtual PrsMerger_i
   {
     static int myNbPresent;
     CutLines_i();
     CutLines_i(const CutLines_i&);
 
   public:
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
 
     explicit
     CutLines_i(Result_i* theResult,

diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc
index c4b952e594f443d0349300035b7275d033483f24..21afcb427bc28f6f36a8c8a043a3fd1bf60fe882 100644 (file)
--- a/src/VISU_I/VISU_CutPlanes_i.cc
+++ b/src/VISU_I/VISU_CutPlanes_i.cc
@@ -43,7 +43,7 @@ static int MYDEBUG = 0;
 int VISU::CutPlanes_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, 
                                  const char* theFieldName, int theIteration, int isMemoryCheck)
 {
-  return VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
+  return TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
 }
 
 
@@ -62,6 +62,7 @@ CutPlanes_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myCutPlanesPL(NULL)
 {}
 
@@ -73,6 +74,7 @@ CutPlanes_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myCutPlanesPL(NULL)
 {
 }
@@ -81,7 +83,7 @@ CutPlanes_i(Result_i* theResult,
 VISU::Storable* VISU::CutPlanes_i::Create(const char* theMeshName, VISU::Entity theEntity, 
                                          const char* theFieldName, int theIteration)
 {
-  return ScalarMap_i::Create(theMeshName,theEntity,theFieldName,theIteration);
+  return TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration);
 }
 
 
@@ -105,7 +107,7 @@ VISU::Storable* VISU::CutPlanes_i::Restore(const Storable::TRestoringMap& theMap
 
 
 void VISU::CutPlanes_i::ToStream(std::ostringstream& theStr){
-  ScalarMap_i::ToStream(theStr);
+  TSuperClass::ToStream(theStr);
 
   Storable::DataToStream( theStr, "myNbPlanes", int(GetNbPlanes()));
   Storable::DataToStream( theStr, "myDisplacement", GetDisplacement());
@@ -182,14 +184,14 @@ void VISU::CutPlanes_i::DoHook(){
   if(!myPipeLine) myPipeLine = VISU_CutPlanesPL::New();
   myCutPlanesPL = dynamic_cast<VISU_CutPlanesPL*>(myPipeLine);
 
-  ScalarMap_i::DoHook();
+  TSuperClass::DoHook();
 }
 
 VISU_Actor* 
 VISU::CutPlanes_i
 ::CreateActor(const Handle(SALOME_InteractiveObject)& theIO)
 {
-  if(VISU_Actor* anActor = ScalarMap_i::CreateActor(theIO)){
+  if(VISU_Actor* anActor = TSuperClass::CreateActor(theIO)){
     anActor->SetVTKMapping(true);
     SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
     int aDispMode = aResourceMgr->integerValue("VISU" , "cut_planes_represent", 1);

diff --git a/src/VISU_I/VISU_CutPlanes_i.hh b/src/VISU_I/VISU_CutPlanes_i.hh
index de65dbb7911c6f083bfdc30361da31d7d350970b..e4a86664328a1714fff572cefbd6dda3a5345186 100644 (file)
--- a/src/VISU_I/VISU_CutPlanes_i.hh
+++ b/src/VISU_I/VISU_CutPlanes_i.hh
@@ -27,20 +27,20 @@
 #ifndef VISU_CutPlanes_i_HeaderFile
 #define VISU_CutPlanes_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_CutPlanesPL;
 
 namespace VISU{
   class CutPlanes_i : public virtual POA_VISU::CutPlanes,
-                     public virtual ScalarMap_i
+                     public virtual PrsMerger_i
   {
     static int myNbPresent;
     CutPlanes_i();
     CutPlanes_i(const CutPlanes_i&);
 
   public:
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
 
     explicit
     CutPlanes_i(Result_i* theResult,

diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index 8c2920dccd005ea1c7522027ecdfe7e0e527fbb9..ec2a17501679545d97dd7441bbe09a060398ca1a 100644 (file)
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -49,7 +49,7 @@ int VISU::DeformedShape_i::IsPossible(Result_i* theResult, const char* theMeshNa
                                      const char* theFieldName, int theIteration, int isMemoryCheck)
 {
   try{
-    if(!VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck)) return 0;
+    if(!TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck)) return 0;
     const VISU::PField aField = theResult->GetInput()->GetField(theMeshName,(VISU::TEntity)theEntity,theFieldName);
     return aField->myNbComp > 1;
   }catch(std::exception& exc){
@@ -74,6 +74,7 @@ DeformedShape_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myDeformedShapePL(NULL)
 {
   if(MYDEBUG) MESSAGE("DeformedShape_i::DeformedShape_i");
@@ -87,6 +88,7 @@ DeformedShape_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myDeformedShapePL(NULL)
 {
   if(MYDEBUG) MESSAGE("DeformedShape_i::DeformedShape_i");
@@ -110,7 +112,7 @@ VISU::Storable* VISU::DeformedShape_i::Create(const char* theMeshName, VISU::Ent
 {
   myIsColored = false;
   myColor.R = myColor.G = myColor.B = 0.5;
-  return ScalarMap_i::Create(theMeshName,theEntity,theFieldName,theIteration);
+  return TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration);
 }
 
 
@@ -129,7 +131,7 @@ VISU::Storable* VISU::DeformedShape_i::Restore(const Storable::TRestoringMap& th
 
 
 void VISU::DeformedShape_i::ToStream(std::ostringstream& theStr){
-  ScalarMap_i::ToStream(theStr);
+  TSuperClass::ToStream(theStr);
 
   Storable::DataToStream( theStr, "myFactor", GetScale() );
 
@@ -158,7 +160,7 @@ void VISU::DeformedShape_i::DoHook(){
   myDeformedShapePL = dynamic_cast<VISU_DeformedShapePL*>(myPipeLine);
   myPipeLine->GetMapper()->SetScalarVisibility(IsColored());
 
-  ScalarMap_i::DoHook();
+  TSuperClass::DoHook();
 }
 
 
@@ -171,7 +173,7 @@ VISU_Actor*
 VISU::DeformedShape_i
 ::CreateActor(const Handle(SALOME_InteractiveObject)& theIO, bool toSupressShrinking) 
 {
-  VISU_Actor* anActor = VISU::ScalarMap_i::CreateActor(theIO, true);
+  VISU_Actor* anActor = TSuperClass::CreateActor(theIO, true);
   anActor->SetVTKMapping(false);
   SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
   int  aDispMode = aResourceMgr->integerValue("VISU", "deformed_shape_represent", 1);
@@ -199,6 +201,6 @@ void VISU::DeformedShape_i::UpdateActor(VISU_Actor* theActor) {
       myPipeLine->GetMapper()->SetScalarVisibility(0);
       anActor->GetProperty()->SetColor(myColor.R,myColor.G,myColor.B);
     }
-    VISU::ScalarMap_i::UpdateActor(theActor);
+    TSuperClass::UpdateActor(theActor);
   }
 }

diff --git a/src/VISU_I/VISU_DeformedShape_i.hh b/src/VISU_I/VISU_DeformedShape_i.hh
index 42854699e5679991f2f24fa8ba90cf8d8f2b4555..5cbaee013fe514653cc1c1252a1cb20867eae797 100644 (file)
--- a/src/VISU_I/VISU_DeformedShape_i.hh
+++ b/src/VISU_I/VISU_DeformedShape_i.hh
@@ -27,20 +27,20 @@
 #ifndef VISU_DeformedShape_i_HeaderFile
 #define VISU_DeformedShape_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_DeformedShapePL;
 
 namespace VISU{
   class DeformedShape_i : public virtual POA_VISU::DeformedShape,
-                         public virtual ScalarMap_i
+                         public virtual PrsMerger_i
   {
     static int myNbPresent;
     DeformedShape_i();
     DeformedShape_i(const DeformedShape_i&);
 
   public:
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
 
     explicit
     DeformedShape_i(Result_i* theResult,

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc
index 0f0077bc244aa7e1e4a435b459082b38508940a9..9b7cf0bfd39dd276b2ccd45721e871ec563b79c6 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.cc
+++ b/src/VISU_I/VISU_IsoSurfaces_i.cc
@@ -43,7 +43,7 @@ static int MYDEBUG = 0;
 int VISU::IsoSurfaces_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity, 
                                    const char* theFieldName, int theIteration, int isMemoryCheck)
 {
-  return VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
+  return TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
 }
 
 int VISU::IsoSurfaces_i::myNbPresent = 0;
@@ -60,6 +60,7 @@ IsoSurfaces_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myIsoSurfacesPL(NULL)
 {}
 
@@ -71,6 +72,7 @@ IsoSurfaces_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myIsoSurfacesPL(NULL)
 {
 }
@@ -79,7 +81,7 @@ IsoSurfaces_i(Result_i* theResult,
 VISU::Storable* VISU::IsoSurfaces_i::Create(const char* theMeshName, VISU::Entity theEntity, 
                                            const char* theFieldName, int theIteration)
 {
-  return ScalarMap_i::Create(theMeshName,theEntity,theFieldName,theIteration);
+  return TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration);
 }
 
 
@@ -96,7 +98,7 @@ VISU::Storable* VISU::IsoSurfaces_i::Restore(const Storable::TRestoringMap& theM
 }
 
 void VISU::IsoSurfaces_i::ToStream(std::ostringstream& theStr){
-  ScalarMap_i::ToStream(theStr);
+  TSuperClass::ToStream(theStr);
 
   Storable::DataToStream( theStr, "myNbSurface", int(GetNbSurfaces()) );
   Storable::DataToStream( theStr, "myRange[0]", GetSubMin() );
@@ -135,7 +137,7 @@ void VISU::IsoSurfaces_i::DoHook(){
   if(!myPipeLine) myPipeLine = VISU_IsoSurfacesPL::New();
   myIsoSurfacesPL = dynamic_cast<VISU_IsoSurfacesPL*>(myPipeLine);
 
-  ScalarMap_i::DoHook();
+  TSuperClass::DoHook();
 }
 
 
@@ -143,7 +145,7 @@ VISU_Actor*
 VISU::IsoSurfaces_i
 ::CreateActor(const Handle(SALOME_InteractiveObject)& theIO)
 {
-  if(VISU_Actor* anActor = ScalarMap_i::CreateActor(theIO)){
+  if(VISU_Actor* anActor = TSuperClass::CreateActor(theIO)){
     anActor->SetVTKMapping(true);
     SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
     int  aDispMode = aResourceMgr->integerValue("VISU" , "iso_surfaces_represent", 2);

diff --git a/src/VISU_I/VISU_IsoSurfaces_i.hh b/src/VISU_I/VISU_IsoSurfaces_i.hh
index 56db9093c1d88d23a368a36e1450bddeafb02cdb..a71601d64e3222b07ce515cf4af7934d0171d9f8 100644 (file)
--- a/src/VISU_I/VISU_IsoSurfaces_i.hh
+++ b/src/VISU_I/VISU_IsoSurfaces_i.hh
@@ -27,20 +27,20 @@
 #ifndef VISU_IsoSurfaces_i_HeaderFile
 #define VISU_IsoSurfaces_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_IsoSurfacesPL;
 
 namespace VISU{
   class IsoSurfaces_i : public virtual POA_VISU::IsoSurfaces,
-                       public virtual ScalarMap_i
+                       public virtual PrsMerger_i
   {
     static int myNbPresent;
     IsoSurfaces_i();
     IsoSurfaces_i(const IsoSurfaces_i&);
 
   public:
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
 
     explicit
     IsoSurfaces_i(Result_i* theResult,

diff --git a/src/VISU_I/VISU_Plot3D_i.cc b/src/VISU_I/VISU_Plot3D_i.cc
index d86ca318333de8fa0ea93bbb963ab641722cdbb5..fbd7b5d3f8b78a2d7aa997a9c958d27c3b2d7e0e 100644 (file)
--- a/src/VISU_I/VISU_Plot3D_i.cc
+++ b/src/VISU_I/VISU_Plot3D_i.cc
@@ -40,7 +40,7 @@ static int MYDEBUG = 0;
 int VISU::Plot3D_i::IsPossible(Result_i* theResult, const char* theMeshName, VISU::Entity theEntity,
                               const char* theFieldName, int theIteration, int isMemoryCheck)
 {
-  return VISU::ScalarMap_i::IsPossible
+  return TSuperClass::IsPossible
     (theResult,theMeshName,theEntity,theFieldName,theIteration,isMemoryCheck);
 }
 
@@ -57,6 +57,7 @@ VISU::Plot3D_i
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myPlot3DPL(NULL)
 {}
 
@@ -67,13 +68,14 @@ VISU::Plot3D_i
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myPlot3DPL(NULL)
 {}
 
 VISU::Storable* VISU::Plot3D_i::Create (const char* theMeshName, VISU::Entity theEntity,
                                        const char* theFieldName, int theIteration)
 {
-  return ScalarMap_i::Create(theMeshName,theEntity,theFieldName,theIteration);
+  return TSuperClass::Create(theMeshName,theEntity,theFieldName,theIteration);
 }
 
 VISU::Storable* VISU::Plot3D_i::Restore (const Storable::TRestoringMap& theMap)
@@ -94,7 +96,7 @@ VISU::Storable* VISU::Plot3D_i::Restore (const Storable::TRestoringMap& theMap)
 
 void VISU::Plot3D_i::ToStream (std::ostringstream& theStr)
 {
-  ScalarMap_i::ToStream(theStr);
+  TSuperClass::ToStream(theStr);
 
   Storable::DataToStream(theStr, "myBasePlane", int(GetOrientationType()));
   Storable::DataToStream(theStr, "aRot[0]", GetRotateX());
@@ -183,14 +185,14 @@ void VISU::Plot3D_i::DoHook()
   if (!myPipeLine) myPipeLine = VISU_Plot3DPL::New();
   myPlot3DPL = dynamic_cast<VISU_Plot3DPL*>(myPipeLine);
 
-  ScalarMap_i::DoHook();
+  TSuperClass::DoHook();
 }
 
 VISU_Actor* 
 VISU::Plot3D_i
 ::CreateActor(const Handle(SALOME_InteractiveObject)& theIO)
 {
-  if(VISU_Actor* anActor = ScalarMap_i::CreateActor(theIO)){
+  if(VISU_Actor* anActor = TSuperClass::CreateActor(theIO)){
     anActor->SetVTKMapping(true);
     SUIT_ResourceMgr* aResourceMgr = VISU::GetResourceMgr();
     int aDispMode = aResourceMgr->integerValue("VISU", "plot3d_represent", 2);

diff --git a/src/VISU_I/VISU_Plot3D_i.hh b/src/VISU_I/VISU_Plot3D_i.hh
index d509b545689fee1a0718035b7534001e206b6ab9..066a05f22f7663f2525d0c17efe99d50b74e1df3 100644 (file)
--- a/src/VISU_I/VISU_Plot3D_i.hh
+++ b/src/VISU_I/VISU_Plot3D_i.hh
@@ -21,20 +21,20 @@
 #ifndef VISU_Plot3D_i_HeaderFile
 #define VISU_Plot3D_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_Plot3DPL;
 
 namespace VISU {
   class Plot3D_i : public virtual POA_VISU::Plot3D,
-                   public virtual ScalarMap_i
+                   public virtual PrsMerger_i
   {
     static int myNbPresent;
     Plot3D_i();
     Plot3D_i(const Plot3D_i&);
 
   public:
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
 
     explicit
     Plot3D_i (Result_i* theResult, bool theAddToStudy = true);

diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
index 487268f8bc8158da84373bf6bac494fd0ed8a3c4..12a430e1c48b07dae81783d97d0d0db2a9c4268c 100644 (file)
--- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
+++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc
@@ -26,7 +26,6 @@
 
 #include "VISU_ScalarMapOnDeformedShapePL.hxx"
 #include "VISU_Result_i.hh"
-#include "VISU_ScalarMap_i.hh"
 #include "VISU_ScalarMapOnDeformedShape_i.hh"
 #include "VISU_Convertor.hxx"
 #include "VISU_ScalarMapAct.h"
@@ -53,7 +52,7 @@ int VISU::ScalarMapOnDeformedShape_i::IsPossible(Result_i* theResult, const char
 {
   bool aResult = false;
   try{
-    aResult = VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,false);
+    aResult = TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,false);
     if(isMemoryCheck && aResult){
       const VISU::PField aField = theResult->GetInput()->GetField(theMeshName,(VISU::TEntity)theEntity,theFieldName);
       if(aField->myNbComp <= 1)
@@ -84,6 +83,7 @@ ScalarMapOnDeformedShape_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  TSuperClass(theResult,theAddToStudy),
   myScalarMapOnDeformedShapePL(NULL),
   myScalarIteration(1)
 {
@@ -96,6 +96,7 @@ ScalarMapOnDeformedShape_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  TSuperClass(theResult,theSObject),
   myScalarMapOnDeformedShapePL(NULL),
   myScalarIteration(1)
 {

diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
index f14c1606fbbf02462656145c5ac7e7ef2532b9ee..4f47b250a0651e2cc92e3825e8e8769db6510c29 100644 (file)
--- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
+++ b/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh
@@ -27,7 +27,7 @@
 #ifndef VISU_ScalarMapOnDeformedShape_i_HeaderFile
 #define VISU_ScalarMapOnDeformedShape_i_HeaderFile
 
-#include "VISU_ScalarMap_i.hh"
+#include "VISU_PrsMerger_i.hh"
 
 class VISU_ScalarMapOnDeformedShapePL;
 
@@ -35,7 +35,7 @@ namespace VISU{
   
   //! Class of Scalar Map on Deformed Shape presentation.
   class ScalarMapOnDeformedShape_i : public virtual POA_VISU::ScalarMapOnDeformedShape,
-                                    public virtual ScalarMap_i
+                                    public virtual PrsMerger_i
   {
     static int myNbPresent;
     ScalarMapOnDeformedShape_i();
@@ -43,7 +43,7 @@ namespace VISU{
     
   public:
     
-    typedef ScalarMap_i TSuperClass;
+    typedef PrsMerger_i TSuperClass;
     
     explicit
     ScalarMapOnDeformedShape_i(Result_i* theResult,

diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index 7aa8273bef16fc7f98260f04be310c3356a084a1..d7be64f835c1ff69dfb6f6db5b767d8b3802a55e 100644 (file)
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -50,7 +50,7 @@ int VISU::StreamLines_i::IsPossible(Result_i* theResult, const char* theMeshName
                                    const char* theFieldName, int theIteration, int isMemoryCheck)
 {
   try{
-    if(!VISU::ScalarMap_i::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,false)) 
+    if(!TSuperClass::IsPossible(theResult,theMeshName,theEntity,theFieldName,theIteration,false)) 
       return 0;
 
     VISU::PIDMapper anIDMapper = 
@@ -83,6 +83,7 @@ StreamLines_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  PrsMerger_i(theResult,theAddToStudy),
   DeformedShape_i(theResult,theAddToStudy),
   myStreamLinesPL(NULL),
   myAppendFilter(vtkAppendFilter::New())
@@ -97,6 +98,7 @@ StreamLines_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  PrsMerger_i(theResult,theSObject),
   DeformedShape_i(theResult,theSObject),
   myStreamLinesPL(NULL),
   myAppendFilter(vtkAppendFilter::New())

diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index c8bd8a59f34e3b2f0bef0809fb6743327752d121..99fc94dd7af36bec1c16dc4e97a8f66c00a6a07e 100644 (file)
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -82,6 +82,7 @@ Vectors_i(Result_i* theResult,
   Prs3d_i(theResult,theAddToStudy),
   ColoredPrs3d_i(theResult,theAddToStudy),
   ScalarMap_i(theResult,theAddToStudy),
+  PrsMerger_i(theResult,theAddToStudy),
   DeformedShape_i(theResult,theAddToStudy),
   myVectorsPL(NULL)
 {
@@ -95,6 +96,7 @@ Vectors_i(Result_i* theResult,
   Prs3d_i(theResult,theSObject),
   ColoredPrs3d_i(theResult,theSObject),
   ScalarMap_i(theResult,theSObject),
+  PrsMerger_i(theResult,theSObject),
   DeformedShape_i(theResult,theSObject),
   myVectorsPL(NULL)
 {