*** empty log message ***

diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl
index 903ee96b751fc2a7a3d6eb1fbd238103d39d309a..d0ad6940e477af6d959295a3a5d26b828ef55779 100644 (file)
--- a/idl/VISU_Gen.idl
+++ b/idl/VISU_Gen.idl
@@ -537,14 +537,10 @@ module VISU {
      * Gets the type of orientation of the scalar bar (to provide backward compatibility).
      */
     Orientation GetBarOrientation();
-  };
 
-  /*! \brief Presentation merger interface
-   *
-   * Presentation parameters of the prsmerger shape presentation.
-   */
-  interface PrsMerger : ScalarMap {
-    
+    /*!
+     *  PrsMerger methods
+     */
     void SetMeshOnGroup(in string theMeshName,
                        in string theGroupName);
 
@@ -584,7 +580,7 @@ module VISU {
    *
    * Presentation parameters of the deformed shape presentation.
    */
-  interface DeformedShape : PrsMerger {
+  interface DeformedShape : ScalarMap {
     /*!
      * Sets the scale of the presentatable object.
      * \param theScale Double value defining the scale of this presentable object.
@@ -624,7 +620,7 @@ module VISU {
    *
    * Presentation parameters of the scalar map on deformed shape presentation.
    */
-  interface ScalarMapOnDeformedShape : PrsMerger {
+  interface ScalarMapOnDeformedShape : ScalarMap {
     
     /*!
      * Sets the source ranges of pipeline
@@ -690,7 +686,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 : PrsMerger {
+  interface Plot3D : ScalarMap {
     /*!
      *  This enumeration contains a set of elements defining
      *  the type of orientation in 3D space of the cutting plane.
@@ -788,7 +784,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 : PrsMerger {
+  interface CutPlanes : ScalarMap {
     /*!
      * This enumeration contains a set of elements defining the type of orientation in 3D space
      * of the cut planes.
@@ -890,7 +886,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 : PrsMerger {
+  interface CutLines : ScalarMap {
     /*!
      * 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 +1098,7 @@ module VISU {
    * values on the cells and on the basis of them constructs
    * isobaric surfaces, which form this presentation.
    */
-  interface IsoSurfaces : PrsMerger {
+  interface IsoSurfaces : ScalarMap {
     /*!
      * Sets the number of isometric surfaces.
      * \param theNb A long value defining the number of isometric surfaces
@@ -1638,18 +1634,6 @@ module VISU {
                         in Entity theEntity, in string theFieldName,
                         in double theIteration);
 
-    /*!
-     * Creates a prs merger presentation.
-     * \param theResult    Data generated in other sources. (MED object or file)
-     * \param theMeshName  One of the meshes presented in MED file
-     * \param theEntity    Type of entity where the field is defined
-     * \param theFieldName Group of data attributed to the %MESH. The data can be scalar or vector.
-     * \param theIteration Number of iteration on the field
-     */
-    PrsMerger PrsMergerOnField(in Result theResult, in string theMeshName,
-                              in Entity theEntity, in string theFieldName,
-                              in double theIteration);
-
     /*!
      * Creates a table presentation.
      * \param theTableEntry The entry of the table which will be displayed.

diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index 02667a3286185880d0cdc0b659b09342ddf8830c..f85b78a32d50d6d00a8e9fe0efff5c8eaebac5d8 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -321,15 +321,6 @@ namespace VISU{
     return myVisuGen->Plot3DOnField(theResult,theMeshName,theEntity,theFieldName,theIteration);
   }
 
-  PrsMerger_ptr VISU_Gen_i::PrsMergerOnField(Result_ptr theResult, 
-                                            const char* theMeshName, 
-                                            VISU::Entity theEntity, 
-                                            const char* theFieldName, 
-                                            CORBA::Double theIteration)
-  {
-    return myVisuGen->PrsMergerOnField(theResult,theMeshName,theEntity,theFieldName,theIteration);
-  }
-
   Table_ptr VISU_Gen_i::CreateTable(const char* theTableEntry){
     return myVisuGen->CreateTable(theTableEntry);
   }

diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index 933cd2cb861da4cb8d820a0c9de62c2e03a37ac4..61353dcae89ee9fffe55fcebedbeebc5682c77cd 100644 (file)
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -106,9 +106,6 @@ namespace VISU{
                                       (Result_ptr theResult, const char* theMeshName, VISU::Entity theEntity,
                                       const char* theFieldName, CORBA::Double theIteration);
 
-    virtual PrsMerger_ptr PrsMergerOnField
-                                      (Result_ptr theResult, const char* theMeshName, VISU::Entity theEntity,
-                                      const char* theFieldName, CORBA::Double theIteration);
     //Create Digital Presentation
     virtual Table_ptr CreateTable(const char* theTableEntry);
     virtual Curve_ptr CreateCurve(Table_ptr theTable, CORBA::Long theHRow, CORBA::Long theVRow);

diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index 1fd83ec3193c8cd7472f8058a5da0810cb7bff39..8ebde5c8d09c8be3f788bbe5dfa2f24a87c30832 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -203,7 +203,7 @@ namespace VISU
   void RegistryStorable() {
     Storable::Registry(Result_i::myComment.c_str(),&(Result_i::Restore));
     Storable::Registry(Mesh_i::myComment.c_str(),&(Restore<Mesh_i>));
-    Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore<ScalarMap_i>));
+    //    Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore<ScalarMap_i>));
     Storable::Registry(GaussPoints_i::myComment.c_str(),&(Restore<GaussPoints_i>));
     Storable::Registry(DeformedShape_i::myComment.c_str(),&(Restore<DeformedShape_i>));
     Storable::Registry(CutPlanes_i::myComment.c_str(),&(Restore<CutPlanes_i>));
@@ -860,7 +860,8 @@ namespace VISU
                                             const char* theFieldName,
                                             CORBA::Double theIteration)
   {
-    return Prs3dOnField<VISU::ScalarMap_i>(theResult,theMeshName,theEntity,theFieldName,theIteration,true)._retn();
+    //return Prs3dOnField<VISU::ScalarMap_i>(theResult,theMeshName,theEntity,theFieldName,theIteration,true)._retn();
+    return Prs3dOnField<VISU::PrsMerger_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }
 
   GaussPoints_ptr VISU_Gen_i::GaussPointsOnField(Result_ptr theResult,
@@ -944,15 +945,6 @@ namespace VISU
     return Prs3dOnField<VISU::CutLines_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
   }
 
-  PrsMerger_ptr VISU_Gen_i::PrsMergerOnField(Result_ptr theResult,
-                                            const char* theMeshName,
-                                            VISU::Entity theEntity,
-                                            const char* theFieldName,
-                                            CORBA::Double theIteration)
-  {
-    return Prs3dOnField<VISU::PrsMerger_i>(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn();
-  }
-
   Table_ptr VISU_Gen_i::CreateTable(const char* theTableEntry){
     if(myStudyDocument->GetProperties()->IsLocked())
       return Table::_nil();

diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index f1f109c215632678a319405215c759804fb4472e..1a5f6f8282b3f9c9cfb40f77187be3f05eb0bb22 100644 (file)
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -275,14 +275,6 @@ namespace VISU
                  const char* theFieldName, 
                  CORBA::Double theIteration);
 
-    virtual
-    PrsMerger_ptr
-    PrsMergerOnField(Result_ptr theResult,
-                    const char* theMeshName, 
-                    VISU::Entity theEntity,
-                    const char* theFieldName, 
-                    CORBA::Double theIteration);
-
     //Create Digital Presentation
     virtual 
     Table_ptr

diff --git a/src/VISU_I/VISU_PrsMerger_i.hh b/src/VISU_I/VISU_PrsMerger_i.hh
index b0d4008a98e3d18fb0a3cb8ed56bcf04e55670d5..52edb3e39951fd055fc72dd4c25a91f4667d552a 100644 (file)
--- a/src/VISU_I/VISU_PrsMerger_i.hh
+++ b/src/VISU_I/VISU_PrsMerger_i.hh
@@ -35,7 +35,7 @@ class VISU_MeshPL;
   
 namespace VISU{
   
-  class PrsMerger_i : public virtual POA_VISU::PrsMerger,
+  class PrsMerger_i : public virtual POA_VISU::ScalarMap,
                      public virtual ScalarMap_i
   {
 
@@ -73,8 +73,6 @@ namespace VISU{
     virtual SALOMEDS::Color GetColor() { return myColor;}
     virtual void SetColor(const SALOMEDS::Color& theColor) { myColor = theColor;}
 
-    typedef VISU::PrsMerger TInterface;
-
     VISU_PrsMergerPL* GetPrsMergerPL(){ return myPrsMergerPL;}
 
   protected: