From: enk Date: Wed, 25 Oct 2006 08:15:08 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: mergeto_V3_2_0_maintainance_30Nov06~12 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e94a20debe3b2b08566581578e65f671de3e11e5;p=modules%2Fvisu.git *** empty log message *** --- diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index 903ee96b..d0ad6940 100644 --- 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 02667a32..f85b78a3 100644 --- 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 933cd2cb..61353dca 100644 --- 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 1fd83ec3..8ebde5c8 100644 --- 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)); - Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore)); + // Storable::Registry(ScalarMap_i::myComment.c_str(),&(Restore)); Storable::Registry(GaussPoints_i::myComment.c_str(),&(Restore)); Storable::Registry(DeformedShape_i::myComment.c_str(),&(Restore)); Storable::Registry(CutPlanes_i::myComment.c_str(),&(Restore)); @@ -860,7 +860,8 @@ namespace VISU const char* theFieldName, CORBA::Double theIteration) { - return Prs3dOnField(theResult,theMeshName,theEntity,theFieldName,theIteration,true)._retn(); + //return Prs3dOnField(theResult,theMeshName,theEntity,theFieldName,theIteration,true)._retn(); + return Prs3dOnField(theResult,theMeshName,theEntity,theFieldName,theIteration)._retn(); } GaussPoints_ptr VISU_Gen_i::GaussPointsOnField(Result_ptr theResult, @@ -944,15 +945,6 @@ namespace VISU return Prs3dOnField(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(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 f1f109c2..1a5f6f82 100644 --- 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 b0d4008a..52edb3e3 100644 --- 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: