From e32a6955d5866eae72122692e7ae255f6256a919 Mon Sep 17 00:00:00 2001 From: mkr Date: Tue, 20 May 2008 14:45:49 +0000 Subject: [PATCH] Fix for NPAL18713 : EDF 611 VISU : Using ScalarMapOnDeformedShape is ambiguous. --- doc/salome/gui/VISU/images/smds1.png | Bin 15132 -> 24007 bytes .../input/calar_map_on_deformed_shape.doc | 22 ++--- doc/salome/gui/VISU/pics/smds1.png | Bin 15132 -> 24007 bytes .../VISU/visugenidl_doc/VISU__Gen_8idl.html | 2 +- ...rfaceVISU_1_1ScalarMapOnDeformedShape.html | 2 +- .../VISU/visugenidl_doc/namespaceVISU.html | 2 +- doc/salome/gui/VISU/whdata/whftdata0.htm | 2 +- doc/salome/gui/VISU/whdata/whtdata0.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstt3.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstt4.htm | 2 +- doc/salome/gui/VISU/whxdata/whftdata0.xml | 2 +- doc/salome/gui/VISU/whxdata/whtdata0.xml | 2 +- idl/VISU_Gen.idl | 23 ++++- src/ENGINE/VISU_Engine_i.cc | 15 ++- src/ENGINE/VISU_Engine_i.hh | 11 ++- src/PIPELINE/Makefile.am | 4 +- src/PIPELINE/VISUPipeLine.cxx | 2 +- ...x => VISU_DeformedShapeAndScalarMapPL.cxx} | 70 ++++++-------- ...x => VISU_DeformedShapeAndScalarMapPL.hxx} | 19 ++-- src/VISUGUI/Makefile.am | 4 +- src/VISUGUI/VISU_images.po | 2 +- src/VISUGUI/VISU_msg_en.po | 34 +++---- src/VISUGUI/VisuGUI.cxx | 53 +++++------ src/VISUGUI/VisuGUI.h | 4 +- src/VISUGUI/VisuGUI_ActionsDef.h | 4 +- ... VisuGUI_DeformedShapeAndScalarMapDlg.cxx} | 54 +++++------ ...=> VisuGUI_DeformedShapeAndScalarMapDlg.h} | 16 ++-- src/VISUGUI/VisuGUI_PopupTools.cxx | 1 + src/VISUGUI/VisuGUI_TimeAnimation.cxx | 25 ++--- src/VISUGUI/VisuGUI_Tools.cxx | 1 + src/VISU_I/Makefile.am | 4 +- src/VISU_I/VISUConfig.cc | 4 +- src/VISU_I/VISU_ColoredPrs3dCache_i.cc | 4 +- src/VISU_I/VISU_ColoredPrs3dFactory.cc | 6 +- src/VISU_I/VISU_ColoredPrs3dFactory.hh | 10 +- ...cc => VISU_DeformedShapeAndScalarMap_i.cc} | 88 +++++++++--------- ...hh => VISU_DeformedShapeAndScalarMap_i.hh} | 28 +++--- src/VISU_I/VISU_DumpPython.cc | 26 +++--- src/VISU_I/VISU_Gen_i.cc | 31 ++++-- src/VISU_I/VISU_Gen_i.hh | 12 ++- src/VISU_I/VISU_I.cxx | 2 +- src/VISU_I/VISU_TimeAnimation.cxx | 24 ++--- src/VISU_I/VISU_View_i.cc | 3 +- src/VISU_SWIG/VISU_Example_01.py | 4 +- src/VISU_SWIG/VISU_Example_07.py | 2 +- src/VISU_SWIG/visu.py | 8 +- src/VISU_SWIG/visu_cache.py | 3 +- 47 files changed, 353 insertions(+), 288 deletions(-) rename src/PIPELINE/{VISU_ScalarMapOnDeformedShapePL.cxx => VISU_DeformedShapeAndScalarMapPL.cxx} (86%) rename src/PIPELINE/{VISU_ScalarMapOnDeformedShapePL.hxx => VISU_DeformedShapeAndScalarMapPL.hxx} (84%) rename src/VISUGUI/{VisuGUI_ScalarMapOnDeformedShapeDlg.cxx => VisuGUI_DeformedShapeAndScalarMapDlg.cxx} (87%) rename src/VISUGUI/{VisuGUI_ScalarMapOnDeformedShapeDlg.h => VisuGUI_DeformedShapeAndScalarMapDlg.h} (87%) rename src/VISU_I/{VISU_ScalarMapOnDeformedShape_i.cc => VISU_DeformedShapeAndScalarMap_i.cc} (79%) rename src/VISU_I/{VISU_ScalarMapOnDeformedShape_i.hh => VISU_DeformedShapeAndScalarMap_i.hh} (82%) diff --git a/doc/salome/gui/VISU/images/smds1.png b/doc/salome/gui/VISU/images/smds1.png index 24c5feda71d28271be6e63a1388b1b6aaa3cea20..f74008d4577b87ddc1a355c8e1ceacdf886d1df0 100644 GIT binary patch literal 24007 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 T97=!#+7Zktx093;en0*fjd`Cv literal 15132 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 diff --git a/doc/salome/gui/VISU/input/calar_map_on_deformed_shape.doc b/doc/salome/gui/VISU/input/calar_map_on_deformed_shape.doc index 0ec95fb5..bc7ea730 100644 --- a/doc/salome/gui/VISU/input/calar_map_on_deformed_shape.doc +++ b/doc/salome/gui/VISU/input/calar_map_on_deformed_shape.doc @@ -1,30 +1,30 @@ /*! -\page scalar_map_on_deformed_shape_page Scalar Map on Deformed Shape presentation +\page scalar_map_on_deformed_shape_page Deformed Shape and Scalar Map presentation -\n Scalar Map on Deformed Shape presentation is a mix of the +\n Deformed Shape and Scalar Map presentation is a mix of the two: \ref scalar_map_page "Scalar Map" and \ref deformed_shape_page "Deformed Shape". In this presentation the Scalar Map is built on a Deformed Shape. -To create a Scalar Map on Deformed Shape presentation: +To create a Deformed Shape and Scalar Map presentation: \par – Right-click on one of the time stamps of the field in the -Object browser and from the pop-up menu choose Scalar Map on -Deformed Shape, or +Object browser and from the pop-up menu choose Deformed Shape and +Scalar Map, or \n – Click on one of the time stamps of the field in the Object -browser and select from the main menu Visualization > Scalar Map on -Deformed Shape, or click "Scalar Map on Deformed Shape" +browser and select from the main menu Visualization > Deformed Shape and +Scalar Map, or click "Deformed Shape and Scalar Map" icon in the Visualization Toolbar. \image html image40.gif -
"Scalar Map on Deformed Shape" icon
+
"Deformed Shape and Scalar Map" icon
\image html smds1.png \par -Scalar Map on Deformed Shape tab allows you to set additional -parameters of your Scalar Map on Deformed Shape presentation: +Deformed Shape and Scalar Map tab allows you to set additional +parameters of your Deformed Shape and Scalar Map presentation:
  • Scale Factor: visualization scaling of all vector values applied to the cells of the mesh.
    • @@ -43,7 +43,7 @@ Compare ordinary Scalar Map presentation: \image html smds-example1.png -with Scalar Map on Deformed Shape presentation: +with Deformed Shape and Scalar Map presentation: \image html smds-example.png diff --git a/doc/salome/gui/VISU/pics/smds1.png b/doc/salome/gui/VISU/pics/smds1.png index 24c5feda71d28271be6e63a1388b1b6aaa3cea20..f74008d4577b87ddc1a355c8e1ceacdf886d1df0 100755 GIT binary patch literal 24007 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 T97=!#+7Zktx093;en0*fjd`Cv literal 15132 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 diff --git a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html index 5d34130d..25789b67 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html +++ b/doc/salome/gui/VISU/visugenidl_doc/VISU__Gen_8idl.html @@ -74,7 +74,7 @@ Include dependency graph for VISU_Gen.idl:

     Deformed shape presentation interface. More...
    interface  VISU.ScalarMapOnDeformedShape - Scalar Map on Deformed shape presentation interface. More...
    + Deformed shape and Scalar Map presentation interface. More...
    interface  VISU.Plot3D  Plot3D interface. More...
    diff --git a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html index 878345b4..79095052 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html +++ b/doc/salome/gui/VISU/visugenidl_doc/interfaceVISU_1_1ScalarMapOnDeformedShape.html @@ -14,7 +14,7 @@
    VISU.ScalarMapOnDeformedShape
    -

    VISU.ScalarMapOnDeformedShape Interface Reference

    Scalar Map on Deformed shape presentation interface. +

    VISU.ScalarMapOnDeformedShape Interface Reference

    Deformed shape and Scalar Map presentation interface. More...

    import "VISU_Gen.idl"; diff --git a/doc/salome/gui/VISU/visugenidl_doc/namespaceVISU.html b/doc/salome/gui/VISU/visugenidl_doc/namespaceVISU.html index 9543044b..8de0ca8a 100644 --- a/doc/salome/gui/VISU/visugenidl_doc/namespaceVISU.html +++ b/doc/salome/gui/VISU/visugenidl_doc/namespaceVISU.html @@ -60,7 +60,7 @@  Deformed shape presentation interface. More...
    interface  ScalarMapOnDeformedShape - Scalar Map on Deformed shape presentation interface. More...
    + Deformed shape and Scalar Map presentation interface. More...
    interface  Plot3D  Plot3D interface. More...
    diff --git a/doc/salome/gui/VISU/whdata/whftdata0.htm b/doc/salome/gui/VISU/whdata/whftdata0.htm index eae6a624..5acacd5e 100755 --- a/doc/salome/gui/VISU/whdata/whftdata0.htm +++ b/doc/salome/gui/VISU/whdata/whftdata0.htm @@ -49,7 +49,7 @@ aTE("Plot2D Viewer","plot2d_viewer.htm"); aTE("Plot 3D presentation","plot_3d_presentation.htm"); aTE("Primitive Types","primitive_types.htm"); aTE("Scalar Bar","scalar_bar.htm"); -aTE("Scalar Map on Deformed Shape presentation","scalar_map_on_deformed_shape_presentation.htm"); +aTE("Deformed Shape and Scalar Map presentation","scalar_map_on_deformed_shape_presentation.htm"); aTE("Segmentation","segmentation.htm"); aTE("Types of Gauss Points Presentations","types_of_gauss_points_presentations.htm"); aTE("VTK 3D Viewer","vtk_3d_viewer.htm"); diff --git a/doc/salome/gui/VISU/whdata/whtdata0.htm b/doc/salome/gui/VISU/whdata/whtdata0.htm index fe3b5c79..67da6bc2 100755 --- a/doc/salome/gui/VISU/whdata/whtdata0.htm +++ b/doc/salome/gui/VISU/whdata/whtdata0.htm @@ -24,7 +24,7 @@ aTE(2,0,"Deformed Shape presentation","files/deformed_shape_presentation.htm"); aTE(2,0,"Vectors Presentation","files/vectors_presentation.htm"); aTE(2,0,"Stream Lines presentation","files/stream_lines_presentation.htm"); - aTE(2,0,"Scalar Map on Deformed Shape presentation","scalar_map_on_deformed_shape_presentation.htm"); + aTE(2,0,"Deformed Shape and Scalar Map presentation","scalar_map_on_deformed_shape_presentation.htm"); aTE(2,0,"Plot 3D presentation","plot_3d_presentation.htm"); aTE(2,0,"Animating presentations","files/animating_presentations.htm"); aTE(1,9,"Gauss Points Presentations"); diff --git a/doc/salome/gui/VISU/whgdata/whlstt3.htm b/doc/salome/gui/VISU/whgdata/whlstt3.htm index d960e94d..56224cc4 100755 --- a/doc/salome/gui/VISU/whgdata/whlstt3.htm +++ b/doc/salome/gui/VISU/whgdata/whlstt3.htm @@ -53,7 +53,7 @@ img {vertial-align:middle;}           Deformed Shape presentation
              Vectors Presentation
              Stream Lines presentation
    -          Scalar Map on Deformed Shape presentation
    +          Deformed Shape and Scalar Map presentation
              Plot 3D presentation
              Animating presentations
              Gauss Points Presentations
    diff --git a/doc/salome/gui/VISU/whgdata/whlstt4.htm b/doc/salome/gui/VISU/whgdata/whlstt4.htm index 253afb61..49593c24 100755 --- a/doc/salome/gui/VISU/whgdata/whlstt4.htm +++ b/doc/salome/gui/VISU/whgdata/whlstt4.htm @@ -53,7 +53,7 @@ img {vertial-align:middle;}           Deformed Shape presentation
              Vectors Presentation
              Stream Lines presentation
    -          Scalar Map on Deformed Shape presentation
    +          Deformed Shape and Scalar Map presentation
              Plot 3D presentation
              Animating presentations
              Gauss Points Presentations
    diff --git a/doc/salome/gui/VISU/whxdata/whftdata0.xml b/doc/salome/gui/VISU/whxdata/whftdata0.xml index 18b3f31d..37c3d337 100755 --- a/doc/salome/gui/VISU/whxdata/whftdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whftdata0.xml @@ -37,7 +37,7 @@ - + diff --git a/doc/salome/gui/VISU/whxdata/whtdata0.xml b/doc/salome/gui/VISU/whxdata/whtdata0.xml index 14a0dff2..13b3a715 100755 --- a/doc/salome/gui/VISU/whxdata/whtdata0.xml +++ b/doc/salome/gui/VISU/whxdata/whtdata0.xml @@ -16,7 +16,7 @@ - + diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl index de6e5119..78337588 100644 --- a/idl/VISU_Gen.idl +++ b/idl/VISU_Gen.idl @@ -78,7 +78,8 @@ module VISU { TSCALARMAP, /*!< Scalarmap 3D presentation object */ TISOSURFACES, /*!< Iso surface 3D presentation object */ TDEFORMEDSHAPE, /*!< Deformed shape 3D presentation object */ - TSCALARMAPONDEFORMEDSHAPE, /*!< Scalar map on deformed shape 3D presentation object */ + TSCALARMAPONDEFORMEDSHAPE, /*!< Scalar map on deformed shape 3D presentation object. It is obsolete. Use TDEFORMEDSHAPEANDSCALARMAP instead */ + TDEFORMEDSHAPEANDSCALARMAP, /*!< Deformed shape and scalar map 3D presentation object */ TGAUSSPOINTS, /*!< Gauss Points 3D presentation object */ TPLOT3D, /*!< Plot3D 3D presentation object */ TPOINTMAP3D, /*!< 3D presentation for table object */ @@ -879,7 +880,7 @@ module VISU { * * Presentation parameters of the scalar map on deformed shape presentation. */ - interface ScalarMapOnDeformedShape : ScalarMap { + interface DeformedShapeAndScalarMap : ScalarMap { /*! * Sets the scale of the presentatable object. @@ -2005,6 +2006,18 @@ module VISU { in Entity theEntity, in string theFieldName, in long theTimeStampNumber); + /*! + * Creates a deformed shape presentation. This function is obsolete. Use DeformedShapeAndScalarMapOnField instead. + * \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 theTimeStampNumber Number of iteration on the field + */ + DeformedShapeAndScalarMap ScalarMapOnDeformedShapeOnField(in Result theResult, in string theMeshName, + in Entity theEntity, in string theFieldName, + in long theTimeStampNumber); + /*! * Creates a deformed shape presentation. * \param theResult Data generated in other sources. (MED object or file) @@ -2013,9 +2026,9 @@ module VISU { * \param theFieldName Group of data attributed to the %MESH. The data can be scalar or vector. * \param theTimeStampNumber Number of iteration on the field */ - ScalarMapOnDeformedShape ScalarMapOnDeformedShapeOnField(in Result theResult, in string theMeshName, - in Entity theEntity, in string theFieldName, - in long theTimeStampNumber); + DeformedShapeAndScalarMap DeformedShapeAndScalarMapOnField(in Result theResult, in string theMeshName, + in Entity theEntity, in string theFieldName, + in long theTimeStampNumber); /*! * Creates a vector presentation. diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc index 80b53607..d857f644 100644 --- a/src/ENGINE/VISU_Engine_i.cc +++ b/src/ENGINE/VISU_Engine_i.cc @@ -278,7 +278,7 @@ namespace VISU{ return myVisuGen->DeformedShapeOnField(theResult,theMeshName,theEntity,theFieldName,theIteration); } - ScalarMapOnDeformedShape_ptr + DeformedShapeAndScalarMap_ptr VISU_Gen_i ::ScalarMapOnDeformedShapeOnField(Result_ptr theResult, const char* theMeshName, @@ -286,7 +286,18 @@ namespace VISU{ const char* theFieldName, CORBA::Long theIteration) { - return myVisuGen->ScalarMapOnDeformedShapeOnField(theResult,theMeshName,theEntity,theFieldName,theIteration); + return DeformedShapeAndScalarMapOnField(theResult,theMeshName,theEntity,theFieldName,theIteration); + } + + DeformedShapeAndScalarMap_ptr + VISU_Gen_i + ::DeformedShapeAndScalarMapOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Long theIteration) + { + return myVisuGen->DeformedShapeAndScalarMapOnField(theResult,theMeshName,theEntity,theFieldName,theIteration); } Vectors_ptr diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh index 8c5964c6..247a1074 100644 --- a/src/ENGINE/VISU_Engine_i.hh +++ b/src/ENGINE/VISU_Engine_i.hh @@ -152,14 +152,23 @@ namespace VISU const char* theFieldName, CORBA::Long theIteration); + //This function is obsolete. Use DeformedShapeAndScalarMapOnField instead. virtual - ScalarMapOnDeformedShape_ptr + DeformedShapeAndScalarMap_ptr ScalarMapOnDeformedShapeOnField(Result_ptr theResult, const char* theMeshName, VISU::Entity theEntity, const char* theFieldName, CORBA::Long theIteration); + virtual + DeformedShapeAndScalarMap_ptr + DeformedShapeAndScalarMapOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Long 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/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am index 1a93742e..82bc4155 100644 --- a/src/PIPELINE/Makefile.am +++ b/src/PIPELINE/Makefile.am @@ -63,7 +63,7 @@ salomeinclude_HEADERS= \ VISU_PlanesWidget.hxx \ VISU_SphereWidget.hxx \ VISU_WidgetCtrl.hxx \ - VISU_ScalarMapOnDeformedShapePL.hxx \ + VISU_DeformedShapeAndScalarMapPL.hxx \ VISUPipeline.hxx \ VISU_LabelPointsFilter.hxx @@ -102,7 +102,7 @@ dist_libVisuPipeLine_la_SOURCES= \ VISU_SphereWidget.cxx \ VISU_WidgetCtrl.cxx \ VISU_ScalarBarCtrl.cxx \ - VISU_ScalarMapOnDeformedShapePL.cxx \ + VISU_DeformedShapeAndScalarMapPL.cxx \ VISU_LabelPointsFilter.cxx libVisuPipeLine_la_CPPFLAGS= \ diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx index 307f99f9..ff3ba992 100644 --- a/src/PIPELINE/VISUPipeLine.cxx +++ b/src/PIPELINE/VISUPipeLine.cxx @@ -33,7 +33,7 @@ #include "VISU_VectorsPL.hxx" #include "VISU_StreamLinesPL.hxx" #include "VISU_GaussPointsPL.hxx" -#include "VISU_ScalarMapOnDeformedShapePL.hxx" +#include "VISU_DeformedShapeAndScalarMapPL.hxx" #include "VISU_Plot3DPL.hxx" #include "VISU_ScalarBarActor.hxx" diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx similarity index 86% rename from src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx rename to src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx index 008939b5..67e1b321 100644 --- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx +++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx @@ -1,4 +1,4 @@ -// VISU ScalarMapOnDeformedShapePL +// VISU DeformedShapeAndScalarMapPL // // Copyright (C) 2003 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -20,11 +20,11 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // -// File: VISU_ScalarMapOnDeformedShapePL.cxx +// File: VISU_DeformedShapeAndScalarMapPL.cxx // Author: Eugeny Nikolaev // Module : VISU -#include "VISU_ScalarMapOnDeformedShapePL.hxx" +#include "VISU_DeformedShapeAndScalarMapPL.hxx" #include "VISU_FieldTransform.hxx" #include "VISU_Extractor.hxx" #include "VISU_LookupTable.hxx" @@ -42,7 +42,7 @@ //---------------------------------------------------------------------------- -vtkStandardNewMacro(VISU_ScalarMapOnDeformedShapePL) +vtkStandardNewMacro(VISU_DeformedShapeAndScalarMapPL) //---------------------------------------------------------------------------- /*! @@ -53,10 +53,9 @@ vtkStandardNewMacro(VISU_ScalarMapOnDeformedShapePL) * Merge filter which unify the deformation and scalars * \li myScalars is vtk shared pointer to vtkUnstructuredGrid - scalars data */ -VISU_ScalarMapOnDeformedShapePL -::VISU_ScalarMapOnDeformedShapePL(): - myScaleFactor(0.0), - myMapScaleFactor(1.0) +VISU_DeformedShapeAndScalarMapPL +::VISU_DeformedShapeAndScalarMapPL(): + myScaleFactor(0.0) { myWarpVector = vtkWarpVector::New(); @@ -75,8 +74,8 @@ VISU_ScalarMapOnDeformedShapePL * Destructor. * Delete all fields. */ -VISU_ScalarMapOnDeformedShapePL -::~VISU_ScalarMapOnDeformedShapePL() +VISU_DeformedShapeAndScalarMapPL +::~VISU_DeformedShapeAndScalarMapPL() { myWarpVector->Delete(); @@ -94,7 +93,7 @@ VISU_ScalarMapOnDeformedShapePL * Initial method */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::Init() { Superclass::Init(); @@ -108,7 +107,7 @@ VISU_ScalarMapOnDeformedShapePL * Building of deformation and puts result to merge filter. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::Build() { Superclass::Build(); @@ -117,7 +116,7 @@ VISU_ScalarMapOnDeformedShapePL //---------------------------------------------------------------------------- vtkDataSet* -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::InsertCustomPL() { GetMapper()->SetColorModeToMapScalars(); @@ -150,7 +149,7 @@ VISU_ScalarMapOnDeformedShapePL * Update method */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::Update() { Superclass::Update(); @@ -170,7 +169,7 @@ VISU_ScalarMapOnDeformedShapePL //---------------------------------------------------------------------------- unsigned long int -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetMemorySize() { unsigned long int aSize = Superclass::GetMemorySize(); @@ -197,7 +196,7 @@ VISU_ScalarMapOnDeformedShapePL * Put scalars to merge filter. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::UpdateScalars() { vtkDataSet* aScalars = GetScalars(); @@ -215,13 +214,13 @@ VISU_ScalarMapOnDeformedShapePL * Copy scale and scalars. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::DoShallowCopy(VISU_PipeLine *thePipeLine, bool theIsCopyInput) { Superclass::DoShallowCopy(thePipeLine, theIsCopyInput); - if(VISU_ScalarMapOnDeformedShapePL *aPipeLine = dynamic_cast(thePipeLine)){ + if(VISU_DeformedShapeAndScalarMapPL *aPipeLine = dynamic_cast(thePipeLine)){ SetScale(aPipeLine->GetScale()); SetScalars(aPipeLine->GetScalars()); } @@ -233,7 +232,7 @@ VISU_ScalarMapOnDeformedShapePL * Sets vtkDataSet with scalars values to VISU_Extractor filter for scalars extraction. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetScalars(vtkDataSet *theScalars) { if(GetScalars() == theScalars) @@ -248,7 +247,7 @@ VISU_ScalarMapOnDeformedShapePL * Get pointer to input scalars. */ vtkDataSet* -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetScalars() { return myScalars.GetPointer(); @@ -259,13 +258,13 @@ VISU_ScalarMapOnDeformedShapePL * Sets scale for deformed shape */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetScale(vtkFloatingPointType theScale) { if(VISU::CheckIsSameValue(myScaleFactor, theScale)) return; - myWarpVector->SetScaleFactor(theScale*myMapScaleFactor); + myWarpVector->SetScaleFactor(theScale); myScaleFactor = theScale; } @@ -274,10 +273,10 @@ VISU_ScalarMapOnDeformedShapePL * Gets scale of deformed shape. */ vtkFloatingPointType -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetScale() { - return myScaleFactor; + return myWarpVector->GetScaleFactor(); } //---------------------------------------------------------------------------- @@ -285,18 +284,11 @@ VISU_ScalarMapOnDeformedShapePL * Set scale factor of deformation. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetMapScale(vtkFloatingPointType theMapScale) { - myMapScaleFactor = theMapScale; Superclass::SetMapScale(theMapScale); - - vtkFloatingPointType aMapScale = myScaleFactor * theMapScale; - - if(VISU::CheckIsSameValue(myWarpVector->GetScaleFactor(), aMapScale)) - return; - - myWarpVector->SetScaleFactor(aMapScale); + myWarpVector->SetScaleFactor(myScaleFactor*theMapScale); } //---------------------------------------------------------------------------- @@ -304,7 +296,7 @@ VISU_ScalarMapOnDeformedShapePL * Gets scalar mode. */ int -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetScalarMode() { return myScalarsExtractor->GetScalarMode(); @@ -315,7 +307,7 @@ VISU_ScalarMapOnDeformedShapePL * Sets scalar mode. */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetScalarMode(int theScalarMode) { VISU_ScalarMapPL::SetScalarMode(theScalarMode, GetScalars(), myScalarsExtractor); @@ -323,7 +315,7 @@ VISU_ScalarMapOnDeformedShapePL //---------------------------------------------------------------------------- void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetScaling(int theScaling) { if(GetScaling() == theScaling) @@ -340,7 +332,7 @@ VISU_ScalarMapOnDeformedShapePL //---------------------------------------------------------------------------- void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::SetScalarRange(vtkFloatingPointType theRange[2]) { if(VISU::CheckIsSameRange(theRange, GetScalarRange())) @@ -353,7 +345,7 @@ VISU_ScalarMapOnDeformedShapePL //---------------------------------------------------------------------------- vtkFloatingPointType* -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetScalarRange() { return myScalarsFieldTransform->GetScalarRange(); @@ -368,7 +360,7 @@ VISU_ScalarMapOnDeformedShapePL * \li theRange[1] - maximum value */ void -VISU_ScalarMapOnDeformedShapePL +VISU_DeformedShapeAndScalarMapPL ::GetSourceRange(vtkFloatingPointType theRange[2]) { myScalarsExtractor->Update(); diff --git a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx similarity index 84% rename from src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx rename to src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx index ea737359..e1041b46 100644 --- a/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.hxx +++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx @@ -20,12 +20,12 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // -// File: VISU_ScalarMapOnDeformedShapePL.hxx +// File: VISU_DeformedShapeAndScalarMapPL.hxx // Author: Eugeny Nikolaev // Module : VISU -#ifndef VISU_ScalarMapOnDeformedShapePL_HeaderFile -#define VISU_ScalarMapOnDeformedShapePL_HeaderFile +#ifndef VISU_DeformedShapeAndScalarMapPL_HeaderFile +#define VISU_DeformedShapeAndScalarMapPL_HeaderFile #include "VISUPipeline.hxx" #include "VISU_ScalarMapPL.hxx" @@ -38,13 +38,13 @@ class vtkPointDataToCellData; //---------------------------------------------------------------------------- -class VISU_PIPELINE_EXPORT VISU_ScalarMapOnDeformedShapePL : public VISU_ScalarMapPL +class VISU_PIPELINE_EXPORT VISU_DeformedShapeAndScalarMapPL : public VISU_ScalarMapPL { public: - vtkTypeMacro(VISU_ScalarMapOnDeformedShapePL, VISU_ScalarMapPL); + vtkTypeMacro(VISU_DeformedShapeAndScalarMapPL, VISU_ScalarMapPL); static - VISU_ScalarMapOnDeformedShapePL* + VISU_DeformedShapeAndScalarMapPL* New(); virtual @@ -117,10 +117,10 @@ public: SetMapScale(vtkFloatingPointType theMapScale = 1.0); protected: - VISU_ScalarMapOnDeformedShapePL(); + VISU_DeformedShapeAndScalarMapPL(); virtual - ~VISU_ScalarMapOnDeformedShapePL(); + ~VISU_DeformedShapeAndScalarMapPL(); virtual vtkDataSet* @@ -132,10 +132,9 @@ protected: bool theIsCopyInput); private: - VISU_ScalarMapOnDeformedShapePL(const VISU_ScalarMapOnDeformedShapePL&); + VISU_DeformedShapeAndScalarMapPL(const VISU_DeformedShapeAndScalarMapPL&); vtkFloatingPointType myScaleFactor; - vtkFloatingPointType myMapScaleFactor; vtkWarpVector *myWarpVector; VISU_MergeFilter *myScalarsMergeFilter; vtkSmartPointer myScalars; diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am index f5a02856..ae11d80c 100644 --- a/src/VISUGUI/Makefile.am +++ b/src/VISUGUI/Makefile.am @@ -63,7 +63,7 @@ dist_libVISU_la_SOURCES= \ VisuGUI_StreamLinesDlg.cxx \ VisuGUI_VectorsDlg.cxx \ VisuGUI_Displayer.cxx \ - VisuGUI_ScalarMapOnDeformedShapeDlg.cxx \ + VisuGUI_DeformedShapeAndScalarMapDlg.cxx \ VisuGUI_SetupPlot2dDlg.cxx \ VisuGUI_BuildProgressDlg.cxx \ VisuGUI_Table3dDlg.cxx \ @@ -96,7 +96,7 @@ MOC_FILES= \ VisuGUI_CutPlanesDlg_moc.cxx \ VisuGUI_StreamLinesDlg_moc.cxx \ VisuGUI_VectorsDlg_moc.cxx \ - VisuGUI_ScalarMapOnDeformedShapeDlg_moc.cxx \ + VisuGUI_DeformedShapeAndScalarMapDlg_moc.cxx \ VisuGUI_SetupPlot2dDlg_moc.cxx \ VisuGUI_BuildProgressDlg_moc.cxx \ VisuGUI_Table3dDlg_moc.cxx \ diff --git a/src/VISUGUI/VISU_images.po b/src/VISUGUI/VISU_images.po index c676492b..c5035745 100644 --- a/src/VISUGUI/VISU_images.po +++ b/src/VISUGUI/VISU_images.po @@ -28,7 +28,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "POT-Creation-Date: 2002-05-28 10:57:43 AM CEST\n" -"PO-Revision-Date: 2005-05-10 15:20+0400\n" +"PO-Revision-Date: 2008-05-04 15:01+0400\n" "Last-Translator: FULLNAME \n" "Content-Type: text/plain; charset=iso-8859-1\n" diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po index fabcb006..002b8c62 100644 --- a/src/VISUGUI/VISU_msg_en.po +++ b/src/VISUGUI/VISU_msg_en.po @@ -21,7 +21,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "POT-Creation-Date: 2002-02-22 16:56:46 CET\n" -"PO-Revision-Date: 2007-12-11 17:26+0300\n" +"PO-Revision-Date: 2008-05-04 10:12+0400\n" "Last-Translator: FULLNAME \n" "Content-Type: text/plain; charset=iso-8859-1\n" @@ -281,8 +281,8 @@ msgstr "Scalar Map" msgid "VisuGUI::MEN_DEFORMED_SHAPE" msgstr "Deformed Shape" -msgid "VisuGUI::MEN_SCALAR_MAP_ON_DEFORMED_SHAPE" -msgstr "Scalar Map on Deformed Shape" +msgid "VisuGUI::MEN_DEFORMED_SHAPE_AND_SCALAR_MAP" +msgstr "Deformed Shape and Scalar Map" msgid "VisuGUI::MEN_VISUALIZATION" msgstr "Visualization" @@ -690,33 +690,33 @@ msgid "VisuGUI_DeformedShapeDlg::SCALE_FACTOR" msgstr "Scale Factor:" -#: VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +#: VisuGUI_DeformedShapeAndScalarMapDlg.cxx -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::DLG_TITLE" -msgstr "Scalar Map on Deformed Shape" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::DLG_TITLE" +msgstr "Deformed Shape and Scalar Map" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::&Cancel" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::&Cancel" msgstr "" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::&OK" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::&OK" msgstr "" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::SCALAR_MAP_ON_DEFORMED_SHAPE_TAB" -msgstr "Scalar Map on Deformed Shape" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::DEFORMED_SHAPE_AND_SCALAR_MAP_TAB" +msgstr "Deformed Shape and Scalar Map" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::SCALAR_BAR_TAB" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::SCALAR_BAR_TAB" msgstr "Scalar Bar" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::INPUT_TAB" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::INPUT_TAB" msgstr "Input" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::SCALE_FACTOR" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::SCALE_FACTOR" msgstr "Scale Factor:" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::FIELD_ITEM" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::FIELD_ITEM" msgstr "Scalar Field:" -msgid "VisuGUI_ScalarMapOnDeformedShapeDlg::TIMESTAMP_ITEM" +msgid "VisuGUI_DeformedShapeAndScalarMapDlg::TIMESTAMP_ITEM" msgstr "Current Time Stamp:" #: VisuGUI_EditContainerDlg.cxx @@ -2444,8 +2444,8 @@ msgstr "Stream Lines" msgid "VISU_PLOT3D" msgstr "Plot3D" -msgid "VISU_SCALAR_MAP_ON_DEFORMED_SHAPE" -msgstr "Scalar Map on Def. Shape" +msgid "VISU_DEFORMED_SHAPE_AND_SCALAR_MAP" +msgstr "Def. Shape and Scalar Map" # MULTIPR msgid "VisuGUI::MEN_MULTIPR_VIEW_FULL_RES" diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx index 66ba70cf..cad01670 100644 --- a/src/VISUGUI/VisuGUI.cxx +++ b/src/VISUGUI/VisuGUI.cxx @@ -115,8 +115,8 @@ #include "VISU_DeformedShape_i.hh" #include "VisuGUI_DeformedShapeDlg.h" -#include "VISU_ScalarMapOnDeformedShape_i.hh" -#include "VisuGUI_ScalarMapOnDeformedShapeDlg.h" +#include "VISU_DeformedShapeAndScalarMap_i.hh" +#include "VisuGUI_DeformedShapeAndScalarMapDlg.h" #include "VISU_IsoSurfaces_i.hh" #include "VisuGUI_IsoSurfacesDlg.h" @@ -671,9 +671,9 @@ VisuGUI void VisuGUI -::OnCreateScalarMapOnDeformedShape() +::OnCreateDeformedShapeAndScalarMap() { - CreatePrs3d(this); + CreatePrs3d(this); } void @@ -879,11 +879,11 @@ VisuGUI //---------------------------------------------------------------------------- void VisuGUI -::OnEditScalarMapOnDeformedShape() +::OnEditDeformedShapeAndScalarMap() { Handle(SALOME_InteractiveObject) anIO; if (VISU::Prs3d_i* aPrs3d = GetPrsToModify(this, anIO)) - EditPrs3d(this, anIO, aPrs3d); + EditPrs3d(this, anIO, aPrs3d); } //---------------------------------------------------------------------------- @@ -1917,7 +1917,8 @@ VisuGUI TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp, false); break; case VISU::TSCALARMAPONDEFORMEDSHAPE: - TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp, false); + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp, false); break; case VISU::TCUTPLANES: TSameAsFactory().Create(aColoredPrs3d, ColoredPrs3d_i::EPublishUnderTimeStamp, false); @@ -2120,9 +2121,9 @@ VisuGUI this, SLOT(OnCreateDeformedShape())); aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SCALAR_MAP_ON_DEFORMED_SHAPE")); - createAction( VISU_SCALAR_MAP_ON_DEFORMED_SHAPE, tr("MEN_SCALAR_MAP_ON_DEFORMED_SHAPE"), QIconSet(aPixmap), - tr("MEN_SCALAR_MAP_ON_DEFORMED_SHAPE"), "", 0, aParent, false, - this, SLOT(OnCreateScalarMapOnDeformedShape())); + createAction( VISU_DEFORMED_SHAPE_AND_SCALAR_MAP, tr("MEN_DEFORMED_SHAPE_AND_SCALAR_MAP"), QIconSet(aPixmap), + tr("MEN_DEFORMED_SHAPE_AND_SCALAR_MAP"), "", 0, aParent, false, + this, SLOT(OnCreateDeformedShapeAndScalarMap())); aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_VECTORS")); createAction( VISU_VECTORS, tr("MEN_VECTORS"), QIconSet(aPixmap), @@ -2358,9 +2359,9 @@ VisuGUI tr("MEN_EDIT_PRS"), "", 0, aParent, false, this, SLOT(OnEditPlot3D())); - createAction( VISU_EDIT_SCALARMAPONDEFORMEDSHAPE, tr("MEN_EDIT_PRS"), QIconSet(), + createAction( VISU_EDIT_DEFORMEDSHAPEANDSCALARMAP, tr("MEN_EDIT_PRS"), QIconSet(), tr("MEN_EDIT_PRS"), "", 0, aParent, false, - this, SLOT(OnEditScalarMapOnDeformedShape())); + this, SLOT(OnEditDeformedShapeAndScalarMap())); createAction( VISU_CREATE_TABLE, tr("MEN_CREATE_TABLE"), QIconSet(), @@ -2461,7 +2462,7 @@ VisuGUI createMenu( VISU_CUT_LINES, aMenuId, 10 ); // cut lines createMenu( VISU_STREAM_LINES, aMenuId, 10 ); // stream lines createMenu( VISU_PLOT_3D, aMenuId, 10 ); // Plot3d - createMenu( VISU_SCALAR_MAP_ON_DEFORMED_SHAPE, aMenuId, 10 ); // scalar map on deformed shape + createMenu( VISU_DEFORMED_SHAPE_AND_SCALAR_MAP, aMenuId, 10 ); // scalar map on deformed shape aMenuId = createMenu( tr( "MEN_SELECTION" ), -1, -1, 30 ); createMenu( VISU_SELECTION_INFO, aMenuId, 10 ); // selection info @@ -2493,7 +2494,7 @@ VisuGUI createTool( VISU_CUT_LINES, aToolId ); createTool( VISU_STREAM_LINES, aToolId ); createTool( VISU_PLOT_3D, aToolId ); - createTool( VISU_SCALAR_MAP_ON_DEFORMED_SHAPE, aToolId ); + createTool( VISU_DEFORMED_SHAPE_AND_SCALAR_MAP, aToolId ); aToolId = createTool(tr("TOOL_REPRESENTATION")); createTool( VISU_POINTS, aToolId ); @@ -2527,7 +2528,7 @@ VisuGUI mgr->insert( action( VISU_VECTORS ), -1, -1, -1 ); // vectors mgr->insert( action( VISU_STREAM_LINES ), -1, -1, -1 ); // stream lines mgr->insert( action( VISU_PLOT_3D ), -1, -1, -1 ); // Plot3d - mgr->insert( action( VISU_SCALAR_MAP_ON_DEFORMED_SHAPE ), -1, -1, -1 ); // scalar map on deformed shape + mgr->insert( action( VISU_DEFORMED_SHAPE_AND_SCALAR_MAP ), -1, -1, -1 ); // scalar map on deformed shape mgr->insert( action( VISU_CREATE_PRS ), -1, -1, -1 ); // create presentation mgr->insert( action( VISU_CREATE_MANY_PRS ), -1, -1, -1 ); // create presentations @@ -2543,7 +2544,7 @@ VisuGUI 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 ); - mgr->insert( action( VISU_EDIT_SCALARMAPONDEFORMEDSHAPE ), -1, -1, -1 ); + mgr->insert( action( VISU_EDIT_DEFORMEDSHAPEANDSCALARMAP ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_CONTAINER ), -1, -1, -1 ); mgr->insert( action( VISU_EDIT_POINTMAP3D ), -1, -1, -1 ); @@ -2624,7 +2625,7 @@ VisuGUI QString aPrsAll ("'VISU::TSCALARMAP' 'VISU::TISOSURFACES' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " "'VISU::TCUTLINES' 'VISU::TVECTORS' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' " - "'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TCOLOREDPRS3DHOLDER'"); + "'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP' 'VISU::TCOLOREDPRS3DHOLDER'"); // VISU root commands QString aRule = "client='ObjectBrowser' and selcount=1 and type='VISU::TVISUGEN'"; @@ -2643,7 +2644,7 @@ VisuGUI mgr->setRule( action( VISU_DEFORMED_SHAPE ), aRule, true ); mgr->setRule( action( VISU_VECTORS ), aRule, true ); mgr->setRule( action( VISU_STREAM_LINES ), aRule, true ); - mgr->setRule( action( VISU_SCALAR_MAP_ON_DEFORMED_SHAPE ), aRule, true ); + mgr->setRule( action( VISU_DEFORMED_SHAPE_AND_SCALAR_MAP ), aRule, true ); // display/erase commands QString andInvisible = " and (((not isVisible) and isActiveView) or (not isActiveView))"; @@ -2687,13 +2688,13 @@ VisuGUI // 3D presentations commands QString aPrsType = " and $type in {'VISU::TMESH'" + aPrsAll + "}"; QString aPrsType2 = " and $type in {'VISU::TMESH' 'VISU::TPOINTMAP3D'" + aPrsAll + "}"; - QString anInsideType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; - QString aSurfFrameType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP''VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE'}"; + QString anInsideType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP'}"; + QString aSurfFrameType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP''VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP'}"; QString aSurfType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TSCALARMAP' 'VISU::TISOSURFACES' 'VISU::TDEFORMEDSHAPE' 'VISU::TCUTPLANES' " - " 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TPOINTMAP3D'}"; - QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TPOINTMAP3D'}"; + " 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP' 'VISU::TPOINTMAP3D'}"; + QString aShrinkType = " and $type in {'VISU::TMESH' 'VISU::TSCALARMAP' 'VISU::TDEFORMEDSHAPE' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP' 'VISU::TPOINTMAP3D'}"; 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' 'VISU::TPOINTMAP3D'}"; + "'VISU::TCUTPLANES' 'VISU::TCUTLINES' 'VISU::TSTREAMLINES' 'VISU::TPLOT3D' 'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP' 'VISU::TPOINTMAP3D'}"; aRule = "selcount=1"; mgr->setRule( action( VISU_CLIPPING ), aRule + aPrsType, true ); @@ -2755,8 +2756,8 @@ VisuGUI "selcount=1 and type='VISU::TSCALARMAP'", true ); mgr->setRule( action( VISU_EDIT_DEFORMEDSHAPE ), "selcount=1 and type='VISU::TDEFORMEDSHAPE'", true ); - mgr->setRule( action( VISU_EDIT_SCALARMAPONDEFORMEDSHAPE ), - "selcount=1 and type='VISU::TSCALARMAPONDEFORMEDSHAPE'", true ); + mgr->setRule( action( VISU_EDIT_DEFORMEDSHAPEANDSCALARMAP ), + "selcount=1 and $type in {'VISU::TSCALARMAPONDEFORMEDSHAPE' 'VISU::TDEFORMEDSHAPEANDSCALARMAP'}", true ); mgr->setRule( action( VISU_EDIT_CUTPLANES ), "selcount=1 and type='VISU::TCUTPLANES'", true ); mgr->setRule( action( VISU_EDIT_CUTLINES ), @@ -3442,7 +3443,7 @@ void VisuGUI::createPreferences() setPreferenceProperty( plot3d_represent, "indexes", indices2 ); addPreference( "", representGr, LightApp_Preferences::Space ); - int scalar_def_represent = addPreference( tr( "VISU_SCALAR_MAP_ON_DEFORMED_SHAPE" ), representGr, LightApp_Preferences::Selector, "VISU", "scalar_def_represent" ); + int scalar_def_represent = addPreference( tr( "VISU_DEFORMED_SHAPE_AND_SCALAR_MAP" ), representGr, LightApp_Preferences::Selector, "VISU", "scalar_def_represent" ); setPreferenceProperty( scalar_def_represent, "strings", modes1 ); setPreferenceProperty( scalar_def_represent, "indexes", indices1 ); addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "scalar_def_shrink" ); diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h index 2d6370b6..5d19813c 100644 --- a/src/VISUGUI/VisuGUI.h +++ b/src/VISUGUI/VisuGUI.h @@ -104,7 +104,7 @@ protected slots: void OnCreatePlot3D(); void OnCreateManyMesh(); void OnCreatePlot2dView(); - void OnCreateScalarMapOnDeformedShape(); + void OnCreateDeformedShapeAndScalarMap(); void OnEditScalarMap(); void OnEditDeformedShape(); @@ -114,7 +114,7 @@ protected slots: void OnEditVectors(); void OnEditStreamLines(); void OnEditPlot3D(); - void OnEditScalarMapOnDeformedShape(); + void OnEditDeformedShapeAndScalarMap(); virtual void OnDisplayPrs(); virtual void OnDisplayOnlyPrs(); diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h index f1115b74..3e0b4bc4 100644 --- a/src/VISUGUI/VisuGUI_ActionsDef.h +++ b/src/VISUGUI/VisuGUI_ActionsDef.h @@ -39,7 +39,7 @@ #define VISU_CUT_LINES 4017 #define VISU_PLOT2D 4018 #define VISU_PLOT_3D 4019 -#define VISU_SCALAR_MAP_ON_DEFORMED_SHAPE 40110 +#define VISU_DEFORMED_SHAPE_AND_SCALAR_MAP 40110 //#define VISU_DELETE 4021 #define VISU_DELETE_OBJS 4022 @@ -92,7 +92,7 @@ #define VISU_EDIT_VECTORS 40625 #define VISU_EDIT_STREAMLINES 40626 #define VISU_EDIT_PLOT3D 40627 -#define VISU_EDIT_SCALARMAPONDEFORMEDSHAPE 40628 +#define VISU_EDIT_DEFORMEDSHAPEANDSCALARMAP 40628 #define VISU_EDIT_PRS 4062 #define VISU_CREATE_TABLE 4063 diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx similarity index 87% rename from src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx rename to src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx index 98dcd686..7fc9b209 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx @@ -21,21 +21,21 @@ // // // -// File : VisuGUI_ScalarMapOnDeformedShapeDlg.cxx +// File : VisuGUI_DeformedShapeAndScalarMapDlg.cxx // Author : Eugeny Nikolaev // Module : VISU -#include "VisuGUI_ScalarMapOnDeformedShapeDlg.h" +#include "VisuGUI_DeformedShapeAndScalarMapDlg.h" #include "VisuGUI_Tools.h" #include "VisuGUI_InputPane.h" #include "VISU_Result_i.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_ColoredPrs3dFactory.hh" #include "VISU_ScalarMapPL.hxx" -#include "VISU_ScalarMapOnDeformedShapePL.hxx" +#include "VISU_DeformedShapeAndScalarMapPL.hxx" #include "VISU_Convertor.hxx" @@ -62,7 +62,7 @@ using namespace std; /*! * Constructor */ -VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (SalomeApp_Module* theModule) +VisuGUI_DeformedShapeAndScalarMapDlg::VisuGUI_DeformedShapeAndScalarMapDlg (SalomeApp_Module* theModule) : VisuGUI_ScalarBarBaseDlg(theModule), myIsAnimation(false), myUpdateScalars(true), @@ -113,10 +113,10 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome TopGroupLayout->addWidget(myTimeStampsCombo,2,1); // - myTabBox->addTab(aBox, tr("SCALAR_MAP_ON_DEFORMED_SHAPE_TAB")); + myTabBox->addTab(aBox, tr("DEFORMED_SHAPE_AND_SCALAR_MAP_TAB")); // Scalar bar pane - myInputPane = new VisuGUI_InputPane(VISU::TSCALARMAPONDEFORMEDSHAPE, theModule, this); + myInputPane = new VisuGUI_InputPane(VISU::TDEFORMEDSHAPEANDSCALARMAP, theModule, this); myTabBox->addTab(GetScalarPane(), tr("SCALAR_BAR_TAB")); myTabBox->addTab(myInputPane, tr("INPUT_TAB")); @@ -160,14 +160,14 @@ VisuGUI_ScalarMapOnDeformedShapeDlg::VisuGUI_ScalarMapOnDeformedShapeDlg (Salome connect(myTimeStampsCombo, SIGNAL(activated(int)), this, SLOT(onTimeStampChanged(int))); } -VisuGUI_ScalarMapOnDeformedShapeDlg::~VisuGUI_ScalarMapOnDeformedShapeDlg() +VisuGUI_DeformedShapeAndScalarMapDlg::~VisuGUI_DeformedShapeAndScalarMapDlg() {} -void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs, +void VisuGUI_DeformedShapeAndScalarMapDlg::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); setFactor(myPrsCopy->GetScale()); myTimeStampsCombo->setDisabled(myIsAnimation); @@ -274,7 +274,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::initFromPrsObject( VISU::ColoredPrs3d_ } int -VisuGUI_ScalarMapOnDeformedShapeDlg +VisuGUI_DeformedShapeAndScalarMapDlg ::storeToPrsObject(VISU::ColoredPrs3d_i* thePrs) { if(!myInputPane->check() || !GetScalarPane()->check()) @@ -292,25 +292,25 @@ VisuGUI_ScalarMapOnDeformedShapeDlg if(myUpdateScalars) SetScalarField( false ); - VISU::TSameAsFactory().Copy(myPrsCopy, thePrs); + VISU::TSameAsFactory().Copy(myPrsCopy, thePrs); return anIsOk; } -int VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarFieldNamePos(){ +int VisuGUI_DeformedShapeAndScalarMapDlg::getCurrentScalarFieldNamePos(){ return myFieldsCombo->currentItem(); } -QString VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarFieldName(){ +QString VisuGUI_DeformedShapeAndScalarMapDlg::getCurrentScalarFieldName(){ return myFieldsCombo->currentText(); } -int VisuGUI_ScalarMapOnDeformedShapeDlg::getCurrentScalarNbIterations(){ +int VisuGUI_DeformedShapeAndScalarMapDlg::getCurrentScalarNbIterations(){ return myTimeStampsCombo->count(); } VISU::Entity -VisuGUI_ScalarMapOnDeformedShapeDlg +VisuGUI_DeformedShapeAndScalarMapDlg ::getCurrentScalarEntity() { VISU::Entity anEntity = VISU::Entity(-1); @@ -329,12 +329,12 @@ VisuGUI_ScalarMapOnDeformedShapeDlg return anEntity; } -void VisuGUI_ScalarMapOnDeformedShapeDlg::SetScalarField( const bool save_scalar_pane ){ +void VisuGUI_DeformedShapeAndScalarMapDlg::SetScalarField( const bool save_scalar_pane ){ SetScalarField( myTimeStampID[ myTimeStampsCombo->currentItem() ], "", save_scalar_pane ); } void -VisuGUI_ScalarMapOnDeformedShapeDlg +VisuGUI_DeformedShapeAndScalarMapDlg ::SetScalarField(int theIter, QString theFieldName, const bool save_scalar_pane ) @@ -363,22 +363,22 @@ VisuGUI_ScalarMapOnDeformedShapeDlg QApplication::restoreOverrideCursor(); } -void VisuGUI_ScalarMapOnDeformedShapeDlg::accept() +void VisuGUI_DeformedShapeAndScalarMapDlg::accept() { VisuGUI_ScalarBarBaseDlg::accept(); } -void VisuGUI_ScalarMapOnDeformedShapeDlg::reject() +void VisuGUI_DeformedShapeAndScalarMapDlg::reject() { VisuGUI_ScalarBarBaseDlg::reject(); } -QString VisuGUI_ScalarMapOnDeformedShapeDlg::GetContextHelpFilePath() +QString VisuGUI_DeformedShapeAndScalarMapDlg::GetContextHelpFilePath() { return "scalar_map_on_deformed_shape_page.html"; } -void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllFieldNames(){ +void VisuGUI_DeformedShapeAndScalarMapDlg::AddAllFieldNames(){ TEntity2Fields::const_iterator anIter = myEntity2Fields.begin(); for(; anIter != myEntity2Fields.end(); anIter++){ const TFieldName2TimeStamps& aFieldName2TimeStamps = anIter->second; @@ -390,7 +390,7 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllFieldNames(){ } } -void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllTimes(const QString& theFieldName){ +void VisuGUI_DeformedShapeAndScalarMapDlg::AddAllTimes(const QString& theFieldName){ TEntity2Fields::const_iterator anIter = myEntity2Fields.begin(); for(; anIter != myEntity2Fields.end(); anIter++){ const TFieldName2TimeStamps& aFieldName2TimeStamps = anIter->second; @@ -417,23 +417,23 @@ void VisuGUI_ScalarMapOnDeformedShapeDlg::AddAllTimes(const QString& theFieldNam } } -void VisuGUI_ScalarMapOnDeformedShapeDlg::onFieldChanged(int){ +void VisuGUI_DeformedShapeAndScalarMapDlg::onFieldChanged(int){ AddAllTimes(myFieldsCombo->currentText()); SetScalarField(); UpdateScalarField(); } -void VisuGUI_ScalarMapOnDeformedShapeDlg::onTimeStampChanged(int){ +void VisuGUI_DeformedShapeAndScalarMapDlg::onTimeStampChanged(int){ SetScalarField(); UpdateScalarField(); } -void VisuGUI_ScalarMapOnDeformedShapeDlg::UpdateScalarField(){ +void VisuGUI_DeformedShapeAndScalarMapDlg::UpdateScalarField(){ GetScalarPane()->initFromPrsObject(myPrsCopy); } QString -VisuGUI_ScalarMapOnDeformedShapeDlg +VisuGUI_DeformedShapeAndScalarMapDlg ::GetFloatValueOfTimeStamp(VISU::Entity theEntity, const std::string& theFieldName, int theTimeStampNumber) diff --git a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h similarity index 87% rename from src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h rename to src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h index 6974d688..c0dcdb9e 100644 --- a/src/VISUGUI/VisuGUI_ScalarMapOnDeformedShapeDlg.h +++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h @@ -21,12 +21,12 @@ // // // -// File : VisuGUI_ScalarMapOnDeformedShapeDlg.h +// File : VisuGUI_DeformedShapeAndScalarMapDlg.h // Author : Eugeny Nikolaev // Module : VISU -#ifndef VISUGUI_SCALARMAPONDEFORMEDSHAPEDLS_H -#define VISUGUI_SCALARMAPONDEFORMEDSHAPEDLS_H +#ifndef VISUGUI_DEFORMEDSHAPEANDSCALARMAPDLS_H +#define VISUGUI_DEFORMEDSHAPEANDSCALARMAPDLS_H #include "VisuGUI_Prs3dDlg.h" @@ -50,16 +50,16 @@ class VisuGUI_InputPane; namespace VISU { - class ScalarMapOnDeformedShape_i; + class DeformedShapeAndScalarMap_i; } -class VisuGUI_ScalarMapOnDeformedShapeDlg : public VisuGUI_ScalarBarBaseDlg +class VisuGUI_DeformedShapeAndScalarMapDlg : public VisuGUI_ScalarBarBaseDlg { Q_OBJECT public: - VisuGUI_ScalarMapOnDeformedShapeDlg (SalomeApp_Module* theModule); - ~VisuGUI_ScalarMapOnDeformedShapeDlg(); + VisuGUI_DeformedShapeAndScalarMapDlg (SalomeApp_Module* theModule); + ~VisuGUI_DeformedShapeAndScalarMapDlg(); double getFactor() { return ScalFact->value(); } @@ -107,7 +107,7 @@ private: std::vector myTimeStampID; _PTR(SObject) mySelectionObj; - SALOME::GenericObjPtr myPrsCopy; + SALOME::GenericObjPtr myPrsCopy; SalomeApp_Module* myVisuGUI; protected: diff --git a/src/VISUGUI/VisuGUI_PopupTools.cxx b/src/VISUGUI/VisuGUI_PopupTools.cxx index e20cf7c6..02af7e98 100644 --- a/src/VISUGUI/VisuGUI_PopupTools.cxx +++ b/src/VISUGUI/VisuGUI_PopupTools.cxx @@ -112,6 +112,7 @@ QString VisuGUI_Selection::type( const int ind ) const ENUM2STRING( aResStr, VISU::TISOSURFACES ); ENUM2STRING( aResStr, VISU::TDEFORMEDSHAPE ); ENUM2STRING( aResStr, VISU::TSCALARMAPONDEFORMEDSHAPE ); + ENUM2STRING( aResStr, VISU::TDEFORMEDSHAPEANDSCALARMAP ); ENUM2STRING( aResStr, VISU::TCUTPLANES ); ENUM2STRING( aResStr, VISU::TCUTLINES ); ENUM2STRING( aResStr, VISU::TVECTORS ); diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx index fd12611f..e7a09f20 100644 --- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx +++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx @@ -34,7 +34,7 @@ #include "VisuGUI_VectorsDlg.h" #include "VisuGUI_IsoSurfacesDlg.h" #include "VisuGUI_StreamLinesDlg.h" -#include "VisuGUI_ScalarMapOnDeformedShapeDlg.h" +#include "VisuGUI_DeformedShapeAndScalarMapDlg.h" #include "VisuGUI_GaussPointsDlg.h" #include "VISU_TimeAnimation.h" @@ -47,7 +47,7 @@ #include "VISU_CutLines_i.hh" #include "VISU_Vectors_i.hh" #include "VISU_StreamLines_i.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_GaussPoints_i.hh" #include "VISU_ViewManager_i.hh" @@ -665,7 +665,7 @@ enum PrsComboItem { TVECTORS_ITEM = 6, // VISU::TVECTORS TSTREAMLINES_ITEM = 7, // VISU::TSTREAMLINES TGAUSSPOINTS_ITEM = 8, // VISU::TGAUSSPOINTS - TSCALARMAPONDEFORMEDSHAPE_ITEM = 9 // VISU::TSCALARMAPONDEFORMEDSHAPE + TDEFORMEDSHAPEANDSCALARMAP_ITEM = 9 // VISU::TDEFORMEDSHAPEANDSCALARMAP }; //------------------------------------------------------------------------ @@ -756,9 +756,9 @@ void SetupDlg::onFieldChange (int theIndex) myTypeId2ComboId[TSTREAMLINES_ITEM] = myComboId2TypeId.size(); myComboId2TypeId.push_back(TSTREAMLINES_ITEM);; - myTypeCombo->insertItem("Scalar map on Deformed shape"); // item 9 - myTypeId2ComboId[TSCALARMAPONDEFORMEDSHAPE_ITEM] = myComboId2TypeId.size(); - myComboId2TypeId.push_back(TSCALARMAPONDEFORMEDSHAPE_ITEM);; + myTypeCombo->insertItem("Deformed shape and Scalar map"); // item 9 + myTypeId2ComboId[TDEFORMEDSHAPEANDSCALARMAP_ITEM] = myComboId2TypeId.size(); + myComboId2TypeId.push_back(TDEFORMEDSHAPEANDSCALARMAP_ITEM);; } if(anEnableGP){ @@ -787,7 +787,8 @@ void SetupDlg::onFieldChange (int theIndex) myTypeCombo->setCurrentItem(myTypeId2ComboId[TDEFORMEDSHAPE_ITEM]); break; case VISU::TSCALARMAPONDEFORMEDSHAPE: //Scalar Map on Deformed Shape - myTypeCombo->setCurrentItem(myTypeId2ComboId[TSCALARMAPONDEFORMEDSHAPE_ITEM]); + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + myTypeCombo->setCurrentItem(myTypeId2ComboId[TDEFORMEDSHAPEANDSCALARMAP_ITEM]); break; case VISU::TVECTORS: //Vectors myTypeCombo->setCurrentItem(myTypeId2ComboId[TVECTORS_ITEM]); @@ -831,8 +832,8 @@ void SetupDlg::onTypeChanged (int theIndex) case TDEFORMEDSHAPE_ITEM: //Deformed Shape aData.myPrsType = VISU::TDEFORMEDSHAPE; break; - case TSCALARMAPONDEFORMEDSHAPE_ITEM: //Scalar Map on Deformed Shape - aData.myPrsType = VISU::TSCALARMAPONDEFORMEDSHAPE; + case TDEFORMEDSHAPEANDSCALARMAP_ITEM: //Scalar Map on Deformed Shape + aData.myPrsType = VISU::TDEFORMEDSHAPEANDSCALARMAP; break; case TVECTORS_ITEM: //Vectors aData.myPrsType = VISU::TVECTORS; @@ -942,11 +943,11 @@ void SetupDlg::onPreferencesDlg() c.suspend(); EditPrs(myModule, aData, myAnimator); break; - case TSCALARMAPONDEFORMEDSHAPE_ITEM: //Scalar Map on Deformed Shape + case TDEFORMEDSHAPEANDSCALARMAP_ITEM: //Scalar Map on Deformed Shape c.suspend(); { - typedef VisuGUI_ScalarMapOnDeformedShapeDlg DLG; - typedef VISU::ScalarMapOnDeformedShape_i TYPE; + typedef VisuGUI_DeformedShapeAndScalarMapDlg DLG; + typedef VISU::DeformedShapeAndScalarMap_i TYPE; DLG* aDlg = new DLG (myModule); TYPE* aPrs3d = dynamic_cast(aData.myPrs[0]); aDlg->initFromPrsObject(aPrs3d, true); diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx index 878cfa2c..88e8ace0 100644 --- a/src/VISUGUI/VisuGUI_Tools.cxx +++ b/src/VISUGUI/VisuGUI_Tools.cxx @@ -1283,6 +1283,7 @@ namespace VISU case VISU::TSTREAMLINES: case VISU::TPLOT3D: case VISU::TSCALARMAPONDEFORMEDSHAPE: + case VISU::TDEFORMEDSHAPEANDSCALARMAP: { PortableServer::ServantBase_var aServant = VISU::GetServant(aCORBAObject); if (aServant.in()) { diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am index 542eab8c..4e2d5ffb 100644 --- a/src/VISU_I/Makefile.am +++ b/src/VISU_I/Makefile.am @@ -50,7 +50,7 @@ salomeinclude_HEADERS = \ VISU_ViewManager_i.hh \ VISU_View_i.hh \ VISU_TimeAnimation.h \ - VISU_ScalarMapOnDeformedShape_i.hh \ + VISU_DeformedShapeAndScalarMap_i.hh \ VISU_ColoredPrs3dFactory.hh \ VISU_MonoColorPrs_i.hh \ SALOME_GenericObjPointer.hh @@ -75,7 +75,7 @@ libVISUEngineImpl_la_SOURCES = \ VISU_CutLines_i.cc \ VISU_Vectors_i.cc \ VISU_StreamLines_i.cc \ - VISU_ScalarMapOnDeformedShape_i.cc \ + VISU_DeformedShapeAndScalarMap_i.cc \ VISU_ColoredPrs3dCache_i.cc \ VISU_ColoredPrs3dHolder_i.cc \ VISU_ColoredPrs3dFactory.cc \ diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc index f42b1ff9..095c1593 100644 --- a/src/VISU_I/VISUConfig.cc +++ b/src/VISU_I/VISUConfig.cc @@ -214,8 +214,8 @@ namespace VISU return VISU::TISOSURFACES; if ( theComment == "DEFORMEDSHAPE" ) return VISU::TDEFORMEDSHAPE; - if ( theComment == "SCALARMAPONDEFORMEDSHAPE" ) - return VISU::TSCALARMAPONDEFORMEDSHAPE; + if ( theComment == "DEFORMEDSHAPEANDSCALARMAP" ) + return VISU::TDEFORMEDSHAPEANDSCALARMAP; if ( theComment == "GAUSSPOINTS" ) return VISU::TGAUSSPOINTS; if ( theComment == "PLOT3D" ) diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc index 6b1143a2..348ff93b 100644 --- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc +++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc @@ -653,8 +653,8 @@ VISU::ColoredPrs3dCache_i aPrs3d->SameAs(thePrs); // special case for deformed shape - VISU::ScalarMapOnDeformedShape_i* dShape = - dynamic_cast( aPrs3d.get() ); + VISU::DeformedShapeAndScalarMap_i* dShape = + dynamic_cast( aPrs3d.get() ); if ( dShape && dShape->GetScalarTimeStampNumber() != theInput.myTimeStampNumber ) { dShape->SetScalarField( dShape->GetScalarEntity(), diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.cc b/src/VISU_I/VISU_ColoredPrs3dFactory.cc index cff778da..0aee75f2 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc @@ -97,7 +97,8 @@ namespace VISU case TDEFORMEDSHAPE: return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TSCALARMAPONDEFORMEDSHAPE: - return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); + case TDEFORMEDSHAPEANDSCALARMAP: + return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TISOSURFACES: return VISU::CreatePrs3dByEnum(theStudy, thePublishInStudyMode); case TSTREAMLINES: @@ -201,7 +202,8 @@ namespace VISU aMemory = CheckIsPossible(theInput, theMemoryCheck); break; case TSCALARMAPONDEFORMEDSHAPE: - aMemory = CheckIsPossible(theInput, theMemoryCheck); + case TDEFORMEDSHAPEANDSCALARMAP: + aMemory = CheckIsPossible(theInput, theMemoryCheck); break; case TISOSURFACES: aMemory = CheckIsPossible(theInput, theMemoryCheck); diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh index eae438dd..98ee08f2 100644 --- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh +++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh @@ -33,7 +33,7 @@ #include "VISU_I.hxx" #include "SALOME_GenericObjPointer.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_Plot3D_i.hh" #include "VISU_GaussPoints_i.hh" #include "VISU_StreamLines_i.hh" @@ -52,7 +52,8 @@ namespace VISU namespace TL { //---------------------------------------------------------------------------- - typedef TList > > > > > > > > > + TNullType> > > > > > > > > > > TColoredPrs3dTypeList; typedef TList, + TList, TList, TList, TList, @@ -76,7 +78,7 @@ namespace VISU TList, TList, TList, - TNullType> > > > > > > > > > + TNullType> > > > > > > > > > > TColoredPrs3dEnumList; diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc similarity index 79% rename from src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc rename to src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc index ac6a8322..f5b4316f 100644 --- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc +++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc @@ -20,16 +20,16 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // -// File : VISU_ScalarMapOnDeformedShape_i.cc +// File : VISU_DeformedShapeAndScalarMap_i.cc // Author : Eugeny Nikolaev // Module : VISU -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_Prs3dUtils.hh" #include "VISU_Result_i.hh" #include "VISU_ScalarMapAct.h" -#include "VISU_ScalarMapOnDeformedShapePL.hxx" +#include "VISU_DeformedShapeAndScalarMapPL.hxx" #include "VISU_Convertor.hxx" #include "SUIT_ResourceMgr.h" @@ -50,7 +50,7 @@ static int INCMEMORY = 4+12; //--------------------------------------------------------------- size_t -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::IsPossible(Result_i* theResult, const std::string& theMeshName, VISU::Entity theEntity, @@ -87,7 +87,7 @@ VISU::ScalarMapOnDeformedShape_i aSize *= INCMEMORY; aResult = VISU_PipeLine::CheckAvailableMemory(aSize); if(MYDEBUG) - MESSAGE("ScalarMapOnDeformedShape_i::IsPossible - CheckAvailableMemory = "<(theOrigin)){ - ScalarMapOnDeformedShape_i* anOrigin = const_cast(aPrs3d); + if(const DeformedShapeAndScalarMap_i* aPrs3d = dynamic_cast(theOrigin)){ + DeformedShapeAndScalarMap_i* anOrigin = const_cast(aPrs3d); CORBA::String_var aFieldName = anOrigin->GetScalarFieldName(); SetScalarField(anOrigin->GetScalarEntity(), @@ -228,44 +228,44 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- void -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::SetScale(CORBA::Double theScale) { VISU::TSetModified aModified(this); - ProcessVoidEvent(new TVoidMemFun1ArgEvent - (GetSpecificPL(), &VISU_ScalarMapOnDeformedShapePL::SetScale, theScale)); + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (GetSpecificPL(), &VISU_DeformedShapeAndScalarMapPL::SetScale, theScale)); } //--------------------------------------------------------------- CORBA::Double -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::GetScale() { - return myScalarMapOnDeformedShapePL->GetScale(); + return myDeformedShapeAndScalarMapPL->GetScale(); } //--------------------------------------------------------------- void -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::CreatePipeLine(VISU_PipeLine* thePipeLine) { if(!thePipeLine){ - myScalarMapOnDeformedShapePL = VISU_ScalarMapOnDeformedShapePL::New(); + myDeformedShapeAndScalarMapPL = VISU_DeformedShapeAndScalarMapPL::New(); }else - myScalarMapOnDeformedShapePL = dynamic_cast(thePipeLine); + myDeformedShapeAndScalarMapPL = dynamic_cast(thePipeLine); - myScalarMapOnDeformedShapePL->GetMapper()->SetScalarVisibility(1); + myDeformedShapeAndScalarMapPL->GetMapper()->SetScalarVisibility(1); - TSuperClass::CreatePipeLine(myScalarMapOnDeformedShapePL); + TSuperClass::CreatePipeLine(myDeformedShapeAndScalarMapPL); } //--------------------------------------------------------------- bool -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::CheckIsPossible() { return IsPossible(GetCResult(),GetCMeshName(),GetEntity(),GetCFieldName(),GetTimeStampNumber(),true); @@ -274,7 +274,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- VISU_Actor* -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::CreateActor() { VISU_Actor* anActor = TSuperClass::CreateActor(true); @@ -291,7 +291,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- void -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::UpdateActor(VISU_Actor* theActor) { if(VISU_ScalarMapAct* anActor = dynamic_cast(theActor)){ @@ -304,7 +304,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- void -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::SetField(VISU::PField theField) { TSuperClass::SetField(theField); @@ -316,7 +316,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- void -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::SetScalarField(VISU::Entity theEntity, const char* theFieldName, CORBA::Long theTimeStampNumber) @@ -351,9 +351,9 @@ VISU::ScalarMapOnDeformedShape_i theTimeStampNumber); vtkUnstructuredGrid* anOutput = anIDMapper->GetUnstructuredGridOutput(); - if(myScalarMapOnDeformedShapePL && anOutput) - ProcessVoidEvent(new TVoidMemFun1ArgEvent - (GetSpecificPL(), &VISU_ScalarMapOnDeformedShapePL::SetScalars, anOutput)); + if(myDeformedShapeAndScalarMapPL && anOutput) + ProcessVoidEvent(new TVoidMemFun1ArgEvent + (GetSpecificPL(), &VISU_DeformedShapeAndScalarMapPL::SetScalars, anOutput)); myScalarEntity = theEntity; myScalarFieldName = theFieldName; @@ -370,7 +370,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- VISU::Entity -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::GetScalarEntity() { return myScalarEntity; @@ -379,7 +379,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- char* -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::GetScalarFieldName() { return CORBA::string_dup(myScalarFieldName.c_str()); @@ -388,7 +388,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- CORBA::Long -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::GetScalarTimeStampNumber() { return myScalarTimeStampNumber; @@ -397,7 +397,7 @@ VISU::ScalarMapOnDeformedShape_i //--------------------------------------------------------------- VISU::PField -VISU::ScalarMapOnDeformedShape_i +VISU::DeformedShapeAndScalarMap_i ::GetScalarField() { return myScalarField; diff --git a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh similarity index 82% rename from src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh rename to src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh index 83f2e64d..35827d1d 100644 --- a/src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh +++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh @@ -20,43 +20,43 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // -// File: VISU_ScalarMapOnDeformedShape_i.hh +// File: VISU_DeformedShapeAndScalarMap_i.hh // Author: Eugeny Nikolaev // Module : VISU -#ifndef VISU_ScalarMapOnDeformedShape_i_HeaderFile -#define VISU_ScalarMapOnDeformedShape_i_HeaderFile +#ifndef VISU_DeformedShapeAndScalarMap_i_HeaderFile +#define VISU_DeformedShapeAndScalarMap_i_HeaderFile #include "VISU_ScalarMap_i.hh" -class VISU_ScalarMapOnDeformedShapePL; +class VISU_DeformedShapeAndScalarMapPL; namespace VISU { //---------------------------------------------------------------------------- //! Class of Scalar Map on Deformed Shape presentation. - class VISU_I_EXPORT ScalarMapOnDeformedShape_i : public virtual POA_VISU::ScalarMapOnDeformedShape, - public virtual ScalarMap_i + class VISU_I_EXPORT DeformedShapeAndScalarMap_i : public virtual POA_VISU::DeformedShapeAndScalarMap, + public virtual ScalarMap_i { static int myNbPresent; - ScalarMapOnDeformedShape_i(const ScalarMapOnDeformedShape_i&); + DeformedShapeAndScalarMap_i(const DeformedShapeAndScalarMap_i&); public: //---------------------------------------------------------------------------- typedef ScalarMap_i TSuperClass; - typedef VISU::ScalarMapOnDeformedShape TInterface; + typedef VISU::DeformedShapeAndScalarMap TInterface; explicit - ScalarMapOnDeformedShape_i(EPublishInStudyMode thePublishInStudyModep); + DeformedShapeAndScalarMap_i(EPublishInStudyMode thePublishInStudyModep); virtual - ~ScalarMapOnDeformedShape_i(); + ~DeformedShapeAndScalarMap_i(); virtual VISU::VISUType GetType() { - return VISU::TSCALARMAPONDEFORMEDSHAPE; + return VISU::TDEFORMEDSHAPEANDSCALARMAP; } virtual @@ -71,10 +71,10 @@ namespace VISU void SameAs(const Prs3d_i* theOrigin); - VISU_ScalarMapOnDeformedShapePL* + VISU_DeformedShapeAndScalarMapPL* GetSpecificPL() { - return myScalarMapOnDeformedShapePL; + return myDeformedShapeAndScalarMapPL; } protected: @@ -168,7 +168,7 @@ namespace VISU GetScalarField(); private: - VISU_ScalarMapOnDeformedShapePL *myScalarMapOnDeformedShapePL; + VISU_DeformedShapeAndScalarMapPL *myDeformedShapeAndScalarMapPL; PField myScalarField; VISU::Entity myScalarEntity; diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc index ce767a35..84b03f05 100644 --- a/src/VISU_I/VISU_DumpPython.cc +++ b/src/VISU_I/VISU_DumpPython.cc @@ -41,7 +41,7 @@ #include "VISU_Table_i.hh" #include "VISU_PointMap3d_i.hh" #include "VISU_GaussPoints_i.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_ColoredPrs3dCache_i.hh" #include "VISU_ColoredPrs3dHolder_i.hh" @@ -507,12 +507,12 @@ namespace VISU //--------------------------------------------------------------------------- std::string - ScalarMapOnDeformedShapeToPython(SALOMEDS::SObject_ptr theSObject, - VISU::ScalarMapOnDeformedShape_i* theServant, - std::ostream& theStr, - const std::string& theName, - TColoredPrs3dFactory& thePrsFactory, - std::string thePrefix) + DeformedShapeAndScalarMapToPython(SALOMEDS::SObject_ptr theSObject, + VISU::DeformedShapeAndScalarMap_i* theServant, + std::ostream& theStr, + const std::string& theName, + TColoredPrs3dFactory& thePrsFactory, + std::string thePrefix) { thePrefix = ScalarMapToPython(theSObject, theServant, theStr, theName, thePrsFactory, thePrefix); theStr<(GetServant(anObj).in())){ - TCreateFromResult aPrsFactory(theSObject, aServant, aName, "ScalarMapOnDeformedShapeOnField", theArgumentName); - thePrefix = ScalarMapOnDeformedShapeToPython(theSObject, aServant, theStr, aName, aPrsFactory, thePrefix); + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + if(DeformedShapeAndScalarMap_i* aServant = dynamic_cast(GetServant(anObj).in())){ + TCreateFromResult aPrsFactory(theSObject, aServant, aName, "DeformedShapeAndScalarMapOnField", theArgumentName); + thePrefix = DeformedShapeAndScalarMapToPython(theSObject, aServant, theStr, aName, aPrsFactory, thePrefix); theStr<(aDevice)){ - ScalarMapOnDeformedShapeToPython(aSObject, aServant, theStr, "aDevice", aPrsFactory, aPrefix3); + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + if(DeformedShapeAndScalarMap_i* aServant = dynamic_cast(aDevice)){ + DeformedShapeAndScalarMapToPython(aSObject, aServant, theStr, "aDevice", aPrsFactory, aPrefix3); break; } case VISU::TVECTORS: diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc index c9b85b1b..ec0c6d66 100644 --- a/src/VISU_I/VISU_Gen_i.cc +++ b/src/VISU_I/VISU_Gen_i.cc @@ -210,7 +210,7 @@ namespace VISU Storable::RegistryStorableEngine(StreamLines_i::myComment.c_str(),&(StorableEngine)); Storable::RegistryStorableEngine(Plot3D_i::myComment.c_str(),&(StorableEngine)); Storable::RegistryStorableEngine(Vectors_i::myComment.c_str(),&(StorableEngine)); - Storable::RegistryStorableEngine(ScalarMapOnDeformedShape_i::myComment.c_str(),&(StorableEngine)); + Storable::RegistryStorableEngine(DeformedShapeAndScalarMap_i::myComment.c_str(),&(StorableEngine)); Storable::RegistryStorableEngine(ColoredPrs3dHolder_i::myComment.c_str(),&(ColoredPrs3dHolder_i::StorableEngine)); Storable::RegistryStorableEngine(ColoredPrs3dCache_i::myComment.c_str(),&(ColoredPrs3dCache_i::StorableEngine)); @@ -967,7 +967,7 @@ namespace VISU //--------------------------------------------------------------- - ScalarMapOnDeformedShape_ptr + DeformedShapeAndScalarMap_ptr VISU_Gen_i ::ScalarMapOnDeformedShapeOnField(Result_ptr theResult, const char* theMeshName, @@ -975,11 +975,28 @@ namespace VISU const char* theFieldName, CORBA::Long theIteration) { - return Prs3dOnField(theResult, - theMeshName, - theEntity, - theFieldName, - theIteration)._retn(); + return DeformedShapeAndScalarMapOnField(theResult, + theMeshName, + theEntity, + theFieldName, + theIteration); + } + + +//--------------------------------------------------------------- + DeformedShapeAndScalarMap_ptr + VISU_Gen_i + ::DeformedShapeAndScalarMapOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Long theIteration) + { + return Prs3dOnField(theResult, + theMeshName, + theEntity, + theFieldName, + theIteration)._retn(); } diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh index 1f38e06e..1043ed2a 100644 --- a/src/VISU_I/VISU_Gen_i.hh +++ b/src/VISU_I/VISU_Gen_i.hh @@ -177,13 +177,23 @@ namespace VISU const char* theFieldName, CORBA::Long theIteration); + //This function is obsolete. Use DeformedShapeAndScalarMapOnField instead. virtual - ScalarMapOnDeformedShape_ptr + DeformedShapeAndScalarMap_ptr ScalarMapOnDeformedShapeOnField(Result_ptr theResult, const char* theMeshName, VISU::Entity theEntity, const char* theFieldName, CORBA::Long theIteration); + + virtual + DeformedShapeAndScalarMap_ptr + DeformedShapeAndScalarMapOnField(Result_ptr theResult, + const char* theMeshName, + VISU::Entity theEntity, + const char* theFieldName, + CORBA::Long theIteration); + virtual Vectors_ptr VectorsOnField(Result_ptr theResult, diff --git a/src/VISU_I/VISU_I.cxx b/src/VISU_I/VISU_I.cxx index 6c8c3973..27114c9f 100644 --- a/src/VISU_I/VISU_I.cxx +++ b/src/VISU_I/VISU_I.cxx @@ -43,7 +43,7 @@ #include "VISU_Vectors_i.hh" #include "VISU_StreamLines_i.hh" #include "VISU_GaussPoints_i.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_ViewManager_i.hh" #include "VISU_View_i.hh" #include "VISU_TimeAnimation.h" diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx index b73b1683..c843845b 100644 --- a/src/VISU_I/VISU_TimeAnimation.cxx +++ b/src/VISU_I/VISU_TimeAnimation.cxx @@ -36,7 +36,7 @@ #include "VISU_Mesh_i.hh" #include "VISU_IsoSurfaces_i.hh" #include "VISU_DeformedShape_i.hh" -#include "VISU_ScalarMapOnDeformedShape_i.hh" +#include "VISU_DeformedShapeAndScalarMap_i.hh" #include "VISU_CutPlanes_i.hh" #include "VISU_Plot3D_i.hh" #include "VISU_CutLines_i.hh" @@ -595,13 +595,14 @@ void VISU_TimeAnimation::generatePresentations(CORBA::Long theFieldNum) { aSequence); break; case VISU::TSCALARMAPONDEFORMEDSHAPE: // Scalar map on deformed shape - GeneratePresentations(myStudy, - aData, - aResult, - isRangeDefined(), - myTimeMinVal, - myTimeMaxVal, - aSequence); + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + GeneratePresentations(myStudy, + aData, + aResult, + isRangeDefined(), + myTimeMinVal, + myTimeMaxVal, + aSequence); break; default: MESSAGE("Not implemented for this presentation type: " << aData.myPrsType); @@ -1668,7 +1669,8 @@ std::string GetPresentationComment (VISU::VISUType thePrsType) aPrsCmt = VISU::GaussPoints_i::myComment; break; case VISU::TSCALARMAPONDEFORMEDSHAPE: - aPrsCmt = VISU::ScalarMapOnDeformedShape_i::myComment; + case VISU::TDEFORMEDSHAPEANDSCALARMAP: + aPrsCmt = VISU::DeformedShapeAndScalarMap_i::myComment; break; default: aPrsCmt = "Unknown presentation"; @@ -1872,8 +1874,8 @@ void VISU_TimeAnimation::restoreFromStudy(_PTR(SObject) theField) aData.myPrsType = VISU::TSTREAMLINES; else if (strName == VISU::GaussPoints_i::myComment.c_str()) aData.myPrsType = VISU::TGAUSSPOINTS; - else if (strName == VISU::ScalarMapOnDeformedShape_i::myComment.c_str()) - aData.myPrsType = VISU::TSCALARMAPONDEFORMEDSHAPE; + else if (strName == VISU::DeformedShapeAndScalarMap_i::myComment.c_str()) + aData.myPrsType = VISU::TDEFORMEDSHAPEANDSCALARMAP; else continue; generatePresentations(getNbFields()-1); diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc index 065953e8..e39769dd 100644 --- a/src/VISU_I/VISU_View_i.cc +++ b/src/VISU_I/VISU_View_i.cc @@ -2378,7 +2378,8 @@ namespace VISU { VISU::VISUType aType = myPrs->GetType(); if (aType != VISU::TSCALARMAP && aType != VISU::TDEFORMEDSHAPE && - aType != VISU::TSCALARMAPONDEFORMEDSHAPE) { + aType != VISU::TSCALARMAPONDEFORMEDSHAPE && + aType != VISU::TDEFORMEDSHAPEANDSCALARMAP) { myResult = "Insideframe representation is not available for this type of presentations."; return; } diff --git a/src/VISU_SWIG/VISU_Example_01.py b/src/VISU_SWIG/VISU_Example_01.py index 159ebdf4..a9e97fc3 100644 --- a/src/VISU_SWIG/VISU_Example_01.py +++ b/src/VISU_SWIG/VISU_Example_01.py @@ -100,7 +100,7 @@ cutplanes.SetOrientation(VISU.CutPlanes.YZ, 0, 0) myView.DisplayOnly(cutplanes) print "Creating Scalar Map On Deformed Shape.......", -scalarmapondefshape = myVisu.ScalarMapOnDeformedShapeOnField(myResult,myMeshName,myNodeEntity,'vitesse',1); +scalarmapondefshape = myVisu.DeformedShapeAndScalarMapOnField(myResult,myMeshName,myNodeEntity,'vitesse',1); if scalarmapondefshape is None : print "Error" else : print "OK" scalarmapondefshape.SetScalarField(myCellEntity,'pression',2); @@ -158,7 +158,7 @@ cutplanes1.SetOrientation(VISU.CutPlanes.YZ, 0, 0) myView1.DisplayOnly(cutplanes1) print "Creating Scalar Map On Deformed Shape.......", -scalarmapondefshape1 = myVisu.ScalarMapOnDeformedShapeOnField(myResult1,myMeshName1,myCellEntity,'vectoriel field',1); +scalarmapondefshape1 = myVisu.DeformedShapeAndScalarMapOnField(myResult1,myMeshName1,myCellEntity,'vectoriel field',1); if scalarmapondefshape1 is None : print "Error" else : print "OK" myView1.DisplayOnly(scalarmapondefshape1) diff --git a/src/VISU_SWIG/VISU_Example_07.py b/src/VISU_SWIG/VISU_Example_07.py index c676ddf5..600f3225 100644 --- a/src/VISU_SWIG/VISU_Example_07.py +++ b/src/VISU_SWIG/VISU_Example_07.py @@ -144,7 +144,7 @@ scmap = myVisu.CutPlanesOnField(myResult,myMeshName,VISU.NODE,myFieldName,1); ChangeRepresentation(scmap, VISU.SHADED, 1, 1, 0.5, 3) print "Creating Scalar Map On Deformed Shape.......", -scmap = myVisu.ScalarMapOnDeformedShapeOnField(myResult,myMeshName,VISU.NODE,myFieldName,1); +scmap = myVisu.DeformedShapeAndScalarMapOnField(myResult,myMeshName,VISU.NODE,myFieldName,1); ChangeRepresentation(scmap, VISU.SHADED, 1, 1, 0.5, 3) print "Creating Deformed Shape.......", diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py index abc7e831..f9df3325 100644 --- a/src/VISU_SWIG/visu.py +++ b/src/VISU_SWIG/visu.py @@ -628,15 +628,15 @@ def CreatePrsForResult(theVisu, theResult, theView, thePrsTypeList, thePictureDi else : aVISUObjList.append(aPrsObj) - if HasValue(thePrsTypeList,VISU.TSCALARMAPONDEFORMEDSHAPE) : - print " Creating ScalarMapOnDeformedShapeOnField", - aPrsObj = theVisu.ScalarMapOnDeformedShapeOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) + if HasValue(thePrsTypeList,VISU.TSCALARMAPONDEFORMEDSHAPE) or HasValue(thePrsTypeList,VISU.TDEFORMEDSHAPEANDSCALARMAP) : + print " Creating DeformedShapeAndScalarMapOnField", + aPrsObj = theVisu.DeformedShapeAndScalarMapOnField(theResult,aMeshName,anEntity,aFieldName,aTimeStampId) if aPrsObj is None : print "Error" else : print ",OK" theView.DisplayOnly(aPrsObj) theView.FitAll() - aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TSCALARMAPONDEFORMEDSHAPE." + thePictureExt + aPictureName = thePictureDir + aMeshNamePic + "_" + anEntityId + "_" + aFieldName + "_" + str(aTimeStampId) + "_TDEFORMEDSHAPEANDSCALARMAP." + 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 bdd01bde..d30ad9d5 100644 --- a/src/VISU_SWIG/visu_cache.py +++ b/src/VISU_SWIG/visu_cache.py @@ -56,6 +56,7 @@ PRS3D_TYPE_LIST.append(VISU.TDEFORMEDSHAPE) PRS3D_TYPE_LIST.append(VISU.TVECTORS) PRS3D_TYPE_LIST.append(VISU.TSTREAMLINES) PRS3D_TYPE_LIST.append(VISU.TSCALARMAPONDEFORMEDSHAPE) +PRS3D_TYPE_LIST.append(VISU.TDEFORMEDSHAPEANDSCALARMAP) #--------------------------------------------------------------- @@ -83,4 +84,4 @@ anInput.myEntity = VISU.CELL; anInput.myFieldName = "pression"; WalkTroughTimeStamps(VISU.TGAUSSPOINTS, anInput, aViewManager) -#execfile('/data/apo/a.py') \ No newline at end of file +#execfile('/data/apo/a.py') -- 2.39.2