From 511c8e26a138eae5edbb14352a10a754a00a6eed Mon Sep 17 00:00:00 2001 From: asv Date: Fri, 17 Feb 2006 07:36:47 +0000 Subject: [PATCH] Merge with OCC_development..a2 branch --- INSTALL | 8 +- adm_local/unix/make_commence.in | 1 + bin/VERSION | 2 +- doc/salome/VISU_index_v3.1.0.html | 19 +- doc/salome/gui/Makefile.in | 4 + doc/salome/gui/VISU/cshdat_robohelp.htm | 2 +- doc/salome/gui/VISU/cshdat_webhelp.htm | 2 +- .../gui/VISU/files/cut_lines_presentation.htm | 109 ++--- .../gui/VISU/files/cut_lines_resentation.htm | 79 ++-- .../files/deformed_shape_presentation.htm | 65 +-- doc/salome/gui/VISU/files/getting_started.htm | 12 +- .../gui/VISU/files/importing_med_objects.htm | 2 + .../VISU/files/iso_surfaces_presentation.htm | 36 +- .../VISU/files/scalar_map_presentation.htm | 127 ++--- .../files/setting_properties_of_xy_plots.htm | 18 +- .../VISU/files/stream_lines_presentation.htm | 153 +++--- .../gui/VISU/files/vectors_presentation.htm | 48 +- doc/salome/gui/VISU/pics/viewsettings.png | Bin 22166 -> 23377 bytes doc/salome/gui/VISU/visu.htm | 2 +- doc/salome/gui/VISU/visu.log | 13 +- doc/salome/gui/VISU/visu_csh.htm | 2 +- doc/salome/gui/VISU/visu_rhc.htm | 2 +- doc/salome/gui/VISU/whcshdata.htm | 2 +- doc/salome/gui/VISU/whdata/whfwdata0.htm | 37 +- doc/salome/gui/VISU/whgdata/whlstf0.htm | 4 +- doc/salome/gui/VISU/whgdata/whlstf1.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstf2.htm | 8 +- doc/salome/gui/VISU/whgdata/whlstf3.htm | 8 +- doc/salome/gui/VISU/whgdata/whlstf4.htm | 6 +- doc/salome/gui/VISU/whgdata/whlstf5.htm | 6 +- doc/salome/gui/VISU/whgdata/whlstf6.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl0.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl1.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl10.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl11.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl12.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl13.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl14.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl15.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl16.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl17.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl18.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl19.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl2.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl20.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl21.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl22.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl3.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl4.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl5.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl6.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl7.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl8.htm | 2 +- doc/salome/gui/VISU/whgdata/whlstfl9.htm | 2 +- doc/salome/gui/VISU/whgdata/whnvl32.htm | 48 +- doc/salome/gui/VISU/whnjs.htm | 2 +- doc/salome/gui/VISU/whskin_homepage.htm | 2 +- doc/salome/gui/VISU/whskin_info.htm | 2 +- doc/salome/gui/VISU/whxdata/whfwdata0.xml | 37 +- doc/salome/tui/VISU/doxyfile | 97 ++-- doc/salome/tui/VISU/sources/static/tree.js | 2 +- resources/VISUCatalog.xml | 2 +- src/CONVERTOR/Makefile.in | 2 +- src/CONVERTOR/VISU_Convertor_impl.cxx | 51 +- src/CONVERTOR/VISU_Convertor_impl.hxx | 3 +- src/CONVERTOR/VISU_MedConvertor.cxx | 17 +- src/CONVERTOR/VISU_MedConvertor.hxx | 3 +- src/OBJECT/Makefile.in | 2 +- src/OBJECT/VISU_Actor.h | 2 +- src/OBJECT/VISU_ActorFactory.h | 2 +- src/OBJECT/VISU_GaussPtsAct.cxx | 17 +- src/PIPELINE/VISU_CutLinesPL.cxx | 5 +- src/PIPELINE/VISU_CutPlanesPL.cxx | 10 + src/VISUGUI/VISUM_msg_en.po | 8 +- src/VISUGUI/VISU_msg_en.po | 12 +- src/VISUGUI/VisuGUI.cxx | 321 ++++++------- src/VISUGUI/VisuGUI.h | 1 - src/VISUGUI/VisuGUI_ActionsDef.h | 10 +- src/VISUGUI/VisuGUI_BuildProgressDlg.cxx | 16 +- src/VISUGUI/VisuGUI_BuildProgressDlg.h | 1 + src/VISUGUI/VisuGUI_ClippingDlg.cxx | 15 +- src/VISUGUI/VisuGUI_CutLinesDlg.cxx | 31 +- src/VISUGUI/VisuGUI_CutPlanesDlg.cxx | 20 +- src/VISUGUI/VisuGUI_Displayer.cxx | 33 +- src/VISUGUI/VisuGUI_Module.cxx | 446 +++++++++--------- src/VISUGUI/VisuGUI_Module.h | 22 - src/VISUGUI/VisuGUI_Plot3DDlg.cxx | 6 +- src/VISUGUI/VisuGUI_PopupTools.cxx | 34 +- src/VISUGUI/VisuGUI_Prs3dTools.h | 109 +++-- src/VISUGUI/VisuGUI_ScalarBarDlg.cxx | 34 +- .../VisuGUI_ScalarMapOnDeformedShapeDlg.cxx | 43 +- src/VISUGUI/VisuGUI_Selection.cxx | 17 +- src/VISUGUI/VisuGUI_TimeAnimation.cxx | 52 +- src/VISUGUI/VisuGUI_Tools.cxx | 331 +++---------- src/VISUGUI/VisuGUI_Tools.h | 48 +- src/VISUGUI/VisuGUI_TransparencyDlg.cxx | 2 +- src/VISUGUI/VisuGUI_ViewTools.cxx | 30 +- src/VISUGUI/VisuGUI_ViewTools.h | 188 ++++---- src/VISU_I/Makefile.in | 2 +- src/VISU_I/VISUConfig.cc | 10 + src/VISU_I/VISUConfig.hh | 1 + src/VISU_I/VISU_Gen_i.cc | 91 ++-- src/VISU_I/VISU_Prs3d_i.cc | 4 +- src/VISU_I/VISU_Result_i.cc | 52 +- src/VISU_I/VISU_Result_i.hh | 7 +- src/VISU_I/VISU_ScalarMapOnDeformedShape_i.cc | 5 +- src/VISU_I/VISU_TimeAnimation.cxx | 123 ++++- src/VISU_I/VISU_ViewManager_i.cc | 30 +- src/VISU_I/VISU_ViewManager_i.hh | 9 +- src/VISU_I/VISU_View_i.cc | 26 +- src/VVTK/VVTK_MainWindow.cxx | 4 +- src/VVTK/VVTK_Renderer.cxx | 57 +-- src/VVTK/VVTK_ViewModel.cxx | 201 +------- src/VVTK/VVTK_ViewModel.h | 48 +- 114 files changed, 1694 insertions(+), 1939 deletions(-) diff --git a/INSTALL b/INSTALL index 151559b0..1e34a59b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,5 +1,5 @@ -This is the version 3.1.0 of VISU +This is the version 3.2.0a1 of VISU Compatible with : - - KERNEL 3.1.0 - - SALOMEGUI 3.1.0 - - MED 3.1.0 + - KERNEL 3.2.0a1 + - SALOMEGUI 3.2.0a1 + - MED 3.2.0a1 diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 574db11c..e38b5b7a 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -38,6 +38,7 @@ CXX_DEPEND_FLAG = @CXX_DEPEND_FLAG@ BOOST_CPPFLAGS = @BOOST_CPPFLAGS@ BOOST_LIBS = @BOOST_LIBS@ +BOOST_LIBTHREAD = @BOOST_LIBTHREAD@ # JAVA diff --git a/bin/VERSION b/bin/VERSION index 12ccd0e5..cadcd19d 100755 --- a/bin/VERSION +++ b/bin/VERSION @@ -1 +1 @@ -THIS IS SALOME - VISU VERSION: 3.1.0 +THIS IS SALOME - VISU VERSION: 3.2.0a1 diff --git a/doc/salome/VISU_index_v3.1.0.html b/doc/salome/VISU_index_v3.1.0.html index d123d0aa..dce35eb1 100644 --- a/doc/salome/VISU_index_v3.1.0.html +++ b/doc/salome/VISU_index_v3.1.0.html @@ -65,25 +65,16 @@
-
-
GUI Documentation
-
- -
+
+ +
Gauss Viewer User Guide
-

-
- -
+
TUI Documentation
- -
- -
- +


diff --git a/doc/salome/gui/Makefile.in b/doc/salome/gui/Makefile.in index e03160f1..805d892e 100644 --- a/doc/salome/gui/Makefile.in +++ b/doc/salome/gui/Makefile.in @@ -16,6 +16,7 @@ VPATH=.:@srcdir@ docs: cp -fr $(srcdir)/VISU ./ + cp -fr $(srcdir)/GAUSS ./ -find $(PWD) -name CVS -exec rm -rf {} \; clean: @@ -23,11 +24,14 @@ clean: distclean: clean rm -fr VISU + rm -fr GAUSS install: mkdir -p $(docdir)/gui cp -rf VISU $(docdir)/gui + cp -rf GAUSS $(docdir)/gui -find $(PWD) -name CVS -exec rm -rf {} \; uninstall: rm -rf $(docdir)/gui/VISU + rm -rf $(docdir)/gui/GAUSS diff --git a/doc/salome/gui/VISU/cshdat_robohelp.htm b/doc/salome/gui/VISU/cshdat_robohelp.htm index bb2335a8..c948d8d1 100755 --- a/doc/salome/gui/VISU/cshdat_robohelp.htm +++ b/doc/salome/gui/VISU/cshdat_robohelp.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/cshdat_webhelp.htm b/doc/salome/gui/VISU/cshdat_webhelp.htm index 42ec5d52..f8d93044 100755 --- a/doc/salome/gui/VISU/cshdat_webhelp.htm +++ b/doc/salome/gui/VISU/cshdat_webhelp.htm @@ -1,6 +1,6 @@ -VISU refrence manual +Post-Pro Reference Manual diff --git a/doc/salome/gui/VISU/files/cut_lines_presentation.htm b/doc/salome/gui/VISU/files/cut_lines_presentation.htm index 8f328e2f..f71a61ff 100755 --- a/doc/salome/gui/VISU/files/cut_lines_presentation.htm +++ b/doc/salome/gui/VISU/files/cut_lines_presentation.htm @@ -19,21 +19,20 @@ p.whs2 { font-family:'Times New Roman' , serif; font-size:12pt; } img_whs3 { border:none; width:30px; height:30px; float:none; border-style:none; } ol.whs4 { list-style:decimal; } p.whs5 { font-family:'Times New Roman' , serif; font-size:12pt; margin-left:40px; } -img_whs6 { border:none; width:340px; height:543px; border-style:none; float:left; } -p.whs7 { font-family:'Times New Roman' , serif; font-style:italic; color:#ff0000; margin-left:40px; } -p.whs8 { font-family:'Times New Roman' , serif; margin-left:40px; font-style:normal; color:#000000; } -img_whs9 { border:none; width:28px; height:26px; float:none; border-style:none; } +p.whs6 { font-family:'Times New Roman' , serif; font-style:italic; color:#ff0000; margin-left:40px; } +p.whs7 { font-family:'Times New Roman' , serif; margin-left:40px; font-style:normal; color:#000000; } +img_whs8 { border:none; width:28px; height:26px; float:none; border-style:none; } +img_whs9 { border:none; width:340px; height:543px; float:none; border-style:none; } p.whs10 { margin-left:40px; } ul.whs11 { list-style:disc; } -p.whs12 { margin-left:24px; } +p.whs12 { margin-left:36px; } p.whs13 { font-family:'Times New Roman' , serif; margin-left:0px; } p.whs14 { font-family:'Times New Roman' , serif; margin-left:0px; font-weight:normal; } -p.whs15 { font-family:'Times New Roman' , serif; margin-left:40px; } -p.whs16 { margin-left:0px; } -p.whs17 { margin-left:0px; font-family:'Times New Roman' , serif; } -img_whs18 { border:none; width:574px; height:411px; float:none; border-style:none; } -p.whs19 { margin-left:0px; font-family:'Times New Roman' , serif; background-image:url('../texture_horiz_ltbluebubbles.jpg'); } -img_whs20 { border:none; width:35px; height:37px; float:none; border-style:none; } +p.whs15 { margin-left:0px; } +p.whs16 { margin-left:0px; font-family:'Times New Roman' , serif; } +img_whs17 { border:none; width:574px; height:411px; float:none; border-style:none; } +p.whs18 { margin-left:0px; font-family:'Times New Roman' , serif; background-image:url('../texture_horiz_ltbluebubbles.jpg'); } +img_whs19 { border:none; width:35px; height:37px; float:none; border-style:none; } -->

Deformed Shape presentation

-

Deformed Shape is +

Deformed Shape is a type of field presentation when vector values corresponding to the cells of the mesh are visualized by shifting of these cells.

-

 

+

 

-

To create a Deformed Shape  presentation:

+

To create a Deformed Shape  presentation:

 

@@ -119,56 +120,62 @@ else

 

-