From bac7d21d987a33a04a24a5e9cc30f9b74062713e Mon Sep 17 00:00:00 2001 From: enk Date: Thu, 30 Nov 2006 09:04:41 +0000 Subject: [PATCH] merging from ScalarMap_ON_GROUP_3_2_0 to V3_2_0_maintainance --- .../VISU/files/scalar_map_presentation.htm | 191 +++--- .../gui/VISU/pics/scalarbarproperties.png | Bin 22868 -> 30988 bytes idl/VISU_Gen.idl | 63 ++ resources/Visu_add.png | Bin 0 -> 389 bytes .../{Visu_cutplane.png => Visu_cutplanes.png} | Bin resources/Visu_remove.png | Bin 0 -> 383 bytes resources/Visu_tree_container.png | Bin 0 -> 425 bytes resources/Visu_tree_curve.png | Bin 0 -> 363 bytes resources/Visu_tree_cutlines.png | Bin 0 -> 773 bytes resources/Visu_tree_cutlines_gr.png | Bin 0 -> 868 bytes resources/Visu_tree_cutplanes.png | Bin 0 -> 1168 bytes resources/Visu_tree_cutplanes_gr.png | Bin 0 -> 960 bytes resources/Visu_tree_deformed.png | Bin 0 -> 1057 bytes resources/Visu_tree_deformed_gr.png | Bin 0 -> 924 bytes resources/Visu_tree_gauss_points.png | Bin 0 -> 460 bytes resources/Visu_tree_isosurfaces.png | Bin 0 -> 1033 bytes resources/Visu_tree_isosurfaces_gr.png | Bin 0 -> 864 bytes resources/Visu_tree_mesh.png | Bin 0 -> 413 bytes resources/Visu_tree_plot3d.png | Bin 0 -> 1205 bytes resources/Visu_tree_plot3d_gr.png | Bin 0 -> 918 bytes resources/Visu_tree_result.png | Bin 0 -> 421 bytes .../Visu_tree_scalarmapondeformedshape.png | Bin 0 -> 1140 bytes .../Visu_tree_scalarmapondeformedshape_gr.png | Bin 0 -> 965 bytes resources/Visu_tree_scalars.png | Bin 0 -> 1118 bytes resources/Visu_tree_scalars_gr.png | Bin 0 -> 928 bytes resources/Visu_tree_streamlines.png | Bin 0 -> 908 bytes resources/Visu_tree_streamlines_gr.png | Bin 0 -> 898 bytes resources/Visu_tree_table.png | Bin 0 -> 306 bytes resources/Visu_tree_vectors.png | Bin 0 -> 1199 bytes resources/Visu_tree_vectors_gr.png | Bin 0 -> 952 bytes src/CONVERTOR/VISU_Convertor_impl.hxx | 1 + src/ENGINE/VISU_Engine_i.cc | 1 - src/ENGINE/VISU_Engine_i.hh | 1 + src/PIPELINE/Makefile.in | 6 +- src/PIPELINE/VISU_CutLinesPL.cxx | 2 +- src/PIPELINE/VISU_CutPlanesPL.cxx | 6 +- src/PIPELINE/VISU_CutPlanesPL.hxx | 6 +- src/PIPELINE/VISU_DeformedShapePL.cxx | 9 +- src/PIPELINE/VISU_DeformedShapePL.hxx | 8 +- src/PIPELINE/VISU_Extractor.cxx | 2 +- src/PIPELINE/VISU_IsoSurfacesPL.cxx | 10 +- src/PIPELINE/VISU_IsoSurfacesPL.hxx | 8 +- src/PIPELINE/VISU_Plot3DPL.cxx | 8 +- src/PIPELINE/VISU_Plot3DPL.hxx | 7 +- src/PIPELINE/VISU_PrsMergerPL.cxx | 401 +++++++++++++ src/PIPELINE/VISU_PrsMergerPL.hxx | 188 ++++++ .../VISU_ScalarMapOnDeformedShapePL.cxx | 8 +- .../VISU_ScalarMapOnDeformedShapePL.hxx | 8 +- src/PIPELINE/VISU_StreamLinesPL.cxx | 4 +- src/VISUGUI/VISU_images.po | 82 ++- src/VISUGUI/VISU_msg_en.po | 6 + src/VISUGUI/VisuGUI.cxx | 28 +- src/VISUGUI/VisuGUI_PopupTools.cxx | 2 +- src/VISUGUI/VisuGUI_ScalarBarDlg.cxx | 211 ++++++- src/VISUGUI/VisuGUI_ScalarBarDlg.h | 44 +- src/VISUGUI/VisuGUI_TimeAnimation.cxx | 6 +- src/VISUGUI/VisuGUI_Tools.cxx | 5 +- src/VISU_I/Makefile.in | 6 +- src/VISU_I/VISU_ColoredPrs3d_i.cc | 13 + src/VISU_I/VISU_ColoredPrs3d_i.hh | 4 + src/VISU_I/VISU_CorbaMedConvertor.cxx | 4 +- src/VISU_I/VISU_CutLines_i.cc | 20 +- src/VISU_I/VISU_CutLines_i.hh | 8 +- src/VISU_I/VISU_CutPlanes_i.cc | 22 +- src/VISU_I/VISU_CutPlanes_i.hh | 8 +- src/VISU_I/VISU_DeformedShape_i.cc | 25 +- src/VISU_I/VISU_DeformedShape_i.hh | 8 +- src/VISU_I/VISU_DumpPython.cc | 29 +- src/VISU_I/VISU_GaussPoints_i.hh | 4 + src/VISU_I/VISU_Gen_i.cc | 8 +- src/VISU_I/VISU_IsoSurfaces_i.cc | 21 +- src/VISU_I/VISU_IsoSurfaces_i.hh | 8 +- src/VISU_I/VISU_Mesh_i.cc | 13 + src/VISU_I/VISU_Plot3D_i.cc | 22 +- src/VISU_I/VISU_Plot3D_i.hh | 8 +- src/VISU_I/VISU_PrsMerger_i.cc | 542 ++++++++++++++++++ src/VISU_I/VISU_PrsMerger_i.hh | 212 +++++++ src/VISU_I/VISU_Result_i.cc | 13 +- src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc | 27 +- src/VISU_I/VISU_ScalarMapOnDeformedShape_i.hh | 13 +- src/VISU_I/VISU_StreamLines_i.cc | 13 +- src/VISU_I/VISU_StreamLines_i.hh | 3 + src/VISU_I/VISU_Table_i.cc | 30 +- src/VISU_I/VISU_TimeAnimation.cxx | 18 +- src/VISU_I/VISU_Vectors_i.cc | 13 + src/VISU_I/VISU_Vectors_i.hh | 3 + src/VISU_SWIG/visu.py | 112 +++- 87 files changed, 2322 insertions(+), 230 deletions(-) create mode 100644 resources/Visu_add.png rename resources/{Visu_cutplane.png => Visu_cutplanes.png} (100%) create mode 100644 resources/Visu_remove.png create mode 100644 resources/Visu_tree_container.png create mode 100644 resources/Visu_tree_curve.png create mode 100755 resources/Visu_tree_cutlines.png create mode 100644 resources/Visu_tree_cutlines_gr.png create mode 100755 resources/Visu_tree_cutplanes.png create mode 100644 resources/Visu_tree_cutplanes_gr.png create mode 100755 resources/Visu_tree_deformed.png create mode 100644 resources/Visu_tree_deformed_gr.png create mode 100644 resources/Visu_tree_gauss_points.png create mode 100755 resources/Visu_tree_isosurfaces.png create mode 100644 resources/Visu_tree_isosurfaces_gr.png create mode 100644 resources/Visu_tree_mesh.png create mode 100755 resources/Visu_tree_plot3d.png create mode 100644 resources/Visu_tree_plot3d_gr.png create mode 100644 resources/Visu_tree_result.png create mode 100755 resources/Visu_tree_scalarmapondeformedshape.png create mode 100644 resources/Visu_tree_scalarmapondeformedshape_gr.png create mode 100755 resources/Visu_tree_scalars.png create mode 100644 resources/Visu_tree_scalars_gr.png create mode 100755 resources/Visu_tree_streamlines.png create mode 100644 resources/Visu_tree_streamlines_gr.png create mode 100644 resources/Visu_tree_table.png create mode 100755 resources/Visu_tree_vectors.png create mode 100644 resources/Visu_tree_vectors_gr.png create mode 100644 src/PIPELINE/VISU_PrsMergerPL.cxx create mode 100644 src/PIPELINE/VISU_PrsMergerPL.hxx create mode 100644 src/VISU_I/VISU_PrsMerger_i.cc create mode 100644 src/VISU_I/VISU_PrsMerger_i.hh diff --git a/doc/salome/gui/VISU/files/scalar_map_presentation.htm b/doc/salome/gui/VISU/files/scalar_map_presentation.htm index 49ea4f57..aeac6a34 100755 --- a/doc/salome/gui/VISU/files/scalar_map_presentation.htm +++ b/doc/salome/gui/VISU/files/scalar_map_presentation.htm @@ -18,25 +18,28 @@ h1.whs1 { margin-top:0px; margin-bottom:0px; } p.whs2 { margin-top:0px; margin-bottom:0px; } img_whs3 { border:none; float:none; width:30px; height:30px; border-style:none; } p.whs4 { margin-left:40px; margin-top:0px; margin-bottom:0px; } -p.whs5 { font-style:italic; color:#ff0000; margin-left:40px; margin-top:0px; margin-bottom:0px; } -img_whs6 { border:none; width:31px; height:27px; float:none; border-style:none; } -p.whs7 { margin-left:0px; margin-top:0px; margin-bottom:0px; } -p.whs8 { margin-left:0px; background-image:url('../texture_horiz_ltbluebubbles.jpg'); margin-top:0px; margin-bottom:0px; } -img_whs9 { border:none; float:none; width:36px; height:38px; border-style:none; } -img_whs10 { border:none; width:336px; height:501px; float:none; border-style:none; } -ul.whs11 { list-style:disc; } -p.whs12 { margin-left:36px; margin-top:0px; margin-bottom:0px; } -p.whs13 { font-weight:bold; margin-left:24px; margin-top:0px; margin-bottom:0px; } -p.whs14 { margin-left:40px; font-weight:bold; margin-top:0px; margin-bottom:0px; } -p.whs15 { margin-left:24px; margin-top:0px; margin-bottom:0px; } -p.whs16 { font-weight:bold; margin-left:36px; margin-top:0px; margin-bottom:0px; } -p.whs17 { margin-left:60px; margin-top:0px; margin-bottom:0px; } -p.whs18 { margin-left:36px; font-weight:bold; margin-top:0px; margin-bottom:0px; } -p.whs19 { margin-left:120px; margin-top:0px; margin-bottom:0px; } -img_whs20 { border:none; width:308px; height:241px; float:none; border-style:none; } -p.whs21 { margin-left:72px; margin-top:0px; margin-bottom:0px; } -p.whs22 { margin-left:48px; margin-top:0px; margin-bottom:0px; } -img_whs23 { border:none; width:433px; height:303px; float:none; border-style:none; } +p.whs5 { margin-top:0px; margin-bottom:0px; margin-left:72px; } +p.whs6 { font-style:italic; color:#ff0000; margin-left:40px; margin-top:0px; margin-bottom:0px; } +img_whs7 { border:none; width:31px; height:27px; float:none; border-style:none; } +p.whs8 { margin-left:0px; margin-top:0px; margin-bottom:0px; } +p.whs9 { margin-left:0px; background-image:url('../texture_horiz_ltbluebubbles.jpg'); margin-top:0px; margin-bottom:0px; } +img_whs10 { border:none; float:none; width:36px; height:38px; border-style:none; } +img_whs11 { border:none; width:374px; height:643px; float:none; border-style:none; } +ul.whs12 { list-style:disc; } +p.whs13 { margin-left:36px; margin-top:0px; margin-bottom:0px; } +p.whs14 { margin-left:36px; margin-top:0px; margin-bottom:0px; font-weight:bold; } +p.whs15 { font-weight:bold; margin-left:24px; margin-top:0px; margin-bottom:0px; } +p.whs16 { margin-left:40px; font-weight:bold; margin-top:0px; margin-bottom:0px; } +p.whs17 { margin-left:24px; margin-top:0px; margin-bottom:0px; } +p.whs18 { font-weight:bold; margin-left:36px; margin-top:0px; margin-bottom:0px; } +p.whs19 { margin-left:60px; margin-top:0px; margin-bottom:0px; } +p.whs20 { margin-top:0px; margin-bottom:0px; margin-left:36px; } +p.whs21 { margin-left:36px; font-weight:bold; margin-top:0px; margin-bottom:0px; } +p.whs22 { margin-left:120px; margin-top:0px; margin-bottom:0px; } +img_whs23 { border:none; width:308px; height:241px; float:none; border-style:none; } +p.whs24 { margin-left:72px; margin-top:0px; margin-bottom:0px; } +p.whs25 { margin-left:48px; margin-top:0px; margin-bottom:0px; } +img_whs26 { border:none; width:433px; height:303px; float:none; border-style:none; } -->