From: vsr <vsr@opencascade.com>
Date: Fri, 7 May 2010 15:00:33 +0000 (+0000)
Subject: Merge from V5_1_4_BR 07/05/2010
X-Git-Tag: V5_1_main_20100512
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7c81afd390ad3599287c084ad5a2a261c8d8f48d;p=modules%2Fvisu.git

Merge from V5_1_4_BR 07/05/2010
---

diff --git a/Makefile.am b/Makefile.am
index 8cd880ea..a33fca9e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # -* Makefile *-
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 28/06/2001
diff --git a/VISU_version.h.in b/VISU_version.h.in
index 0ea0965a..82f367ce 100644
--- a/VISU_version.h.in
+++ b/VISU_version.h.in
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_version.h
 //  Author : Vadim SANDLER
 //  Module : SALOME
diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am
index 9bca392c..9c3642cb 100644
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 SUBDIRS = unix
\ No newline at end of file
diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am
index 5f6d5f75..19064045 100644
--- a/adm_local/unix/Makefile.am
+++ b/adm_local/unix/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 SUBDIRS = config_files
diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am
index 170a21c9..281847bf 100644
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 dist_admlocalm4_DATA = \
diff --git a/adm_local/unix/config_files/check_VISU.m4 b/adm_local/unix/config_files/check_VISU.m4
index 1fde1814..770279f2 100755
--- a/adm_local/unix/config_files/check_VISU.m4
+++ b/adm_local/unix/config_files/check_VISU.m4
@@ -1,4 +1,4 @@
-dnl  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+dnl  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 dnl  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@ dnl  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 dnl
 dnl  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 dnl
+
 ###########################################################
 # File    : check_Visu.m4
 # Author  : Vadim SANDLER (OCN)
diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 958becf8..5e4626c4 100644
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -24,6 +21,7 @@
 # The following is to avoid PACKAGE_... env variable
 # redefinition compilation warnings
 # ============================================================
+#
 AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
 
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 15df8dbd..b6633307 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # non-distributed files 
diff --git a/build_cmake b/build_cmake
index 3a96af4f..43e9cdb8 100755
--- a/build_cmake
+++ b/build_cmake
@@ -1,8 +1,5 @@
 #!/bin/sh
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
diff --git a/build_cmake.bat b/build_cmake.bat
index 2e01c285..e7ca5925 100644
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -1,2 +1,20 @@
-
+@REM  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+@REM
+@REM  This library is free software; you can redistribute it and/or
+@REM  modify it under the terms of the GNU Lesser General Public
+@REM  License as published by the Free Software Foundation; either
+@REM  version 2.1 of the License.
+@REM
+@REM  This library is distributed in the hope that it will be useful,
+@REM  but WITHOUT ANY WARRANTY; without even the implied warranty of
+@REM  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+@REM  Lesser General Public License for more details.
+@REM
+@REM  You should have received a copy of the GNU Lesser General Public
+@REM  License along with this library; if not, write to the Free Software
+@REM  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+@REM
+@REM  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+@REM
+
 %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --visu
diff --git a/build_configure b/build_configure
index a9d38bdc..8820f1cb 100755
--- a/build_configure
+++ b/build_configure
@@ -1,5 +1,5 @@
 #!/bin/bash
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Tool for updating list of .in file for the SALOME project
 # and regenerating configure script
 # Author : Marc Tajchman - CEA
diff --git a/clean_configure b/clean_configure
index f57f7b3b..36652087 100755
--- a/clean_configure
+++ b/clean_configure
@@ -1,8 +1,5 @@
 #!/bin/sh
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +17,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 rm -rf autom4te.cache aclocal.m4 configure make_config
 find . -name "*~" -print -exec rm {} \;
 find . -name "*.pyc" -print -exec rm {} \;
diff --git a/configure.ac b/configure.ac
index 3a3d1704..be5cc49f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,13 +16,14 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Author : Marc Tajchman (CEA)
 # Date : 28/06/2001
 # Modified by : Patrick GOLDBRONN (CEA)
 # Modified by : Marc Tajchman (CEA)
 # Modified by : Mikhail Ponikarov (OCN)
 #
-AC_INIT([Salome2 Project VISU module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeVISU])
+AC_INIT([Salome2 Project VISU module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeVISU])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -387,8 +385,6 @@ AC_OUTPUT([ \
 	src/CONVERTOR/Makefile \
 	src/PIPELINE/Makefile \
 	src/OBJECT/Makefile \
-	src/VVTK/Makefile \
-	src/GUITOOLS/Makefile \
 	src/VISU_I/Makefile \
 	src/VISUGUI/Makefile \
 	src/VISU_SWIG/Makefile \
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 34a233c1..de721b61 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 SUBDIRS = salome
 
 usr_docs:
diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 7e1ed335..04df9d8f 100644
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # $Header$
 #
 SUBDIRS = tui gui
diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index 85aabb8c..6fee2a4e 100644
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
diff --git a/doc/salome/gui/VISU/Makefile.am b/doc/salome/gui/VISU/Makefile.am
index a8dd57ba..86577d7e 100644
--- a/doc/salome/gui/VISU/Makefile.am
+++ b/doc/salome/gui/VISU/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
diff --git a/doc/salome/gui/VISU/doxyfile.in b/doc/salome/gui/VISU/doxyfile.in
index f9dce57e..9d8dfd62 100755
--- a/doc/salome/gui/VISU/doxyfile.in
+++ b/doc/salome/gui/VISU/doxyfile.in
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/VISU/doxyfile_idl.in b/doc/salome/gui/VISU/doxyfile_idl.in
index 4bc72214..8f306271 100755
--- a/doc/salome/gui/VISU/doxyfile_idl.in
+++ b/doc/salome/gui/VISU/doxyfile_idl.in
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/gui/VISU/images/viewtable.png b/doc/salome/gui/VISU/images/viewtable.png
index 13a0e5da..697cdd31 100644
Binary files a/doc/salome/gui/VISU/images/viewtable.png and b/doc/salome/gui/VISU/images/viewtable.png differ
diff --git a/doc/salome/gui/VISU/input/index.doc b/doc/salome/gui/VISU/input/index.doc
index c82f4977..f6da3fe9 100644
--- a/doc/salome/gui/VISU/input/index.doc
+++ b/doc/salome/gui/VISU/input/index.doc
@@ -13,6 +13,7 @@ A MED file contains the description of a  \subpage med_object_page "MED object",
  \subpage table_presentations_page "Data Table Objects",
  two-dimensional data arrays, as input type for visualization. 
 
-\n The Python interface of \b Post-Pro module is described in \subpage idl_interface_page "Access to Post-Pro module functionality" page.
+\n The Python interface of \b Post-Pro module is described in \subpage
+idl_interface_page "Access to Post-Pro module functionality" page.
 
 */
diff --git a/doc/salome/gui/VISU/input/table_presentations.doc b/doc/salome/gui/VISU/input/table_presentations.doc
index 82dc0c96..44a153bf 100644
--- a/doc/salome/gui/VISU/input/table_presentations.doc
+++ b/doc/salome/gui/VISU/input/table_presentations.doc
@@ -27,6 +27,26 @@ in the context menu.
 
 \image html viewtable.png
 
+When the <b>Enable editing</b> option is checked, contents of the table
+are editable.
+\note At the current moment this mode allows to sort table data only.
+Sorting is performed by clicking on header of the column, by which the data
+has to be sorted.
+
+<b>Sort policy</b> option allows to specify how the empty cells will be processed
+during the sort procedure. The following options are available:
+<ul>
+<li><b>Empty cells are considered as lowest values</b></li>
+<li><b>Empty cells are considered as highest values</b></li>
+<li><b>Empty cells are always first</b></li>
+<li><b>Empty cells are always last</b></li>
+<li><b>Empty cells are ignored</b> (means that positions of the empty cells
+will not change after sorting)</li>
+</ul>
+
+<b>Adjust Cells</b> button allows to adjust size of the table cells according
+to their contents.
+
 It is also possible to create 
 \subpage table_3d_page "Table 3D presentation" basing on the table
 data and display it in the VTK viewer.
diff --git a/doc/salome/gui/VISU/static/footer.html b/doc/salome/gui/VISU/static/footer.html
index 012833ea..fdfb138c 100755
--- a/doc/salome/gui/VISU/static/footer.html
+++ b/doc/salome/gui/VISU/static/footer.html
@@ -6,7 +6,7 @@
 <div class="footer">
 <div style="text-align: center;">
 Copyright &copy; 2007-2010  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
-Copyright &copy; 2003-2010  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
+Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
 </div>
 </div>
 </body>
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 28d253e2..1a5a70e1 100644
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.in
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 36ae7620..10265e09 100755
--- a/doc/salome/tui/doxyfile.in
+++ b/doc/salome/tui/doxyfile.in
@@ -1,4 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
index 512db61f..53f5a62f 100755
--- a/doc/salome/tui/static/footer.html
+++ b/doc/salome/tui/static/footer.html
@@ -7,7 +7,7 @@
 <!--hr style="width: 100%; height: 2px;"-->
 <div style="text-align: center;">
 Copyright &copy; 2007-2010  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
-Copyright &copy; 2003-2010  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
+Copyright &copy; 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS<br>
 </div>
 </div>
 </body>
diff --git a/idl/Makefile.am b/idl/Makefile.am
index 28f4db67..cb47e69a 100644
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # This Makefile is responsible of generating the client and server
 # implementation of IDL interfaces for both C++ and python usage.
 # The building process of the C++ files is in charge of each source
diff --git a/idl/VISU_Gen.idl b/idl/VISU_Gen.idl
index 965f30fb..58d40368 100644
--- a/idl/VISU_Gen.idl
+++ b/idl/VISU_Gen.idl
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Gen.idl
 //  Author : Alexey Petrov
 //
diff --git a/resources/Makefile.am b/resources/Makefile.am
index c9ae4291..5ea587cb 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,8 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# $Header$
-#
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 #
@@ -58,14 +54,10 @@ Visu_import_med.png \
 Visu_isosurfaces.png \
 Visu_load_texture.png \
 Visu_ok.png \
-Visu_PlaneSegmentation.png \
 Visu_plot2d.png \
 Visu_plot3d.png \
 Visu_point_selection.png \
 Visu_points.png \
-Visu_recording_pause.png \
-Visu_recording_play.png \
-Visu_recording_start.png \
 Visu_recording_stop.png \
 Visu_remove.png \
 Visu_sameas.png \
@@ -82,7 +74,6 @@ Visu_selectioncell.png \
 Visu_selectionedge.png \
 Visu_selectionpoint.png \
 Visu_selectonly.png \
-Visu_SphereSegmentation.png \
 Visu_streamlines.png \
 Visu_surface.png \
 Visu_tree_container.png \
@@ -117,7 +108,6 @@ Visu_tree_vectors_gr.png \
 Visu_tree_vectors.png \
 Visu_tree_visu.png \
 Visu_vectors.png \
-Visu_vvtk_switch.png \
 Visu_wireframe.png \
 Visu_slider_more.png \
 Visu_slider_avi.png \
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 4eb9f200..74dc330c 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -1,5 +1,5 @@
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -72,6 +72,8 @@
     <parameter name="edge_color"               value="255, 255, 255"/>
     <parameter name="type_of_marker"           value="1"/>
     <parameter name="marker_scale"             value="9"/>
+    <parameter name="tables_enable_editing"    value="false"/>
+    <parameter name="tables_sort_policy"       value="3"/>
     <parameter name="scalar_bar_horizontal_height" value="0.08"/>
     <parameter name="scalar_bar_horizontal_width"  value="0.8" />
     <parameter name="scalar_bar_horizontal_x" value="0.1"/>
diff --git a/resources/VISUCatalog.xml.in b/resources/VISUCatalog.xml.in
index 3668d1f0..f1cff94e 100644
--- a/resources/VISUCatalog.xml.in
+++ b/resources/VISUCatalog.xml.in
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/VISU_en.xml b/resources/VISU_en.xml
index 7e7e28c6..9792855d 100644
--- a/resources/VISU_en.xml
+++ b/resources/VISU_en.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/VISU_fr.xml b/resources/VISU_fr.xml
index decdc38b..057e4a1e 100644
--- a/resources/VISU_fr.xml
+++ b/resources/VISU_fr.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <!DOCTYPE application PUBLIC "" "desktop.dtd">
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
diff --git a/resources/Visu_PlaneSegmentation.png b/resources/Visu_PlaneSegmentation.png
deleted file mode 100644
index 16bee54a..00000000
Binary files a/resources/Visu_PlaneSegmentation.png and /dev/null differ
diff --git a/resources/Visu_SphereSegmentation.png b/resources/Visu_SphereSegmentation.png
deleted file mode 100644
index 3b596448..00000000
Binary files a/resources/Visu_SphereSegmentation.png and /dev/null differ
diff --git a/resources/Visu_recording_pause.png b/resources/Visu_recording_pause.png
deleted file mode 100644
index f181a0f6..00000000
Binary files a/resources/Visu_recording_pause.png and /dev/null differ
diff --git a/resources/Visu_recording_play.png b/resources/Visu_recording_play.png
deleted file mode 100644
index 7724f48b..00000000
Binary files a/resources/Visu_recording_play.png and /dev/null differ
diff --git a/resources/Visu_recording_start.png b/resources/Visu_recording_start.png
deleted file mode 100644
index 5b71dc51..00000000
Binary files a/resources/Visu_recording_start.png and /dev/null differ
diff --git a/resources/Visu_vvtk_switch.png b/resources/Visu_vvtk_switch.png
deleted file mode 100644
index b0a9c807..00000000
Binary files a/resources/Visu_vvtk_switch.png and /dev/null differ
diff --git a/src/CONVERTOR/Makefile.am b/src/CONVERTOR/Makefile.am
index 504233b8..552138a4 100644
--- a/src/CONVERTOR/Makefile.am
+++ b/src/CONVERTOR/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.am
 #  Module : VISU
diff --git a/src/CONVERTOR/VISUConvertor.cxx b/src/CONVERTOR/VISUConvertor.cxx
index 6e6170d9..c3f7de91 100644
--- a/src/CONVERTOR/VISUConvertor.cxx
+++ b/src/CONVERTOR/VISUConvertor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:    VISUConvertor.cxx
 //  Author:  Alexey PETROV
diff --git a/src/CONVERTOR/VISUConvertor.hxx b/src/CONVERTOR/VISUConvertor.hxx
index 3ed40aeb..6d7dd9ba 100755
--- a/src/CONVERTOR/VISUConvertor.hxx
+++ b/src/CONVERTOR/VISUConvertor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISUConvertor.hxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_AppendFilter.cxx b/src/CONVERTOR/VISU_AppendFilter.cxx
index ae1f897a..d744ba52 100644
--- a/src/CONVERTOR/VISU_AppendFilter.cxx
+++ b/src/CONVERTOR/VISU_AppendFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME OBJECT : kernel of SALOME component
 //  File   : VISU_GeometryFilter.cxx
 //  Author : 
diff --git a/src/CONVERTOR/VISU_AppendFilter.hxx b/src/CONVERTOR/VISU_AppendFilter.hxx
index 84009b9d..8096c620 100644
--- a/src/CONVERTOR/VISU_AppendFilter.hxx
+++ b/src/CONVERTOR/VISU_AppendFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_APPENDFILTER_H
 #define VISU_APPENDFILTER_H
 
diff --git a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx
index 2a943476..8789df11 100644
--- a/src/CONVERTOR/VISU_AppendFilterUtilities.cxx
+++ b/src/CONVERTOR/VISU_AppendFilterUtilities.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME OBJECT : kernel of SALOME component
 //  File   : VISU_GeometryFilter.cxx
 //  Author : 
diff --git a/src/CONVERTOR/VISU_AppendFilterUtilities.hxx b/src/CONVERTOR/VISU_AppendFilterUtilities.hxx
index 108399b5..42f018ae 100644
--- a/src/CONVERTOR/VISU_AppendFilterUtilities.hxx
+++ b/src/CONVERTOR/VISU_AppendFilterUtilities.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_APPENDFILTERUTILITIES_H
 #define VISU_APPENDFILTERUTILITIES_H
 
diff --git a/src/CONVERTOR/VISU_AppendPolyData.cxx b/src/CONVERTOR/VISU_AppendPolyData.cxx
index 67b445c6..901f2bc2 100644
--- a/src/CONVERTOR/VISU_AppendPolyData.cxx
+++ b/src/CONVERTOR/VISU_AppendPolyData.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME OBJECT : kernel of SALOME component
 //  File   : VTKViewer_GeometryFilter.cxx
 //  Author : 
diff --git a/src/CONVERTOR/VISU_AppendPolyData.hxx b/src/CONVERTOR/VISU_AppendPolyData.hxx
index 0eaf4e4e..78aac1dc 100644
--- a/src/CONVERTOR/VISU_AppendPolyData.hxx
+++ b/src/CONVERTOR/VISU_AppendPolyData.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_APPENDPOLYDATA_H
 #define VISU_APPENDPOLYDATA_H
 
diff --git a/src/CONVERTOR/VISU_CommonCellsFilter.cxx b/src/CONVERTOR/VISU_CommonCellsFilter.cxx
index 9959ca13..71dfb461 100644
--- a/src/CONVERTOR/VISU_CommonCellsFilter.cxx
+++ b/src/CONVERTOR/VISU_CommonCellsFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File      : VISU_CommonCellsFilter.cxx
 // Created   : Wed Apr  4 08:45:07 2007
 // Author    : Eugeny NIKOLAEV (enk)
diff --git a/src/CONVERTOR/VISU_CommonCellsFilter.hxx b/src/CONVERTOR/VISU_CommonCellsFilter.hxx
index 043b1dea..7f133abf 100644
--- a/src/CONVERTOR/VISU_CommonCellsFilter.hxx
+++ b/src/CONVERTOR/VISU_CommonCellsFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File      : VISU_CommonCellsFilter.hxx
 // Created   : Tue Apr  3 16:16:53 2007
 // Author    : Eugeny NIKOLAEV (enk)
diff --git a/src/CONVERTOR/VISU_Convertor.cxx b/src/CONVERTOR/VISU_Convertor.cxx
index ace49808..7a334552 100644
--- a/src/CONVERTOR/VISU_Convertor.cxx
+++ b/src/CONVERTOR/VISU_Convertor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:    VISU_Convertor.cxx
 //  Author:  Alexey PETROV
diff --git a/src/CONVERTOR/VISU_Convertor.hxx b/src/CONVERTOR/VISU_Convertor.hxx
index ee7ffa1f..99e778c5 100644
--- a/src/CONVERTOR/VISU_Convertor.hxx
+++ b/src/CONVERTOR/VISU_Convertor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_Convertor.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_ConvertorDef.hxx b/src/CONVERTOR/VISU_ConvertorDef.hxx
index 9e9099d3..6c587fb5 100644
--- a/src/CONVERTOR/VISU_ConvertorDef.hxx
+++ b/src/CONVERTOR/VISU_ConvertorDef.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
index 1e73c642..d617bb55 100644
--- a/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
+++ b/src/CONVERTOR/VISU_ConvertorDef_impl.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_ConvertorUtils.cxx b/src/CONVERTOR/VISU_ConvertorUtils.cxx
index 72ce3048..75b6da65 100644
--- a/src/CONVERTOR/VISU_ConvertorUtils.cxx
+++ b/src/CONVERTOR/VISU_ConvertorUtils.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Convertor_impl.cxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_ConvertorUtils.hxx b/src/CONVERTOR/VISU_ConvertorUtils.hxx
index 2d51c376..2ce54539 100644
--- a/src/CONVERTOR/VISU_ConvertorUtils.hxx
+++ b/src/CONVERTOR/VISU_ConvertorUtils.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ConvertorUtils.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_Convertor_impl.cxx b/src/CONVERTOR/VISU_Convertor_impl.cxx
index 42a84765..40dddf27 100644
--- a/src/CONVERTOR/VISU_Convertor_impl.cxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Convertor_impl.cxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_Convertor_impl.hxx b/src/CONVERTOR/VISU_Convertor_impl.hxx
index 86c950a6..c7e347cb 100644
--- a/src/CONVERTOR/VISU_Convertor_impl.hxx
+++ b/src/CONVERTOR/VISU_Convertor_impl.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_ElnoMeshValue.hxx b/src/CONVERTOR/VISU_ElnoMeshValue.hxx
index 74d1732b..1827f204 100644
--- a/src/CONVERTOR/VISU_ElnoMeshValue.hxx
+++ b/src/CONVERTOR/VISU_ElnoMeshValue.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_ElnoMeshValue.hxx
 //  Author : Alexey PETROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_ExtractUnstructuredGrid.cxx b/src/CONVERTOR/VISU_ExtractUnstructuredGrid.cxx
index 5559598f..1c0b64c6 100644
--- a/src/CONVERTOR/VISU_ExtractUnstructuredGrid.cxx
+++ b/src/CONVERTOR/VISU_ExtractUnstructuredGrid.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 // File:    VISU_ExtractUnstructuredGrid.cxx
 // Author:  Alexey PETROV
diff --git a/src/CONVERTOR/VISU_ExtractUnstructuredGrid.hxx b/src/CONVERTOR/VISU_ExtractUnstructuredGrid.hxx
index 6a2ba728..52b7bd6b 100644
--- a/src/CONVERTOR/VISU_ExtractUnstructuredGrid.hxx
+++ b/src/CONVERTOR/VISU_ExtractUnstructuredGrid.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_ExtractUnstructuredGrid.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_GaussMergeFilter.cxx b/src/CONVERTOR/VISU_GaussMergeFilter.cxx
index cf380c81..a430f6af 100644
--- a/src/CONVERTOR/VISU_GaussMergeFilter.cxx
+++ b/src/CONVERTOR/VISU_GaussMergeFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_GaussMergeFilter.hxx b/src/CONVERTOR/VISU_GaussMergeFilter.hxx
index 21bc0305..53fbaefd 100644
--- a/src/CONVERTOR/VISU_GaussMergeFilter.hxx
+++ b/src/CONVERTOR/VISU_GaussMergeFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_IDMapper.cxx b/src/CONVERTOR/VISU_IDMapper.cxx
index dac794bc..bf8a20c7 100644
--- a/src/CONVERTOR/VISU_IDMapper.cxx
+++ b/src/CONVERTOR/VISU_IDMapper.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:
 //  Author:
diff --git a/src/CONVERTOR/VISU_IDMapper.hxx b/src/CONVERTOR/VISU_IDMapper.hxx
index 5a9fec79..a9a7bef3 100644
--- a/src/CONVERTOR/VISU_IDMapper.hxx
+++ b/src/CONVERTOR/VISU_IDMapper.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_Convertor.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_MedConvertor.cxx b/src/CONVERTOR/VISU_MedConvertor.cxx
index 91d86996..5b03e784 100644
--- a/src/CONVERTOR/VISU_MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_MedConvertor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MedConvertor.cxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_MedConvertor.hxx b/src/CONVERTOR/VISU_MedConvertor.hxx
index 216e8a15..2bde42d2 100644
--- a/src/CONVERTOR/VISU_MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_MedConvertor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_MedConvertor.hxx
 //  Author : Alexey PETROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_MergeFilter.cxx b/src/CONVERTOR/VISU_MergeFilter.cxx
index f8099afc..ad8ee5ee 100644
--- a/src/CONVERTOR/VISU_MergeFilter.cxx
+++ b/src/CONVERTOR/VISU_MergeFilter.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_MergeFilter.hxx b/src/CONVERTOR/VISU_MergeFilter.hxx
index d0a07f86..97e68926 100644
--- a/src/CONVERTOR/VISU_MergeFilter.hxx
+++ b/src/CONVERTOR/VISU_MergeFilter.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
index adcf7fb0..d431ee06 100644
--- a/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
+++ b/src/CONVERTOR/VISU_MergeFilterUtilities.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_MergeFilterUtilities.hxx b/src/CONVERTOR/VISU_MergeFilterUtilities.hxx
index d0bfb0f0..b3d9fbb8 100644
--- a/src/CONVERTOR/VISU_MergeFilterUtilities.hxx
+++ b/src/CONVERTOR/VISU_MergeFilterUtilities.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/CONVERTOR/VISU_MeshValue.cxx b/src/CONVERTOR/VISU_MeshValue.cxx
index 95e0c646..97c34f7c 100644
--- a/src/CONVERTOR/VISU_MeshValue.cxx
+++ b/src/CONVERTOR/VISU_MeshValue.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:
 //  Author:
 //  Module : VISU
-
+//
 #include "VISU_MeshValue.hxx"
 #include "VISU_ElnoMeshValue.hxx"
 #include "VISU_Structures_impl.hxx"
diff --git a/src/CONVERTOR/VISU_MeshValue.hxx b/src/CONVERTOR/VISU_MeshValue.hxx
index e29f2922..b74e1cf2 100644
--- a/src/CONVERTOR/VISU_MeshValue.hxx
+++ b/src/CONVERTOR/VISU_MeshValue.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_Convertor.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_PointCoords.cxx b/src/CONVERTOR/VISU_PointCoords.cxx
index 189887f1..659a4794 100644
--- a/src/CONVERTOR/VISU_PointCoords.cxx
+++ b/src/CONVERTOR/VISU_PointCoords.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:
 //  Author:
diff --git a/src/CONVERTOR/VISU_PointCoords.hxx b/src/CONVERTOR/VISU_PointCoords.hxx
index b1fcd87b..179997fe 100644
--- a/src/CONVERTOR/VISU_PointCoords.hxx
+++ b/src/CONVERTOR/VISU_PointCoords.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_Convertor.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_Structures.cxx b/src/CONVERTOR/VISU_Structures.cxx
index ec123971..4f749858 100644
--- a/src/CONVERTOR/VISU_Structures.cxx
+++ b/src/CONVERTOR/VISU_Structures.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File:    
 //  Author:  Alexey PETROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_Structures.hxx b/src/CONVERTOR/VISU_Structures.hxx
index 563a1206..24b0af32 100644
--- a/src/CONVERTOR/VISU_Structures.hxx
+++ b/src/CONVERTOR/VISU_Structures.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : 
 //  Author : Alexey PETROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_Structures_impl.cxx b/src/CONVERTOR/VISU_Structures_impl.cxx
index 438033e1..a0c1012b 100644
--- a/src/CONVERTOR/VISU_Structures_impl.cxx
+++ b/src/CONVERTOR/VISU_Structures_impl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,10 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File:
 //  Author:  Alexey PETROV
 //  Module : VISU
-
+//
 #include "VISU_Structures_impl.hxx"
 #include "VISU_PointCoords.hxx"
 #include "VISU_MeshValue.hxx"
diff --git a/src/CONVERTOR/VISU_Structures_impl.hxx b/src/CONVERTOR/VISU_Structures_impl.hxx
index 8b96bd1b..11d7e818 100644
--- a/src/CONVERTOR/VISU_Structures_impl.hxx
+++ b/src/CONVERTOR/VISU_Structures_impl.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : 
 //  Author : Alexey PETROV
 //  Module : VISU
diff --git a/src/CONVERTOR/VISU_TableReader.cxx b/src/CONVERTOR/VISU_TableReader.cxx
index 19f582ea..d01a7b52 100644
--- a/src/CONVERTOR/VISU_TableReader.cxx
+++ b/src/CONVERTOR/VISU_TableReader.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File:
 //  Author:
diff --git a/src/CONVERTOR/VISU_TableReader.hxx b/src/CONVERTOR/VISU_TableReader.hxx
index 4e6c5114..52340023 100644
--- a/src/CONVERTOR/VISU_TableReader.hxx
+++ b/src/CONVERTOR/VISU_TableReader.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_TableReader.hxx
 //  Author : Alexey PETROV
diff --git a/src/CONVERTOR/VISU_TypeList.hxx b/src/CONVERTOR/VISU_TypeList.hxx
index bf548181..1707d144 100644
--- a/src/CONVERTOR/VISU_TypeList.hxx
+++ b/src/CONVERTOR/VISU_TypeList.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_TypeList.hxx
 //  Author : Oleg UVAROV
diff --git a/src/CONVERTOR/VISU_UsedPointsFilter.cxx b/src/CONVERTOR/VISU_UsedPointsFilter.cxx
index 660a6183..6bd7ef45 100644
--- a/src/CONVERTOR/VISU_UsedPointsFilter.cxx
+++ b/src/CONVERTOR/VISU_UsedPointsFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_UsedPointsFilter.cxx
 //  Author : 
diff --git a/src/CONVERTOR/VISU_UsedPointsFilter.hxx b/src/CONVERTOR/VISU_UsedPointsFilter.hxx
index 7cc9b895..a3c90659 100644
--- a/src/CONVERTOR/VISU_UsedPointsFilter.hxx
+++ b/src/CONVERTOR/VISU_UsedPointsFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU CONVERTOR :
 //  File   : VISU_UsedPointsFilter.hxx
 //  Author : 
diff --git a/src/CONVERTOR/VISU_VTKTypeList.hxx b/src/CONVERTOR/VISU_VTKTypeList.hxx
index d0b2862c..8a1234c2 100644
--- a/src/CONVERTOR/VISU_VTKTypeList.hxx
+++ b/src/CONVERTOR/VISU_VTKTypeList.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_VTKTypeList.hxx
 //  Author : Oleg UVAROV
diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
index b6e3a872..fe67d6db 100644
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Vtk2MedConvertor.cxx
 //  Author : Eugeny NIKOLAEV, Open CASCADE SAS
 //
-
 #include "VISU_Vtk2MedConvertor.hxx"
 
 // QT includes
diff --git a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
index 50610707..584e3d42 100644
--- a/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
+++ b/src/CONVERTOR/VISU_Vtk2MedConvertor.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Vtk2MedConvertor.hxx
 //  Author : Eugeny NIKOLAEV, Open CASCADE SAS
 //
-
 #ifndef VISU_VTK2MEDCONVERTOR_H
 #define VISU_VTK2MEDCONVERTOR_H
 
diff --git a/src/ENGINE/Makefile.am b/src/ENGINE/Makefile.am
index 30618c13..68613286 100644
--- a/src/ENGINE/Makefile.am
+++ b/src/ENGINE/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.in
 #  Author : Alexey Petrov
 #  Module : VISU
diff --git a/src/ENGINE/VISU_Engine_i.cc b/src/ENGINE/VISU_Engine_i.cc
index ef22469f..0dc03421 100644
--- a/src/ENGINE/VISU_Engine_i.cc
+++ b/src/ENGINE/VISU_Engine_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_Engine_i.hh"
 #include "utilities.h"
 
diff --git a/src/ENGINE/VISU_Engine_i.hh b/src/ENGINE/VISU_Engine_i.hh
index d921aa37..70deb929 100644
--- a/src/ENGINE/VISU_Engine_i.hh
+++ b/src/ENGINE/VISU_Engine_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __VISU_ENGINE_I_H__
 #define __VISU_ENGINE_I_H__
 
diff --git a/src/GUITOOLS/Makefile.am b/src/GUITOOLS/Makefile.am
deleted file mode 100644
index 7a30dd9b..00000000
--- a/src/GUITOOLS/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  VISU VISUGUI : GUI of VISU component
-#  File   : Makefile.in
-#  Author : Marc Tajchman (CEA)
-#  Module : VISU
-#  $Header$
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-lib_LTLIBRARIES= libVISUGUITOOLS.la
-
-salomeinclude_HEADERS= \
-	VisuGUI_TableDlg.h \
-	VisuGUITools.h \
-	VisuGUI_GUITools.h
-
-dist_libVISUGUITOOLS_la_SOURCES= \
-	VisuGUI_TableDlg.cxx \
-	VisuGUI_GUITools.cxx
-
-MOC_FILES= VisuGUI_TableDlg_moc.cxx
-nodist_libVISUGUITOOLS_la_SOURCES=$(MOC_FILES)
-
-# additionnal information to compil and link file
-libVISUGUITOOLS_la_CPPFLAGS=  -ftemplate-depth-32 \
-	$(QT_INCLUDES) $(VTK_INCLUDES) @CAS_CPPFLAGS@ @CAS_CXXFLAGS@ \
-	$(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(QWT_INCLUDES) \
-	$(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(BOOST_CPPFLAGS)
-
-libVISUGUITOOLS_la_LDFLAGS= \
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
-	$(GUI_LDFLAGS) -lCAM -lsuit -lqtx -lSalomeApp
diff --git a/src/GUITOOLS/VisuGUITools.h b/src/GUITOOLS/VisuGUITools.h
deleted file mode 100755
index 87537d69..00000000
--- a/src/GUITOOLS/VisuGUITools.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VisuGUITools.h
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#ifndef _VisuGUITools_H_
-#define _VisuGUITools_H_
-
-#ifdef WNT
- #if defined VISU_GUITOOLS_EXPORTS || defined VISUGUITOOLS_EXPORTS
-  #if defined WIN32
-   #define VISU_GUITOOLS_EXPORT __declspec( dllexport )
-  #else
-   #define VISU_GUITOOLS_EXPORT
-  #endif
- #else
-  #if defined WIN32
-   #define VISU_GUITOOLS_EXPORT __declspec( dllimport )
-  #else
-   #define VISU_GUITOOLS_EXPORT
-  #endif
- #endif
-#else
- #define VISU_GUITOOLS_EXPORT
-#endif
-
-#endif
diff --git a/src/GUITOOLS/VisuGUI_GUITools.cxx b/src/GUITOOLS/VisuGUI_GUITools.cxx
deleted file mode 100644
index c5162d71..00000000
--- a/src/GUITOOLS/VisuGUI_GUITools.cxx
+++ /dev/null
@@ -1,70 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VisuGUI_GUITools.cxx
-//  Author : Sergey ANIKIN, Open CASCADE S.A.S.
-//  Module : VISU
-//
-
-#include "VisuGUI_GUITools.h"
-
-#include <SalomeApp_IntSpinBox.h>
-#include <SalomeApp_DoubleSpinBox.h>
-
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-
-#include <QVariant>
-
-namespace VISU{
-  void initSpinBox( SalomeApp_IntSpinBox* sb, 
-                    const int bottom, 
-                    const int top, 
-                    const int step )
-  {
-    sb->setAcceptNames( false );
-    sb->setRange( bottom, top );
-    sb->setSingleStep( step );
-  }
-  
-  void initSpinBox( SalomeApp_DoubleSpinBox* sb, 
-                    const double& bottom, 
-                    const double& top, 
-                    const double& step, 
-                    const char* quantity )
-  {
-    // Obtain precision from preferences
-    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
-    int precision = resMgr->integerValue( "VISU", quantity, 3 );
-  
-    sb->setPrecision   ( precision ); 
-    sb->setDecimals    ( qAbs(precision) );
-    sb->setRange       ( bottom, top );
-    sb->setSingleStep  ( step );
-    sb->setDefaultValue( bottom );
-    sb->setAcceptNames ( false );
-  
-    // Add a hint for the user saying how to tune precision
-    QString userPropName = QObject::tr( QString( "VISU_PREF_%1" ).arg( quantity ).toLatin1().constData() );
-    sb->setProperty( "validity_tune_hint", 
-                     QVariant( QObject::tr( "VISU_PRECISION_HINT" ).arg( userPropName ) ) );  
-  }
-}
diff --git a/src/GUITOOLS/VisuGUI_GUITools.h b/src/GUITOOLS/VisuGUI_GUITools.h
deleted file mode 100644
index 6f90bdc3..00000000
--- a/src/GUITOOLS/VisuGUI_GUITools.h
+++ /dev/null
@@ -1,41 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VisuGUI_GUITools.h
-//  Author : Sergey ANIKIN, Open CASCADE S.A.S.
-//  Module : VISU
-//
-#ifndef VISUGUI_GUITOOLS_H
-#define VISUGUI_GUITOOLS_H
-
-#include "VisuGUITools.h"
-
-class SalomeApp_IntSpinBox;
-class SalomeApp_DoubleSpinBox;
-
-namespace VISU{
-  VISU_GUITOOLS_EXPORT
-  void initSpinBox( SalomeApp_IntSpinBox*, const int, const int, const int );
-  VISU_GUITOOLS_EXPORT
-  void initSpinBox( SalomeApp_DoubleSpinBox*, const double&, const double&, const double&, const char* );
-}
-
-#endif
diff --git a/src/GUITOOLS/VisuGUI_TableDlg.cxx b/src/GUITOOLS/VisuGUI_TableDlg.cxx
deleted file mode 100644
index b782a881..00000000
--- a/src/GUITOOLS/VisuGUI_TableDlg.cxx
+++ /dev/null
@@ -1,1073 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VisuGUI_TableDlg.cxx
-//  Author : Vadim SANDLER
-//  Module : SALOME
-//
-#include "VisuGUI_TableDlg.h"
-
-#include "SUIT_Tools.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-
-#include "LightApp_Application.h"
-
-#include "CAM_Module.h"
-
-#include "SALOMEDSClient_Study.hxx"
-#include "SALOMEDSClient_GenericAttribute.hxx"
-#include "SALOMEDSClient_AttributeTableOfInteger.hxx"
-#include "SALOMEDSClient_AttributeTableOfReal.hxx"
-#include "SALOMEDSClient_StudyBuilder.hxx"
-
-#include <QLayout>
-#include <QValidator>
-#include <QTableWidget>
-#include <QTabWidget>
-#include <QList>
-#include <QVector>
-#include <QInputDialog>
-#include <QLabel>
-#include <QIntValidator>
-#include <QDoubleValidator>
-#include <QKeyEvent>
-#include <QHeaderView>
-
-#include "utilities.h"
-
-using namespace std;
-
-#define MARGIN_SIZE       11
-#define SPACING_SIZE      6
-#define SPACER_SIZE       5
-#define MIN_TABLE_WIDTH   200
-#define MIN_TABLE_HEIGHT  200
-
-NumDelegateItem::NumDelegateItem( QObject* parent, NumValidator mode )
-  : QItemDelegate( parent ),
-    myMode( mode )
-{
-}
-
-NumDelegateItem::~NumDelegateItem()
-{
-}
-
-QWidget * NumDelegateItem::createEditor( QWidget * parent,
-                                         const QStyleOptionViewItem & option,
-                                         const QModelIndex & index ) const
-{
-  QLineEdit *editor = new QLineEdit(parent);
-  switch ( myMode )
-  {
-  case NV_Int:
-    editor->setValidator( new QIntValidator( editor ) );
-    break;
-  case NV_Real:
-    editor->setValidator( new QDoubleValidator( editor ) );
-    break;
-  default:
-    editor->setText( "No validator!" );
-  }
-  
-  return editor;
-}
-
-void NumDelegateItem::setEditorData( QWidget * editor,
-                                     const QModelIndex & index ) const
-{
-  QLineEdit *aLE = qobject_cast<QLineEdit*>(editor);
-  if ( !aLE )
-    return;
-  
-  switch ( myMode )
-  {
-  case NV_Int:
-    {
-      int value = index.model()->data(index, Qt::DisplayRole).toInt();
-      aLE->setText( QString("%1").arg( value ) );
-      break;
-    }
-  case NV_Real:
-    {
-      double value = index.model()->data(index, Qt::DisplayRole).toDouble();
-      aLE->setText( QString("%1").arg( value ) );
-      break;
-    }
-  default:
-    aLE->setText( "No validator!!!" );
-  }  
-}
-
-
-
-
-
-/*class VisuGUI_Table : public QTableWidget {
-public:
-  VisuGUI_Table( Orientation orient, QWidget* parent = 0 ) 
-    : QTableWidget( parent ), myValidator( 0 ), myOrientation( orient ) {}
-  VisuGUI_Table( Orientation orient, int numRows, int numCols, QWidget* parent = 0 )
-    : QTableWidget( numRows, numCols, parent ), myValidator( 0 ), myOrientation( orient ) {}
-  
-  void setValidator( QValidator* v = 0 ) { myValidator = v;  }
-  bool isEditing() const { return QTable::isEditing(); }
-  
-protected:
-  QWidget* createEditor ( int row, int col, bool initFromCell ) const
-    {
-      bool testUnits = ( myOrientation == Qt::Horizontal && col == 0 ) || ( myOrientation == Qt::Vertical && row == 0 );
-      QWidget* wg = QTable::createEditor( row, col, initFromCell );
-      if ( wg && wg->inherits("QLineEdit") && myValidator && !testUnits ) 
-        (( QLineEdit*)wg)->setValidator( myValidator );
-      return wg;
-    }
-
-protected:
-  QValidator* myValidator;
-  Orientation myOrientation;
-  };*/
-
-/*!
-  Constructor
-*/
-VisuGUI_TableDlg::VisuGUI_TableDlg( QWidget* parent, 
-                                    _PTR(SObject) obj, 
-                                    bool edit,
-                                    int which,
-                                    Qt::Orientation orient,
-                                    bool showColumnTitles )
-     : QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
-       myIntTable( 0 ), myRealTable( 0 )
-{
-  setWindowTitle( edit ? tr( "EDIT_TABLE_TLT" ) : tr( "VIEW_TABLE_TLT" ) );
-  setSizeGripEnabled( true );
-
-  myObject = obj;
-  bool bHasIntTable = false;
-  bool bHasRealTable = false;
-  if ( myObject ) {
-    _PTR(GenericAttribute) anAttr;
-    bHasIntTable  = myObject->FindAttribute( anAttr, "AttributeTableOfInteger");
-    bHasRealTable = myObject->FindAttribute( anAttr, "AttributeTableOfReal");
-  }
-  
-  QVBoxLayout* mainLayout = new QVBoxLayout( this );
-  mainLayout->setMargin( MARGIN_SIZE );
-  mainLayout->setSpacing( SPACING_SIZE );
-
-  bool bDoInt  = which == ttInt  || which == ttBoth || which == ttAuto && bHasIntTable;
-  bool bDoReal = which == ttReal || which == ttBoth || which == ttAuto && bHasRealTable;
-
-  QWidget* top;
-  QVBoxLayout* tl;
-  if ( bDoInt && bDoReal ) {
-    top = new QTabWidget( this );
-    //( ( QTabWidget* ) top) ->setMargin( MARGIN_SIZE );
-  }
-  else {
-    top = new QWidget( this );
-    tl  = new QVBoxLayout( top ); tl->setMargin( 0 ); tl->setSpacing( SPACING_SIZE );
-  }
-
-  if ( bDoInt ) {
-    myIntTable = new VisuGUI_TableWidget( top, "myIntTable", edit, orient, showColumnTitles );
-    //myIntTable->getTable()->setValidator( new QIntValidator( this ) );
-    //QAbstractItemDelegate* item = myIntTable->getTable()->itemDelegate();
-    myIntTable->getTable()->setItemDelegate( new NumDelegateItem( myIntTable, NumDelegateItem::NV_Int ) );
-    //item->deleteLater();
-                                 
-    if ( bDoInt && bDoReal )
-      ( ( QTabWidget* )top )->addTab( myIntTable, tr( "TABLE_OF_INTEGER_TLT" ) );
-    else
-      tl->addWidget( myIntTable );
-  }
-  if ( bDoReal ) {
-    myRealTable = new VisuGUI_TableWidget( top, "myRealTable", edit, orient, showColumnTitles );
-    //myRealTable->getTable()->setValidator( new QDoubleValidator( this ) );
-    //QAbstractItemDelegate* item = myIntTable->getTable()->itemDelegate();
-    myRealTable->getTable()->setItemDelegate( new NumDelegateItem( myRealTable, NumDelegateItem::NV_Real ) );
-    //item->deleteLater();
-    if ( bDoInt && bDoReal )
-      ( ( QTabWidget* )top )->addTab( myRealTable, tr( "TABLE_OF_REAL_TLT" ) );
-    else
-      tl->addWidget( myRealTable );
-  }
-  if ( !bDoInt && !bDoReal ) {
-    QLabel *dumbLabel = new QLabel( tr( "ERR_TABLE_NOT_AVAILABLE" ), top );
-    dumbLabel->setAlignment( Qt::AlignCenter );
-    tl->addWidget( dumbLabel );
-  }
-
-  QHBoxLayout* btnLayout = new QHBoxLayout; 
-  btnLayout->setMargin( 0 ); btnLayout->setSpacing( SPACING_SIZE );
-  
-  myOKBtn = new QPushButton( tr( "BUT_OK" ), this );
-  myHelpBtn = new QPushButton( tr( "BUT_HELP" ), this );
-  if ( edit ) {
-    myCancelBtn = new QPushButton( tr( "BUT_CANCEL" ), this );
-    btnLayout->addWidget( myOKBtn );
-    btnLayout->addItem( new QSpacerItem( SPACER_SIZE, SPACER_SIZE, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
-    btnLayout->addWidget( myCancelBtn );
-    btnLayout->addWidget( myHelpBtn );
-    connect( myOKBtn,     SIGNAL( clicked() ), this, SLOT( onOK() ) );
-    connect( myCancelBtn, SIGNAL( clicked() ), this, SLOT( reject() ) );
-  }
-  else {
-    btnLayout->addWidget( myOKBtn );
-    btnLayout->addItem( new QSpacerItem( SPACER_SIZE, SPACER_SIZE, QSizePolicy::Expanding, QSizePolicy::Minimum ) );
-    btnLayout->addWidget( myHelpBtn );
-    connect( myOKBtn,     SIGNAL( clicked() ), this, SLOT( accept() ) );
-  }
-  connect( myHelpBtn,     SIGNAL( clicked() ), this, SLOT( onHelp() ) );
-
-  mainLayout->addWidget( top );
-  mainLayout->addLayout( btnLayout );
-
-  initDlg();
-  resize( 500, 400 );
-  SUIT_Tools::centerWidget( this, parent );
-}
-
-/*!
-  Destructor
-*/
-VisuGUI_TableDlg::~VisuGUI_TableDlg()
-{
-}
-
-/*!
-  <OK> button slot, saves table(s)
-  Called only in create/edit mode ( <edit> parameter for constructor is true )
-*/
-void VisuGUI_TableDlg::onOK()
-{
-  myOKBtn->setFocus(); // accept possible changes
-  bool done = true;
-
-  if ( myObject ) {
-    _PTR(Study) study = myObject->GetStudy();
-    _PTR(AttributeTableOfInteger) tblIntAttr;
-    _PTR(AttributeTableOfReal)    tblRealAttr;
-
-    if ( study ) {
-      _PTR(StudyBuilder) builder = study->NewBuilder();
-      builder->NewCommand(); // start transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-      try {
-        if ( myIntTable ) {
-          builder->RemoveAttribute( myObject, "AttributeTableOfInteger" );
-          tblIntAttr = builder->FindOrCreateAttribute( myObject, "AttributeTableOfInteger" );
-
-          int i;
-          int nbRows  = myIntTable->getNumRows();
-          int nbCols  = myIntTable->getNumCols();
-          QString tlt = myIntTable->getTableTitle();
-          QStringList rowTitles, colTitles, units;
-          myIntTable->getRowTitles( rowTitles );
-          myIntTable->getColTitles( colTitles );
-          myIntTable->getUnits( units );
-          
-          if ( nbRows > 0) {
-            // data
-            int nRow = 0;
-            tblIntAttr->SetNbColumns( nbCols );
-            for ( i = 0; i < nbRows; i++ ) {
-              QStringList data;
-              myIntTable->getRowData( i, data );
-              bool bEmptyRow = true;
-              for ( int j = 0; j < data.count(); j++ ) {
-                if ( !data[ j ].isNull() ) {
-                  tblIntAttr->PutValue( data[ j ].toInt(), nRow+1, j+1 );
-                  bEmptyRow = false;
-                }
-              }
-              if ( !bEmptyRow ) {  // Skip rows with no data !!!
-                // set row title
-                tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : (const char*)rowTitles[ i ].toLatin1() ); 
-                // set row unit
-                tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : (const char*)units[ i ].toLatin1() ); 
-                nRow++;
-              }
-            }
-            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
-              // column titles
-              for ( i = 0; i < colTitles.count(); i++ )
-                tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : (const char*)colTitles[ i ].toLatin1() );
-            }
-          }
-          // title
-          tblIntAttr->SetTitle( (const char*)myIntTable->getTableTitle().toLatin1() );
-        }
-        if ( myRealTable ) {
-          builder->RemoveAttribute( myObject, "AttributeTableOfReal" );
-          tblRealAttr = builder->FindOrCreateAttribute( myObject, "AttributeTableOfReal" );
-
-          int i;
-          int nbRows  = myRealTable->getNumRows();
-          int nbCols  = myRealTable->getNumCols();
-          QString tlt = myRealTable->getTableTitle();
-          QStringList rowTitles, colTitles, units;
-          myRealTable->getRowTitles( rowTitles );
-          myRealTable->getColTitles( colTitles );
-          myRealTable->getUnits( units );
-          
-          if ( nbRows > 0) {
-            // data
-            int nRow = 0;
-            tblRealAttr->SetNbColumns( nbCols );
-            for ( i = 0; i < nbRows; i++ ) {
-              QStringList data;
-              myRealTable->getRowData( i, data );
-              bool bEmptyRow = true;
-              for ( int j = 0; j < data.count(); j++ ) {
-                if ( !data[ j ].isNull() ) {
-                  tblRealAttr->PutValue( data[ j ].toDouble(), nRow+1, j+1 );
-                  bEmptyRow = false;
-                }
-              }
-              if ( !bEmptyRow ) {  // Skip rows with no data !!!
-                // set row title
-                tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : (const char*)rowTitles[ i ].toLatin1() ); 
-                // set row unit
-                tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : (const char*)units[ i ].toLatin1() );
-                nRow++;
-              }
-            }
-            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
-              // column titles
-              for ( i = 0; i < colTitles.count(); i++ )
-                tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : (const char*)colTitles[ i ].toLatin1() );
-            }
-          }
-          // title
-          tblRealAttr->SetTitle( (const char*)myRealTable->getTableTitle().toLatin1() );
-        }
-        if ( myIntTable || myRealTable)
-          builder->CommitCommand(); // commit transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!
-        else
-          builder->AbortCommand();  // abort transaction  !!!!!!!!!!!!!!!!!!!!!!!!!!!
-      }
-      catch( ... ) {
-        MESSAGE("VisuGUI_TableDlg::onOK : Exception has been caught !!!");
-        builder->AbortCommand();  // abort transaction  !!!!!!!!!!!!!!!!!!!!!!!!!!!
-        done = false;
-        SUIT_MessageBox::critical ( this, tr("ERR_ERROR"), tr("ERR_APP_EXCEPTION") );
-      }
-    }
-  }
-  if ( done ) 
-    accept();
-}
-
-/*!
-  <Help> button slot, shows corresponding help page
-*/
-void VisuGUI_TableDlg::onHelp()
-{
-  QString aHelpFileName = "table_presentations_page.html";
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
-  else {
-                QString platform;
-#ifdef WIN32
-                platform = "winapplication";
-#else
-                platform = "application";
-#endif
-    SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"),
-                             QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                             arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName) );
-  }
-}
-
-/*!
-   Populates table with data
-*/
-void VisuGUI_TableDlg::initDlg()
-{
-  int i, j;
-  if ( myObject ) {
-    _PTR(GenericAttribute) anAttr;
-    _PTR(AttributeTableOfInteger) tblIntAttr;
-    _PTR(AttributeTableOfReal)    tblRealAttr;
-    if ( myObject->FindAttribute( anAttr, "AttributeTableOfInteger") ) {
-      tblIntAttr = anAttr;
-    }
-    if ( myObject->FindAttribute( anAttr, "AttributeTableOfReal") ) {
-      tblRealAttr = anAttr;
-    }
-    // Table of integer
-    if ( tblIntAttr && myIntTable ) {
-      try {
-        // title
-        myIntTable->setTableTitle( tblIntAttr->GetTitle().c_str() );
-        // nb of rows & cols
-        int nbRows = tblIntAttr->GetNbRows() ; 
-        int nbCols = tblIntAttr->GetNbColumns();
-        myIntTable->setNumRows( nbRows );
-        myIntTable->setNumCols( nbCols );
-        // rows titles
-        QStringList strlist;
-        vector<string> rowTitles = tblIntAttr->GetRowTitles();
-        for ( i = 0; i < nbRows; i++ ) {
-          if ( rowTitles.size() > 0 )
-            strlist.append( rowTitles[i].c_str() );
-          else
-            strlist.append( "" );
-        }
-        myIntTable->setRowTitles( strlist );
-        // columns titles
-        strlist.clear();
-        vector<string> colTitles = tblIntAttr->GetColumnTitles();
-        for ( i = 0; i < nbCols; i++ ) {
-          if ( colTitles.size() > 0 )
-            strlist.append( colTitles[i].c_str() );
-          else
-            strlist.append( "" );
-        }
-        myIntTable->setColTitles( strlist );
-        // units
-        strlist.clear();
-        vector<string> rowUnits = tblIntAttr->GetRowUnits();
-        if ( rowUnits.size() > 0 ) {
-          for ( i = 0; i < nbRows; i++ )
-            strlist.append( rowUnits[i].c_str() );
-          myIntTable->setUnits( strlist );
-        }
-        // data
-        for ( i = 1; i <= nbRows; i++ ) {
-          strlist.clear();
-          for ( j = 1; j <= nbCols; j++ ) {
-            if ( tblIntAttr->HasValue( i, j ) )
-              strlist.append( QString::number( tblIntAttr->GetValue( i, j ) ) );
-            else
-              strlist.append( QString::null );
-          }
-          myIntTable->setRowData( i-1, strlist );
-        }
-        myIntTable->adjustTable();
-      }
-      catch( ... ) {
-        MESSAGE("VisuGUI_TableDlg::initDlg : Exception has been caught !!!");
-      }
-    } 
-    // Table of real
-    if ( tblRealAttr && myRealTable ) {
-      try {
-        // title
-        myRealTable->setTableTitle( tblRealAttr->GetTitle().c_str() );
-        // nb of rows & cols
-        int nbRows = tblRealAttr->GetNbRows() ; 
-        int nbCols = tblRealAttr->GetNbColumns();
-        myRealTable->setNumRows( nbRows );
-        myRealTable->setNumCols( nbCols );
-        // rows titles
-        QStringList strlist;
-        vector<string> rowTitles = tblRealAttr->GetRowTitles();
-        for ( i = 0; i < nbRows; i++ ) {
-          if ( rowTitles.size() > 0 )
-            strlist.append( rowTitles[i].c_str() );
-          else
-            strlist.append( "" );
-        }
-        myRealTable->setRowTitles( strlist );
-        // columns titles
-        strlist.clear();
-        vector<string> colTitles = tblRealAttr->GetColumnTitles();
-        for ( i = 0; i < nbCols; i++ ) {
-          if ( colTitles.size() > 0 )
-            strlist.append( colTitles[i].c_str() );
-          else
-            strlist.append( "" );
-        }
-        myRealTable->setColTitles( strlist );
-        // units
-        strlist.clear();
-        vector<string> rowUnits = tblRealAttr->GetRowUnits();
-        if ( rowUnits.size() > 0 ) {
-          for ( i = 0; i < nbRows; i++ )
-            strlist.append( rowUnits[i].c_str() );
-          myRealTable->setUnits( strlist );
-        }
-        // data
-        for ( i = 1; i <= nbRows; i++ ) {
-          strlist.clear();
-          for ( j = 1; j <= nbCols; j++ ) {
-            if ( tblRealAttr->HasValue( i, j ) )
-              strlist.append( QString::number( tblRealAttr->GetValue( i, j ) ) );
-            else
-              strlist.append( QString::null );
-          }
-          myRealTable->setRowData( i-1, strlist );
-        }
-        myRealTable->adjustTable();
-      }
-      catch( ... ) {
-        MESSAGE("VisuGUI_TableDlg::initDlg : Exception has been caught !!!");
-      }
-    } 
-  }
-}
-
-/*!
-  Provides help on F1 button click
-*/
-void VisuGUI_TableDlg::keyPressEvent( QKeyEvent* e )
-{
-  QDialog::keyPressEvent( e );
-  if ( e->isAccepted() )
-    return;
-
-  if ( e->key() == Qt::Key_F1 )
-    {
-      e->accept();
-      onHelp();
-    }
-}
-
-/*!
-  Constructor
-*/
-VisuGUI_TableWidget::VisuGUI_TableWidget( QWidget* parent, 
-                                              const char* name, 
-                                              bool edit, 
-                                              Qt::Orientation orient,
-                                              bool showColumnTitles )
-     : QWidget( parent ), myOrientation( orient )
-{
-  QGridLayout* mainLayout = new QGridLayout( this );
-  mainLayout->setMargin( 0 );
-  mainLayout->setSpacing( SPACING_SIZE );
-
-  myTitleEdit = new QLineEdit( this );
-  myTitleEdit->setAlignment( Qt::AlignCenter );
-  myTitleEdit->setReadOnly( !edit );
-  QFont fnt = myTitleEdit->font();
-  fnt.setBold( true ); 
-  myTitleEdit->setFont( fnt );
-
-  //myTable = new VisuGUI_Table( orient, this );
-  myTable = new QTableWidget( 5, 5, this );
-  //myTable->setNumRows( 5 );
-  //myTable->setNumCols( 5 );
-  myTable->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
-  myTable->setMinimumSize( MIN_TABLE_WIDTH, MIN_TABLE_HEIGHT );
-  myTable->setSelectionMode( QAbstractItemView::SingleSelection );
-  myTable->setShowGrid( true );
-  myTable->horizontalHeader()->setMovable( false );
-  myTable->verticalHeader()->setMovable( false );
-  //myTable->setColumnMovingEnabled( false );
-  //myTable->setRowMovingEnabled( false );
-  myTable->setDragEnabled( false );
-  //myTable->setReadOnly( !edit );
-  myTable->setEditTriggers( edit ? QAbstractItemView::AllEditTriggers : QAbstractItemView::NoEditTriggers );
-
-  setUnitsTitle( tr( "UNITS_TLT" ) );
-
-  if ( !showColumnTitles ) {
-    if ( myOrientation == Qt::Horizontal ) {
-      myTable->horizontalHeader()->hide();
-      //myTable->setTopMargin( 0 );
-    }
-    else {
-      myTable->verticalHeader()->hide();
-      //myTable->setLeftMargin( 0 );
-    }
-  }
-
-  mainLayout->addWidget( myTitleEdit, 0, 0 );
-  mainLayout->addWidget( myTable, 1, 0 );
-
-  if ( edit ) {
-    myAddRowBtn    = new QPushButton( tr( "ADD_ROW_BTN" ), this );
-    myDelRowBtn    = new QPushButton( tr( "REMOVE_ROW_BTN" ), this );
-    myAddColBtn    = new QPushButton( tr( "ADD_COLUMN_BTN" ), this );
-    myDelColBtn    = new QPushButton( tr( "REMOVE_COLUMN_BTN" ), this );
-    myAdjustBtn    = new QPushButton( tr( "ADJUST_CELLS_BTN" ), this );
-    mySelectAllBtn = new QPushButton( tr( "SELECT_ALL_BTN" ), this );
-    myClearBtn     = new QPushButton( tr( "CLEAR_BTN"), this );
-    QVBoxLayout* btnLayout = new QVBoxLayout; btnLayout->setMargin( 0 ); btnLayout->setSpacing( SPACING_SIZE );
-    btnLayout->addWidget( myAddRowBtn );
-    btnLayout->addWidget( myDelRowBtn );
-    btnLayout->addWidget( myAddColBtn );
-    btnLayout->addWidget( myDelColBtn );
-    btnLayout->addStretch();
-    btnLayout->addWidget( myAdjustBtn );
-    btnLayout->addStretch();
-    btnLayout->addWidget( mySelectAllBtn );
-    btnLayout->addWidget( myClearBtn );
-    mainLayout->addLayout( btnLayout, 1, 1 );
-    connect( myTable, SIGNAL( selectionChanged() ),        this, SLOT( updateButtonsState() ) );
-    connect( myTable, SIGNAL( currentChanged( int, int) ), this, SLOT( updateButtonsState() ) );
-    connect( myAddRowBtn,    SIGNAL( clicked() ),   this, SLOT( addRow() ) );
-    connect( myAddColBtn,    SIGNAL( clicked() ),   this, SLOT( addCol() ) );
-    connect( myDelRowBtn,    SIGNAL( clicked() ),   this, SLOT( delRow() ) );
-    connect( myDelColBtn,    SIGNAL( clicked() ),   this, SLOT( delCol() ) );
-    connect( myAdjustBtn,    SIGNAL( clicked() ),   this, SLOT( adjustTable() ) );
-    connect( mySelectAllBtn, SIGNAL( clicked() ),   this, SLOT( selectAll() ) );
-    connect( myClearBtn,     SIGNAL( clicked() ),   this, SLOT( clearTable() ) );
-    myTable->horizontalHeader()->installEventFilter( this );
-    myTable->verticalHeader()->installEventFilter( this );
-    myTable->installEventFilter( this );
-  }
-  updateButtonsState();
-}
-/*!
-  Destructor
-*/
-VisuGUI_TableWidget::~VisuGUI_TableWidget()
-{
-}
-/*!
-  Sets table title
-*/
-void VisuGUI_TableWidget::setTableTitle( const QString& title )
-{
-  myTitleEdit->setText( title );
-}
-/*!
-  Gets table title
-*/
-QString VisuGUI_TableWidget::getTableTitle()
-{
-  return myTitleEdit->text();
-}
-/*!
-  Sets total number of rows
-*/
-void VisuGUI_TableWidget::setNumRows( const int num )
-{
-  myOrientation == Qt::Horizontal ? myTable->setRowCount( num ) : myTable->setColumnCount( num );
-}
-/*!
-  Gets total number of rows
-*/
-int VisuGUI_TableWidget::getNumRows()
-{
-  return myOrientation == Qt::Horizontal ? myTable->rowCount() : myTable->columnCount();
-}
-/*!
-  Sets total number of columns
-*/
-void VisuGUI_TableWidget::setNumCols( const int num )
-{
-  // !!! first column contains units !!!
-  myOrientation == Qt::Horizontal ? myTable->setColumnCount( num+1 ) : myTable->setRowCount( num+1 );
-//  myOrientation == Qt::Horizontal ? myTable->setColumnReadOnly( 0, true ) : myTable->setRowReadOnly( 0, true );
-}
-/*!
-  Gets total number of columns
-*/
-int VisuGUI_TableWidget::getNumCols()
-{
-  // !!! first column contains units !!!
-  return myOrientation == Qt::Horizontal ? myTable->columnCount()-1 : myTable->rowCount()-1;
-}
-/*!
-  Sets rows titles
-*/
-void VisuGUI_TableWidget::setRowTitles( QStringList& tlts )
-{
-  QStringList aLabels;
-  for ( int i = 0; i < tlts.count(); i++ )
-    tlts[i].isNull() ? aLabels.append("") : aLabels.append( tlts[i] );
-
-  myOrientation == Qt::Horizontal ?
-    myTable->setVerticalHeaderLabels( aLabels ) :
-    myTable->setHorizontalHeaderLabels( aLabels );
-    
-    //  myTable->verticalHeader()->setLabel( i, tlts[i] ) : 
-    //myTable->horizontalHeader()->setLabel( i, tlts[i] );
-  //}
-}
-/*!
-  Gets rows titles
-*/
-void VisuGUI_TableWidget::getRowTitles( QStringList& tlts )
-{
-  tlts.clear();
-  if ( myOrientation == Qt::Horizontal ) {
-    for ( int i = 0; i < myTable->rowCount(); i++ ) {
-      tlts.append( myTable->verticalHeaderItem(i) ? myTable->verticalHeaderItem(i)->text() : "" );
-    }
-  }
-  else {
-    for ( int i = 0; i < myTable->columnCount(); i++ ) {
-      tlts.append( myTable->horizontalHeaderItem(i) ? myTable->horizontalHeaderItem(i)->text() : "" );
-    }
-  }
-}
-/*!
-  Sets columns titles
-*/
-void VisuGUI_TableWidget::setColTitles( QStringList& tlts )
-{
-  QStringList aLabels;
-
-  // !!! first column contains units !!!
-  aLabels.append(""); // it'll be initialized below - in setUnitsTitle() method
-
-  for ( int i = 0; i < tlts.count(); i++ )
-    tlts[i].isNull() ? aLabels.append("") : aLabels.append( tlts[i] );
-
-  myOrientation == Qt::Horizontal ?
-    myTable->setHorizontalHeaderLabels( aLabels ) :
-    myTable->setVerticalHeaderLabels( aLabels );
-  
-  setUnitsTitle( tr( "UNITS_TLT" ) );
-}
-/*!
-  Sets columns titles
-*/
-void VisuGUI_TableWidget::getColTitles( QStringList& tlts )
-{
-  // !!! first column contains units !!!
-  tlts.clear();
-  if ( myOrientation == Qt::Horizontal ) {
-    for ( int i = 1; i < myTable->columnCount(); i++ ) {
-      tlts.append( myTable->horizontalHeaderItem(i) ? myTable->horizontalHeaderItem(i)->text() : "" );
-    }    
-  }
-  else {
-    for ( int i = 1; i < myTable->rowCount(); i++ ) {
-      tlts.append( myTable->verticalHeaderItem(i) ? myTable->verticalHeaderItem(i)->text() : "" );
-    }
-  }
-}
-/*!
-  Sets units title
-*/
-void VisuGUI_TableWidget::setUnitsTitle( const QString& tlt ) {
-  // !!! first column contains units !!!
-  myTable->model()->setHeaderData( 0, myOrientation, QVariant(tlt.isNull() ? "" : tlt), Qt::DisplayRole );
-}
-/*!
-  Sets units
-*/
-void VisuGUI_TableWidget::setUnits( QStringList& units )
-{
-  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
-  if ( aModel )
-  {
-    QModelIndex anIndex;
-    for ( int i = 0; i < units.count(); i++ )
-    {
-      myOrientation == Qt::Horizontal ?
-        anIndex = aModel->index( i, 0 ) :
-        anIndex = aModel->index( 0, i );
-
-      aModel->setData( anIndex, QVariant( units[i].isNull() ? "" : units[i] ) );      
-    }
-  }
-}
-/*!
-  Gets units
-*/
-void VisuGUI_TableWidget::getUnits( QStringList& units )
-{
-  units.clear();
-  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
-  if ( aModel )
-  {
-    if ( myOrientation == Qt::Horizontal )
-    {
-      for ( int i = 0; i < myTable->rowCount(); i++ )
-        units.append( aModel->index( i, 0 ).data().toString() );
-    }
-    else {
-      for ( int i = 0; i < myTable->columnCount(); i++ )
-        units.append( aModel->index( 0, i ).data().toString() );
-    }
-  }
-}
-/*!
-  Sets row data
-*/
-void VisuGUI_TableWidget::setRowData( int row, QStringList& data )
-{
-  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
-  if ( aModel )
-  {
-    QModelIndex anIndex; 
-    if ( row >= 0 && row < getNumRows() ) {
-      for ( int i = 0; i < data.count(); i++ )
-      {
-        myOrientation == Qt::Horizontal ? anIndex = aModel->index( row, i+1 ) :
-                                          anIndex = aModel->index( i+1, row );
-        aModel->setData( anIndex, QVariant( data[i] ) );
-          
-      }
-    }
-  }
-}
-/*!
-  Gets row data
-*/
-void VisuGUI_TableWidget::getRowData( int row, QStringList& data )
-{
-  data.clear();
-  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
-  if ( aModel )
-  {
-    if ( row >= 0 && row < getNumRows() )
-    {
-      if ( myOrientation == Qt::Horizontal )
-      {
-        for ( int i = 1; i < myTable->columnCount(); i++ )
-          data.append( aModel->index( row, i ).data().toString() );
-      }
-      else {
-        for ( int i = 1; i < myTable->rowCount(); i++ )
-          data.append( aModel->index( i, row ).data().toString() );
-      }
-    }
-  }
-}
-/*!
-  Adjusts table cell to see contents, <Adjust Cells> button slot
-*/
-void VisuGUI_TableWidget::adjustTable()
-{
-  myTable->resizeRowsToContents();
-  myTable->resizeColumnsToContents();
-}
-/*!
-  Called when selection changed in table
-*/
-void VisuGUI_TableWidget::updateButtonsState()
-{
-  if ( myTable->editTriggers() == QAbstractItemView::NoEditTriggers )
-    return;
-  bool bDR = false; // <Delete Row(s)>
-  bool bDC = false; // <Delete Column(s)>
-  bool bSA = false; // <Select All>
-  bool bCT = false; // <Clear>
-  int i;
-  //TO DO column/row selection check
-  /*int c = myOrientation == Qt::Horizontal ? 0 : 1;
-  for ( i = c; i < myTable->rowCount(); i++ ) {
-    
-    if ( myTable->isRowSelected( i, true ) )
-      bDR = true;
-    else 
-      bSA = true;
-  }
-  c = myOrientation == Qt::Horizontal ? 1 : 0;
-  for ( i = c; i < myTable->columnCount(); i++ ) {
-    if ( myTable->isColumnSelected( i, true ) )
-      bDC = true;
-    else 
-      bSA = true;
-      }*/
-  /*int nbSel = myTable->numSelections();
-  for ( i = 0; i < nbSel; i++ ) {
-    QTableSelection ts = myTable->selection( i );
-    for ( int j = ts.topRow(); j < ts.bottomRow()+1; j++) {
-      for ( int k = ts.leftCol(); k < ts.rightCol()+1; k++) {
-        if ( myTable->item( j, k ) )
-          bCT = true;
-      }
-    }
-    }*/
-  QList<QTableWidgetItem*> aSelection = myTable->selectedItems();
-  QList<QTableWidgetItem*>::ConstIterator anIt = aSelection.constBegin(),
-    anEndIt = aSelection.constEnd();
-  for ( ; anIt !=  anEndIt; anIt++ )
-  {
-    if( *anIt )
-    {
-      bCT = true;
-      break;
-    }
-  }
-  
-  if ( myTable->item( myTable->currentRow(), myTable->currentColumn() ) )
-    bCT = true;
-  myDelRowBtn->setEnabled( bDR );
-  myDelColBtn->setEnabled( bDC );
-  mySelectAllBtn->setEnabled( bSA );
-  myClearBtn->setEnabled( bCT );
-}
-/*!
-  <Add row> button slot
-*/
-void VisuGUI_TableWidget::addRow()
-{
-  myTable->insertRow( myTable->rowCount() );
-  updateButtonsState();
-}
-/*!
-  <Add column> button slot
-*/
-void VisuGUI_TableWidget::addCol()
-{
-  myTable->insertColumn( myTable->columnCount() );
-  updateButtonsState();
-}
-/*!
-  <Delete row(s)> button slot
-*/
-void VisuGUI_TableWidget::delRow()
-{
-  //TODO
-  /*int c = myOrientation == Qt::Horizontal ? 0 : 1;
-  QList<int> il;
-  int i;
-  for ( i = c; i < myTable->rowCount(); i++ )
-    if ( myTable->isRowSelected( i, true ) )
-      il.append( i );
-  if ( il.count() > 0 ) {
-    QMemArray<int> ildel( il.count() );
-    for ( i = 0; i < il.count(); i++ )
-      ildel[ i ] = il[ i ];
-    myTable->removeRows( ildel );
-    }*/
-  
-  updateButtonsState();
-}
-/*!
-  <Delete column(s)> button slot
-*/
-void VisuGUI_TableWidget::delCol()
-{
-  //TODO
-  /*int c = myOrientation == Qt::Horizontal ? 1 : 0;
-  QValueList<int> il;
-  int i;
-  for ( i = c; i < myTable->numCols(); i++ )
-    if ( myTable->isColumnSelected( i, true ) )
-      il.append( i );
-  if ( il.count() > 0 ) {
-    QMemArray<int> ildel( il.count() );
-    for ( i = 0; i < il.count(); i++ )
-      ildel[ i ] = il[ i ];
-    myTable->removeColumns( ildel );
-    }*/
-  updateButtonsState();
-}
-/*!
-  <Select All> button slot
-*/
-void VisuGUI_TableWidget::selectAll()
-{
-  /*myTable->clearSelection();
-  QTableSelection ts;
-  ts.init( 0, 0 ); ts.expandTo( myTable->numRows()-1, myTable->numCols()-1 );
-  myTable->addSelection( ts );*/
-  myTable->selectAll();
-  updateButtonsState();
-}
-/*!
-  <Clear> button slot
-*/
-void VisuGUI_TableWidget::clearTable()
-{
-  /*int nbSel = myTable->numSelections();
-  for ( int i = 0; i < nbSel; i++ ) {
-    QTableSelection ts = myTable->selection( i );
-    for ( int j = ts.topRow(); j < ts.bottomRow()+1; j++) {
-      if ( myOrientation == Qt::Vertical && j == 0 ) {
-//      continue;      // UNITS
-      }
-      for ( int k = ts.leftCol(); k < ts.rightCol()+1; k++) {
-        if ( myOrientation == Qt::Horizontal && k == 0 ) {
-//        continue;   // UNITS
-        }
-        myTable->clearCell( j, k );
-      }
-    }
-  }
-  if ( nbSel == 0 )
-    myTable->clearCell( myTable->currentRow(), myTable->currentColumn() );
-    myTable->clearSelection();*/
-  myTable->clearContents();
-  updateButtonsState();
-}
-/*!
-  Event filter - handles titles editing
-*/
-bool VisuGUI_TableWidget::eventFilter( QObject* o, QEvent* e )
-{
-  if ( e->type() == QEvent::MouseButtonDblClick) {
-    //TODO
-    /*QMouseEvent* me = ( QMouseEvent* )e;
-    if ( me->button() == Qt::LeftButton && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers ) ) {
-      if ( o == myTable->horizontalHeader() ) {
-        for ( int i = 0; i < myTable->horizontalHeader()->count(); i++ ) {
-          QRect rect = myTable->horizontalHeader()->sectionRect( i );
-          rect.addCoords( 1, 1, -1, -1 );
-          if ( rect.contains( myTable->horizontalHeader()->mapFromGlobal( me->globalPos() ) ) ) {
-            if ( myOrientation == Qt::Vertical || i != 0 ) {
-              bool bOk;
-              QString tlt = QInputDialog::getText( tr( "SET_TITLE_TLT" ), 
-                                                   tr( "TITLE_LBL" ),
-                                                   QLineEdit::Normal,
-                                                   myTable->horizontalHeader()->label( i ),
-                                                   &bOk,
-                                                   this );
-              if ( bOk && !tlt.isNull() )
-                myTable->horizontalHeader()->setLabel( i, tlt );
-              break;
-            }
-          }
-        }
-      }
-      if ( o == myTable->verticalHeader() ) {
-        for ( int i = 0; i < myTable->verticalHeader()->count(); i++ ) {
-          QRect rect = myTable->verticalHeader()->sectionRect( i );
-          rect.addCoords( 1, 1, -1, -1 );
-          if ( rect.contains( myTable->verticalHeader()->mapFromGlobal( me->globalPos() ) ) ) {
-            if ( myOrientation == Qt::Horizontal || i != 0 ) {
-              bool bOk;
-              QString tlt = QInputDialog::getText( tr( "SET_TITLE_TLT" ), 
-                                                   tr( "TITLE_LBL" ),
-                                                   QLineEdit::Normal,
-                                                   myTable->verticalHeader()->label( i ),
-                                                   &bOk,
-                                                   this );
-              if ( bOk && !tlt.isNull() )
-                myTable->verticalHeader()->setLabel( i, tlt );
-              break;
-            }
-          }
-        }
-      }
-      }*/    
-  }     
-  else if ( e->type() == QEvent::KeyRelease && o == myTable ) {
-    QKeyEvent* ke = (QKeyEvent*)e;
-    if ( ke->key() == Qt::Key_Delete && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers) ) {
-      clearTable();
-    }
-    else if ( ke->key() == Qt::Key_Backspace && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers) ) {
-      clearTable();
-      int i = myTable->currentRow();
-      int j = myTable->currentColumn() - 1;
-      if ( j < 0 ) { j = myTable->columnCount()-1; i--; }
-      if ( i >= 0 && j >= 0 )
-        myTable->setCurrentCell( i, j );
-    }
-  }
-  return QWidget::eventFilter( o, e );
-}
diff --git a/src/GUITOOLS/VisuGUI_TableDlg.h b/src/GUITOOLS/VisuGUI_TableDlg.h
deleted file mode 100644
index 9f708ae7..00000000
--- a/src/GUITOOLS/VisuGUI_TableDlg.h
+++ /dev/null
@@ -1,150 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VisuGUI_TableDlg.h
-//  Author : Vadim SANDLER
-//  Module : VISU
-//
-#ifndef VisuGUI_TABLE_DLG_H
-#define VisuGUI_TABLE_DLG_H
-
-#include <QDialog>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QItemDelegate>
-
-class QTableWidget;
-class VisuGUI_TableWidget;
-
-#include <SALOMEDSClient_SObject.hxx>
-
-#include "VisuGUITools.h"
-
-class VISU_GUITOOLS_EXPORT VisuGUI_TableDlg : public QDialog
-{ 
-  Q_OBJECT
-
-public:
-
-  enum { ttNone, ttInt, ttReal, ttBoth, ttAuto };
-
-  VisuGUI_TableDlg( QWidget* parent, 
-                    _PTR(SObject) obj, 
-                    bool edit = false,
-                    int which = ttAuto, 
-                    Qt::Orientation orient = Qt::Horizontal,
-                    bool showColumnTitles = true );
-  ~VisuGUI_TableDlg();
-
-private:
-  void keyPressEvent( QKeyEvent* e );
-
-public slots:
-  void onOK();
-  void onHelp(); 
-
-private:
-  void initDlg();
-
-private:
-  VisuGUI_TableWidget*   myIntTable;
-  VisuGUI_TableWidget*   myRealTable;
-  QPushButton*           myOKBtn;
-  QPushButton*           myCancelBtn;
-  QPushButton*           myHelpBtn;
-
-  _PTR(SObject) myObject;
-};
- 
-class VISU_GUITOOLS_EXPORT VisuGUI_TableWidget : public QWidget
-{
-  Q_OBJECT
-public:
-  VisuGUI_TableWidget( QWidget* parent = 0, 
-                       const char* name = 0, 
-                       bool edit = false, 
-                       Qt::Orientation orient = Qt::Horizontal,
-                       bool showColumnTitles = true );
-  ~VisuGUI_TableWidget();
-
-  void    setTableTitle( const QString& title );
-  QString getTableTitle();
-  void    setNumRows( const int num );
-  int     getNumRows();
-  void    setNumCols( const int num );
-  int     getNumCols();
-  void    setRowTitles( QStringList& tlts );
-  void    getRowTitles( QStringList& tlts );
-  void    setColTitles( QStringList& tlts );
-  void    getColTitles( QStringList& tlts );
-  void    setUnitsTitle( const QString& tlt );
-  void    setUnits( QStringList& units );
-  void    getUnits( QStringList& units );
-  void    setRowData( int row, QStringList& data );
-  void    getRowData( int row, QStringList& data );
-
-  QTableWidget*     getTable()     { return myTable; } 
-  QLineEdit*       getTitleEdit() { return myTitleEdit; }
-
-  bool    eventFilter( QObject* o, QEvent* e);
-
-public slots:
-  void updateButtonsState();
-  void addRow();
-  void addCol();
-  void delRow();
-  void delCol();
-  void adjustTable();
-  void selectAll();
-  void clearTable();
-
-private:
-  QLineEdit*       myTitleEdit;
-  QTableWidget*    myTable;
-  QPushButton*     myAddRowBtn;
-  QPushButton*     myAddColBtn;
-  QPushButton*     myDelRowBtn;
-  QPushButton*     myDelColBtn;
-  QPushButton*     myAdjustBtn;
-  QPushButton*     mySelectAllBtn;
-  QPushButton*     myClearBtn;
-  Qt::Orientation  myOrientation;
-};
-
-class VISU_GUITOOLS_EXPORT NumDelegateItem: public QItemDelegate
-{
-public:
-  enum NumValidator{ NV_Int, NV_Real };
-
-  NumDelegateItem( QObject* parent, NumValidator mode = NV_Int );
-  virtual ~NumDelegateItem();
-
-  virtual QWidget * createEditor( QWidget * parent,
-                                  const QStyleOptionViewItem & option,
-                                  const QModelIndex & index ) const;
-  virtual void setEditorData( QWidget * editor,
-                              const QModelIndex & index ) const;
-private:
-  int         myMode;
-};
-
-#endif // VisuGUI_TABLE_DLG_H
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 7e23c911..5a41dc48 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # $Header$
 #
-SUBDIRS = CONVERTOR PIPELINE OBJECT GUITOOLS VVTK VISU_I VISUGUI VISU_SWIG ENGINE
+SUBDIRS = CONVERTOR PIPELINE OBJECT VISU_I VISUGUI VISU_SWIG ENGINE
diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index 7ae989b8..64d1a787 100644
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.in
 #  Module : VISU
diff --git a/src/OBJECT/VISU_Actor.cxx b/src/OBJECT/VISU_Actor.cxx
index e3721d8c..bcb66281 100644
--- a/src/OBJECT/VISU_Actor.cxx
+++ b/src/OBJECT/VISU_Actor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   :
 //  Author :
 //  Module : VISU
-
+//
 #include "VISU_Actor.h"
 
 #include "VISU_ActorFactory.h"
diff --git a/src/OBJECT/VISU_Actor.h b/src/OBJECT/VISU_Actor.h
index 41152cfc..84d8876c 100644
--- a/src/OBJECT/VISU_Actor.h
+++ b/src/OBJECT/VISU_Actor.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
 //  Module : VISU
-
+//
 #ifndef VISU_ACTOR_H
 #define VISU_ACTOR_H
 
diff --git a/src/OBJECT/VISU_ActorBase.cxx b/src/OBJECT/VISU_ActorBase.cxx
index 44dbbc6f..ae6c8e9d 100644
--- a/src/OBJECT/VISU_ActorBase.cxx
+++ b/src/OBJECT/VISU_ActorBase.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_ActorBase.h b/src/OBJECT/VISU_ActorBase.h
index 7a39f0a5..10645c40 100644
--- a/src/OBJECT/VISU_ActorBase.h
+++ b/src/OBJECT/VISU_ActorBase.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_ActorFactory.h b/src/OBJECT/VISU_ActorFactory.h
index fa4acf99..032af805 100644
--- a/src/OBJECT/VISU_ActorFactory.h
+++ b/src/OBJECT/VISU_ActorFactory.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_BoostSignals.h b/src/OBJECT/VISU_BoostSignals.h
index 18cec9aa..b924b73a 100644
--- a/src/OBJECT/VISU_BoostSignals.h
+++ b/src/OBJECT/VISU_BoostSignals.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_DataSetActor.cxx b/src/OBJECT/VISU_DataSetActor.cxx
index 05fda9ba..acaab583 100644
--- a/src/OBJECT/VISU_DataSetActor.cxx
+++ b/src/OBJECT/VISU_DataSetActor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_DataSetActor.h b/src/OBJECT/VISU_DataSetActor.h
index 9261b6f9..7bb63b45 100644
--- a/src/OBJECT/VISU_DataSetActor.h
+++ b/src/OBJECT/VISU_DataSetActor.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_Event.h b/src/OBJECT/VISU_Event.h
index 4b50add9..29ddc9af 100644
--- a/src/OBJECT/VISU_Event.h
+++ b/src/OBJECT/VISU_Event.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_GaussPtsAct.cxx b/src/OBJECT/VISU_GaussPtsAct.cxx
index 7556eb33..83840ebe 100644
--- a/src/OBJECT/VISU_GaussPtsAct.cxx
+++ b/src/OBJECT/VISU_GaussPtsAct.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MeshAct.hxx
 //  Author : Laurent CORNABE with the help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_GaussPtsAct.h b/src/OBJECT/VISU_GaussPtsAct.h
index 66140e9d..fcfdb8a7 100644
--- a/src/OBJECT/VISU_GaussPtsAct.h
+++ b/src/OBJECT/VISU_GaussPtsAct.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ScalarMapAct.h
 //  Author : Laurent CORNABE with help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_GaussPtsActorFactory.h b/src/OBJECT/VISU_GaussPtsActorFactory.h
index b99a4046..6af774a3 100644
--- a/src/OBJECT/VISU_GaussPtsActorFactory.h
+++ b/src/OBJECT/VISU_GaussPtsActorFactory.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ScalarMapAct.h
 //  Author : Laurent CORNABE with help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
index 72faaef4..bd30fc36 100644
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH OBJECT : interactive object for SMESH visualization
 //  File   :
 //  Author : 
diff --git a/src/OBJECT/VISU_GaussPtsDeviceActor.h b/src/OBJECT/VISU_GaussPtsDeviceActor.h
index 6a9b6501..8ed805cd 100644
--- a/src/OBJECT/VISU_GaussPtsDeviceActor.h
+++ b/src/OBJECT/VISU_GaussPtsDeviceActor.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SMESH OBJECT : interactive object for SMESH visualization
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_GaussPtsSettings.cxx b/src/OBJECT/VISU_GaussPtsSettings.cxx
index bb9dd393..6e3fa7ff 100644
--- a/src/OBJECT/VISU_GaussPtsSettings.cxx
+++ b/src/OBJECT/VISU_GaussPtsSettings.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_GaussPtsSettings.h b/src/OBJECT/VISU_GaussPtsSettings.h
index 627d8980..8bc24083 100644
--- a/src/OBJECT/VISU_GaussPtsSettings.h
+++ b/src/OBJECT/VISU_GaussPtsSettings.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_IsoSurfActor.cxx b/src/OBJECT/VISU_IsoSurfActor.cxx
index 312b14d5..769563a9 100644
--- a/src/OBJECT/VISU_IsoSurfActor.cxx
+++ b/src/OBJECT/VISU_IsoSurfActor.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_IsoSurfActor.cxx
 //  Author : Vitaly Smetannikov
diff --git a/src/OBJECT/VISU_IsoSurfActor.h b/src/OBJECT/VISU_IsoSurfActor.h
index 4513d42a..345e66f9 100644
--- a/src/OBJECT/VISU_IsoSurfActor.h
+++ b/src/OBJECT/VISU_IsoSurfActor.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_IsoSurfActor.h
 //  Author : Vitaly Smetannikov
diff --git a/src/OBJECT/VISU_MeshAct.cxx b/src/OBJECT/VISU_MeshAct.cxx
index 41799765..1549c328 100644
--- a/src/OBJECT/VISU_MeshAct.cxx
+++ b/src/OBJECT/VISU_MeshAct.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MeshAct.cxx
 //  Author : 
diff --git a/src/OBJECT/VISU_MeshAct.h b/src/OBJECT/VISU_MeshAct.h
index 9e24df92..cbdc3a37 100644
--- a/src/OBJECT/VISU_MeshAct.h
+++ b/src/OBJECT/VISU_MeshAct.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MeshAct.h
 //  Author : Laurent CORNABE with the help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_OBJECT.h b/src/OBJECT/VISU_OBJECT.h
index 7b512d90..0f441ee3 100755
--- a/src/OBJECT/VISU_OBJECT.h
+++ b/src/OBJECT/VISU_OBJECT.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifdef WIN32
 # if defined VISU_OBJECT_EXPORTS || defined VisuObject_EXPORTS
 #  define VISU_OBJECT_EXPORT __declspec(dllexport)
diff --git a/src/OBJECT/VISU_PickingSettings.cxx b/src/OBJECT/VISU_PickingSettings.cxx
index 9cbdeaed..c7a8f168 100644
--- a/src/OBJECT/VISU_PickingSettings.cxx
+++ b/src/OBJECT/VISU_PickingSettings.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PickingSettings.cxx
 //  Author : Oleg UVAROV
diff --git a/src/OBJECT/VISU_PickingSettings.h b/src/OBJECT/VISU_PickingSettings.h
index e5b894d1..412bf759 100644
--- a/src/OBJECT/VISU_PickingSettings.h
+++ b/src/OBJECT/VISU_PickingSettings.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PickingSettings.cxx
 //  Author : Oleg UVAROV
diff --git a/src/OBJECT/VISU_PointMap3dActor.cxx b/src/OBJECT/VISU_PointMap3dActor.cxx
index d92b698a..e60b8a42 100644
--- a/src/OBJECT/VISU_PointMap3dActor.cxx
+++ b/src/OBJECT/VISU_PointMap3dActor.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : 
 //  Author : 
diff --git a/src/OBJECT/VISU_PointMap3dActor.h b/src/OBJECT/VISU_PointMap3dActor.h
index cf0ab13c..c14d70ed 100644
--- a/src/OBJECT/VISU_PointMap3dActor.h
+++ b/src/OBJECT/VISU_PointMap3dActor.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PointMap3dActor.h
 //  Author : Dmitry MATVEICHEV with help of Alexey PETROV
diff --git a/src/OBJECT/VISU_ScalarMapAct.cxx b/src/OBJECT/VISU_ScalarMapAct.cxx
index 54996e98..f6b85ac4 100644
--- a/src/OBJECT/VISU_ScalarMapAct.cxx
+++ b/src/OBJECT/VISU_ScalarMapAct.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MeshAct.hxx
 //  Author : Laurent CORNABE with the help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_ScalarMapAct.h b/src/OBJECT/VISU_ScalarMapAct.h
index 9ff48ab2..b7a256ca 100644
--- a/src/OBJECT/VISU_ScalarMapAct.h
+++ b/src/OBJECT/VISU_ScalarMapAct.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ScalarMapAct.h
 //  Author : Laurent CORNABE with help of Nicolas REJNERI
diff --git a/src/OBJECT/VISU_SelectVisiblePoints.cxx b/src/OBJECT/VISU_SelectVisiblePoints.cxx
index 1f91cae1..99e41574 100644
--- a/src/OBJECT/VISU_SelectVisiblePoints.cxx
+++ b/src/OBJECT/VISU_SelectVisiblePoints.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,11 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_SelectVisiblePoints.h
 //  Author : Oleg UVAROV
 //  Module : VISU
-
+//
 #include "VISU_SelectVisiblePoints.h"
 
 #include "vtkCamera.h"
diff --git a/src/OBJECT/VISU_SelectVisiblePoints.h b/src/OBJECT/VISU_SelectVisiblePoints.h
index d112326b..778ab2d1 100644
--- a/src/OBJECT/VISU_SelectVisiblePoints.h
+++ b/src/OBJECT/VISU_SelectVisiblePoints.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,11 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_SelectVisiblePoints.h
 //  Author : Oleg UVAROV
 //  Module : VISU
-
+//
 #ifndef VISU_SelectVisiblePoints_HeaderFile
 #define VISU_SelectVisiblePoints_HeaderFile
 
diff --git a/src/OBJECT/VISU_VectorsAct.cxx b/src/OBJECT/VISU_VectorsAct.cxx
index 0742a57a..a2e866ba 100644
--- a/src/OBJECT/VISU_VectorsAct.cxx
+++ b/src/OBJECT/VISU_VectorsAct.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_VectorsAct.cxx
 //  Author : Laurent CORNABE with help of Nicolas REJNERI
 //  Module : VISU
-
+//
 #include "VISU_VectorsAct.h"
 #include "VISU_VectorsPL.hxx"
 #include <SVTK_Actor.h>
diff --git a/src/OBJECT/VISU_VectorsAct.h b/src/OBJECT/VISU_VectorsAct.h
index 98db4124..2729a683 100644
--- a/src/OBJECT/VISU_VectorsAct.h
+++ b/src/OBJECT/VISU_VectorsAct.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_VectorsAct.h
 //  Author : Laurent CORNABE with help of Nicolas REJNERI
 //  Module : VISU
-
+//
 #ifndef VISU_VectorsAct_HeaderFile
 #define VISU_VectorsAct_HeaderFile
 
diff --git a/src/PIPELINE/Makefile.am b/src/PIPELINE/Makefile.am
index a7558e34..ee6aa5b6 100644
--- a/src/PIPELINE/Makefile.am
+++ b/src/PIPELINE/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU OBJECT : interactive object for VISU entities implementation
 #  File   : Makefile.in
 #  Module : VISU
diff --git a/src/PIPELINE/SALOME_ExtractGeometry.cxx b/src/PIPELINE/SALOME_ExtractGeometry.cxx
index 2c4293d6..b057ef83 100755
--- a/src/PIPELINE/SALOME_ExtractGeometry.cxx
+++ b/src/PIPELINE/SALOME_ExtractGeometry.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "SALOME_ExtractGeometry.h"
 
 #include <vtkCell.h>
diff --git a/src/PIPELINE/SALOME_ExtractGeometry.h b/src/PIPELINE/SALOME_ExtractGeometry.h
index 93e73d8c..81fcb1f6 100755
--- a/src/PIPELINE/SALOME_ExtractGeometry.h
+++ b/src/PIPELINE/SALOME_ExtractGeometry.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef SALOME_ExtractGeometry_H
 #define SALOME_ExtractGeometry_H
 
diff --git a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
index eb187548..5fce6dfc 100644
--- a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
+++ b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "SALOME_ExtractPolyDataGeometry.h"
 
 #include <vtkCellArray.h>
diff --git a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.h b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.h
index 862a9f2d..9feb4e02 100644
--- a/src/PIPELINE/SALOME_ExtractPolyDataGeometry.h
+++ b/src/PIPELINE/SALOME_ExtractPolyDataGeometry.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef SALOME_ExtractPolyDataGeometry_H
 #define SALOME_ExtractPolyDataGeometry_H
 
diff --git a/src/PIPELINE/VISUPipeLine.cxx b/src/PIPELINE/VISUPipeLine.cxx
index b789ff69..8e99d6d9 100644
--- a/src/PIPELINE/VISUPipeLine.cxx
+++ b/src/PIPELINE/VISUPipeLine.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISUPipeline.hxx b/src/PIPELINE/VISUPipeline.hxx
index 17930bde..9e1b8a0e 100755
--- a/src/PIPELINE/VISUPipeline.hxx
+++ b/src/PIPELINE/VISUPipeline.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISUPipeline.hxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/PIPELINE/VISU_ColoredPL.cxx b/src/PIPELINE/VISU_ColoredPL.cxx
index 1407f02e..a14d401e 100644
--- a/src/PIPELINE/VISU_ColoredPL.cxx
+++ b/src/PIPELINE/VISU_ColoredPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ColoredPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_ColoredPL.hxx b/src/PIPELINE/VISU_ColoredPL.hxx
index 04dfd7e9..e5771969 100644
--- a/src/PIPELINE/VISU_ColoredPL.hxx
+++ b/src/PIPELINE/VISU_ColoredPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ColoredPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_CutLinesBasePL.cxx b/src/PIPELINE/VISU_CutLinesBasePL.cxx
index 13370909..a23545ec 100644
--- a/src/PIPELINE/VISU_CutLinesBasePL.cxx
+++ b/src/PIPELINE/VISU_CutLinesBasePL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_CutLinesBasePL.cxx
 // Author:  Oleg UVAROV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_CutLinesBasePL.hxx b/src/PIPELINE/VISU_CutLinesBasePL.hxx
index d3ed3d0f..dc068505 100644
--- a/src/PIPELINE/VISU_CutLinesBasePL.hxx
+++ b/src/PIPELINE/VISU_CutLinesBasePL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_CutLinesBasePL.hxx
 // Author:  Oleg UVAROV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_CutLinesPL.cxx b/src/PIPELINE/VISU_CutLinesPL.cxx
index 3182a43e..c833c6f7 100644
--- a/src/PIPELINE/VISU_CutLinesPL.cxx
+++ b/src/PIPELINE/VISU_CutLinesPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_CutLinesPL.hxx b/src/PIPELINE/VISU_CutLinesPL.hxx
index f34504d5..39770a0e 100644
--- a/src/PIPELINE/VISU_CutLinesPL.hxx
+++ b/src/PIPELINE/VISU_CutLinesPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_CutPlanesPL.cxx b/src/PIPELINE/VISU_CutPlanesPL.cxx
index 247f8943..da2d79f9 100644
--- a/src/PIPELINE/VISU_CutPlanesPL.cxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_CutPlanesPL.hxx b/src/PIPELINE/VISU_CutPlanesPL.hxx
index 581ae148..3326aab4 100644
--- a/src/PIPELINE/VISU_CutPlanesPL.hxx
+++ b/src/PIPELINE/VISU_CutPlanesPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_CutPlanesPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_CutSegmentPL.cxx b/src/PIPELINE/VISU_CutSegmentPL.cxx
index 9a884804..aa0087fe 100644
--- a/src/PIPELINE/VISU_CutSegmentPL.cxx
+++ b/src/PIPELINE/VISU_CutSegmentPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_CutSegmentPL.hxx
 // Author:  Oleg UVAROV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_CutSegmentPL.hxx b/src/PIPELINE/VISU_CutSegmentPL.hxx
index ece3967f..ab71b207 100644
--- a/src/PIPELINE/VISU_CutSegmentPL.hxx
+++ b/src/PIPELINE/VISU_CutSegmentPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_CutSegmentPL.hxx
 // Author:  Oleg UVAROV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_DataSetMapperHolder.cxx b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
index bdb227d8..dc510182 100644
--- a/src/PIPELINE/VISU_DataSetMapperHolder.cxx
+++ b/src/PIPELINE/VISU_DataSetMapperHolder.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_DataSetMapperHolder.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_DataSetMapperHolder.hxx b/src/PIPELINE/VISU_DataSetMapperHolder.hxx
index da8a3bf8..37d5db6e 100644
--- a/src/PIPELINE/VISU_DataSetMapperHolder.hxx
+++ b/src/PIPELINE/VISU_DataSetMapperHolder.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_DataSetMapperHolder.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_DeformationPL.cxx b/src/PIPELINE/VISU_DeformationPL.cxx
index 27059816..0fbaa6c0 100755
--- a/src/PIPELINE/VISU_DeformationPL.cxx
+++ b/src/PIPELINE/VISU_DeformationPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_ScalarMapPL.cxx
 // Author:  Roman NIKOLAEV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_DeformationPL.hxx b/src/PIPELINE/VISU_DeformationPL.hxx
index 85409d38..e8d66576 100755
--- a/src/PIPELINE/VISU_DeformationPL.hxx
+++ b/src/PIPELINE/VISU_DeformationPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_DeformationPL.hxx
 //  Author : 
 //  Module : SALOME
diff --git a/src/PIPELINE/VISU_DeformedGridPL.cxx b/src/PIPELINE/VISU_DeformedGridPL.cxx
index 112b55b4..d4fe0590 100644
--- a/src/PIPELINE/VISU_DeformedGridPL.cxx
+++ b/src/PIPELINE/VISU_DeformedGridPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_DeformedGridPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_DeformedGridPL.hxx b/src/PIPELINE/VISU_DeformedGridPL.hxx
index 38eb5938..5955af9d 100644
--- a/src/PIPELINE/VISU_DeformedGridPL.hxx
+++ b/src/PIPELINE/VISU_DeformedGridPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ScalarMapPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
index 30b2ce06..4f2891c9 100644
--- a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU DeformedShapeAndScalarMapPL
 // File:    VISU_DeformedShapeAndScalarMapPL.cxx
 // Author:  Eugeny Nikolaev
diff --git a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx
index 546f7daa..a59794db 100644
--- a/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx
+++ b/src/PIPELINE/VISU_DeformedShapeAndScalarMapPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_DeformedShapeAndScalarMapPL.hxx
 // Author:  Eugeny Nikolaev
diff --git a/src/PIPELINE/VISU_DeformedShapePL.cxx b/src/PIPELINE/VISU_DeformedShapePL.cxx
index b3c93c87..3312723f 100644
--- a/src/PIPELINE/VISU_DeformedShapePL.cxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_DeformedShapePL.hxx b/src/PIPELINE/VISU_DeformedShapePL.hxx
index 2fbb3bf0..ccbeb582 100644
--- a/src/PIPELINE/VISU_DeformedShapePL.hxx
+++ b/src/PIPELINE/VISU_DeformedShapePL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_ElnoAssembleFilter.cxx b/src/PIPELINE/VISU_ElnoAssembleFilter.cxx
index de46b628..68e25e21 100644
--- a/src/PIPELINE/VISU_ElnoAssembleFilter.cxx
+++ b/src/PIPELINE/VISU_ElnoAssembleFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_ElnoAssembleFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_ElnoMeshValue.hxx"
diff --git a/src/PIPELINE/VISU_ElnoAssembleFilter.hxx b/src/PIPELINE/VISU_ElnoAssembleFilter.hxx
index ca023a3e..e3953c3b 100644
--- a/src/PIPELINE/VISU_ElnoAssembleFilter.hxx
+++ b/src/PIPELINE/VISU_ElnoAssembleFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_ElnoAssembleFilter_H
 #define VISU_ElnoAssembleFilter_H
 
diff --git a/src/PIPELINE/VISU_ElnoDisassembleFilter.cxx b/src/PIPELINE/VISU_ElnoDisassembleFilter.cxx
index 38957e4b..8eacd242 100644
--- a/src/PIPELINE/VISU_ElnoDisassembleFilter.cxx
+++ b/src/PIPELINE/VISU_ElnoDisassembleFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_ElnoDisassembleFilter.hxx"
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_ElnoMeshValue.hxx"
diff --git a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
index 9276887d..32754a49 100644
--- a/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
+++ b/src/PIPELINE/VISU_ElnoDisassembleFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_ElnoDisassembleFilter_H
 #define VISU_ElnoDisassembleFilter_H
 
diff --git a/src/PIPELINE/VISU_Extractor.cxx b/src/PIPELINE/VISU_Extractor.cxx
index f900ab37..c8ecf191 100644
--- a/src/PIPELINE/VISU_Extractor.cxx
+++ b/src/PIPELINE/VISU_Extractor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,10 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Extractor.cxx
 //  Module : VISU
-
+//
 #include "VISU_Extractor.hxx"
 #include "VISU_PipeLineUtils.hxx"
 #include "VISU_ConvertorUtils.hxx"
diff --git a/src/PIPELINE/VISU_Extractor.hxx b/src/PIPELINE/VISU_Extractor.hxx
index 5d6b8874..698b0376 100644
--- a/src/PIPELINE/VISU_Extractor.hxx
+++ b/src/PIPELINE/VISU_Extractor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Extractor.hxx
 //  Author : Alexey PETROV
diff --git a/src/PIPELINE/VISU_FieldTransform.cxx b/src/PIPELINE/VISU_FieldTransform.cxx
index 16a36d01..0b3a4eb2 100644
--- a/src/PIPELINE/VISU_FieldTransform.cxx
+++ b/src/PIPELINE/VISU_FieldTransform.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_FieldTransform.cxx
 //  Module : VISU
 //
diff --git a/src/PIPELINE/VISU_FieldTransform.hxx b/src/PIPELINE/VISU_FieldTransform.hxx
index 62dfe0ee..455ed3ce 100644
--- a/src/PIPELINE/VISU_FieldTransform.hxx
+++ b/src/PIPELINE/VISU_FieldTransform.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_FieldTransform.hxx
 //  Author : Alexey PETROV
diff --git a/src/PIPELINE/VISU_GaussPointsPL.cxx b/src/PIPELINE/VISU_GaussPointsPL.cxx
index 70cc1b12..43887c4f 100644
--- a/src/PIPELINE/VISU_GaussPointsPL.cxx
+++ b/src/PIPELINE/VISU_GaussPointsPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_GaussPoints.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_GaussPointsPL.hxx b/src/PIPELINE/VISU_GaussPointsPL.hxx
index cbfec5a1..0e0df2b2 100644
--- a/src/PIPELINE/VISU_GaussPointsPL.hxx
+++ b/src/PIPELINE/VISU_GaussPointsPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_GaussPointsPL.hxx
 // Author:  
diff --git a/src/PIPELINE/VISU_ImplicitFunctionWidget.cxx b/src/PIPELINE/VISU_ImplicitFunctionWidget.cxx
index b364e380..286dea53 100644
--- a/src/PIPELINE/VISU_ImplicitFunctionWidget.cxx
+++ b/src/PIPELINE/VISU_ImplicitFunctionWidget.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VVTK_ImplicitFunctionWidget.cxx
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
index 7adb1b8c..a7069343 100644
--- a/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
+++ b/src/PIPELINE/VISU_ImplicitFunctionWidget.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VISU_PlanesWidget.h
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.cxx b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
index 23917c1d..ae875a05 100644
--- a/src/PIPELINE/VISU_IsoSurfacesPL.cxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_IsoSurfacesPL.hxx b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
index 697223a3..81651dd0 100644
--- a/src/PIPELINE/VISU_IsoSurfacesPL.hxx
+++ b/src/PIPELINE/VISU_IsoSurfacesPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_LabelPointsFilter.cxx b/src/PIPELINE/VISU_LabelPointsFilter.cxx
index 577fc04b..3ec4db61 100644
--- a/src/PIPELINE/VISU_LabelPointsFilter.cxx
+++ b/src/PIPELINE/VISU_LabelPointsFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_LabelPointsFilter.cxx
 // Author:  Vitaly Smetannikov
diff --git a/src/PIPELINE/VISU_LabelPointsFilter.hxx b/src/PIPELINE/VISU_LabelPointsFilter.hxx
index 32eee87d..e00bcc69 100644
--- a/src/PIPELINE/VISU_LabelPointsFilter.hxx
+++ b/src/PIPELINE/VISU_LabelPointsFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_LabelPointsFilter.hxx
 // Author:  Vitaly Smetannikov
diff --git a/src/PIPELINE/VISU_LookupTable.cxx b/src/PIPELINE/VISU_LookupTable.cxx
index a2a4e7f7..79ab4c41 100644
--- a/src/PIPELINE/VISU_LookupTable.cxx
+++ b/src/PIPELINE/VISU_LookupTable.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_LookupTable.cxx
 //  Author : Vitaliy Smetannikov
 //  Module : VISU
-
+//
 #include "VISU_LookupTable.hxx"
 
 #include <vtkObjectFactory.h>
diff --git a/src/PIPELINE/VISU_LookupTable.hxx b/src/PIPELINE/VISU_LookupTable.hxx
index 0026a774..daa1a22b 100644
--- a/src/PIPELINE/VISU_LookupTable.hxx
+++ b/src/PIPELINE/VISU_LookupTable.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_LookupTable.h
 //  Author : Vitaliy Smetannikov
 //  Module : VISU
diff --git a/src/PIPELINE/VISU_MapperHolder.cxx b/src/PIPELINE/VISU_MapperHolder.cxx
index 3aec8976..51e57035 100644
--- a/src/PIPELINE/VISU_MapperHolder.cxx
+++ b/src/PIPELINE/VISU_MapperHolder.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MapperHolder.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MapperHolder.hxx b/src/PIPELINE/VISU_MapperHolder.hxx
index 84d87710..faed87d5 100644
--- a/src/PIPELINE/VISU_MapperHolder.hxx
+++ b/src/PIPELINE/VISU_MapperHolder.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MapperHolder.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MaskPointsFilter.cxx b/src/PIPELINE/VISU_MaskPointsFilter.cxx
index 02c53dc7..be62e5a3 100644
--- a/src/PIPELINE/VISU_MaskPointsFilter.cxx
+++ b/src/PIPELINE/VISU_MaskPointsFilter.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_StreamLinesPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MaskPointsFilter.hxx b/src/PIPELINE/VISU_MaskPointsFilter.hxx
index a3fb63a7..96335f33 100644
--- a/src/PIPELINE/VISU_MaskPointsFilter.hxx
+++ b/src/PIPELINE/VISU_MaskPointsFilter.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MaskPointsFilter.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MergedPL.cxx b/src/PIPELINE/VISU_MergedPL.cxx
index 17cb59b5..3f92fcfd 100644
--- a/src/PIPELINE/VISU_MergedPL.cxx
+++ b/src/PIPELINE/VISU_MergedPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MergedPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MergedPL.hxx b/src/PIPELINE/VISU_MergedPL.hxx
index a2648e48..bde4f455 100644
--- a/src/PIPELINE/VISU_MergedPL.hxx
+++ b/src/PIPELINE/VISU_MergedPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MergedPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MeshPL.cxx b/src/PIPELINE/VISU_MeshPL.cxx
index cff1dbf3..b24f4e98 100644
--- a/src/PIPELINE/VISU_MeshPL.cxx
+++ b/src/PIPELINE/VISU_MeshPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MeshPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_MeshPL.hxx b/src/PIPELINE/VISU_MeshPL.hxx
index 7118da3d..d4f79fbd 100644
--- a/src/PIPELINE/VISU_MeshPL.hxx
+++ b/src/PIPELINE/VISU_MeshPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_MeshPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
index fbf5a895..56c18d93 100755
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_OpenGLPointSpriteMapper.cxx
 // Author:  
diff --git a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
index 94fa3b23..1b029c58 100755
--- a/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
+++ b/src/PIPELINE/VISU_OpenGLPointSpriteMapper.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_OpenGLPointSpriteMapper.hxx
 // Author:  
diff --git a/src/PIPELINE/VISU_OptionalDeformationPL.cxx b/src/PIPELINE/VISU_OptionalDeformationPL.cxx
index 496ebd19..ae8527c3 100755
--- a/src/PIPELINE/VISU_OptionalDeformationPL.cxx
+++ b/src/PIPELINE/VISU_OptionalDeformationPL.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    VISU_ScalarMapPL.cxx
 // Author:  Roman NIKOLAEV
 // Module : VISU
diff --git a/src/PIPELINE/VISU_OptionalDeformationPL.hxx b/src/PIPELINE/VISU_OptionalDeformationPL.hxx
index 0bd30730..f3f94f09 100755
--- a/src/PIPELINE/VISU_OptionalDeformationPL.hxx
+++ b/src/PIPELINE/VISU_OptionalDeformationPL.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_OptionalDeformationPL.hxx
 //  Author : 
 //  Module : SALOME
diff --git a/src/PIPELINE/VISU_PipeLine.cxx b/src/PIPELINE/VISU_PipeLine.cxx
index 89bf6b40..d9809ae5 100644
--- a/src/PIPELINE/VISU_PipeLine.cxx
+++ b/src/PIPELINE/VISU_PipeLine.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PipeLine.hxx b/src/PIPELINE/VISU_PipeLine.hxx
index 959142dd..d2bf38a5 100644
--- a/src/PIPELINE/VISU_PipeLine.hxx
+++ b/src/PIPELINE/VISU_PipeLine.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PipeLineUtils.cxx b/src/PIPELINE/VISU_PipeLineUtils.cxx
index 03c0edc7..b048a04c 100644
--- a/src/PIPELINE/VISU_PipeLineUtils.cxx
+++ b/src/PIPELINE/VISU_PipeLineUtils.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PipeLineUtils.hxx b/src/PIPELINE/VISU_PipeLineUtils.hxx
index 081869db..a6026293 100644
--- a/src/PIPELINE/VISU_PipeLineUtils.hxx
+++ b/src/PIPELINE/VISU_PipeLineUtils.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PlanesWidget.cxx b/src/PIPELINE/VISU_PlanesWidget.cxx
index e7a91df0..08e7a437 100644
--- a/src/PIPELINE/VISU_PlanesWidget.cxx
+++ b/src/PIPELINE/VISU_PlanesWidget.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VVTK_ImplicitFunctionWidget.cxx
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_PlanesWidget.hxx b/src/PIPELINE/VISU_PlanesWidget.hxx
index 7c5fc26c..a02742ea 100644
--- a/src/PIPELINE/VISU_PlanesWidget.hxx
+++ b/src/PIPELINE/VISU_PlanesWidget.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VISU_PlanesWidget.h
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_Plot3DPL.cxx b/src/PIPELINE/VISU_Plot3DPL.cxx
index 22795765..08846958 100644
--- a/src/PIPELINE/VISU_Plot3DPL.cxx
+++ b/src/PIPELINE/VISU_Plot3DPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_Plot3DPL.hxx b/src/PIPELINE/VISU_Plot3DPL.hxx
index 9d7e379c..ab3d2594 100644
--- a/src/PIPELINE/VISU_Plot3DPL.hxx
+++ b/src/PIPELINE/VISU_Plot3DPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_CutPlanesPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PointSpriteMapperHolder.cxx b/src/PIPELINE/VISU_PointSpriteMapperHolder.cxx
index a83aa55e..d8f891a9 100644
--- a/src/PIPELINE/VISU_PointSpriteMapperHolder.cxx
+++ b/src/PIPELINE/VISU_PointSpriteMapperHolder.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PointSpriteMapperHolder.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PointSpriteMapperHolder.hxx b/src/PIPELINE/VISU_PointSpriteMapperHolder.hxx
index 96f6d56f..151b377b 100644
--- a/src/PIPELINE/VISU_PointSpriteMapperHolder.hxx
+++ b/src/PIPELINE/VISU_PointSpriteMapperHolder.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PointSpriteMapperHolder.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PolyDataMapperHolder.cxx b/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
index a328a587..fd4a6ec7 100644
--- a/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
+++ b/src/PIPELINE/VISU_PolyDataMapperHolder.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PolyDataMapperHolder.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PolyDataMapperHolder.hxx b/src/PIPELINE/VISU_PolyDataMapperHolder.hxx
index 524c49ae..c1695fb2 100644
--- a/src/PIPELINE/VISU_PolyDataMapperHolder.hxx
+++ b/src/PIPELINE/VISU_PolyDataMapperHolder.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PolyDataMapperHolder.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PolyDataPL.cxx b/src/PIPELINE/VISU_PolyDataPL.cxx
index 2655054d..573b3da6 100644
--- a/src/PIPELINE/VISU_PolyDataPL.cxx
+++ b/src/PIPELINE/VISU_PolyDataPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PolyDataPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_PolyDataPL.hxx b/src/PIPELINE/VISU_PolyDataPL.hxx
index 3dc1aa0b..6185a20c 100644
--- a/src/PIPELINE/VISU_PolyDataPL.hxx
+++ b/src/PIPELINE/VISU_PolyDataPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_UnstructuredGripPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_ScalarBarActor.cxx b/src/PIPELINE/VISU_ScalarBarActor.cxx
index 4aadc308..b213d1c1 100644
--- a/src/PIPELINE/VISU_ScalarBarActor.cxx
+++ b/src/PIPELINE/VISU_ScalarBarActor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_ScalarBarActor.hxx b/src/PIPELINE/VISU_ScalarBarActor.hxx
index 6a4bf8ee..49885a75 100644
--- a/src/PIPELINE/VISU_ScalarBarActor.hxx
+++ b/src/PIPELINE/VISU_ScalarBarActor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.cxx b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
index 5833db1f..cb2807a2 100644
--- a/src/PIPELINE/VISU_ScalarBarCtrl.cxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ScalarBarCtrl.cxx
 // Author:  Peter KURNEV
diff --git a/src/PIPELINE/VISU_ScalarBarCtrl.hxx b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
index a8f7bf3d..61f794cc 100644
--- a/src/PIPELINE/VISU_ScalarBarCtrl.hxx
+++ b/src/PIPELINE/VISU_ScalarBarCtrl.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ScalarBarCtrl.hxx
 // Author:  Peter KURNEV
diff --git a/src/PIPELINE/VISU_ScalarMapPL.cxx b/src/PIPELINE/VISU_ScalarMapPL.cxx
index e15d9434..17638d39 100644
--- a/src/PIPELINE/VISU_ScalarMapPL.cxx
+++ b/src/PIPELINE/VISU_ScalarMapPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,12 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
-//
 //  File:    VISU_ScalarMapPL.cxx
 //  Author:  Alexey PETROV
 //  Module : VISU
-
+//
 #include "VISU_ScalarMapPL.hxx"
 #include "VISU_DataSetMapperHolder.hxx"
 #include "VISU_ElnoAssembleFilter.hxx"
diff --git a/src/PIPELINE/VISU_ScalarMapPL.hxx b/src/PIPELINE/VISU_ScalarMapPL.hxx
index ea975bc7..531602c2 100644
--- a/src/PIPELINE/VISU_ScalarMapPL.hxx
+++ b/src/PIPELINE/VISU_ScalarMapPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_ScalarMapPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_SphereWidget.cxx b/src/PIPELINE/VISU_SphereWidget.cxx
index 4369d7bc..445f8f79 100755
--- a/src/PIPELINE/VISU_SphereWidget.cxx
+++ b/src/PIPELINE/VISU_SphereWidget.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_SphereWidget.hxx"
 
 #include <vtkActor.h>
diff --git a/src/PIPELINE/VISU_SphereWidget.hxx b/src/PIPELINE/VISU_SphereWidget.hxx
index ce571c82..092b5490 100755
--- a/src/PIPELINE/VISU_SphereWidget.hxx
+++ b/src/PIPELINE/VISU_SphereWidget.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __VISU_SphereWidget_h
 #define __VISU_SphereWidget_h
 
diff --git a/src/PIPELINE/VISU_StreamLine.cxx b/src/PIPELINE/VISU_StreamLine.cxx
index 9c0979fd..79b751cf 100644
--- a/src/PIPELINE/VISU_StreamLine.cxx
+++ b/src/PIPELINE/VISU_StreamLine.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_StreamLine.hxx"
 
 #include "vtkCellArray.h"
diff --git a/src/PIPELINE/VISU_StreamLine.hxx b/src/PIPELINE/VISU_StreamLine.hxx
index 150094a3..ca6b7ac5 100644
--- a/src/PIPELINE/VISU_StreamLine.hxx
+++ b/src/PIPELINE/VISU_StreamLine.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_StreamLine_HeaderFile
 #define VISU_StreamLine_HeaderFile
 
diff --git a/src/PIPELINE/VISU_StreamLinesPL.cxx b/src/PIPELINE/VISU_StreamLinesPL.cxx
index 40d0dcd8..6eb70ecc 100644
--- a/src/PIPELINE/VISU_StreamLinesPL.cxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_StreamLinesPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_StreamLinesPL.hxx b/src/PIPELINE/VISU_StreamLinesPL.hxx
index fd72d0f3..009424b0 100644
--- a/src/PIPELINE/VISU_StreamLinesPL.hxx
+++ b/src/PIPELINE/VISU_StreamLinesPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_StreamLinesPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_Streamer.cxx b/src/PIPELINE/VISU_Streamer.cxx
index 6f8cbc89..167ed70d 100644
--- a/src/PIPELINE/VISU_Streamer.cxx
+++ b/src/PIPELINE/VISU_Streamer.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_Streamer.hxx"
 
 #include "vtkCell.h"
diff --git a/src/PIPELINE/VISU_Streamer.hxx b/src/PIPELINE/VISU_Streamer.hxx
index 987a8973..b3e660fd 100644
--- a/src/PIPELINE/VISU_Streamer.hxx
+++ b/src/PIPELINE/VISU_Streamer.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_Streamer_HeaderFile
 #define VISU_Streamer_HeaderFile
 
diff --git a/src/PIPELINE/VISU_UnstructuredGridPL.cxx b/src/PIPELINE/VISU_UnstructuredGridPL.cxx
index 070aafc0..6216e9e5 100644
--- a/src/PIPELINE/VISU_UnstructuredGridPL.cxx
+++ b/src/PIPELINE/VISU_UnstructuredGridPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_UnstructuredGridPL.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_UnstructuredGridPL.hxx b/src/PIPELINE/VISU_UnstructuredGridPL.hxx
index 4ef55391..2bce111e 100644
--- a/src/PIPELINE/VISU_UnstructuredGridPL.hxx
+++ b/src/PIPELINE/VISU_UnstructuredGridPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_UnstructuredGripPL.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_VectorsPL.cxx b/src/PIPELINE/VISU_VectorsPL.cxx
index 4c0f2ebd..9831783b 100644
--- a/src/PIPELINE/VISU_VectorsPL.cxx
+++ b/src/PIPELINE/VISU_VectorsPL.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.cxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_VectorsPL.hxx b/src/PIPELINE/VISU_VectorsPL.hxx
index d96cfdb8..b6bb4e84 100644
--- a/src/PIPELINE/VISU_VectorsPL.hxx
+++ b/src/PIPELINE/VISU_VectorsPL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_PipeLine.hxx
 // Author:  Alexey PETROV
diff --git a/src/PIPELINE/VISU_WidgetCtrl.cxx b/src/PIPELINE/VISU_WidgetCtrl.cxx
index 055ad249..1d15449e 100644
--- a/src/PIPELINE/VISU_WidgetCtrl.cxx
+++ b/src/PIPELINE/VISU_WidgetCtrl.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VVTK_WidgetCtrl.cxx
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_WidgetCtrl.hxx b/src/PIPELINE/VISU_WidgetCtrl.hxx
index 7faa4c1f..70618724 100644
--- a/src/PIPELINE/VISU_WidgetCtrl.hxx
+++ b/src/PIPELINE/VISU_WidgetCtrl.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : VISU_WidgetCtrl.hxx
 //  Author : Peter KURNEV
diff --git a/src/PIPELINE/VISU_XYPlotActor.cxx b/src/PIPELINE/VISU_XYPlotActor.cxx
index bbdabd9b..9c66379b 100644
--- a/src/PIPELINE/VISU_XYPlotActor.cxx
+++ b/src/PIPELINE/VISU_XYPlotActor.cxx
@@ -11,6 +11,8 @@
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
 
+  *** Modified by OPEN CASCADE
+
 =========================================================================*/
 #include "VISU_XYPlotActor.hxx"
 
diff --git a/src/PIPELINE/VISU_XYPlotActor.hxx b/src/PIPELINE/VISU_XYPlotActor.hxx
index c9d86edc..cc066b52 100644
--- a/src/PIPELINE/VISU_XYPlotActor.hxx
+++ b/src/PIPELINE/VISU_XYPlotActor.hxx
@@ -15,6 +15,8 @@
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
      PURPOSE.  See the above copyright notice for more information.
+     
+  *** Modified by OPEN CASCADE
 
 =========================================================================*/
 // .NAME vtkXYPlotActor - generate an x-y plot from input dataset(s) or field data
diff --git a/src/PIPELINE/VISU_img2vti.cxx b/src/PIPELINE/VISU_img2vti.cxx
index 33a7c2aa..a503e98a 100644
--- a/src/PIPELINE/VISU_img2vti.cxx
+++ b/src/PIPELINE/VISU_img2vti.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_img2vti.cxx
 // Author:  Oleg UVAROV
diff --git a/src/VISUGUI/Makefile.am b/src/VISUGUI/Makefile.am
index aff94dc9..05d69ef5 100644
--- a/src/VISUGUI/Makefile.am
+++ b/src/VISUGUI/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,11 +16,12 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISUGUI : GUI of VISU component
 #  File   : Makefile.am
 #  Author : Marc Tajchman (CEA)
 #  Module : VISU
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES= libVISU.la
@@ -70,7 +68,9 @@ salomeinclude_HEADERS= \
 	VisuGUI_Slider.h \
 	VisuGUI_InputPane.h \
 	VisuGUI_FieldFilter.h \
-	VisuGUI_ValuesLabelingDlg.h
+	VisuGUI_ValuesLabelingDlg.h \
+	VisuGUI_PrimitiveBox.h \
+	VisuGUI_SizeBox.h
 
 dist_libVISU_la_SOURCES= \
 	VisuGUI.cxx \
@@ -123,7 +123,9 @@ dist_libVISU_la_SOURCES= \
 	VisuGUI_ClippingPanel.cxx \
 	VisuGUI_ClippingPlaneDlg.cxx \
 	VisuGUI_FilterScalarsDlg.cxx \
-	VisuGUI_ValuesLabelingDlg.cxx
+	VisuGUI_ValuesLabelingDlg.cxx \
+	VisuGUI_PrimitiveBox.cxx \
+	VisuGUI_SizeBox.cxx
 
 MOC_FILES= \
 	VisuGUI_moc.cxx \
@@ -169,7 +171,9 @@ MOC_FILES= \
 	VisuGUI_ClippingPanel_moc.cxx \
 	VisuGUI_ClippingPlaneDlg_moc.cxx \
 	VisuGUI_FilterScalarsDlg_moc.cxx \
-	VisuGUI_ValuesLabelingDlg_moc.cxx
+	VisuGUI_ValuesLabelingDlg_moc.cxx \
+	VisuGUI_PrimitiveBox_moc.cxx \
+	VisuGUI_SizeBox_moc.cxx
 
 nodist_libVISU_la_SOURCES=$(MOC_FILES)
 
@@ -182,7 +186,7 @@ libVISU_la_CPPFLAGS= \
 	$(BOOST_CPPFLAGS) \
 	$(GUI_CXXFLAGS) \
 	$(CORBA_CXXFLAGS) $(CORBA_INCLUDES) \
-	-I$(srcdir)/../VVTK -I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I -I$(srcdir)/../GUITOOLS \
+	-I$(srcdir)/../OBJECT -I$(srcdir)/../VISU_I \
 	-I$(top_builddir)/idl -I$(srcdir)/../CONVERTOR -I$(srcdir)/../PIPELINE
 
 libVISU_la_LDFLAGS= \
@@ -190,8 +194,7 @@ libVISU_la_LDFLAGS= \
 	$(CAS_LDFLAGS) -lTKV3d \
 	$(KERNEL_LDFLAGS) -lSalomeNS -lSalomeDSClient \
 	$(GUI_LDFLAGS) -lSVTK -lSPlot2d -lSalomePrs -lOCCViewer \
-	../VVTK/libVVTK.la ../OBJECT/libVisuObject.la ../VISU_I/libVISUEngineImpl.la \
-	../GUITOOLS/libVISUGUITOOLS.la \
+	../OBJECT/libVisuObject.la ../VISU_I/libVISUEngineImpl.la \
 	../../idl/libSalomeIDLVISU.la
 
 if MED_ENABLE_MULTIPR
diff --git a/src/VISUGUI/VISU_images.ts b/src/VISUGUI/VISU_images.ts
index a5b74650..c2e31e3c 100644
--- a/src/VISUGUI/VISU_images.ts
+++ b/src/VISUGUI/VISU_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS>
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -327,42 +327,10 @@
             <source>ICON_VECTORS</source>
             <translation>Visu_vectors.png</translation>
         </message>
-        <message>
-            <source>ICON_VVTK_INTERACTOR_STYLE_SWITCH</source>
-            <translation>Visu_vvtk_switch.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_PLANE_SEGMENTATION_SWITCH</source>
-            <translation>Visu_PlaneSegmentation.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_RECORDING_PAUSE</source>
-            <translation>Visu_recording_pause.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_RECORDING_PLAY</source>
-            <translation>Visu_recording_play.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_RECORDING_START</source>
-            <translation>Visu_recording_start.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_RECORDING_STOP</source>
-            <translation>Visu_recording_stop.png</translation>
-        </message>
         <message>
             <source>ICON_SWEEP_STOP</source>
             <translation>Visu_recording_stop.png</translation>
         </message>
-        <message>
-            <source>ICON_VVTK_SELECTION_MODE_SWITCH</source>
-            <translation>Visu_points.png</translation>
-        </message>
-        <message>
-            <source>ICON_VVTK_SPHERE_SEGMENTATION_SWITCH</source>
-            <translation>Visu_SphereSegmentation.png</translation>
-        </message>
         <message>
             <source>ICON_WIREFRAME</source>
             <translation>Visu_wireframe.png</translation>
diff --git a/src/VISUGUI/VISU_msg_en.ts b/src/VISUGUI/VISU_msg_en.ts
index 84bdd1e2..7c4cfd7a 100644
--- a/src/VISUGUI/VISU_msg_en.ts
+++ b/src/VISUGUI/VISU_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS>
 <!--
-  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 
   Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
   CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -421,6 +421,42 @@ number of time stamps or number of components is not the same!</translation>
             <source>VISU_SWEEPING_PREF</source>
             <translation>Sweeping preferences</translation>
         </message>
+        <message>
+            <source>VISU_TABLES</source>
+            <translation>Tables</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EDITING_PROPS</source>
+            <translation>Tables editing properties</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_ENABLE_EDITING</source>
+            <translation>Enable editing</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_SORT_POLICY</source>
+            <translation>Sort policy</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EMPTY_LOWEST</source>
+            <translation>Empty cells are considered as lowest values</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EMPTY_HIGHEST</source>
+            <translation>Empty cells are considered as highest values</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EMPTY_FIRST</source>
+            <translation>Empty cells are always first</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EMPTY_LAST</source>
+            <translation>Empty cells are always last</translation>
+        </message>
+        <message>
+            <source>VISU_TABLES_EMPTY_IGNORE</source>
+            <translation>Empty cells are ignored</translation>
+        </message>
         <message>
             <source>VISU_TIME_STAMP_FREQUENCY</source>
             <translation>Time stamp frequency (for AVI generation)</translation>
@@ -585,418 +621,6 @@ Input value precision can be adjusted using
             <translation>No appropriate objects selected</translation>
         </message>
     </context>
-    <context>
-        <name>VVTK_MainWindow</name>
-        <message>
-            <source>DSC_VVTK_RECORDING_PAUSE</source>
-            <translation>Pause recording</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_RECORDING_PLAY</source>
-            <translation>Play recording</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_RECORDING_START</source>
-            <translation>Start recording</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_RECORDING_STOP</source>
-            <translation>Stop recording</translation>
-        </message>
-        <message>
-            <source>LBL_TOOLBAR_RECORD_LABEL</source>
-            <translation>Recording Operations</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_RECORDING_PAUSE</source>
-            <translation>Pause recording</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_RECORDING_PLAY</source>
-            <translation>Play recording</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_RECORDING_START</source>
-            <translation>Start recording</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_RECORDING_STOP</source>
-            <translation>Stop recording</translation>
-        </message>
-        <message>
-            <source>MSG_NO_AVI_MAKER</source>
-            <translation>Tool jpeg2yuv, necessary for AVI recording, is not available.
-Please, refer to the documentation.</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_MainWindow1</name>
-        <message>
-            <source>DSC_VVTK_INTERACTOR_STYLE_SWITCH</source>
-            <translation>Interaction Style Switch</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_PLANE_SEGMENTATION_SWITCH</source>
-            <translation>Plane Segmentation</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_SELECTION_MODE_SWITCH</source>
-            <translation>Selection Mode Switch</translation>
-        </message>
-        <message>
-            <source>DSC_VVTK_SPHERE_SEGMENTATION_SWITCH</source>
-            <translation>Sphere Segmentation</translation>
-        </message>
-        <message>
-            <source>LBL_TOOLBAR_GAUSS_LABEL</source>
-            <translation>Gauss Viewer Tools</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_INTERACTOR_STYLE_SWITCH</source>
-            <translation>Interaction Style Switch</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_PLANE_SEGMENTATION_SWITCH</source>
-            <translation>Plane Segmentation</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_SELECTION_MODE_SWITCH</source>
-            <translation>Selection Mode Switch</translation>
-        </message>
-        <message>
-            <source>MNU_VVTK_SPHERE_SEGMENTATION_SWITCH</source>
-            <translation>Sphere Segmentation</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_PickingDlg</name>
-        <message>
-            <source>BELOW_POINT</source>
-            <translation>Centered below the point</translation>
-        </message>
-        <message>
-            <source>CAMERA_TITLE</source>
-            <translation>Movement of the camera</translation>
-        </message>
-        <message>
-            <source>CURSOR_SIZE</source>
-            <translation>Size of the cursor :</translation>
-        </message>
-        <message>
-            <source>CURSOR_TITLE</source>
-            <translation>Cursor</translation>
-        </message>
-        <message>
-            <source>DISPLAY_PARENT_MESH</source>
-            <translation>Display parent mesh element</translation>
-        </message>
-        <message>
-            <source>INFO_WINDOW_TITLE</source>
-            <translation>Information window</translation>
-        </message>
-        <message>
-            <source>PARENT_MESH_TITLE</source>
-            <translation>Parent mesh element</translation>
-        </message>
-        <message>
-            <source>PICKING_DLG_TITLE</source>
-            <translation>Picking</translation>
-        </message>
-        <message>
-            <source>POINT_TOLERANCE</source>
-            <translation>Point tolerance :</translation>
-        </message>
-        <message>
-            <source>POSITION</source>
-            <translation>Position :</translation>
-        </message>
-        <message>
-            <source>PYRAMID_HEIGHT</source>
-            <translation>Height of the pyramids :</translation>
-        </message>
-        <message>
-            <source>SELECTION_COLOR</source>
-            <translation>Selection cursor color :</translation>
-        </message>
-        <message>
-            <source>STEP_NUMBER</source>
-            <translation>Number of steps between two positions :</translation>
-        </message>
-        <message>
-            <source>TOLERANCE_TITLE</source>
-            <translation>Tolerance</translation>
-        </message>
-        <message>
-            <source>TOP_LEFT_CORNER</source>
-            <translation>Top-left corner of the 3D view</translation>
-        </message>
-        <message>
-            <source>TRANSPARENCY</source>
-            <translation>Transparency :</translation>
-        </message>
-        <message>
-            <source>ZOOM_FACTOR</source>
-            <translation>Zoom at first selected point (ratio) :</translation>
-        </message>
-        <message>
-            <source>DATA_POSITION</source>
-            <translation>Position</translation>
-        </message>
-        <message>
-            <source>PARENT_ELEMENT</source>
-            <translation>Parent mesh element ID:</translation>
-        </message>
-        <message>
-            <source>LOCAL_POINT</source>
-            <translation>Local Gauss Point ID:</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_PrimitiveBox</name>
-        <message>
-            <source>ALPHA_TEXTURE</source>
-            <translation>Alpha Channel Texture (16x16) : </translation>
-        </message>
-        <message>
-            <source>ALPHA_THRESHOLD</source>
-            <translation>Alpha Channel Threshold : </translation>
-        </message>
-        <message>
-            <source>CLAMP</source>
-            <translation>Maximum Size (Clamp) : </translation>
-        </message>
-        <message>
-            <source>FACE_LIMIT</source>
-            <translation>Notify when number of faces exceeds : </translation>
-        </message>
-        <message>
-            <source>FACE_NUMBER</source>
-            <translation>Number of faces : </translation>
-        </message>
-        <message>
-            <source>GEOMETRICAL_SPHERE</source>
-            <translation>Geometrical Sphere</translation>
-        </message>
-        <message>
-            <source>MAIN_TEXTURE</source>
-            <translation>Main Texture (16x16) : </translation>
-        </message>
-        <message>
-            <source>OPENGL_POINT</source>
-            <translation>OpenGL Point</translation>
-        </message>
-        <message>
-            <source>POINT_SPRITE</source>
-            <translation>Point Sprite</translation>
-        </message>
-        <message>
-            <source>PRIMITIVE_TITLE</source>
-            <translation>Primitive</translation>
-        </message>
-        <message>
-            <source>RESOLUTION</source>
-            <translation>Resolution : </translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_RecorderDlg</name>
-        <message>
-            <source>ALL_DISLPAYED_FRAMES</source>
-            <translation>Recording all displayed frames</translation>
-        </message>
-        <message>
-            <source>CLOSE</source>
-            <translation>Close</translation>
-        </message>
-        <message>
-            <source>DLG_RECORDER_TITLE</source>
-            <translation>Recorder</translation>
-        </message>
-        <message>
-            <source>FILE_NAME</source>
-            <translation>Save to file : </translation>
-        </message>
-        <message>
-            <source>FLT_ALL_FILES</source>
-            <translation>All Files (*.*)</translation>
-        </message>
-        <message>
-            <source>FLT_AVI_FILES</source>
-            <translation>AVI Files (*.avi)</translation>
-        </message>
-        <message>
-            <source>FPS</source>
-            <translation>FPS : </translation>
-        </message>
-        <message>
-            <source>PROGRESSIVE</source>
-            <translation>Progressive</translation>
-        </message>
-        <message>
-            <source>QUALITY</source>
-            <translation>Quality : </translation>
-        </message>
-        <message>
-            <source>RECORDING_MODE</source>
-            <translation>Mode : </translation>
-        </message>
-        <message>
-            <source>SETTINGS</source>
-            <translation>Settings</translation>
-        </message>
-        <message>
-            <source>SKIPPED_FRAMES</source>
-            <translation>Recording at a given FPS</translation>
-        </message>
-        <message>
-            <source>START</source>
-            <translation>Start</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_SegmentationCursorDlg</name>
-        <message>
-            <source>DEPTH</source>
-            <translation>Depth of the cursor: </translation>
-        </message>
-        <message>
-            <source>DEPTH_TITLE</source>
-            <translation>Depth</translation>
-        </message>
-        <message>
-            <source>DIRECTION_DX</source>
-            <translation>DX: </translation>
-        </message>
-        <message>
-            <source>DIRECTION_DY</source>
-            <translation>DY: </translation>
-        </message>
-        <message>
-            <source>DIRECTION_DZ</source>
-            <translation>DZ: </translation>
-        </message>
-        <message>
-            <source>DIRECTION_TITLE</source>
-            <translation>Direction</translation>
-        </message>
-        <message>
-            <source>GAUSS_POINTS_TAB</source>
-            <translation>Gauss Points</translation>
-        </message>
-        <message>
-            <source>INCREMENT</source>
-            <translation>+/- Ratio : </translation>
-        </message>
-        <message>
-            <source>INSIDE_GAUSS_POINTS</source>
-            <translation>Inside Cursor Gauss Points Presentation</translation>
-        </message>
-        <message>
-            <source>MAGNIFICATION</source>
-            <translation>Magnification (%) : </translation>
-        </message>
-        <message>
-            <source>MAGNIFICATION_TITLE</source>
-            <translation>Magnification</translation>
-        </message>
-        <message>
-            <source>ORIGIN_TITLE</source>
-            <translation>Origin</translation>
-        </message>
-        <message>
-            <source>ORIGIN_X</source>
-            <translation>X: </translation>
-        </message>
-        <message>
-            <source>ORIGIN_Y</source>
-            <translation>Y: </translation>
-        </message>
-        <message>
-            <source>ORIGIN_Z</source>
-            <translation>Z: </translation>
-        </message>
-        <message>
-            <source>OUTSIDE_GAUSS_POINTS</source>
-            <translation>Outside Cursor Gauss Points Presentation</translation>
-        </message>
-        <message>
-            <source>RADIUS</source>
-            <translation>Radius of the cursor :</translation>
-        </message>
-        <message>
-            <source>RADIUS_TITLE</source>
-            <translation>Radius</translation>
-        </message>
-        <message>
-            <source>RATIO</source>
-            <translation>+/- Ratio :</translation>
-        </message>
-        <message>
-            <source>SEGMENTATION_CURSOR_DLG_TITLE</source>
-            <translation>Segmentation Cursor</translation>
-        </message>
-        <message>
-            <source>SEGMENTATION_CURSOR_TAB</source>
-            <translation>Segmentation Cursor</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_SizeBox</name>
-        <message>
-            <source>COLOR</source>
-            <translation>Color : </translation>
-        </message>
-        <message>
-            <source>COLOR_TITLE</source>
-            <translation>Color</translation>
-        </message>
-        <message>
-            <source>GEOM_SIZE</source>
-            <translation>Size of points (%) : </translation>
-        </message>
-        <message>
-            <source>INCREMENT</source>
-            <translation>+/- Ratio : </translation>
-        </message>
-        <message>
-            <source>MAGNIFICATION</source>
-            <translation>Magnification (%) : </translation>
-        </message>
-        <message>
-            <source>MAX_SIZE</source>
-            <translation>max size (%) : </translation>
-        </message>
-        <message>
-            <source>MIN_SIZE</source>
-            <translation>Range values for min size (%) : </translation>
-        </message>
-        <message>
-            <source>OUTSIDE_SIZE</source>
-            <translation>Percentage of normal size(%) : </translation>
-        </message>
-        <message>
-            <source>SIZE_TITLE</source>
-            <translation>Size</translation>
-        </message>
-        <message>
-            <source>UNIFORM_COLOR</source>
-            <translation>Uniform Color</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_ViewManager</name>
-        <message>
-            <source>VTK_VIEW_TITLE</source>
-            <translation>Gauss scene:%1 - viewer:%2</translation>
-        </message>
-    </context>
-    <context>
-        <name>VVTK_ViewWindow</name>
-        <message>
-            <source>LBL_TOOLBAR_LABEL</source>
-            <translation>GAUSS viewer tools</translation>
-        </message>
-    </context>
     <context>
         <name>VisuGUI</name>
         <message>
@@ -3431,72 +3055,6 @@ Please select another field.</translation>
             <translation>Time step (second):</translation>
         </message>
     </context>
-    <context>
-        <name>VisuGUI_TableDlg</name>
-        <message>
-            <source>EDIT_TABLE_TLT</source>
-            <translation>Edit Table</translation>
-        </message>
-        <message>
-            <source>ERR_TABLE_NOT_AVAILABLE</source>
-            <translation>Table is not available</translation>
-        </message>
-        <message>
-            <source>TABLE_OF_INTEGER_TLT</source>
-            <translation>Table of integer</translation>
-        </message>
-        <message>
-            <source>TABLE_OF_REAL_TLT</source>
-            <translation>Table of real</translation>
-        </message>
-        <message>
-            <source>VIEW_TABLE_TLT</source>
-            <translation>View Table</translation>
-        </message>
-    </context>
-    <context>
-        <name>VisuGUI_TableWidget</name>
-        <message>
-            <source>ADD_COLUMN_BTN</source>
-            <translation>Add Column</translation>
-        </message>
-        <message>
-            <source>ADD_ROW_BTN</source>
-            <translation>Add Row</translation>
-        </message>
-        <message>
-            <source>ADJUST_CELLS_BTN</source>
-            <translation>Adjust Cells</translation>
-        </message>
-        <message>
-            <source>CLEAR_BTN</source>
-            <translation>Clear</translation>
-        </message>
-        <message>
-            <source>REMOVE_COLUMN_BTN</source>
-            <translation>Remove Column(s)</translation>
-        </message>
-        <message>
-            <source>REMOVE_ROW_BTN</source>
-            <translation>Remove Row(s)</translation>
-        </message>
-        <message>
-            <source>SELECT_ALL_BTN</source>
-            <translation>Select All</translation>
-        </message>
-        <message>
-            <source>SET_TITLE_TLT</source>
-            <translation>Set title</translation>
-        </message>
-        <message>
-            <source>TITLE_LBL</source>
-            <translation>Title:</translation>
-        </message>
-        <message>
-            <source>UNITS_TLT</source>
-            <translation>Units</translation>
-        </message>
-    </context>
     <context>
         <name>VisuGUI_TextPrefDlg</name>
         <message>
@@ -4277,4 +3835,75 @@ Please, refer to the QT documentation.</translation>
             <translation>Shrink Factor:</translation>
         </message>
     </context>
+    <context>
+        <name>VISU_TableDlg</name>
+        <message>
+            <source>ERR_TABLE_NOT_AVAILABLE</source>
+            <translation>Table is not available</translation>
+        </message>
+        <message>
+            <source>TABLE_OF_INTEGER_TLT</source>
+            <translation>Table of integer</translation>
+        </message>
+        <message>
+            <source>TABLE_OF_REAL_TLT</source>
+            <translation>Table of real</translation>
+        </message>
+        <message>
+            <source>TABLE_UNKNOWN_TLT</source>
+            <translation>Table of unknown</translation>
+        </message>
+        <message>
+            <source>VIEW_TABLE_TLT</source>
+            <translation>View Table</translation>
+        </message>
+        <message>
+            <source>ALLOW_EDIT_CHECK</source>
+            <translation>Enable editing</translation>
+        </message>
+        <message>
+            <source>DO_UPDATE_CHECK</source>
+            <translation>Immediate update</translation>
+        </message>
+        <message>
+            <source>ADD_COLUMN_BTN</source>
+            <translation>Add Column</translation>
+        </message>
+        <message>
+            <source>ADD_ROW_BTN</source>
+            <translation>Add Row</translation>
+        </message>
+        <message>
+            <source>ADJUST_CELLS_BTN</source>
+            <translation>Adjust Cells</translation>
+        </message>
+        <message>
+            <source>CLEAR_BTN</source>
+            <translation>Clear</translation>
+        </message>
+        <message>
+            <source>REMOVE_COLUMN_BTN</source>
+            <translation>Remove Column(s)</translation>
+        </message>
+        <message>
+            <source>REMOVE_ROW_BTN</source>
+            <translation>Remove Row(s)</translation>
+        </message>
+        <message>
+            <source>SELECT_ALL_BTN</source>
+            <translation>Select All</translation>
+        </message>
+        <message>
+            <source>SET_TITLE_TLT</source>
+            <translation>Set title</translation>
+        </message>
+        <message>
+            <source>TITLE_LBL</source>
+            <translation>Title:</translation>
+        </message>
+        <message>
+            <source>UNITS_TLT</source>
+            <translation>Units</translation>
+        </message>
+    </context>
 </TS>
diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index b36302cd..8cc895f5 100644
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI.cxx
 //  Author :
 //  Module : VISU
-
+//
 #include "VisuGUI.h"
 
 // STL Includes
@@ -151,7 +152,7 @@
 #include "VISU_Vectors_i.hh"
 #include "VisuGUI_VectorsDlg.h"
 
-#include "VisuGUI_TableDlg.h"
+#include "VISU_TableDlg.h"
 #include "VisuGUI_FileInfoDlg.h"
 
 #include "SALOMEconfig.h"
@@ -1512,19 +1513,19 @@ VisuGUI
   Handle(SALOME_InteractiveObject) anIO = aSelectionItem.myIO;
   VISU::Base_i* aBase = aSelectionItem.myObjectInfo.myBase;
   _PTR(SObject) aSObject = aSelectionItem.myObjectInfo.mySObject;
-  if(VISU::Table_i* aTable = dynamic_cast<VISU::Table_i*>(aBase))
+  if(VISU::Table_i* aTable = dynamic_cast<VISU::Table_i*>(aBase)) {
     aSObject = GetCStudy( GetAppStudy( this ) )->FindObjectID( aTable->GetObjectEntry() );
-
-  if( !IsSObjectTable( aSObject ) )
-    return;
-
-  VisuGUI_TableDlg* dlg = new VisuGUI_TableDlg( GetDesktop( this ),
-                                               aSObject,
-                                               false,
-                                               //SAL2670 Orientation of show tables
-                                               VisuGUI_TableDlg::ttAuto,
-                                               Qt::Vertical );
-  dlg->show();
+    if( IsSObjectTable( aSObject ) ) {
+      VISU_TableDlg* dlg = new VISU_TableDlg( GetDesktop( this ),
+                                              GetCStudy( GetAppStudy( this ) ),
+                                              aTable,
+                                              false,
+                                              //SAL2670 Orientation of show tables
+                                              VISU_TableDlg::ttAuto,
+                                              Qt::Vertical );
+      dlg->show();
+    }
+  }
 }
 
 //----------------------------------------------------------------------------
@@ -4214,9 +4215,6 @@ void VisuGUI::createPreferences()
   setPreferenceProperty( scalar_def_represent, "indexes", indices1 );
   addPreference( tr( "VISU_SHRINK" ), representGr, LightApp_Preferences::Bool, "VISU", "scalar_def_shrink" );
 
-  addPreference( "", representGr, LightApp_Preferences::Space );
-
-
   int quadraticmode = addPreference( tr( "QUADRATIC_REPRESENT_MODE" ), representGr, LightApp_Preferences::Selector, "VISU", "quadratic_mode" );
   QStringList quadraticModes;
   quadraticModes.append("Lines");
@@ -4284,6 +4282,30 @@ void VisuGUI::createPreferences()
   addPreference( tr( "VISU_AUTOMATIC_FIT_ALL" ), representGr,
                  LightApp_Preferences::Bool, "VISU", "automatic_fit_all" );
 
+  // TAB: Tables ; group: "Tables editing properties"
+  int tablesTab = addPreference( tr( "VISU_TABLES" ) );
+
+  int tablesGr = addPreference( tr( "VISU_TABLES_EDITING_PROPS" ), tablesTab );
+  setPreferenceProperty( tablesGr, "columns", 1 );
+
+  addPreference( tr( "VISU_TABLES_ENABLE_EDITING" ), tablesGr, LightApp_Preferences::Bool, "VISU", "tables_enable_editing" );
+
+  int sortPolicyPref = addPreference( tr( "VISU_TABLES_SORT_POLICY" ), tablesGr, LightApp_Preferences::Selector, "VISU", "tables_sort_policy" );
+  QStringList policies;
+  policies.append( tr( "VISU_TABLES_EMPTY_LOWEST" ) );
+  policies.append( tr( "VISU_TABLES_EMPTY_HIGHEST" ) );
+  policies.append( tr( "VISU_TABLES_EMPTY_FIRST" ) );
+  policies.append( tr( "VISU_TABLES_EMPTY_LAST" ) );
+  policies.append( tr( "VISU_TABLES_EMPTY_IGNORE" ) );
+  indices.clear();
+  indices.append( 0 );
+  indices.append( 1 );
+  indices.append( 2 );
+  indices.append( 3 );
+  indices.append( 4 );
+  setPreferenceProperty( sortPolicyPref, "strings", policies );
+  setPreferenceProperty( sortPolicyPref, "indexes", indices );
+
   // TAB: Feature edges ; group: "Feature edges properties"
   int featureEdgesTab = addPreference( tr( "VISU_FEATURE_EDGES" ) );
 
diff --git a/src/VISUGUI/VisuGUI.h b/src/VISUGUI/VisuGUI.h
index 05f19dd8..0dd29a45 100644
--- a/src/VISUGUI/VisuGUI.h
+++ b/src/VISUGUI/VisuGUI.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
 //  Module : VISU
-
+//
 #ifndef VisuGUI_HeaderFile
 #define VisuGUI_HeaderFile
 
diff --git a/src/VISUGUI/VisuGUI_ActionsDef.h b/src/VISUGUI/VisuGUI_ActionsDef.h
index f0717599..c474c082 100644
--- a/src/VISUGUI/VisuGUI_ActionsDef.h
+++ b/src/VISUGUI/VisuGUI_ActionsDef.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISUGUI_ACTIONSDEF
 #define VISUGUI_ACTIONSDEF
 
diff --git a/src/VISUGUI/VisuGUI_BasePanel.cxx b/src/VISUGUI/VisuGUI_BasePanel.cxx
index 2db8ded0..f1083a8e 100755
--- a/src/VISUGUI/VisuGUI_BasePanel.cxx
+++ b/src/VISUGUI/VisuGUI_BasePanel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_BasePanel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_BasePanel.h b/src/VISUGUI/VisuGUI_BasePanel.h
index f961c21c..1570ae36 100755
--- a/src/VISUGUI/VisuGUI_BasePanel.h
+++ b/src/VISUGUI/VisuGUI_BasePanel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_BasePanel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
index 1ac19ffd..3bef54dc 100644
--- a/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
+++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_BuildProgressDlg.cxx
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_BuildProgressDlg.h b/src/VISUGUI/VisuGUI_BuildProgressDlg.h
index d125a637..0e3a5e85 100644
--- a/src/VISUGUI/VisuGUI_BuildProgressDlg.h
+++ b/src/VISUGUI/VisuGUI_BuildProgressDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_BuildProgressDlg.h
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_CacheDlg.cxx b/src/VISUGUI/VisuGUI_CacheDlg.cxx
index 1bdcc4eb..589af2cf 100644
--- a/src/VISUGUI/VisuGUI_CacheDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CacheDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CacheDlg.cxx
 //  Author : Oleg UVAROV
@@ -28,8 +29,6 @@
 
 #include "VisuGUI_Tools.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_PipeLine.hxx"
 
 #include "SUIT_Desktop.h"
diff --git a/src/VISUGUI/VisuGUI_CacheDlg.h b/src/VISUGUI/VisuGUI_CacheDlg.h
index 421a0962..f4d554c4 100644
--- a/src/VISUGUI/VisuGUI_CacheDlg.h
+++ b/src/VISUGUI/VisuGUI_CacheDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CacheDlg.h
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.cxx b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
index 60e9f253..2881bb37 100644
--- a/src/VISUGUI/VisuGUI_ClippingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,14 +19,13 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VisuGUI_ClippingDlg.h"
 
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_Prs3d_i.hh"
 #include "VISU_Result_i.hh"
 #include "VISU_ColoredPrs3dHolder_i.hh"
diff --git a/src/VISUGUI/VisuGUI_ClippingDlg.h b/src/VISUGUI/VisuGUI_ClippingDlg.h
index 074f0b11..a40cd1c0 100644
--- a/src/VISUGUI/VisuGUI_ClippingDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef DIALOGBOX_CLIPPING_H
 #define DIALOGBOX_CLIPPING_H
 
diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.cxx b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
index 2aa3ed50..9a8ee781 100644
--- a/src/VISUGUI/VisuGUI_ClippingPanel.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VisuGUI_ClippingPanel.h"
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
diff --git a/src/VISUGUI/VisuGUI_ClippingPanel.h b/src/VISUGUI/VisuGUI_ClippingPanel.h
index a3d6f004..af15738e 100644
--- a/src/VISUGUI/VisuGUI_ClippingPanel.h
+++ b/src/VISUGUI/VisuGUI_ClippingPanel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef DIALOGBOX_CLIPPINGPANEL_H
 #define DIALOGBOX_CLIPPINGPANEL_H
 
diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
index 0f798a04..2bc39acf 100644
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,13 +16,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VisuGUI_ClippingPlaneDlg.h"
 #include "VisuGUI.h"
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include <VISU_Gen_i.hh>
 
 #include <LightApp_Application.h>
diff --git a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
index ab858c2e..85c9fbe2 100644
--- a/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
+++ b/src/VISUGUI/VisuGUI_ClippingPlaneDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef DIALOGBOX_CLIPPINGPLANEDLG_H
 #define DIALOGBOX_CLIPPINGPLANEDLG_H
 
diff --git a/src/VISUGUI/VisuGUI_CursorDlg.cxx b/src/VISUGUI/VisuGUI_CursorDlg.cxx
index cb2e4e74..c5331679 100644
--- a/src/VISUGUI/VisuGUI_CursorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CursorDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CursorDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_CursorDlg.h b/src/VISUGUI/VisuGUI_CursorDlg.h
index 7a08d061..47d5b4f6 100644
--- a/src/VISUGUI/VisuGUI_CursorDlg.h
+++ b/src/VISUGUI/VisuGUI_CursorDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CursorDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
index 10fc0ea7..687f71f4 100644
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_CutLinesDlg.cxx
 //  Author : VSV
 //  Module : VISU
@@ -31,7 +32,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
-#include <VisuGUI_GUITools.h>
 
 #include "VISU_Gen_i.hh"
 #include "VISU_CutLines_i.hh"
@@ -55,7 +55,7 @@
 //TO DO
 //#include "OB_Browser.h"
 
-#include "VisuGUI_TableDlg.h"
+#include "VISU_TableDlg.h"
 
 #include <QLayout>
 #include <QTabWidget>
diff --git a/src/VISUGUI/VisuGUI_CutLinesDlg.h b/src/VISUGUI/VisuGUI_CutLinesDlg.h
index f803bd30..7e661ef2 100644
--- a/src/VISUGUI/VisuGUI_CutLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutLinesDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_CutLinesDlg.h
 //  Author : VSV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
index 412e8918..f6e688cf 100644
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CutPlanesDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
@@ -33,7 +34,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
-#include <VisuGUI_GUITools.h>
 
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_CutPlanes_i.hh"
@@ -42,7 +42,7 @@
 
 //#include "OB_Browser.h"
 
-#include "VisuGUI_TableDlg.h"
+#include "VISU_TableDlg.h"
 
 #include "SVTK_ViewWindow.h"
 
diff --git a/src/VISUGUI/VisuGUI_CutPlanesDlg.h b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
index 803958c2..5c8f019e 100644
--- a/src/VISUGUI/VisuGUI_CutPlanesDlg.h
+++ b/src/VISUGUI/VisuGUI_CutPlanesDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_CutPlanesDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
index e10b0284..1872d10a 100644
--- a/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
+++ b/src/VISUGUI/VisuGUI_CutSegmentDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_CutSegmentDlg.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
@@ -30,8 +28,6 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_Gen_i.hh"
 #include "VISU_CutSegment_i.hh"
 #include "VISU_ColoredPrs3dFactory.hh"
diff --git a/src/VISUGUI/VisuGUI_CutSegmentDlg.h b/src/VISUGUI/VisuGUI_CutSegmentDlg.h
index 8c380f15..342e9a72 100644
--- a/src/VISUGUI/VisuGUI_CutSegmentDlg.h
+++ b/src/VISUGUI/VisuGUI_CutSegmentDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_CutSegmentDlg.h
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
index 40475de9..1a0e4986 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_DeformedShapeAndScalarMapDlg.cxx
 //  Author : Eugeny Nikolaev
@@ -28,7 +26,6 @@
 
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_InputPane.h"
-#include <VisuGUI_GUITools.h>
 
 #include "VISU_Result_i.hh"
 #include "VISU_DeformedShapeAndScalarMap_i.hh"
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h
index 956174c6..fec1bd1e 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeAndScalarMapDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_DeformedShapeAndScalarMapDlg.h
 //  Author : Eugeny Nikolaev
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index 052b90dd..ff0815c2 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_MagnitudeDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
@@ -32,8 +33,6 @@
 #include "VisuGUI.h"
 #include "VisuGUI_Prs3dTools.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_DeformedShape_i.hh"
 #include "VisuGUI_ViewTools.h"
diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
index ea27c624..4a93b761 100644
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_MagnitudeDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_DialogRunner.cxx b/src/VISUGUI/VisuGUI_DialogRunner.cxx
index dcae7db6..f681b74a 100644
--- a/src/VISUGUI/VisuGUI_DialogRunner.cxx
+++ b/src/VISUGUI/VisuGUI_DialogRunner.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:        VisuGUI_DialogRunner.cxx
 // Created:     Thu Oct  6 10:17:39 2005
 // Author:      Alexander SOLOVYOV
diff --git a/src/VISUGUI/VisuGUI_DialogRunner.h b/src/VISUGUI/VisuGUI_DialogRunner.h
index 2b7486c2..b5172dce 100644
--- a/src/VISUGUI/VisuGUI_DialogRunner.h
+++ b/src/VISUGUI/VisuGUI_DialogRunner.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef DIALOG_RUNNER_HEADER
 #define DIALOG_RUNNER_HEADER
 
diff --git a/src/VISUGUI/VisuGUI_Displayer.cxx b/src/VISUGUI/VisuGUI_Displayer.cxx
index 49fa883c..84a2d03c 100644
--- a/src/VISUGUI/VisuGUI_Displayer.cxx
+++ b/src/VISUGUI/VisuGUI_Displayer.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : Displayer for VISU module
 //  File   : VisuGUI_Displayer.cxx
 //  Author : Alexander SOLOVYOV
diff --git a/src/VISUGUI/VisuGUI_Displayer.h b/src/VISUGUI/VisuGUI_Displayer.h
index 8a625784..8111373a 100644
--- a/src/VISUGUI/VisuGUI_Displayer.h
+++ b/src/VISUGUI/VisuGUI_Displayer.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : Displayer for VISU module
 //  File   : VisuGUI_Displayer.h
 //  Author : Alexander SOLOVYOV
diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
index d5dd350a..94f21245 100644
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_EditContainerDlg.cxx
 //  Author : VSV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_EditContainerDlg.h b/src/VISUGUI/VisuGUI_EditContainerDlg.h
index 2c9cbd67..846fa110 100644
--- a/src/VISUGUI/VisuGUI_EditContainerDlg.h
+++ b/src/VISUGUI/VisuGUI_EditContainerDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_EditContainerDlg.h
 //  Author : VSV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
index b5298f14..dc86d2c6 100644
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_EvolutionDlg.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_EvolutionDlg.h b/src/VISUGUI/VisuGUI_EvolutionDlg.h
index bf86a0bb..f4e49d4f 100644
--- a/src/VISUGUI/VisuGUI_EvolutionDlg.h
+++ b/src/VISUGUI/VisuGUI_EvolutionDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_EvolutionDlg.h
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_Factory.cxx b/src/VISUGUI/VisuGUI_Factory.cxx
index a09a628e..78e03963 100644
--- a/src/VISUGUI/VisuGUI_Factory.cxx
+++ b/src/VISUGUI/VisuGUI_Factory.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Factory.cxx
 //  Author : 
diff --git a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
index 291c412f..d005dcbf 100644
--- a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
+++ b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FeatureEdgesPanel.cxx
 //  Author : Oleg Uvarov
@@ -30,8 +28,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include <QCheckBox>
 #include <QGroupBox>
 #include <QKeyEvent>
diff --git a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.h b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.h
index 282bd676..01d61929 100644
--- a/src/VISUGUI/VisuGUI_FeatureEdgesPanel.h
+++ b/src/VISUGUI/VisuGUI_FeatureEdgesPanel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FeatureEdgesPanel.h
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_FieldFilter.cxx b/src/VISUGUI/VisuGUI_FieldFilter.cxx
index 526eabed..11cbab04 100644
--- a/src/VISUGUI/VisuGUI_FieldFilter.cxx
+++ b/src/VISUGUI/VisuGUI_FieldFilter.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FieldFilter.cxx
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_FieldFilter.h b/src/VISUGUI/VisuGUI_FieldFilter.h
index d9215fc0..845c9337 100644
--- a/src/VISUGUI/VisuGUI_FieldFilter.h
+++ b/src/VISUGUI/VisuGUI_FieldFilter.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_FieldFilter.hxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_FileDlg.cxx b/src/VISUGUI/VisuGUI_FileDlg.cxx
index d37e8e06..fbcb5a07 100644
--- a/src/VISUGUI/VisuGUI_FileDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_FileDlg.cxx
 //  Author : 
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_FileDlg.h b/src/VISUGUI/VisuGUI_FileDlg.h
index 3c236a6b..00fad1be 100644
--- a/src/VISUGUI/VisuGUI_FileDlg.h
+++ b/src/VISUGUI/VisuGUI_FileDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_FileDlg.h
 //  Author : 
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
index 5a7ffb40..53291c6d 100644
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // VISU VISUGUI : GUI of VISU component
 // File   : VisuGUI_FileInfoDlg.cxx
 // Author : Alexandre SOLOVYOV, Open CASCADE S.A.S. ( alexander.solovyov@opencascade.com)
diff --git a/src/VISUGUI/VisuGUI_FileInfoDlg.h b/src/VISUGUI/VisuGUI_FileInfoDlg.h
index 09899737..e11c8dba 100644
--- a/src/VISUGUI/VisuGUI_FileInfoDlg.h
+++ b/src/VISUGUI/VisuGUI_FileInfoDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // VISU VISUGUI : GUI of VISU component
 // File   : VisuGUI_FileInfoDlg.h
 // Author : Alexandre SOLOVYOV, Open CASCADE S.A.S. ( alexander.solovyov@opencascade.com)
diff --git a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
index f94d05ab..3916066c 100644
--- a/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_FilterScalarsDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VisuGUI_FilterScalarsDlg.h"
 #include "VISU_ColoredPrs3d_i.hh"
 #include "VISU_ColoredPrs3dHolder_i.hh"
diff --git a/src/VISUGUI/VisuGUI_FilterScalarsDlg.h b/src/VISUGUI/VisuGUI_FilterScalarsDlg.h
index 2e262036..55725865 100644
--- a/src/VISUGUI/VisuGUI_FilterScalarsDlg.h
+++ b/src/VISUGUI/VisuGUI_FilterScalarsDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FilterScalarsDlg.h
 //  Author : vsv
diff --git a/src/VISUGUI/VisuGUI_FindPane.cxx b/src/VISUGUI/VisuGUI_FindPane.cxx
index 07b2cdc8..ac705b45 100644
--- a/src/VISUGUI/VisuGUI_FindPane.cxx
+++ b/src/VISUGUI/VisuGUI_FindPane.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FindPane.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_FindPane.h b/src/VISUGUI/VisuGUI_FindPane.h
index 40d374ae..079f87dd 100644
--- a/src/VISUGUI/VisuGUI_FindPane.h
+++ b/src/VISUGUI/VisuGUI_FindPane.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_FindPane.h
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
index ab9baad0..fff579d0 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,19 +19,20 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_GaussPointsDlg.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
-
+//
 #include "VisuGUI_GaussPointsDlg.h"
 
 #include "VISUConfig.hh"
 
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_InputPane.h"
-
-#include <VisuGUI_GUITools.h>
+#include "VisuGUI_PrimitiveBox.h"
+#include "VisuGUI_SizeBox.h"
 
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_GaussPoints_i.hh"
@@ -40,9 +41,6 @@
 #include "VISU_OpenGLPointSpriteMapper.hxx"
 #include "VISU_Convertor.hxx"
 
-#include "VVTK_PrimitiveBox.h"
-#include "VVTK_SizeBox.h"
-
 #include "LightApp_Application.h"
 #include "SalomeApp_Module.h"
 #include "SalomeApp_IntSpinBox.h"
@@ -853,11 +851,11 @@ VisuGUI_GaussPointsDlg::VisuGUI_GaussPointsDlg(SalomeApp_Module* theModule):
   aVBLay->setSpacing(6);
 
   // Primitive
-  myPrimitiveBox = new VVTK_PrimitiveBox( aBox );
+  myPrimitiveBox = new VisuGUI_PrimitiveBox( aBox );
   aVBLay->addWidget( myPrimitiveBox );
 
   // Size
-  mySizeBox = new VVTK_SizeBox( aBox );
+  mySizeBox = new VisuGUI_SizeBox( aBox );
   aVBLay->addWidget( mySizeBox );
 
   // Deformed Shape
@@ -961,7 +959,7 @@ void VisuGUI_GaussPointsDlg::initFromPrsObject( VISU::ColoredPrs3d_i* thePrs,
   myPrimitiveBox->setResolution( myPrsCopy->GetResolution() );
   myPrimitiveBox->setFaceLimit( myPrsCopy->GetFaceLimit() );
 
-  mySizeBox->setType( isResults || isDeformed ? VVTK_SizeBox::Results : VVTK_SizeBox::Geometry );
+  mySizeBox->setType( isResults || isDeformed ? VisuGUI_SizeBox::Results : VisuGUI_SizeBox::Geometry );
   mySizeBox->setGeomSize( myPrsCopy->GetGeomSize() );
   mySizeBox->setMinSize( myPrsCopy->GetMinSize() );
   mySizeBox->setMaxSize( myPrsCopy->GetMaxSize() );
@@ -1053,7 +1051,7 @@ void VisuGUI_GaussPointsDlg::onToggleDefShape( bool on )
   if( on )//myDefShapeButton->isChecked() )
   {
     myDefShapeBox->show();
-    mySizeBox->setType( VVTK_SizeBox::Results );
+    mySizeBox->setType( VisuGUI_SizeBox::Results );
   }
   else
     myDefShapeBox->hide();
diff --git a/src/VISUGUI/VisuGUI_GaussPointsDlg.h b/src/VISUGUI/VisuGUI_GaussPointsDlg.h
index 5f3d4ba2..e3433e5c 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsDlg.h
+++ b/src/VISUGUI/VisuGUI_GaussPointsDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_GaussPointsDlg.h
 //  Author : Oleg UVAROV
@@ -34,8 +35,8 @@ class SalomeApp_DoubleSpinBox;
 
 class SalomeApp_Module;
 class SalomeApp_IntSpinBox;
-class VVTK_PrimitiveBox;
-class VVTK_SizeBox;
+class VisuGUI_PrimitiveBox;
+class VisuGUI_SizeBox;
 class VisuGUI_TextPrefDlg;
 class VisuGUI_InputPane;
 
@@ -159,8 +160,8 @@ private:
   QRadioButton*            myGeometryButton;
   QRadioButton*            myDefShapeButton;
 
-  VVTK_PrimitiveBox*       myPrimitiveBox;
-  VVTK_SizeBox*            mySizeBox;
+  VisuGUI_PrimitiveBox*    myPrimitiveBox;
+  VisuGUI_SizeBox*         mySizeBox;
 
   QGroupBox*               myDefShapeBox;
   SalomeApp_DoubleSpinBox* myScaleSpinBox;
diff --git a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
index 7ae3c886..54b638bf 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
+++ b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_GaussPointsSelectionPane.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.h b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.h
index a6d52eaf..e376b607 100644
--- a/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.h
+++ b/src/VISUGUI/VisuGUI_GaussPointsSelectionPane.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_GaussPointsSelectionPane.h
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_InputPane.cxx b/src/VISUGUI/VisuGUI_InputPane.cxx
index cf6197ef..83c26d14 100644
--- a/src/VISUGUI/VisuGUI_InputPane.cxx
+++ b/src/VISUGUI/VisuGUI_InputPane.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_InputPane.cxx
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_InputPane.h b/src/VISUGUI/VisuGUI_InputPane.h
index ae807c85..f31fec6c 100644
--- a/src/VISUGUI/VisuGUI_InputPane.h
+++ b/src/VISUGUI/VisuGUI_InputPane.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_InputPane.h
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_InputPanel.cxx b/src/VISUGUI/VisuGUI_InputPanel.cxx
index 3f43a36a..8938ac6f 100755
--- a/src/VISUGUI/VisuGUI_InputPanel.cxx
+++ b/src/VISUGUI/VisuGUI_InputPanel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_InputPanel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_InputPanel.h b/src/VISUGUI/VisuGUI_InputPanel.h
index c40029c7..2cb094ca 100755
--- a/src/VISUGUI/VisuGUI_InputPanel.h
+++ b/src/VISUGUI/VisuGUI_InputPanel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_InputPanel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
index 415913ca..d68d57cc 100644
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,12 +19,13 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_IsoSurfacesDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
 //  Module : VISU
 //  $Header$
-
+//
 #include "VisuGUI_IsoSurfacesDlg.h"
 
 #include "VisuGUI.h"
diff --git a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
index 3472ad82..17d54b47 100644
--- a/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
+++ b/src/VISUGUI/VisuGUI_IsoSurfacesDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,12 +19,13 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_IsoSurfacesDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
 //  Module : VISU
 //  $Header$
-
+//
 #ifndef VISUGUI_ISOSURFACESDLG_H
 #define VISUGUI_ISOSURFACESDLG_H
 
diff --git a/src/VISUGUI/VisuGUI_Module.cxx b/src/VISUGUI/VisuGUI_Module.cxx
index 5beb580f..50818adb 100644
--- a/src/VISUGUI/VisuGUI_Module.cxx
+++ b/src/VISUGUI/VisuGUI_Module.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Module.cxx
 //  Author : Laurent CORNABE
diff --git a/src/VISUGUI/VisuGUI_Module.h b/src/VISUGUI/VisuGUI_Module.h
index 52ccb936..422816b8 100644
--- a/src/VISUGUI/VisuGUI_Module.h
+++ b/src/VISUGUI/VisuGUI_Module.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Module.h
 //  Author : 
diff --git a/src/VISUGUI/VisuGUI_NameDlg.cxx b/src/VISUGUI/VisuGUI_NameDlg.cxx
index 8c6300f8..f5e8293f 100644
--- a/src/VISUGUI/VisuGUI_NameDlg.cxx
+++ b/src/VISUGUI/VisuGUI_NameDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_NameDlg.cxx
 //  Author : Vadim SANDLER
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_NameDlg.h b/src/VISUGUI/VisuGUI_NameDlg.h
index ed1cdab1..4f1b507b 100644
--- a/src/VISUGUI/VisuGUI_NameDlg.h
+++ b/src/VISUGUI/VisuGUI_NameDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_NameDlg.h
 //  Author : Vadim SANDLER
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.cxx b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
index 9c65f507..391c8264 100644
--- a/src/VISUGUI/VisuGUI_OffsetDlg.cxx
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VisuGUI_OffsetDlg.h"
 
 #include "VisuGUI.h"
@@ -40,8 +41,6 @@
 #include "SUIT_MessageBox.h"
 #include "SUIT_ResourceMgr.h"
 
-#include <VisuGUI_GUITools.h>
-
 // VTK Includes
 #include "vtkRenderer.h"
 
diff --git a/src/VISUGUI/VisuGUI_OffsetDlg.h b/src/VISUGUI/VisuGUI_OffsetDlg.h
index 5efcce42..7e67892a 100644
--- a/src/VISUGUI/VisuGUI_OffsetDlg.h
+++ b/src/VISUGUI/VisuGUI_OffsetDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef DIALOGBOX_OFFSET_H
 #define DIALOGBOX_OFFSET_H
 
diff --git a/src/VISUGUI/VisuGUI_Panel.cxx b/src/VISUGUI/VisuGUI_Panel.cxx
index 85d15da6..017854a9 100755
--- a/src/VISUGUI/VisuGUI_Panel.cxx
+++ b/src/VISUGUI/VisuGUI_Panel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Panel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_Panel.h b/src/VISUGUI/VisuGUI_Panel.h
index e7eedb4b..5f78bcce 100755
--- a/src/VISUGUI/VisuGUI_Panel.h
+++ b/src/VISUGUI/VisuGUI_Panel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Panel.cxx
 //  Author : Oleg Uvarov
diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
index d0b9a6ba..3f8fdb32 100644
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Plot3DDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
@@ -31,7 +32,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
-#include <VisuGUI_GUITools.h>
 
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_ViewManager_i.hh"
diff --git a/src/VISUGUI/VisuGUI_Plot3DDlg.h b/src/VISUGUI/VisuGUI_Plot3DDlg.h
index f7ad94ce..a04882dd 100644
--- a/src/VISUGUI/VisuGUI_Plot3DDlg.h
+++ b/src/VISUGUI/VisuGUI_Plot3DDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Plot3DDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_PrimitiveBox.cxx b/src/VISUGUI/VisuGUI_PrimitiveBox.cxx
new file mode 100644
index 00000000..b5a11706
--- /dev/null
+++ b/src/VISUGUI/VisuGUI_PrimitiveBox.cxx
@@ -0,0 +1,375 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  VISU VISUGUI : GUI of VISU component
+//  File   : VisuGUI_PrimitiveBox.cxx
+//  Author : Oleg UVAROV
+//  Module : VISU
+//
+#include "VisuGUI_PrimitiveBox.h"
+#include "VisuGUI_Tools.h"
+
+#include <VISU_OpenGLPointSpriteMapper.hxx>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+
+#include <SalomeApp_DoubleSpinBox.h>
+#include <SalomeApp_IntSpinBox.h>
+
+#include <QLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QButtonGroup>
+#include <QRadioButton>
+#include <QPushButton>
+#include <QFileDialog>
+
+#include <iostream>
+
+using namespace std;
+
+VisuGUI_PrimitiveBox::VisuGUI_PrimitiveBox( QWidget* parent ) :
+  QGroupBox( parent )
+{
+  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
+
+  setTitle( tr( "PRIMITIVE_TITLE" ) );
+  //setColumnLayout(0, Qt::Vertical );
+  //layout()->setSpacing( 0 );
+  //layout()->setMargin( 0 );
+
+  QGridLayout* aLayout = new QGridLayout( this );
+  aLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
+  aLayout->setSpacing(6);
+  aLayout->setMargin(11);
+
+  myPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
+
+  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
+  myMainTexture = aRootDir + "sprite_texture.bmp";
+  myAlphaTexture = aRootDir + "sprite_alpha.bmp";
+
+  // Primitive Type
+  QGroupBox* aPrimitiveTypeGroup = new QGroupBox( this );
+  aPrimitiveTypeGroup->setMinimumWidth( 450 );
+  QHBoxLayout* aPrimLayout = new QHBoxLayout( aPrimitiveTypeGroup );
+  aPrimLayout->setMargin( 0 );
+
+  //QButtonGroup* aPrimitiveTypeGroup = new QButtonGroup( 3, Qt::Horizontal, this, "PrimitiveTypeGroup" );
+  //aPrimitiveTypeGroup->setMinimumWidth( 450 );
+  //aPrimitiveTypeGroup->setRadioButtonExclusive( true );
+  //aPrimitiveTypeGroup->setFrameStyle( QFrame::NoFrame );
+  //aPrimitiveTypeGroup->layout()->setMargin( 0 );
+
+  myPointSpriteButton = new QRadioButton( tr( "POINT_SPRITE" ), aPrimitiveTypeGroup );
+  myOpenGLPointButton = new QRadioButton( tr( "OPENGL_POINT" ), aPrimitiveTypeGroup );
+  myGeomSphereButton = new QRadioButton( tr( "GEOMETRICAL_SPHERE" ), aPrimitiveTypeGroup );
+
+  aPrimLayout->addWidget( myPointSpriteButton );
+  aPrimLayout->addWidget( myOpenGLPointButton );
+  aPrimLayout->addWidget( myGeomSphereButton );
+
+  aLayout->addWidget( aPrimitiveTypeGroup, 0, 0, 1, 2 );
+
+  // Clamp ( Point Sprite & OpenGL Point )
+  myClampLabel = new QLabel( tr( "CLAMP" ), this );
+  myClampSpinBox = new SalomeApp_DoubleSpinBox( this );
+  VISU::initSpinBox( myClampSpinBox, 1.0, 512.0, 1.0, "parametric_precision" );
+  myClampSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  aLayout->addWidget( myClampLabel, 1, 0 );
+  aLayout->addWidget( myClampSpinBox, 1, 1, 1, 2 );
+
+  // Main Texture ( Point Sprite )
+  myMainTextureLabel = new QLabel( tr( "MAIN_TEXTURE" ), this );
+  myMainTextureLineEdit = new QLineEdit( this );
+  myMainTextureButton = new QPushButton( this );
+  myMainTextureButton->setAutoDefault( false );
+  myMainTextureButton->setIcon( aResourceMgr->loadPixmap( "VISU", tr( "ICON_LOAD_TEXTURE" ) ) );
+  connect( myMainTextureButton, SIGNAL( clicked() ), this, SLOT( onBrowseMainTexture() ) );
+
+  aLayout->addWidget( myMainTextureLabel, 2, 0 );
+  aLayout->addWidget( myMainTextureLineEdit, 2, 1 );
+  aLayout->addWidget( myMainTextureButton, 2, 2 );
+
+  // Alpha Texture ( Point Sprite )
+  myAlphaTextureLabel = new QLabel( tr( "ALPHA_TEXTURE" ), this );
+  myAlphaTextureLineEdit = new QLineEdit( this );
+  myAlphaTextureButton = new QPushButton( this );
+  myAlphaTextureButton->setAutoDefault( false );
+  myAlphaTextureButton->setIcon( aResourceMgr->loadPixmap( "VISU", tr( "ICON_LOAD_TEXTURE" ) ) );
+  connect( myAlphaTextureButton, SIGNAL( clicked() ), this, SLOT( onBrowseAlphaTexture() ) );
+
+  aLayout->addWidget( myAlphaTextureLabel, 3, 0 );
+  aLayout->addWidget( myAlphaTextureLineEdit, 3, 1 );
+  aLayout->addWidget( myAlphaTextureButton, 3, 2 );
+
+  // Alpha Threshold ( Point Sprite )
+  myAlphaThresholdLabel = new QLabel( tr( "ALPHA_THRESHOLD" ), this );
+  myAlphaThresholdSpinBox = new SalomeApp_DoubleSpinBox( this );
+  VISU::initSpinBox( myAlphaThresholdSpinBox,  0.0, 1.0, 0.1, "parametric_precision" );  
+  myAlphaThresholdSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  aLayout->addWidget( myAlphaThresholdLabel, 4, 0 );
+  aLayout->addWidget( myAlphaThresholdSpinBox, 4, 1, 1, 2 );
+
+  // Resolution ( Geometrical Sphere )
+  myResolutionLabel = new QLabel( tr( "RESOLUTION" ), this );
+  myResolutionSpinBox = new SalomeApp_IntSpinBox( this );
+  VISU::initSpinBox( myResolutionSpinBox, 3, 100, 1 );    
+  myResolutionSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  connect( myResolutionSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( onResolutionChanged( int ) ) );
+
+  aLayout->addWidget( myResolutionLabel, 5, 0 );
+  aLayout->addWidget( myResolutionSpinBox, 5, 1, 1, 2 );
+
+  // Number of faces ( Geometrical Sphere )
+  myFaceNumberLabel = new QLabel( tr( "FACE_NUMBER" ), this );
+  myFaceNumberLineEdit = new QLineEdit( this );
+  myFaceNumberLineEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+  myFaceNumberLineEdit->setEnabled( false );
+  //myFaceNumberLineEdit->setReadOnly( true );
+
+  aLayout->addWidget( myFaceNumberLabel, 6, 0 );
+  aLayout->addWidget( myFaceNumberLineEdit, 6, 1, 1, 2 );
+
+  // Notification ( Geometrical Sphere )
+  myFaceLimitLabel = new QLabel( tr( "FACE_LIMIT" ), this );
+  myFaceLimitSpinBox = new SalomeApp_IntSpinBox( this );
+  VISU::initSpinBox( myFaceLimitSpinBox, 10, 1000000, 10 );      
+  myFaceLimitSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  aLayout->addWidget( myFaceLimitLabel, 7, 0 );
+  aLayout->addWidget( myFaceLimitSpinBox, 7, 1, 1, 2 );
+
+  connect( myPointSpriteButton, SIGNAL( clicked() ), this, SLOT( onTogglePointSprite() ) );
+  connect( myOpenGLPointButton, SIGNAL( clicked() ), this, SLOT( onToggleOpenGLPoint() ) );
+  connect( myGeomSphereButton,  SIGNAL( clicked() ), this, SLOT( onToggleGeomSphere() ) );
+}
+
+void VisuGUI_PrimitiveBox::onTogglePointSprite()
+{
+  myPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
+
+  myClampLabel->show();
+  myClampSpinBox->show();
+
+  myMainTextureLabel->show();
+  myMainTextureLineEdit->show();
+  myMainTextureButton->show();
+
+  myAlphaTextureLabel->show();
+  myAlphaTextureLineEdit->show();
+  myAlphaTextureButton->show();
+
+  myAlphaThresholdLabel->show();
+  myAlphaThresholdSpinBox->show();
+
+  myResolutionLabel->hide();
+  myResolutionSpinBox->hide();
+
+  myFaceNumberLabel->hide();
+  myFaceNumberLineEdit->hide();
+
+  myFaceLimitLabel->hide();
+  myFaceLimitSpinBox->hide();
+}
+
+void VisuGUI_PrimitiveBox::onToggleOpenGLPoint()
+{
+  myPrimitiveType = VISU_OpenGLPointSpriteMapper::OpenGLPoint;
+
+  myClampLabel->show();
+  myClampSpinBox->show();
+
+  myMainTextureLabel->hide();
+  myMainTextureLineEdit->hide();
+  myMainTextureButton->hide();
+
+  myAlphaTextureLabel->hide();
+  myAlphaTextureLineEdit->hide();
+  myAlphaTextureButton->hide();
+
+  myAlphaThresholdLabel->hide();
+  myAlphaThresholdSpinBox->hide();
+
+  myResolutionLabel->hide();
+  myResolutionSpinBox->hide();
+
+  myFaceNumberLabel->hide();
+  myFaceNumberLineEdit->hide();
+
+  myFaceLimitLabel->hide();
+  myFaceLimitSpinBox->hide();
+}
+
+void VisuGUI_PrimitiveBox::onToggleGeomSphere()
+{
+  myPrimitiveType = VISU_OpenGLPointSpriteMapper::GeomSphere;
+
+  myClampLabel->hide();
+  myClampSpinBox->hide();
+
+  myMainTextureLabel->hide();
+  myMainTextureLineEdit->hide();
+  myMainTextureButton->hide();
+
+  myAlphaTextureLabel->hide();
+  myAlphaTextureLineEdit->hide();
+  myAlphaTextureButton->hide();
+
+  myAlphaThresholdLabel->hide();
+  myAlphaThresholdSpinBox->hide();
+
+  myResolutionLabel->show();
+  myResolutionSpinBox->show();
+
+  myFaceNumberLabel->show();
+  myFaceNumberLineEdit->show();
+
+  myFaceLimitLabel->show();
+  myFaceLimitSpinBox->show();
+}
+
+void VisuGUI_PrimitiveBox::onResolutionChanged( int theResolution )
+{
+  setFaceNumber( 2 * theResolution * ( theResolution - 2 ) );
+}
+
+void VisuGUI_PrimitiveBox::setPrimitiveType( int theType )
+{
+  myPrimitiveType = theType;
+
+  switch( myPrimitiveType )
+  {
+    case VISU_OpenGLPointSpriteMapper::PointSprite :
+      myPointSpriteButton->setChecked( true );
+      onTogglePointSprite();
+      break;
+    case VISU_OpenGLPointSpriteMapper::OpenGLPoint :
+      myOpenGLPointButton->setChecked( true );
+      onToggleOpenGLPoint();
+      break;
+    case VISU_OpenGLPointSpriteMapper::GeomSphere :
+      myGeomSphereButton->setChecked( true );
+      onToggleGeomSphere();
+      break;
+    default : break;
+  }
+}
+
+float VisuGUI_PrimitiveBox::getClamp() const
+{
+  return myClampSpinBox->value();
+}
+
+void VisuGUI_PrimitiveBox::setClamp( float theClamp )
+{
+  myClampSpinBox->setValue( theClamp );
+}
+
+void VisuGUI_PrimitiveBox::setClampMaximum( float theClampMaximum )
+{
+  myClampSpinBox->setMaximum( theClampMaximum );
+}
+
+void VisuGUI_PrimitiveBox::setMainTexture( const QString& theMainTexture )
+{
+  myMainTexture = theMainTexture;
+  myMainTextureLineEdit->setText( theMainTexture.section( '/', -1 ) );
+}
+
+void VisuGUI_PrimitiveBox::setAlphaTexture( const QString& theAlphaTexture )
+{
+  myAlphaTexture = theAlphaTexture;
+  myAlphaTextureLineEdit->setText( theAlphaTexture.section( '/', -1 ) );
+}
+
+float VisuGUI_PrimitiveBox::getAlphaThreshold() const
+{
+  return myAlphaThresholdSpinBox->value();
+}
+
+void VisuGUI_PrimitiveBox::setAlphaThreshold( float theAlphaThreshold )
+{
+  myAlphaThresholdSpinBox->setValue( theAlphaThreshold );
+}
+
+int VisuGUI_PrimitiveBox::getResolution() const
+{
+  return myResolutionSpinBox->value();
+}
+
+void VisuGUI_PrimitiveBox::setResolution( int theResolution )
+{
+  myResolutionSpinBox->setValue( theResolution );
+}
+
+int VisuGUI_PrimitiveBox::getFaceNumber() const
+{
+  int aResolution = getResolution();
+  return 2 * aResolution * ( aResolution - 2 );
+  //return myFaceNumberLineEdit->text().toInt();
+}
+
+void VisuGUI_PrimitiveBox::setFaceNumber( int theFaceNumber )
+{
+  myFaceNumberLineEdit->setText( QString::number( theFaceNumber ) );
+}
+
+int VisuGUI_PrimitiveBox::getFaceLimit() const
+{
+  return myFaceLimitSpinBox->value();
+}
+
+void VisuGUI_PrimitiveBox::setFaceLimit( int theFaceLimit )
+{
+  myFaceLimitSpinBox->setValue( theFaceLimit );
+}
+
+void VisuGUI_PrimitiveBox::onBrowseMainTexture()
+{
+  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
+  QString aFileName = QFileDialog::getOpenFileName( this,
+                                                    0,
+                                                    aRootDir,
+                                                    "Bitmap (*.bmp *.jpg *.png)" );
+
+  if( aFileName.isNull() )
+    return;
+
+  myMainTexture = aFileName;
+  myMainTextureLineEdit->setText( aFileName.section( '/', -1 ) );
+}
+
+void VisuGUI_PrimitiveBox::onBrowseAlphaTexture()
+{
+  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
+  QString aFileName = QFileDialog::getOpenFileName( this,
+                                                    0,
+                                                    aRootDir,
+                                                    "Bitmap (*.bmp *.jpg *.png)" );
+
+  if( aFileName.isNull() )
+    return;
+
+  myAlphaTexture = aFileName;
+  myAlphaTextureLineEdit->setText( aFileName.section( '/', -1 ) );
+}
diff --git a/src/VISUGUI/VisuGUI_PrimitiveBox.h b/src/VISUGUI/VisuGUI_PrimitiveBox.h
new file mode 100644
index 00000000..e2de3e21
--- /dev/null
+++ b/src/VISUGUI/VisuGUI_PrimitiveBox.h
@@ -0,0 +1,118 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  VISU VISUGUI : GUI of VISU component
+//  File   : VisuGUI_PrimitiveBox.h
+//  Author : Oleg UVAROV
+//  Module : VISU
+//
+#ifndef VISUGUI_PRIMITIVEBOX_H
+#define VISUGUI_PRIMITIVEBOX_H
+
+#include <QGroupBox>
+
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QRadioButton;
+
+class SalomeApp_DoubleSpinBox;
+class SalomeApp_IntSpinBox;
+
+class VisuGUI_PrimitiveBox : public QGroupBox
+{
+  Q_OBJECT
+
+public:
+  VisuGUI_PrimitiveBox( QWidget* );
+  ~VisuGUI_PrimitiveBox() {}
+
+public:
+  int                      getPrimitiveType() const { return myPrimitiveType; }
+  void                     setPrimitiveType( int );
+
+  float                    getClamp() const;
+  void                     setClamp( float );
+  void                     setClampMaximum( float );
+
+  QString                  getMainTexture() const { return myMainTexture; }
+  void                     setMainTexture( const QString& );
+
+  QString                  getAlphaTexture() const { return myAlphaTexture; }
+  void                     setAlphaTexture( const QString& );
+
+  float                    getAlphaThreshold() const;
+  void                     setAlphaThreshold( float );
+
+  int                      getResolution() const;
+  void                     setResolution( int );
+
+  int                      getFaceNumber() const;
+  void                     setFaceNumber( int );
+
+  int                      getFaceLimit() const;
+  void                     setFaceLimit( int );
+
+protected slots:
+  void                     onTogglePointSprite();
+  void                     onToggleOpenGLPoint();
+  void                     onToggleGeomSphere();
+
+  void                     onBrowseMainTexture();
+  void                     onBrowseAlphaTexture();
+
+  void                     onResolutionChanged( int );
+
+private:
+  int                      myPrimitiveType;
+
+  QRadioButton*            myPointSpriteButton;
+  QRadioButton*            myOpenGLPointButton;
+  QRadioButton*            myGeomSphereButton;
+
+  QString                  myMainTexture;
+  QString                  myAlphaTexture;
+
+  QLabel*                  myClampLabel;
+  SalomeApp_DoubleSpinBox* myClampSpinBox;
+
+  QLabel*                  myMainTextureLabel;
+  QLineEdit*               myMainTextureLineEdit;
+  QPushButton*             myMainTextureButton;
+
+  QLabel*                  myAlphaTextureLabel;
+  QLineEdit*               myAlphaTextureLineEdit;
+  QPushButton*             myAlphaTextureButton;
+
+  QLabel*                  myAlphaThresholdLabel;
+  SalomeApp_DoubleSpinBox* myAlphaThresholdSpinBox;
+
+  QLabel*                  myResolutionLabel;
+  SalomeApp_IntSpinBox*    myResolutionSpinBox;
+
+  QLabel*                  myFaceNumberLabel;
+  QLineEdit*               myFaceNumberLineEdit;
+
+  QLabel*                  myFaceLimitLabel;
+  SalomeApp_IntSpinBox*    myFaceLimitSpinBox;
+};
+
+
+
+#endif
diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
index abc73bf7..3b7f907a 100644
--- a/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Prs3dDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,11 +19,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Prs3dDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
 //  Module : VISU
-
+//
 #include "VisuGUI_Prs3dDlg.h"
 
 #include "VisuGUI.h"
@@ -31,8 +32,6 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "SVTK_ViewWindow.h"
 #include "SVTK_FontWidget.h"
 
diff --git a/src/VISUGUI/VisuGUI_Prs3dDlg.h b/src/VISUGUI/VisuGUI_Prs3dDlg.h
index 060c436b..06645169 100644
--- a/src/VISUGUI/VisuGUI_Prs3dDlg.h
+++ b/src/VISUGUI/VisuGUI_Prs3dDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Prs3dDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_Prs3dTools.h b/src/VISUGUI/VisuGUI_Prs3dTools.h
index 7fa0e657..e1028449 100644
--- a/src/VISUGUI/VisuGUI_Prs3dTools.h
+++ b/src/VISUGUI/VisuGUI_Prs3dTools.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Module.h
 //  Author : 
diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index 5bf97d0a..f770c525 100644
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_ScalarBarDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.h b/src/VISUGUI/VisuGUI_ScalarBarDlg.h
index f7440805..0500eb40 100644
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.h
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_ScalarBarDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_Selection.cxx b/src/VISUGUI/VisuGUI_Selection.cxx
index 1610288d..b4f09bbe 100644
--- a/src/VISUGUI/VisuGUI_Selection.cxx
+++ b/src/VISUGUI/VisuGUI_Selection.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Selection.cxx
 //  Author : Sergey Anikin 
diff --git a/src/VISUGUI/VisuGUI_Selection.h b/src/VISUGUI/VisuGUI_Selection.h
index 07fd8024..9e23164c 100644
--- a/src/VISUGUI/VisuGUI_Selection.h
+++ b/src/VISUGUI/VisuGUI_Selection.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Selection.h
 //  Author : Sergey Anikin 
diff --git a/src/VISUGUI/VisuGUI_SelectionPanel.cxx b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
index 0405e510..969d73e8 100644
--- a/src/VISUGUI/VisuGUI_SelectionPanel.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPanel.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_SelectionPanel.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_SelectionPanel.h b/src/VISUGUI/VisuGUI_SelectionPanel.h
index 324ce098..ee4fff3c 100644
--- a/src/VISUGUI/VisuGUI_SelectionPanel.h
+++ b/src/VISUGUI/VisuGUI_SelectionPanel.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_SelectionPanel.h
 //  Author : Laurent CORNABE & Hubert ROLLAND 
diff --git a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
index 1d71d17a..486d5957 100644
--- a/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SelectionPrefDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,14 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_SelectionPrefDlg.cxx
 //  Author : Oleg UVAROV
 //  Module : SALOME
 //
 #include "VisuGUI_SelectionPrefDlg.h"
 #include "VisuGUI.h"
-
-#include <VisuGUI_GUITools.h>
+#include "VisuGUI_Tools.h"
 
 #include "VISU_PickingSettings.h"
 
diff --git a/src/VISUGUI/VisuGUI_SelectionPrefDlg.h b/src/VISUGUI/VisuGUI_SelectionPrefDlg.h
index ca4c4f4f..c4431b0c 100644
--- a/src/VISUGUI/VisuGUI_SelectionPrefDlg.h
+++ b/src/VISUGUI/VisuGUI_SelectionPrefDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_SelectionPrefDlg.cxx
 //  Author : Oleg UVAROV
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
index c8c073d3..665127a0 100644
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_SetupPlot2dDlg.cxx
 //  Author : Vadim SANDLER
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
index 476bdb93..e1b65af0 100644
--- a/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
+++ b/src/VISUGUI/VisuGUI_SetupPlot2dDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_SetupPlot2dDlg.h
 //  Author : Vadim SANDLER
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
index 4b473719..0d755a9a 100644
--- a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_ShrinkFactorDlg.cxx
 //  Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #include "VisuGUI_ShrinkFactorDlg.h"
 
 #include "VisuGUI.h"
diff --git a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h
index 90568d13..2828e31c 100644
--- a/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h
+++ b/src/VISUGUI/VisuGUI_ShrinkFactorDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,10 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_ShrinkFactorDlg.h
 //  Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #ifndef VISUGUI_SHRINKFACTORDLG_H
 #define VISUGUI_SHRINKFACTORDLG_H
 
diff --git a/src/VISUGUI/VisuGUI_SizeBox.cxx b/src/VISUGUI/VisuGUI_SizeBox.cxx
new file mode 100644
index 00000000..8e86bc12
--- /dev/null
+++ b/src/VISUGUI/VisuGUI_SizeBox.cxx
@@ -0,0 +1,380 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  VISU VISUGUI : GUI of VISU component
+//  File   : VisuGUI_SizeBox.cxx
+//  Author : Oleg UVAROV
+//  Module : VISU
+//
+#include "VisuGUI_SizeBox.h"
+
+#include "VisuGUI_Tools.h"
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+
+#include <SalomeApp_DoubleSpinBox.h>
+#include <SalomeApp_IntSpinBox.h>
+#include <QtxColorButton.h>
+
+#include <QLayout>
+#include <QLabel>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QGroupBox>
+#include <QButtonGroup>
+#include <QRadioButton>
+#include <QPushButton>
+#include <QColorDialog>
+
+using namespace std;
+
+VisuGUI_SizeBox::VisuGUI_SizeBox( QWidget* parent ) :
+  QWidget( parent )
+{
+  QVBoxLayout* aMainLayout = new QVBoxLayout( this );
+  aMainLayout->setSpacing( 0 );
+  aMainLayout->setMargin( 0 );
+
+  // Size
+  QGroupBox* SizeGroup = new QGroupBox ( tr( "SIZE_TITLE" ), this );
+  //SizeGroup->setColumnLayout(0, Qt::Vertical );
+  //SizeGroup->layout()->setSpacing( 0 );
+  //SizeGroup->layout()->setMargin( 0 );
+
+  QGridLayout* SizeGroupLayout = new QGridLayout (SizeGroup);
+  SizeGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
+  SizeGroupLayout->setSpacing(6);
+  SizeGroupLayout->setMargin(11);
+
+  // Outside Size
+  myOutsideSizeLabel = new QLabel( tr( "OUTSIDE_SIZE" ), SizeGroup );
+  myOutsideSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
+  VISU::initSpinBox( myOutsideSizeSpinBox, 0, 100, 1 );
+  myOutsideSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myOutsideSizeLabel, 0, 0 );
+  SizeGroupLayout->addWidget( myOutsideSizeSpinBox, 0, 1 );
+
+  // Geometry Size
+  myGeomSizeLabel = new QLabel( tr( "GEOM_SIZE" ), SizeGroup );
+  myGeomSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
+  VISU::initSpinBox( myGeomSizeSpinBox, 0, 100, 1 );  
+  myGeomSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myGeomSizeLabel, 0, 0 );
+  SizeGroupLayout->addWidget( myGeomSizeSpinBox, 0, 1 );
+
+  // Min Size
+  myMinSizeLabel = new QLabel( tr( "MIN_SIZE" ), SizeGroup );
+  myMinSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
+  VISU::initSpinBox( myMinSizeSpinBox, 0, 100, 1 );
+  myMinSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myMinSizeLabel, 1, 0 );
+  SizeGroupLayout->addWidget( myMinSizeSpinBox, 1, 1 );
+
+  // Max Size
+  myMaxSizeLabel = new QLabel( tr( "MAX_SIZE" ), SizeGroup );
+  myMaxSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
+  VISU::initSpinBox( myMaxSizeSpinBox, 0, 100, 1 );
+  myMaxSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myMaxSizeLabel, 1, 2 );
+  SizeGroupLayout->addWidget( myMaxSizeSpinBox, 1, 3 );
+
+  // Magnification
+  myMagnificationLabel = new QLabel( tr( "MAGNIFICATION" ), SizeGroup );
+  myMagnificationSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
+  VISU::initSpinBox( myMagnificationSpinBox, 1, 10000, 10 );  
+  myMagnificationSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myMagnificationLabel, 2, 0 );
+  SizeGroupLayout->addWidget( myMagnificationSpinBox, 2, 1 );
+
+  // Increment
+  myIncrementLabel = new QLabel( tr( "INCREMENT" ), SizeGroup );
+  myIncrementSpinBox = new SalomeApp_DoubleSpinBox( SizeGroup );
+  VISU::initSpinBox( myIncrementSpinBox, 0.01, 10, 0.1, "parametric_precision" );
+  myIncrementSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
+
+  SizeGroupLayout->addWidget( myIncrementLabel, 2, 2 );
+  SizeGroupLayout->addWidget( myIncrementSpinBox, 2, 3 );
+
+  aMainLayout->addWidget( SizeGroup );
+
+  // Color
+  myColorGroup = new QGroupBox ( tr( "COLOR_TITLE" ), this );
+  //myColorGroup->setColumnLayout(0, Qt::Vertical );
+  //myColorGroup->layout()->setSpacing( 0 );
+  //myColorGroup->layout()->setMargin( 0 );
+
+  QGridLayout* ColorGroupLayout = new QGridLayout ( myColorGroup );
+  ColorGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
+  ColorGroupLayout->setSpacing(6);
+  ColorGroupLayout->setMargin(11);
+
+  myUniformCheckBox = new QCheckBox( tr( "UNIFORM_COLOR" ), myColorGroup );
+
+  myColorLabel = new QLabel( tr( "COLOR" ), myColorGroup );
+  myColorButton = new QtxColorButton( myColorGroup );
+
+  ColorGroupLayout->addWidget( myUniformCheckBox, 0, 0 );
+  ColorGroupLayout->addWidget( myColorLabel, 0, 1 );
+  ColorGroupLayout->addWidget( myColorButton, 0, 2 );
+
+  aMainLayout->addWidget( myColorGroup );
+
+  connect( myUniformCheckBox, SIGNAL( toggled( bool ) ), myColorButton, SLOT( setEnabled( bool ) ) );
+  //connect( myColorButton, SIGNAL( clicked() ), this, SLOT( onColorButtonPressed() ) );
+
+  setType( VisuGUI_SizeBox::Results );
+}
+
+void VisuGUI_SizeBox::onToggleResults()
+{
+  myType = VisuGUI_SizeBox::Results;
+
+  myOutsideSizeLabel->hide();
+  myOutsideSizeSpinBox->hide();
+
+  myGeomSizeLabel->hide();
+  myGeomSizeSpinBox->hide();
+
+  myMinSizeLabel->show();
+  myMinSizeSpinBox->show();
+
+  myMaxSizeLabel->show();
+  myMaxSizeSpinBox->show();
+
+  myMagnificationLabel->show();
+  myMagnificationSpinBox->show();
+
+  myIncrementLabel->show();
+  myIncrementSpinBox->show();
+
+  myColorGroup->hide();
+
+  myUniformCheckBox->hide();
+}
+
+void VisuGUI_SizeBox::onToggleGeometry()
+{
+  myType = VisuGUI_SizeBox::Geometry;
+
+  myOutsideSizeLabel->hide();
+  myOutsideSizeSpinBox->hide();
+
+  myGeomSizeLabel->show();
+  myGeomSizeSpinBox->show();
+
+  myMinSizeLabel->hide();
+  myMinSizeSpinBox->hide();
+
+  myMaxSizeLabel->hide();
+  myMaxSizeSpinBox->hide();
+
+  myMagnificationLabel->show();
+  myMagnificationSpinBox->show();
+
+  myIncrementLabel->show();
+  myIncrementSpinBox->show();
+
+  myColorGroup->show();
+
+  myUniformCheckBox->hide();
+}
+
+void VisuGUI_SizeBox::onToggleInside()
+{
+  myType = VisuGUI_SizeBox::Inside;
+
+  myOutsideSizeLabel->hide();
+  myOutsideSizeSpinBox->hide();
+
+  myGeomSizeLabel->hide();
+  myGeomSizeSpinBox->hide();
+
+  myMinSizeLabel->show();
+  myMinSizeSpinBox->show();
+
+  myMaxSizeLabel->show();
+  myMaxSizeSpinBox->show();
+
+  myMagnificationLabel->hide();
+  myMagnificationSpinBox->hide();
+
+  myIncrementLabel->hide();
+  myIncrementSpinBox->hide();
+
+  myColorGroup->hide();
+
+  myUniformCheckBox->hide();
+}
+
+void VisuGUI_SizeBox::onToggleOutside()
+{
+  myType = VisuGUI_SizeBox::Outside;
+
+  myOutsideSizeLabel->show();
+  myOutsideSizeSpinBox->show();
+
+  myGeomSizeLabel->hide();
+  myGeomSizeSpinBox->hide();
+
+  myMinSizeLabel->hide();
+  myMinSizeSpinBox->hide();
+
+  myMaxSizeLabel->hide();
+  myMaxSizeSpinBox->hide();
+
+  myMagnificationLabel->hide();
+  myMagnificationSpinBox->hide();
+
+  myIncrementLabel->hide();
+  myIncrementSpinBox->hide();
+
+  myColorGroup->show();
+
+  myUniformCheckBox->show();
+}
+
+void VisuGUI_SizeBox::setType( int theType )
+{
+  myType = theType;
+
+  switch( myType )
+  {
+    case VisuGUI_SizeBox::Results  : onToggleResults(); break;
+    case VisuGUI_SizeBox::Geometry : onToggleGeometry(); break;
+    case VisuGUI_SizeBox::Inside   : onToggleInside();  break;
+    case VisuGUI_SizeBox::Outside  : onToggleOutside();  break;
+    default : break;
+  }
+}
+
+float VisuGUI_SizeBox::getOutsideSize() const
+{
+  return myOutsideSizeSpinBox->value() / 100.0;
+}
+
+void VisuGUI_SizeBox::setOutsideSize( float theOutsideSize )
+{
+  myOutsideSizeSpinBox->setValue( ( int )( theOutsideSize * 100 ) );
+}
+
+float VisuGUI_SizeBox::getGeomSize() const
+{
+  return myGeomSizeSpinBox->value() / 100.0;
+}
+
+void VisuGUI_SizeBox::setGeomSize( float theGeomSize )
+{
+  myGeomSizeSpinBox->setValue( ( int )( theGeomSize * 100 ) );
+}
+
+float VisuGUI_SizeBox::getMinSize() const
+{
+  return myMinSizeSpinBox->value() / 100.0;
+}
+
+void VisuGUI_SizeBox::setMinSize( float theMinSize )
+{
+  myMinSizeSpinBox->setValue( ( int )( theMinSize * 100 ) );
+}
+
+float VisuGUI_SizeBox::getMaxSize() const
+{
+  return myMaxSizeSpinBox->value() / 100.0;
+}
+
+void VisuGUI_SizeBox::setMaxSize( float theMaxSize )
+{
+  myMaxSizeSpinBox->setValue( ( int )( theMaxSize * 100 ) );
+}
+
+float VisuGUI_SizeBox::getMagnification() const
+{
+  return myMagnificationSpinBox->value() / 100.0;
+}
+
+void VisuGUI_SizeBox::setMagnification( float theMagnification )
+{
+  myMagnificationSpinBox->setValue( ( int )( theMagnification * 100 ) );
+}
+
+float VisuGUI_SizeBox::getIncrement() const
+{
+  return myIncrementSpinBox->value();
+}
+
+void VisuGUI_SizeBox::setIncrement( float theIncrement )
+{
+  myIncrementSpinBox->setValue( theIncrement );
+}
+
+bool VisuGUI_SizeBox::getUniform() const
+{
+  return myUniformCheckBox->isChecked();
+}
+
+void VisuGUI_SizeBox::setUniform( bool theUniform )
+{
+  myUniformCheckBox->setChecked( theUniform );
+  myColorButton->setEnabled( theUniform );
+}
+
+QColor VisuGUI_SizeBox::getColor() const
+{
+  return myColorButton->color();//palette().color( myColorButton->backgroundRole() );
+  //return myColorButton->paletteBackgroundColor();
+}
+
+void VisuGUI_SizeBox::setColor( const QColor& theColor )
+{
+  if ( theColor.isValid() )
+  {
+    //QPalette aPalette( myColorButton->palette() );
+    //aPalette.setColor( myColorButton->backgroundRole(), theColor );
+    myColorButton->setColor( theColor );
+  }
+  //myColorButton->setPaletteBackgroundColor( theColor );
+}
+
+void VisuGUI_SizeBox::enableSizeControls( bool enabled )
+{
+  myMagnificationSpinBox->setEnabled( enabled );
+  myMaxSizeSpinBox->setEnabled( enabled );
+  myMinSizeSpinBox->setEnabled( enabled );
+  myIncrementSpinBox->setEnabled( enabled );
+  myGeomSizeSpinBox->setEnabled( enabled );
+}
+
+/*void VisuGUI_SizeBox::onColorButtonPressed()
+{
+  QPalette aPalette( myColorButton->palette() );
+  QColor aColor = QColorDialog::
+    getColor( aPalette.color(myColorButton->backgroundRole() ), this );
+
+  if( aColor.isValid() )
+  {
+      aPalette.setColor( myColorButton->backgroundRole(), aColor );
+      myColorButton->setPalette( aPalette );
+  }
+}*/
diff --git a/src/VISUGUI/VisuGUI_SizeBox.h b/src/VISUGUI/VisuGUI_SizeBox.h
new file mode 100644
index 00000000..69e42ab9
--- /dev/null
+++ b/src/VISUGUI/VisuGUI_SizeBox.h
@@ -0,0 +1,119 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  VISU VISUGUI : GUI of VISU component
+//  File   : VisuGUI_SizeBox.h
+//  Author : Oleg UVAROV
+//  Module : VISU
+//
+#ifndef VISUGUI_SIZEBOX_H
+#define VISUGUI_SIZEBOX_H
+
+#include <QWidget>
+
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QCheckBox;
+class QGroupBox;
+
+class SalomeApp_DoubleSpinBox;
+class SalomeApp_IntSpinBox;
+class QtxColorButton;
+
+class VisuGUI_SizeBox : public QWidget
+{
+  Q_OBJECT
+
+public:
+  enum { Results = 0, Geometry, Inside, Outside };
+
+public:
+  VisuGUI_SizeBox( QWidget* );
+  ~VisuGUI_SizeBox() {}
+
+public:
+  int                      getType() const { return myType; }
+  void                     setType( int );
+
+  float                    getOutsideSize() const;
+  void                     setOutsideSize( float );
+
+  float                    getGeomSize() const;
+  void                     setGeomSize( float );
+
+  float                    getMinSize() const;
+  void                     setMinSize( float );
+
+  float                    getMaxSize() const;
+  void                     setMaxSize( float );
+
+  float                    getMagnification() const;
+  void                     setMagnification( float );
+
+  float                    getIncrement() const;
+  void                     setIncrement( float );
+
+  bool                     getUniform() const;
+  void                     setUniform( bool );
+
+  QColor                   getColor() const;
+  void                     setColor( const QColor& );
+
+  void                     enableSizeControls( bool enabled );
+
+protected slots:
+  void                     onToggleResults();
+  void                     onToggleGeometry();
+  void                     onToggleInside();
+  void                     onToggleOutside();
+
+  //void                     onColorButtonPressed();
+
+private:
+  int                      myType;
+
+  QLabel*                  myOutsideSizeLabel;
+  SalomeApp_IntSpinBox*    myOutsideSizeSpinBox;
+
+  QLabel*                  myGeomSizeLabel;
+  SalomeApp_IntSpinBox*    myGeomSizeSpinBox;
+
+  QLabel*                  myMinSizeLabel;
+  SalomeApp_IntSpinBox*    myMinSizeSpinBox;
+
+  QLabel*                  myMaxSizeLabel;
+  SalomeApp_IntSpinBox*    myMaxSizeSpinBox;
+
+  QLabel*                  myMagnificationLabel;
+  SalomeApp_IntSpinBox*    myMagnificationSpinBox;
+
+  QLabel*                  myIncrementLabel;
+  SalomeApp_DoubleSpinBox* myIncrementSpinBox;
+
+  QCheckBox*               myUniformCheckBox;  
+
+  QGroupBox*               myColorGroup;
+  QLabel*                  myColorLabel;
+  QtxColorButton*          myColorButton;
+};
+
+
+
+#endif
diff --git a/src/VISUGUI/VisuGUI_Slider.cxx b/src/VISUGUI/VisuGUI_Slider.cxx
index ac2eedc0..f479c029 100644
--- a/src/VISUGUI/VisuGUI_Slider.cxx
+++ b/src/VISUGUI/VisuGUI_Slider.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,14 +19,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Slider.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
 //
 #include "VisuGUI_Slider.h"
-
-#include <VisuGUI_GUITools.h>
+#include "VisuGUI_Tools.h"
 
 #include "SUIT_ResourceMgr.h"
 #include "SUIT_Session.h"
diff --git a/src/VISUGUI/VisuGUI_Slider.h b/src/VISUGUI/VisuGUI_Slider.h
index 54d5e615..75c9458a 100644
--- a/src/VISUGUI/VisuGUI_Slider.h
+++ b/src/VISUGUI/VisuGUI_Slider.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Slider.h
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
index e828a891..5fa078a0 100644
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_StreamLinesDlg.cxx
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
@@ -29,8 +30,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_InputPane.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_Mesh_i.hh"
 #include "VISU_Gen_i.hh"
 #include "VISU_StreamLines_i.hh"
diff --git a/src/VISUGUI/VisuGUI_StreamLinesDlg.h b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
index 5ccdee11..a0eebdf9 100644
--- a/src/VISUGUI/VisuGUI_StreamLinesDlg.h
+++ b/src/VISUGUI/VisuGUI_StreamLinesDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_StreamLinesDlg.h
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_Sweep.cxx b/src/VISUGUI/VisuGUI_Sweep.cxx
index bcbbf9bf..0c28791f 100644
--- a/src/VISUGUI/VisuGUI_Sweep.cxx
+++ b/src/VISUGUI/VisuGUI_Sweep.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,14 +16,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Slider.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
 //
 #include "VisuGUI_Sweep.h"
-
-#include <VisuGUI_GUITools.h>
+#include "VisuGUI_Tools.h"
 
 #include "SUIT_ResourceMgr.h"
 
diff --git a/src/VISUGUI/VisuGUI_Sweep.h b/src/VISUGUI/VisuGUI_Sweep.h
index 5426e3ea..c5f0ce77 100644
--- a/src/VISUGUI/VisuGUI_Sweep.h
+++ b/src/VISUGUI/VisuGUI_Sweep.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Sweep.h
 //  Author : Oleg UVAROV
diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.cxx b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
index f5e2f2b6..4b45a9ec 100644
--- a/src/VISUGUI/VisuGUI_Table3dDlg.cxx
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // VISU VISUGUI : GUI of VISU component
 // File   : VisuGUI_Table3dDlg.cxx
 // Author : Laurent CORNABE & Hubert ROLLAND
@@ -30,8 +28,6 @@
 #include "VisuGUI_ViewTools.h"
 #include "VisuGUI_InputPane.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_ViewManager_i.hh"
 #include "VISU_Prs3dUtils.hh"
diff --git a/src/VISUGUI/VisuGUI_Table3dDlg.h b/src/VISUGUI/VisuGUI_Table3dDlg.h
index 5ee3dd15..4d5e8deb 100644
--- a/src/VISUGUI/VisuGUI_Table3dDlg.h
+++ b/src/VISUGUI/VisuGUI_Table3dDlg.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // VISU VISUGUI : GUI of VISU component
 // File   : VisuGUI_Table3dDlg.h
 // Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.cxx b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
index a7bdbcfb..149f3ea7 100644
--- a/src/VISUGUI/VisuGUI_TimeAnimation.cxx
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -17,8 +17,9 @@
 //  License along with this library; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_TimeAnimation.cxx
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
@@ -40,8 +41,6 @@
 #include "VisuGUI_DeformedShapeAndScalarMapDlg.h"
 #include "VisuGUI_GaussPointsDlg.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_TimeAnimation.h"
 
 #include "VISU_ScalarMap_i.hh"
diff --git a/src/VISUGUI/VisuGUI_TimeAnimation.h b/src/VISUGUI/VisuGUI_TimeAnimation.h
index 44d6de0c..86be3c6c 100644
--- a/src/VISUGUI/VisuGUI_TimeAnimation.h
+++ b/src/VISUGUI/VisuGUI_TimeAnimation.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_TimeAnimation.h
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
diff --git a/src/VISUGUI/VisuGUI_Timer.cxx b/src/VISUGUI/VisuGUI_Timer.cxx
index d78348b5..d2ab6a47 100644
--- a/src/VISUGUI/VisuGUI_Timer.cxx
+++ b/src/VISUGUI/VisuGUI_Timer.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Timer.cxx
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_Timer.h b/src/VISUGUI/VisuGUI_Timer.h
index e5856d8c..8cc37626 100644
--- a/src/VISUGUI/VisuGUI_Timer.h
+++ b/src/VISUGUI/VisuGUI_Timer.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Timer.h
 //  Module : SALOME
diff --git a/src/VISUGUI/VisuGUI_Tools.cxx b/src/VISUGUI/VisuGUI_Tools.cxx
index 40215a7a..91b9e908 100644
--- a/src/VISUGUI/VisuGUI_Tools.cxx
+++ b/src/VISUGUI/VisuGUI_Tools.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Tools.cxx
 //  Author : Sergey Anikin
@@ -47,6 +48,8 @@
 #include "SalomeApp_Module.h"
 #include "SalomeApp_Study.h"
 #include "SalomeApp_Application.h"
+#include "SalomeApp_IntSpinBox.h"
+#include "SalomeApp_DoubleSpinBox.h"
 
 #include "LightApp_DataObject.h"
 #include "LightApp_SelectionMgr.h"
@@ -70,6 +73,7 @@
 #include "SUIT_MessageBox.h"
 #include "SUIT_Desktop.h"
 #include "SUIT_ViewWindow.h"
+#include "SUIT_ResourceMgr.h"
 
 #include "CAM_DataModel.h"
 
@@ -79,6 +83,7 @@
 #include <QString>
 #include <QSpinBox>
 #include <QDoubleSpinBox>
+#include <QVariant>
 
 using namespace std;
 
@@ -1342,4 +1347,39 @@ namespace VISU
     theSObject = aFolder;
     return true;
   }
+
+  //------------------------------------------------------------
+  void initSpinBox( SalomeApp_IntSpinBox* sb, 
+                    const int bottom, 
+                    const int top, 
+                    const int step )
+  {
+    sb->setAcceptNames( false );
+    sb->setRange( bottom, top );
+    sb->setSingleStep( step );
+  }
+  
+  //------------------------------------------------------------
+  void initSpinBox( SalomeApp_DoubleSpinBox* sb, 
+                    const double& bottom, 
+                    const double& top, 
+                    const double& step, 
+                    const char* quantity )
+  {
+    // Obtain precision from preferences
+    SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+    int precision = resMgr->integerValue( "VISU", quantity, 3 );
+  
+    sb->setPrecision   ( precision ); 
+    sb->setDecimals    ( qAbs(precision) );
+    sb->setRange       ( bottom, top );
+    sb->setSingleStep  ( step );
+    sb->setDefaultValue( bottom );
+    sb->setAcceptNames ( false );
+  
+    // Add a hint for the user saying how to tune precision
+    QString userPropName = QObject::tr( QString( "VISU_PREF_%1" ).arg( quantity ).toLatin1().constData() );
+    sb->setProperty( "validity_tune_hint", 
+                     QVariant( QObject::tr( "VISU_PRECISION_HINT" ).arg( userPropName ) ) );  
+  }
 }
diff --git a/src/VISUGUI/VisuGUI_Tools.h b/src/VISUGUI/VisuGUI_Tools.h
index c953076c..9f29ed5a 100644
--- a/src/VISUGUI/VisuGUI_Tools.h
+++ b/src/VISUGUI/VisuGUI_Tools.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Tools.h
 //  Author : Sergey Anikin
@@ -51,6 +52,8 @@ class SPlot2d_Curve;
 class Plot2d_ViewFrame;
 class CAM_Module;
 class LightApp_SelectionMgr;
+class SalomeApp_DoubleSpinBox;
+class SalomeApp_IntSpinBox;
 class SalomeApp_Module;
 class SalomeApp_Study;
 class VisuGUI;
@@ -243,6 +246,9 @@ namespace VISU
 #define CLIP_PLANES_FOLDER "Clipping Planes"
 
   bool getClippingPlanesFolder(_PTR(Study) theStudy, _PTR(SObject)& theSObject);
+
+  void initSpinBox( SalomeApp_IntSpinBox*, const int, const int, const int );
+  void initSpinBox( SalomeApp_DoubleSpinBox*, const double&, const double&, const double&, const char* );
 }
 
 #endif
diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
index 0227625a..3890d2b5 100644
--- a/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
+++ b/src/VISUGUI/VisuGUI_TransparencyDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_TransparencyDlg.cxx
 //  Author : Nicolas REJNERI
diff --git a/src/VISUGUI/VisuGUI_TransparencyDlg.h b/src/VISUGUI/VisuGUI_TransparencyDlg.h
index 9f9af30e..f32c63f3 100644
--- a/src/VISUGUI/VisuGUI_TransparencyDlg.h
+++ b/src/VISUGUI/VisuGUI_TransparencyDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VisuGUI : GUI for VISU component
 //  File   : VisuGUI_TransparencyDlg.h
 //  Author : Nicolas REJNERI
diff --git a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
index 54c71d16..769cbead 100755
--- a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.cxx
@@ -1,5 +1,4 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -17,10 +16,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VisuGUI_ValuesLabelingDlg.cxx
 //  Author : Litonin SERGEY
 //  Module : SALOME
-
+//
 #include "VisuGUI_ValuesLabelingDlg.h"
 #include "VisuGUI.h"
 
diff --git a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.h b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.h
index 74dc42b0..e5b0c4c0 100755
--- a/src/VISUGUI/VisuGUI_ValuesLabelingDlg.h
+++ b/src/VISUGUI/VisuGUI_ValuesLabelingDlg.h
@@ -1,26 +1,26 @@
-//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
-// 
-//  This library is free software; you can redistribute it and/or 
-//  modify it under the terms of the GNU Lesser General Public 
-//  License as published by the Free Software Foundation; either 
-//  version 2.1 of the License. 
-// 
-//  This library is distributed in the hope that it will be useful, 
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-//  Lesser General Public License for more details. 
-// 
-//  You should have received a copy of the GNU Lesser General Public 
-//  License along with this library; if not, write to the Free Software 
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
-// 
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
 //  File   : VisuGUI_ValuesLabelingDlg.h
 //  Author : Sergey LITONIN
 //  Module : SALOME
-
+//
 #ifndef VisuGUI_ValuesLabelingDlg_H
 #define VisuGUI_ValuesLabelingDlg_H
 
diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.cxx b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
index a4310d8e..998b3dbf 100644
--- a/src/VISUGUI/VisuGUI_VectorsDlg.cxx
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_VectorsDlg.cxx
 //  Author : Laurent CORNABE & Hubert ROLLAND 
@@ -31,8 +32,6 @@
 #include "VisuGUI_Tools.h"
 #include "VisuGUI_InputPane.h"
 
-#include <VisuGUI_GUITools.h>
-
 #include "VISU_ColoredPrs3dFactory.hh"
 #include "VISU_Vectors_i.hh"
 #include "LightApp_Application.h"
diff --git a/src/VISUGUI/VisuGUI_VectorsDlg.h b/src/VISUGUI/VisuGUI_VectorsDlg.h
index 2353fcee..13def1c5 100644
--- a/src/VISUGUI/VisuGUI_VectorsDlg.h
+++ b/src/VISUGUI/VisuGUI_VectorsDlg.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_VectorsDlg.h
 //  Author : Laurent CORNABE & Hubert ROLLAND
diff --git a/src/VISUGUI/VisuGUI_ViewExtender.cxx b/src/VISUGUI/VisuGUI_ViewExtender.cxx
index 3dff1134..d5b105c1 100644
--- a/src/VISUGUI/VisuGUI_ViewExtender.cxx
+++ b/src/VISUGUI/VisuGUI_ViewExtender.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_ViewExtender.cxx
 //  Author : Vitaly Smetannikov
diff --git a/src/VISUGUI/VisuGUI_ViewExtender.h b/src/VISUGUI/VisuGUI_ViewExtender.h
index 16303177..f4923d19 100644
--- a/src/VISUGUI/VisuGUI_ViewExtender.h
+++ b/src/VISUGUI/VisuGUI_ViewExtender.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_ViewExtender.h
 //  Author : Vitaly Smetannikov
diff --git a/src/VISUGUI/VisuGUI_ViewTools.cxx b/src/VISUGUI/VisuGUI_ViewTools.cxx
index 65aaeed9..7e455698 100644
--- a/src/VISUGUI/VisuGUI_ViewTools.cxx
+++ b/src/VISUGUI/VisuGUI_ViewTools.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Tools.cxx
 //  Author : Sergey Anikin
diff --git a/src/VISUGUI/VisuGUI_ViewTools.h b/src/VISUGUI/VisuGUI_ViewTools.h
index 772d780a..0830a2e0 100644
--- a/src/VISUGUI/VisuGUI_ViewTools.h
+++ b/src/VISUGUI/VisuGUI_ViewTools.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISUGUI : GUI of VISU component
 //  File   : VisuGUI_Tools.h
 //  Author : Sergey Anikin
diff --git a/src/VISU_I/Makefile.am b/src/VISU_I/Makefile.am
index 9d6c9de5..b7d846d0 100644
--- a/src/VISU_I/Makefile.am
+++ b/src/VISU_I/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : Alexey Petrov
 #  Module : VISU
@@ -67,8 +65,8 @@ salomeinclude_HEADERS = \
 	VISU_Deformation_i.hh \
 	VISU_OptionalDeformation_i.hh \
 	SALOME_GenericObjPointer.hh \
-	VISU_ClippingPlaneMgr.hxx
-
+	VISU_ClippingPlaneMgr.hxx \
+	VISU_TableDlg.h
 
 libVISUEngineImpl_la_SOURCES = \
 	VISUConfig.cc \
@@ -109,9 +107,13 @@ libVISUEngineImpl_la_SOURCES = \
 	VISU_Deformation_i.cc \
 	VISU_OptionalDeformation_i.cc \
 	SALOME_GenericObjPointer.cc \
-	VISU_ClippingPlaneMgr.cxx
+	VISU_ClippingPlaneMgr.cxx \
+	VISU_TableDlg.cxx
+
+MOC_FILES = \
+	VISU_TimeAnimation_moc.cxx \
+	VISU_TableDlg_moc.cxx
 
-MOC_FILES = VISU_TimeAnimation_moc.cxx
 nodist_libVISUEngineImpl_la_SOURCES= $(MOC_FILES)
 
 # additionnal information to compil and link file
@@ -131,7 +133,6 @@ libVISUEngineImpl_la_CPPFLAGS= \
 	-I$(srcdir)/../CONVERTOR \
 	-I$(srcdir)/../PIPELINE \
 	-I$(srcdir)/../OBJECT \
-	-I$(srcdir)/../GUITOOLS \
 	-I$(top_builddir)/idl
 
 libVISUEngineImpl_la_LDFLAGS= \
@@ -150,7 +151,6 @@ libVISUEngineImpl_la_LIBADD= \
 	../CONVERTOR/libVisuConvertor.la \
 	../PIPELINE/libVisuPipeLine.la \
 	../OBJECT/libVisuObject.la \
-	../GUITOOLS/libVISUGUITOOLS.la \
 	-lSalomeIDLKernel \
 	-lSalomeHDFPersist \
 	-lSalomeGenericObj \
@@ -160,6 +160,7 @@ libVISUEngineImpl_la_LIBADD= \
 	-lTOOLSDS \
 	-lOpUtil \
 	-lSalomeLifeCycleCORBA \
+	-lCAM \
 	-lVTKViewer \
 	-lSVTK \
 	-lEvent \
diff --git a/src/VISU_I/SALOME_GenericObjPointer.cc b/src/VISU_I/SALOME_GenericObjPointer.cc
index ad08d8aa..d947e669 100644
--- a/src/VISU_I/SALOME_GenericObjPointer.cc
+++ b/src/VISU_I/SALOME_GenericObjPointer.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOME_GenericObjPtr.cc
 //  Author : Oleg UVAROV
 //  Module : SALOME
diff --git a/src/VISU_I/SALOME_GenericObjPointer.hh b/src/VISU_I/SALOME_GenericObjPointer.hh
index c54c762a..2af65334 100644
--- a/src/VISU_I/SALOME_GenericObjPointer.hh
+++ b/src/VISU_I/SALOME_GenericObjPointer.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOME_GenericObjPtr.hh
 //  Author : Oleg UVAROV
 //  Module : SALOME
diff --git a/src/VISU_I/VISUConfig.cc b/src/VISU_I/VISUConfig.cc
index 8407799a..d2ad2061 100644
--- a/src/VISU_I/VISUConfig.cc
+++ b/src/VISU_I/VISUConfig.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISUConfig.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISUConfig.hh b/src/VISU_I/VISUConfig.hh
index 27af4103..c463972a 100644
--- a/src/VISU_I/VISUConfig.hh
+++ b/src/VISU_I/VISUConfig.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISUConfig.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.cxx b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
index d1346758..7a169cca 100644
--- a/src/VISU_I/VISU_ClippingPlaneMgr.cxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_ClippingPlaneMgr.hxx"
 #include "VISU_ColoredPrs3dHolder_i.hh"
 
diff --git a/src/VISU_I/VISU_ClippingPlaneMgr.hxx b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
index 09ca4759..7841a1a0 100644
--- a/src/VISU_I/VISU_ClippingPlaneMgr.hxx
+++ b/src/VISU_I/VISU_ClippingPlaneMgr.hxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ClippingPlaneMgr.hxx
 //  Author : VSV
diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
index adfef8b8..0dcddc75 100644
--- a/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dCache_i.cc
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3dCache_i.hh b/src/VISU_I/VISU_ColoredPrs3dCache_i.hh
index 61c6fc09..ee0d7615 100644
--- a/src/VISU_I/VISU_ColoredPrs3dCache_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dCache_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dCache_i.hh
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.cc b/src/VISU_I/VISU_ColoredPrs3dFactory.cc
index 26327b58..1e49cd04 100644
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dCache_i.cc
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3dFactory.hh b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
index e3633e40..82735358 100644
--- a/src/VISU_I/VISU_ColoredPrs3dFactory.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dFactory.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dCache_i.hh
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
index 539a7912..8e6cf555 100644
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dHolder_i.cc
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
index 40859e8c..2ec13355 100644
--- a/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3dHolder_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3dHolder_i.hxx
 //  Author : Oleg UVAROV
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.cc b/src/VISU_I/VISU_ColoredPrs3d_i.cc
index 0b984dd0..5157647f 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.cc
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ColoredPrs3d_i.hh b/src/VISU_I/VISU_ColoredPrs3d_i.hh
index 877b0003..ae796d2f 100644
--- a/src/VISU_I/VISU_ColoredPrs3d_i.hh
+++ b/src/VISU_I/VISU_ColoredPrs3d_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ColoredPrs3d_i.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CorbaMedConvertor.cxx b/src/VISU_I/VISU_CorbaMedConvertor.cxx
index 763e4f2e..898ad2c3 100644
--- a/src/VISU_I/VISU_CorbaMedConvertor.cxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_CorbaMedConvertor.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CorbaMedConvertor.hxx b/src/VISU_I/VISU_CorbaMedConvertor.hxx
index b6715c9a..dc848457 100644
--- a/src/VISU_I/VISU_CorbaMedConvertor.hxx
+++ b/src/VISU_I/VISU_CorbaMedConvertor.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_CorbaMedConvertor.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CutLinesBase_i.cc b/src/VISU_I/VISU_CutLinesBase_i.cc
index 2a256794..d2e79d4e 100644
--- a/src/VISU_I/VISU_CutLinesBase_i.cc
+++ b/src/VISU_I/VISU_CutLinesBase_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_CutLinesBase_i.cc
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_CutLinesBase_i.hh b/src/VISU_I/VISU_CutLinesBase_i.hh
index 1371023e..9d9054f3 100644
--- a/src/VISU_I/VISU_CutLinesBase_i.hh
+++ b/src/VISU_I/VISU_CutLinesBase_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_CutLinesBase_i.hh
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_CutLines_i.cc b/src/VISU_I/VISU_CutLines_i.cc
index a1dccb01..691bfe8c 100644
--- a/src/VISU_I/VISU_CutLines_i.cc
+++ b/src/VISU_I/VISU_CutLines_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CutLines_i.hh b/src/VISU_I/VISU_CutLines_i.hh
index daccbc3a..00498ef7 100644
--- a/src/VISU_I/VISU_CutLines_i.hh
+++ b/src/VISU_I/VISU_CutLines_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CutPlanes_i.cc b/src/VISU_I/VISU_CutPlanes_i.cc
index c9411b38..e3cde2d8 100644
--- a/src/VISU_I/VISU_CutPlanes_i.cc
+++ b/src/VISU_I/VISU_CutPlanes_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CutPlanes_i.hh b/src/VISU_I/VISU_CutPlanes_i.hh
index e00faebb..671ae7d8 100644
--- a/src/VISU_I/VISU_CutPlanes_i.hh
+++ b/src/VISU_I/VISU_CutPlanes_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_CutSegment_i.cc b/src/VISU_I/VISU_CutSegment_i.cc
index 4e01b20b..b784ea8e 100644
--- a/src/VISU_I/VISU_CutSegment_i.cc
+++ b/src/VISU_I/VISU_CutSegment_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_CutSegment_i.cc
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_CutSegment_i.hh b/src/VISU_I/VISU_CutSegment_i.hh
index 6f7abdc2..3ca1dab6 100644
--- a/src/VISU_I/VISU_CutSegment_i.hh
+++ b/src/VISU_I/VISU_CutSegment_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_CutSegment_i.hh
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Deformation_i.cc b/src/VISU_I/VISU_Deformation_i.cc
index 7ed03fa0..af55a17f 100755
--- a/src/VISU_I/VISU_Deformation_i.cc
+++ b/src/VISU_I/VISU_Deformation_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Deformation_i.cc
 //  Author : 
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Deformation_i.hh b/src/VISU_I/VISU_Deformation_i.hh
index 85dcf3ae..44aab2f4 100755
--- a/src/VISU_I/VISU_Deformation_i.hh
+++ b/src/VISU_I/VISU_Deformation_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Deformation_i.hxx
 //  Author : 
 //  Module : VISU
diff --git a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
index 8fa94e4d..ba0e1d7c 100644
--- a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
+++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_DeformedShapeAndScalarMap_i.cc
 //  Author : Eugeny Nikolaev
diff --git a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh
index a50f64df..e96ddce4 100644
--- a/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh
+++ b/src/VISU_I/VISU_DeformedShapeAndScalarMap_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 // File:    VISU_DeformedShapeAndScalarMap_i.hh
 // Author:  Eugeny Nikolaev
diff --git a/src/VISU_I/VISU_DeformedShape_i.cc b/src/VISU_I/VISU_DeformedShape_i.cc
index fa280ebf..00275e87 100644
--- a/src/VISU_I/VISU_DeformedShape_i.cc
+++ b/src/VISU_I/VISU_DeformedShape_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_DeformedShape_i.hh b/src/VISU_I/VISU_DeformedShape_i.hh
index de3664ac..99888b39 100644
--- a/src/VISU_I/VISU_DeformedShape_i.hh
+++ b/src/VISU_I/VISU_DeformedShape_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_DumpPython.cc b/src/VISU_I/VISU_DumpPython.cc
index aafb1b5e..80bcd374 100644
--- a/src/VISU_I/VISU_DumpPython.cc
+++ b/src/VISU_I/VISU_DumpPython.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_DumpPython.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Evolution.cxx b/src/VISU_I/VISU_Evolution.cxx
index 75e971cd..80dd27ab 100644
--- a/src/VISU_I/VISU_Evolution.cxx
+++ b/src/VISU_I/VISU_Evolution.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Evolution.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Evolution.h b/src/VISU_I/VISU_Evolution.h
index b40e9aec..7f095318 100644
--- a/src/VISU_I/VISU_Evolution.h
+++ b/src/VISU_I/VISU_Evolution.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Evolution.h
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_GaussPoints_i.cc b/src/VISU_I/VISU_GaussPoints_i.cc
index ac8886f3..2aa0d74a 100644
--- a/src/VISU_I/VISU_GaussPoints_i.cc
+++ b/src/VISU_I/VISU_GaussPoints_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   :
 //  Author :
diff --git a/src/VISU_I/VISU_GaussPoints_i.hh b/src/VISU_I/VISU_GaussPoints_i.hh
index 740cd61f..2c658bec 100644
--- a/src/VISU_I/VISU_GaussPoints_i.hh
+++ b/src/VISU_I/VISU_GaussPoints_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Gen_i.cc b/src/VISU_I/VISU_Gen_i.cc
index c61da4cd..c866e1d3 100644
--- a/src/VISU_I/VISU_Gen_i.cc
+++ b/src/VISU_I/VISU_Gen_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Gen_i.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Gen_i.hh b/src/VISU_I/VISU_Gen_i.hh
index b66db20a..70e3833f 100644
--- a/src/VISU_I/VISU_Gen_i.hh
+++ b/src/VISU_I/VISU_Gen_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Gen_i.hh
 //  Author : Alexey Petrov
 //  Module : VISU
diff --git a/src/VISU_I/VISU_I.cxx b/src/VISU_I/VISU_I.cxx
index 49d32432..e9f0654c 100644
--- a/src/VISU_I/VISU_I.cxx
+++ b/src/VISU_I/VISU_I.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   :
 //  Author :
diff --git a/src/VISU_I/VISU_I.hxx b/src/VISU_I/VISU_I.hxx
index 88a50c1b..790cf719 100755
--- a/src/VISU_I/VISU_I.hxx
+++ b/src/VISU_I/VISU_I.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_I.hxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_IsoSurfaces_i.cc b/src/VISU_I/VISU_IsoSurfaces_i.cc
index 906aef86..64510747 100644
--- a/src/VISU_I/VISU_IsoSurfaces_i.cc
+++ b/src/VISU_I/VISU_IsoSurfaces_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_IsoSurfaces_i.hh b/src/VISU_I/VISU_IsoSurfaces_i.hh
index b8e245c5..3283dfa0 100644
--- a/src/VISU_I/VISU_IsoSurfaces_i.hh
+++ b/src/VISU_I/VISU_IsoSurfaces_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Mesh_i.cc b/src/VISU_I/VISU_Mesh_i.cc
index f703ca22..0ab3f334 100644
--- a/src/VISU_I/VISU_Mesh_i.cc
+++ b/src/VISU_I/VISU_Mesh_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Mesh_i.hh b/src/VISU_I/VISU_Mesh_i.hh
index 9115438b..349d9592 100644
--- a/src/VISU_I/VISU_Mesh_i.hh
+++ b/src/VISU_I/VISU_Mesh_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_MonoColorPrs_i.cc b/src/VISU_I/VISU_MonoColorPrs_i.cc
index b7ddf576..c8c7c0b1 100644
--- a/src/VISU_I/VISU_MonoColorPrs_i.cc
+++ b/src/VISU_I/VISU_MonoColorPrs_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MonoColorPrs_i.cxx
 //  Author : Vitaly Smetannikov
diff --git a/src/VISU_I/VISU_MonoColorPrs_i.hh b/src/VISU_I/VISU_MonoColorPrs_i.hh
index 5bddbdd4..7f07467a 100644
--- a/src/VISU_I/VISU_MonoColorPrs_i.hh
+++ b/src/VISU_I/VISU_MonoColorPrs_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MonoColorPrs_i.hxx
 //  Author : Vitaly Smetannikov
diff --git a/src/VISU_I/VISU_MultiResult_i.cc b/src/VISU_I/VISU_MultiResult_i.cc
index 42ef355f..9aad0f2d 100644
--- a/src/VISU_I/VISU_MultiResult_i.cc
+++ b/src/VISU_I/VISU_MultiResult_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MultiResult_i.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_MultiResult_i.hh b/src/VISU_I/VISU_MultiResult_i.hh
index 1bbfad1b..863de49a 100644
--- a/src/VISU_I/VISU_MultiResult_i.hh
+++ b/src/VISU_I/VISU_MultiResult_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_MultiResult_i.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_OptionalDeformation_i.cc b/src/VISU_I/VISU_OptionalDeformation_i.cc
index d7263255..07e2ea46 100755
--- a/src/VISU_I/VISU_OptionalDeformation_i.cc
+++ b/src/VISU_I/VISU_OptionalDeformation_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_OptionalDeformation_i.cc
 //  Author : 
 //  Module : VISU
diff --git a/src/VISU_I/VISU_OptionalDeformation_i.hh b/src/VISU_I/VISU_OptionalDeformation_i.hh
index b7ba13f3..bdcd13e3 100755
--- a/src/VISU_I/VISU_OptionalDeformation_i.hh
+++ b/src/VISU_I/VISU_OptionalDeformation_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Deformation_i.hxx
 //  Author : 
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Plot3D_i.cc b/src/VISU_I/VISU_Plot3D_i.cc
index cea07c35..310e06ad 100644
--- a/src/VISU_I/VISU_Plot3D_i.cc
+++ b/src/VISU_I/VISU_Plot3D_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "VISU_Plot3D_i.hh"
 #include "VISU_Prs3dUtils.hh"
 
diff --git a/src/VISU_I/VISU_Plot3D_i.hh b/src/VISU_I/VISU_Plot3D_i.hh
index 929cce8d..e85a62bb 100644
--- a/src/VISU_I/VISU_Plot3D_i.hh
+++ b/src/VISU_I/VISU_Plot3D_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef VISU_Plot3D_i_HeaderFile
 #define VISU_Plot3D_i_HeaderFile
 
diff --git a/src/VISU_I/VISU_PointMap3d_i.cc b/src/VISU_I/VISU_PointMap3d_i.cc
index 0bda5dbb..97391826 100644
--- a/src/VISU_I/VISU_PointMap3d_i.cc
+++ b/src/VISU_I/VISU_PointMap3d_i.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PointMap3d_i.cc
 //  Author : Dmitry Matveitchev
diff --git a/src/VISU_I/VISU_PointMap3d_i.hh b/src/VISU_I/VISU_PointMap3d_i.hh
index 252c00e7..e634a5f8 100644
--- a/src/VISU_I/VISU_PointMap3d_i.hh
+++ b/src/VISU_I/VISU_PointMap3d_i.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PointMap3d_i.hh
 //  Author : 
diff --git a/src/VISU_I/VISU_Prs3dUtils.cc b/src/VISU_I/VISU_Prs3dUtils.cc
index 35685d9f..60781b56 100644
--- a/src/VISU_I/VISU_Prs3dUtils.cc
+++ b/src/VISU_I/VISU_Prs3dUtils.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Prs3dUtils.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Prs3dUtils.hh b/src/VISU_I/VISU_Prs3dUtils.hh
index 7cf7fd20..13d3abb1 100644
--- a/src/VISU_I/VISU_Prs3dUtils.hh
+++ b/src/VISU_I/VISU_Prs3dUtils.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Prs3dUtils.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Prs3d_i.cc b/src/VISU_I/VISU_Prs3d_i.cc
index ac0058d5..11cb28d2 100644
--- a/src/VISU_I/VISU_Prs3d_i.cc
+++ b/src/VISU_I/VISU_Prs3d_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Prs3d_i.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Prs3d_i.hh b/src/VISU_I/VISU_Prs3d_i.hh
index 929a7eea..ff73eac1 100644
--- a/src/VISU_I/VISU_Prs3d_i.hh
+++ b/src/VISU_I/VISU_Prs3d_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_PrsObject_i.cc b/src/VISU_I/VISU_PrsObject_i.cc
index 1893a1b6..a7cb0113 100644
--- a/src/VISU_I/VISU_PrsObject_i.cc
+++ b/src/VISU_I/VISU_PrsObject_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_PrsObject_i.hh b/src/VISU_I/VISU_PrsObject_i.hh
index 3827f496..ad291f67 100644
--- a/src/VISU_I/VISU_PrsObject_i.hh
+++ b/src/VISU_I/VISU_PrsObject_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ResultUtils.cc b/src/VISU_I/VISU_ResultUtils.cc
index 3645abf0..55b14d55 100644
--- a/src/VISU_I/VISU_ResultUtils.cc
+++ b/src/VISU_I/VISU_ResultUtils.cc
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ResultUtils.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ResultUtils.hh b/src/VISU_I/VISU_ResultUtils.hh
index 639e22a0..a7e47ad1 100644
--- a/src/VISU_I/VISU_ResultUtils.hh
+++ b/src/VISU_I/VISU_ResultUtils.hh
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ResultUtils.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Result_i.cc b/src/VISU_I/VISU_Result_i.cc
index 3099bec2..a0315f5c 100644
--- a/src/VISU_I/VISU_Result_i.cc
+++ b/src/VISU_I/VISU_Result_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Result_i.cc
 //  Author : Alexey PETROV
@@ -101,12 +102,19 @@ namespace VISU
   GetResult(SALOMEDS::Study_ptr theStudy,
 	    const std::string& theResultEntry)
   {
-    if(CORBA::is_nil(theStudy))
-      return NULL;
-
-    SALOMEDS::SObject_var aSObject = theStudy->FindObjectID(theResultEntry.c_str());
-    CORBA::Object_var anObject = SObjectToObject(aSObject);
-    return dynamic_cast<VISU::Result_i*>(GetServant(anObject).in());
+    Result_i* result = NULL;
+    if (!CORBA::is_nil(theStudy)) {
+      SALOMEDS::SComponent_var aSComponent = theStudy->FindComponent("VISU");
+      if (!CORBA::is_nil(aSComponent)) {
+	std::string compid = aSComponent->GetID();
+	std::string aResultEntry = theResultEntry;
+	if (theResultEntry.substr(0, compid.length()) != compid) aResultEntry = compid + theResultEntry.substr(compid.length());
+	SALOMEDS::SObject_var aSObject = theStudy->FindObjectID(aResultEntry.c_str());
+	CORBA::Object_var anObject = SObjectToObject(aSObject);
+	result = dynamic_cast<VISU::Result_i*>(GetServant(anObject).in());
+      }
+    }
+    return result;
   }
 
 
diff --git a/src/VISU_I/VISU_Result_i.hh b/src/VISU_I/VISU_Result_i.hh
index 8871cfcc..676a0e39 100644
--- a/src/VISU_I/VISU_Result_i.hh
+++ b/src/VISU_I/VISU_Result_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Result_i.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ScalarMap_i.cc b/src/VISU_I/VISU_ScalarMap_i.cc
index 8b0326d6..eb58055a 100644
--- a/src/VISU_I/VISU_ScalarMap_i.cc
+++ b/src/VISU_I/VISU_ScalarMap_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ScalarMap_i.hh b/src/VISU_I/VISU_ScalarMap_i.hh
index aa0b4644..bb40649a 100644
--- a/src/VISU_I/VISU_ScalarMap_i.hh
+++ b/src/VISU_I/VISU_ScalarMap_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_StreamLines_i.cc b/src/VISU_I/VISU_StreamLines_i.cc
index de15f772..fba29abd 100644
--- a/src/VISU_I/VISU_StreamLines_i.cc
+++ b/src/VISU_I/VISU_StreamLines_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.cxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_StreamLines_i.hh b/src/VISU_I/VISU_StreamLines_i.hh
index e8245252..641ea9d9 100644
--- a/src/VISU_I/VISU_StreamLines_i.hh
+++ b/src/VISU_I/VISU_StreamLines_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_TableDlg.cxx b/src/VISU_I/VISU_TableDlg.cxx
new file mode 100644
index 00000000..46a6b993
--- /dev/null
+++ b/src/VISU_I/VISU_TableDlg.cxx
@@ -0,0 +1,1234 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : VISU_TableDlg.cxx
+//  Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
+//
+#include "VISU_TableDlg.h"
+
+#include "VISU_Table_i.hh"
+
+#include "SUIT_Tools.h"
+#include "SUIT_MessageBox.h"
+#include "SUIT_ResourceMgr.h"
+#include "SUIT_Session.h"
+
+#include "LightApp_Application.h"
+
+#include "CAM_Module.h"
+
+#include "SALOMEDSClient_Study.hxx"
+#include "SALOMEDSClient_GenericAttribute.hxx"
+#include "SALOMEDSClient_AttributeTableOfInteger.hxx"
+#include "SALOMEDSClient_AttributeTableOfReal.hxx"
+#include "SALOMEDSClient_StudyBuilder.hxx"
+
+#include <QLayout>
+#include <QTableWidget>
+#include <QTabWidget>
+#include <QList>
+#include <QInputDialog>
+#include <QLabel>
+#include <QIntValidator>
+#include <QDoubleValidator>
+#include <QKeyEvent>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QCheckBox>
+#include <QComboBox>
+
+#include "utilities.h"
+
+const int MARGIN_SIZE      = 11;
+const int SPACING_SIZE     = 6;
+const int MIN_TABLE_WIDTH  = 200;
+const int MIN_TABLE_HEIGHT = 200;
+
+NumDelegateItem::NumDelegateItem( QObject* parent, NumValidator mode )
+  : QItemDelegate( parent ),
+    myMode( mode )
+{
+}
+
+NumDelegateItem::~NumDelegateItem()
+{
+}
+
+QWidget* NumDelegateItem::createEditor( QWidget* parent,
+                                        const QStyleOptionViewItem& option,
+                                        const QModelIndex& index ) const
+{
+  QLineEdit* editor = new QLineEdit( parent );
+  switch ( myMode )
+  {
+  case NV_Int:
+    editor->setValidator( new QIntValidator( editor ) );
+    break;
+  case NV_Real:
+    editor->setValidator( new QDoubleValidator( editor ) );
+    break;
+  default:
+    break;
+  }
+  return editor;
+}
+
+void NumDelegateItem::setEditorData( QWidget* editor,
+                                     const QModelIndex& index ) const
+{
+  QLineEdit* aLE = qobject_cast<QLineEdit*>( editor );
+  if ( !aLE )
+    return;
+  
+  switch ( myMode )
+  {
+  case NV_Int:
+    {
+      int value = index.model()->data( index, Qt::DisplayRole ).toInt();
+      aLE->setText( QString("%1").arg( value ) );
+      break;
+    }
+  case NV_Real:
+    {
+      double value = index.model()->data(index, Qt::DisplayRole).toDouble();
+      aLE->setText( QString("%1").arg( value ) );
+      break;
+    }
+  default:
+    aLE->setText( index.model()->data( index, Qt::DisplayRole ).toString() );
+    break;
+  }
+}
+
+class VISU_TableDlg::WidgetCointainer : public QWidget
+{
+public:
+  WidgetCointainer( QWidget* parent, Qt::Orientation o, int lm, int tm, int rm, int bm, int s )
+  : QWidget( parent )
+  {
+    QLayout* l = o == Qt::Horizontal ? (QLayout*)( new QHBoxLayout( this ) ) : ( QLayout* )( new QVBoxLayout( this ) );
+    l->setContentsMargins( lm, tm, rm, bm ); 
+    l->setSpacing( s );
+    setLayout( l );
+  }
+  void addWidget( QWidget* w )
+  {
+    if ( w ) {
+      QHBoxLayout* hl = qobject_cast<QHBoxLayout*>( layout() );
+      QVBoxLayout* wl = qobject_cast<QVBoxLayout*>( layout() );
+      if      ( hl ) hl->addWidget( w );
+      else if ( wl ) wl->addWidget( w );
+    }
+  }
+  void addSpacing( int s )
+  {
+    if ( s > 0 ) {
+      QHBoxLayout* hl = qobject_cast<QHBoxLayout*>( layout() );
+      QVBoxLayout* wl = qobject_cast<QVBoxLayout*>( layout() );
+      if      ( hl ) hl->addSpacing( s );
+      else if ( wl ) wl->addSpacing( s );
+    }
+  }
+  void addStretch( int s )
+  {
+    if ( s >= 0 ) {
+      QHBoxLayout* hl = qobject_cast<QHBoxLayout*>( layout() );
+      QVBoxLayout* wl = qobject_cast<QVBoxLayout*>( layout() );
+      if      ( hl ) hl->addStretch( s );
+      else if ( wl ) wl->addStretch( s );
+    }
+  }
+};
+
+/*class VISU_Table : public QTableWidget {
+public:
+  VISU_Table( Orientation orient, QWidget* parent = 0 ) 
+    : QTableWidget( parent ), myValidator( 0 ), myOrientation( orient ) {}
+  VISU_Table( Orientation orient, int numRows, int numCols, QWidget* parent = 0 )
+    : QTableWidget( numRows, numCols, parent ), myValidator( 0 ), myOrientation( orient ) {}
+  
+  void setValidator( QValidator* v = 0 ) { myValidator = v;  }
+  bool isEditing() const { return QTable::isEditing(); }
+  
+protected:
+  QWidget* createEditor ( int row, int col, bool initFromCell ) const
+    {
+      bool testUnits = ( myOrientation == Qt::Horizontal && col == 0 ) || ( myOrientation == Qt::Vertical && row == 0 );
+      QWidget* wg = QTable::createEditor( row, col, initFromCell );
+      if ( wg && wg->inherits("QLineEdit") && myValidator && !testUnits ) 
+        (( QLineEdit*)wg)->setValidator( myValidator );
+      return wg;
+    }
+
+protected:
+  QValidator* myValidator;
+  Orientation myOrientation;
+  };*/
+
+QString VISU_TableDlg::tableTitle( int type )
+{
+  QString tlt;
+  switch ( type ) {
+  case ttInt:  tlt = tr( "TABLE_OF_INTEGER_TLT" ); break;
+  case ttReal: tlt = tr( "TABLE_OF_REAL_TLT" );    break;
+  default:     tlt = tr( "TABLE_UNKNOWN_TLT" );    break;
+  }
+  return tlt;
+}
+/*!
+  Constructor
+*/
+VISU_TableDlg::VISU_TableDlg( QWidget* parent, 
+                              _PTR(Study) study, 
+                              VISU::Table_i* table,
+                              bool allowEdition,
+                              int which,
+                              Qt::Orientation orient,
+                              bool showColumnTitles )
+  : QDialog( parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ), 
+    myStudy( study ), myTable( table ), myEditCheck( 0 ), myUpdateCheck( 0 )
+{
+  allowEdition = true; //////////////////////////////////
+  setWindowTitle( tr( "VIEW_TABLE_TLT" ) );
+  setSizeGripEnabled( true );
+
+  bool bHasIntTable = false;
+  bool bHasRealTable = false;
+  if ( myStudy && myTable ) {
+    _PTR(SObject) aSObject = myStudy->FindObjectID( myTable->GetObjectEntry() );
+    if ( aSObject ) {
+      _PTR(GenericAttribute) anAttr;
+      bHasIntTable  = aSObject->FindAttribute( anAttr, "AttributeTableOfInteger" );
+      bHasRealTable = aSObject->FindAttribute( anAttr, "AttributeTableOfReal" );
+    }
+  }
+
+  if ( allowEdition ) {
+    myEditCheck = new QCheckBox( tr( "ALLOW_EDIT_CHECK" ), this );
+    myUpdateCheck = new QCheckBox( tr( "DO_UPDATE_CHECK" ), this );
+    connect( myEditCheck, SIGNAL( toggled( bool ) ), myUpdateCheck, SLOT( setEnabled( bool ) ) );
+    myUpdateCheck->setEnabled( false );
+    myUpdateCheck->hide(); // the feature has been temporarily disabled
+  }
+
+  QWidget* top = 0;
+
+  if ( which == ttInt  || which == ttAll || which == ttAuto && bHasIntTable ) {
+    myTableMap[ ttInt ]  = new TableWidget( this, orient );
+    myTableMap[ ttInt ]->initialize( myStudy, myTable, ttInt );
+    myTableMap[ ttInt ]->setEditEnabled( false );
+    myTableMap[ ttInt ]->showColumnTitles( showColumnTitles );
+    if ( myEditCheck )
+      connect( myEditCheck, SIGNAL( toggled( bool ) ), myTableMap[ ttInt ], SLOT( setEditEnabled( bool ) ) );
+  }
+  if ( which == ttReal || which == ttAll || which == ttAuto && bHasRealTable ) {
+    myTableMap[ ttReal ] = new TableWidget( this, orient );
+    myTableMap[ ttReal ]->initialize( myStudy, myTable, ttReal );
+    myTableMap[ ttReal ]->setEditEnabled( false );
+    myTableMap[ ttReal ]->showColumnTitles( showColumnTitles );
+    if ( myEditCheck )
+      connect( myEditCheck, SIGNAL( toggled( bool ) ), myTableMap[ ttReal ], SLOT( setEditEnabled( bool ) ) );
+  }
+  
+  if ( myTableMap.count() > 1 ) {
+    QTabWidget* tw = new QTabWidget( this );
+    for ( int i = ttInt; i < ttAll; i++ ) {
+      if ( myTableMap.contains( i ) ) {
+        tw->addTab( myTableMap[ i ], tableTitle( i ) );
+        myTableMap[ i ]->layout()->setMargin( MARGIN_SIZE );
+      }
+    }
+    top = tw;
+  }
+  else if ( myTableMap.count() == 1 ) {
+    top = myTableMap[myTableMap.keys().first()];
+  }
+  else {
+    QLabel* dumbLabel = new QLabel( tr( "ERR_TABLE_NOT_AVAILABLE" ), this );
+    dumbLabel->setAlignment( Qt::AlignCenter );
+    top = dumbLabel;
+  }
+
+  myOKBtn   = new QPushButton( tr( "BUT_OK" ), this );
+  myHelpBtn = new QPushButton( tr( "BUT_HELP" ), this );
+  
+  QHBoxLayout* btnLayout = new QHBoxLayout; 
+  btnLayout->setMargin( 0 );
+  btnLayout->setSpacing( SPACING_SIZE );
+  
+  btnLayout->addWidget( myOKBtn );
+  btnLayout->addStretch( 20 );
+  btnLayout->addWidget( myHelpBtn );
+  connect( myOKBtn,   SIGNAL( clicked() ), this, SLOT( close() ) );
+  connect( myHelpBtn, SIGNAL( clicked() ), this, SLOT( help()  ) );
+
+  QVBoxLayout* mainLayout = new QVBoxLayout( this );
+  mainLayout->setMargin( MARGIN_SIZE );
+  mainLayout->setSpacing( SPACING_SIZE );
+
+  if ( myEditCheck ) {
+    QHBoxLayout* checkLayout = new QHBoxLayout; 
+    checkLayout->setMargin( 0 );
+    checkLayout->setSpacing( SPACING_SIZE );
+    checkLayout->addWidget( myEditCheck );
+    checkLayout->addWidget( myUpdateCheck );
+    mainLayout->addLayout( checkLayout );
+
+    if ( LightApp_Application* app = ( LightApp_Application* )SUIT_Session::session()->activeApplication() ) {
+      int anEnableEditing = app->resourceMgr()->booleanValue( "VISU", "tables_enable_editing", false );
+      myEditCheck->setChecked( anEnableEditing );
+    }
+  }
+  mainLayout->addWidget( top );
+  mainLayout->addLayout( btnLayout );
+
+  resize( 500, 400 );
+  SUIT_Tools::centerWidget( this, parent );
+}
+
+/*!
+  Destructor
+*/
+VISU_TableDlg::~VISU_TableDlg()
+{
+}
+
+/*!
+  <OK> button slot, saves table(s)
+  Called only in create/edit mode ( <edit> parameter for constructor is true )
+*/
+/*
+void VISU_TableDlg::onOK()
+{
+  myOKBtn->setFocus(); // accept possible changes
+  bool done = true;
+
+  if ( myObject ) {
+    _PTR(Study) study = myObject->GetStudy();
+    _PTR(AttributeTableOfInteger) tblIntAttr;
+    _PTR(AttributeTableOfReal)    tblRealAttr;
+
+    if ( study ) {
+      _PTR(StudyBuilder) builder = study->NewBuilder();
+      builder->NewCommand(); // start transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+      try {
+        if ( myTableMap.contains( ttInt ) ) {
+          builder->RemoveAttribute( myObject, "AttributeTableOfInteger" );
+          tblIntAttr = builder->FindOrCreateAttribute( myObject, "AttributeTableOfInteger" );
+
+          int i;
+          int nbRows  = myTableMap[ ttInt ]->getNumRows();
+          int nbCols  = myTableMap[ ttInt ]->getNumCols();
+          QString tlt = myTableMap[ ttInt ]->getTableTitle();
+          QStringList rowTitles, colTitles, units;
+          myTableMap[ ttInt ]->getRowTitles( rowTitles );
+          myTableMap[ ttInt ]->getColTitles( colTitles );
+          myTableMap[ ttInt ]->getUnits( units );
+          
+          if ( nbRows > 0) {
+            // data
+            int nRow = 0;
+            tblIntAttr->SetNbColumns( nbCols );
+            for ( i = 0; i < nbRows; i++ ) {
+              QStringList data;
+              myTableMap[ ttInt ]->getRowData( i, data );
+              bool bEmptyRow = true;
+              for ( int j = 0; j < data.count(); j++ ) {
+                if ( !data[ j ].isNull() ) {
+                  tblIntAttr->PutValue( data[ j ].toInt(), nRow+1, j+1 );
+                  bEmptyRow = false;
+                }
+              }
+              if ( !bEmptyRow ) {  // Skip rows with no data !!!
+                // set row title
+                tblIntAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : (const char*)rowTitles[ i ].toLatin1() ); 
+                // set row unit
+                tblIntAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : (const char*)units[ i ].toLatin1() ); 
+                nRow++;
+              }
+            }
+            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
+              // column titles
+              for ( i = 0; i < colTitles.count(); i++ )
+                tblIntAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : (const char*)colTitles[ i ].toLatin1() );
+            }
+          }
+          // title
+          tblIntAttr->SetTitle( (const char*)myTableMap[ ttInt ]->getTableTitle().toLatin1() );
+        }
+        if ( myTableMap.contains( ttReal ) ) {
+          builder->RemoveAttribute( myObject, "AttributeTableOfReal" );
+          tblRealAttr = builder->FindOrCreateAttribute( myObject, "AttributeTableOfReal" );
+
+          int i;
+          int nbRows  = myTableMap[ ttReal ]->getNumRows();
+          int nbCols  = myTableMap[ ttReal ]->getNumCols();
+          QString tlt = myTableMap[ ttReal ]->getTableTitle();
+          QStringList rowTitles, colTitles, units;
+          myTableMap[ ttReal ]->getRowTitles( rowTitles );
+          myTableMap[ ttReal ]->getColTitles( colTitles );
+          myTableMap[ ttReal ]->getUnits( units );
+          
+          if ( nbRows > 0) {
+            // data
+            int nRow = 0;
+            tblRealAttr->SetNbColumns( nbCols );
+            for ( i = 0; i < nbRows; i++ ) {
+              QStringList data;
+              myTableMap[ ttReal ]->getRowData( i, data );
+              bool bEmptyRow = true;
+              for ( int j = 0; j < data.count(); j++ ) {
+                if ( !data[ j ].isNull() ) {
+                  tblRealAttr->PutValue( data[ j ].toDouble(), nRow+1, j+1 );
+                  bEmptyRow = false;
+                }
+              }
+              if ( !bEmptyRow ) {  // Skip rows with no data !!!
+                // set row title
+                tblRealAttr->SetRowTitle( nRow+1, rowTitles[ i ].isNull() ? "" : (const char*)rowTitles[ i ].toLatin1() ); 
+                // set row unit
+                tblRealAttr->SetRowUnit( nRow+1, units[ i ].isNull() ? "" : (const char*)units[ i ].toLatin1() );
+                nRow++;
+              }
+            }
+            if ( nRow > 0 ) { // Set columns only if table is not empty, otherwise exception is raised !!!
+              // column titles
+              for ( i = 0; i < colTitles.count(); i++ )
+                tblRealAttr->SetColumnTitle( i+1, colTitles[ i ].isNull() ? "" : (const char*)colTitles[ i ].toLatin1() );
+            }
+          }
+          // title
+          tblRealAttr->SetTitle( (const char*)myTableMap[ ttReal ]->getTableTitle().toLatin1() );
+        }
+        if ( myTableMap.contains( ttInt ) || myTableMap.contains( ttReal ) )
+          builder->CommitCommand(); // commit transaction !!!!!!!!!!!!!!!!!!!!!!!!!!!
+        else
+          builder->AbortCommand();  // abort transaction  !!!!!!!!!!!!!!!!!!!!!!!!!!!
+      }
+      catch( ... ) {
+        MESSAGE("VISU_TableDlg::onOK : Exception has been caught !!!");
+        builder->AbortCommand();  // abort transaction  !!!!!!!!!!!!!!!!!!!!!!!!!!!
+        done = false;
+        SUIT_MessageBox::critical ( this, tr("ERR_ERROR"), tr("ERR_APP_EXCEPTION") );
+      }
+    }
+  }
+  if ( done ) 
+    accept();
+}
+*/
+
+/*!
+  <Help> button slot, shows corresponding help page
+*/
+void VISU_TableDlg::help()
+{
+  QString aHelpFileName = "table_presentations_page.html";
+  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
+  if (app)
+    app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
+  else {
+    QString platform;
+#ifdef WIN32
+    platform = "winapplication";
+#else
+    platform = "application";
+#endif
+    SUIT_MessageBox::warning( this,
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
+                              arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName) );
+  }
+}
+
+/*!
+  Provides help on F1 button click
+*/
+void VISU_TableDlg::keyPressEvent( QKeyEvent* e )
+{
+  QDialog::keyPressEvent( e );
+  if ( e->isAccepted() )
+    return;
+
+  if ( e->key() == Qt::Key_F1 ) {
+    e->accept();
+    help();
+  }
+}
+
+/*!
+  Constructor
+*/
+VISU_TableDlg::TableWidget::TableWidget( QWidget* parent, 
+                                         Qt::Orientation orientation )
+  : QWidget( parent ), myOrientation( orientation )
+{
+  myTitleEdit = new QLineEdit( this );
+
+  myTable = new QTableWidget( 5, 5, this );
+  myTable->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding ) );
+  myTable->setMinimumSize( MIN_TABLE_WIDTH, MIN_TABLE_HEIGHT );
+  myTable->setSelectionMode( QAbstractItemView::SingleSelection );
+  myTable->setShowGrid( true );
+  myTable->horizontalHeader()->setMovable( false );
+  myTable->verticalHeader()->setMovable( false );
+  myTable->setDragEnabled( false );
+
+  myAdjustBtn    = new QPushButton( VISU_TableDlg::tr( "ADJUST_CELLS_BTN" ),  this );
+  myAddRowBtn    = new QPushButton( VISU_TableDlg::tr( "ADD_ROW_BTN" ),       this );
+  myDelRowBtn    = new QPushButton( VISU_TableDlg::tr( "REMOVE_ROW_BTN" ),    this );
+  myAddColBtn    = new QPushButton( VISU_TableDlg::tr( "ADD_COLUMN_BTN" ),    this );
+  myDelColBtn    = new QPushButton( VISU_TableDlg::tr( "REMOVE_COLUMN_BTN" ), this );
+  mySelectAllBtn = new QPushButton( VISU_TableDlg::tr( "SELECT_ALL_BTN" ),    this );
+  myClearBtn     = new QPushButton( VISU_TableDlg::tr( "CLEAR_BTN" ),         this );
+
+  mySortPolicyLabel = new QLabel( VISU_TableDlg::tr( "VISU_TABLES_SORT_POLICY" ), this );
+  mySortPolicyCombo = new QComboBox( this );
+  mySortPolicyCombo->insertItems( 0, QStringList() <<
+                                  VISU_TableDlg::tr( "VISU_TABLES_EMPTY_LOWEST" ) <<
+                                  VISU_TableDlg::tr( "VISU_TABLES_EMPTY_HIGHEST" ) <<
+                                  VISU_TableDlg::tr( "VISU_TABLES_EMPTY_FIRST" ) <<
+                                  VISU_TableDlg::tr( "VISU_TABLES_EMPTY_LAST" ) <<
+                                  VISU_TableDlg::tr( "VISU_TABLES_EMPTY_IGNORE" ) );
+
+  if ( LightApp_Application* app = ( LightApp_Application* )SUIT_Session::session()->activeApplication() ) {
+    int aSortPolicy = app->resourceMgr()->integerValue( "VISU", "tables_sort_policy", 3 );
+    mySortPolicyCombo->setCurrentIndex( aSortPolicy );
+  }
+
+  // the features has been temporarily disabled
+  myAddRowBtn->hide();
+  myDelRowBtn->hide();
+  myAddColBtn->hide();
+  myDelColBtn->hide();
+  mySelectAllBtn->hide();
+  myClearBtn->hide();
+
+  QVBoxLayout* btnLayout = new QVBoxLayout;
+  btnLayout->setMargin( 0 );
+  btnLayout->setSpacing( SPACING_SIZE );
+  btnLayout->addWidget( myAdjustBtn );
+  btnLayout->addStretch( 20 );
+  btnLayout->addWidget( myAddRowBtn );
+  btnLayout->addWidget( myDelRowBtn );
+  btnLayout->addWidget( myAddColBtn );
+  btnLayout->addWidget( myDelColBtn );
+  btnLayout->addStretch( 20 );
+  btnLayout->addWidget( mySelectAllBtn );
+  btnLayout->addWidget( myClearBtn );
+
+  QHBoxLayout* sortLayout = new QHBoxLayout;
+  sortLayout->setMargin( 0 );
+  sortLayout->setSpacing( SPACING_SIZE );
+  sortLayout->addWidget( mySortPolicyLabel );
+  sortLayout->addWidget( mySortPolicyCombo );
+  sortLayout->addStretch( 1 );
+
+  QGridLayout* mainLayout = new QGridLayout( this );
+  mainLayout->setMargin( 0 );
+  mainLayout->setSpacing( SPACING_SIZE );
+  mainLayout->addWidget( myTitleEdit, 0, 0, 1, 2 );
+  mainLayout->addWidget( myTable,     1, 0 );
+  mainLayout->addLayout( btnLayout,   1, 1 );
+  mainLayout->addLayout( sortLayout,  2, 0, 1, 2 );
+
+  connect( myTable, SIGNAL( itemSelectionChanged() ),
+           this, SLOT( updateButtonsState() ) );
+  connect( myTable, SIGNAL( currentItemChanged( QTableWidgetItem*, QTableWidgetItem* ) ),
+           this, SLOT( updateButtonsState() ) );
+  connect( myAddRowBtn,    SIGNAL( clicked() ),   this, SLOT( addRow() ) );
+  connect( myAddColBtn,    SIGNAL( clicked() ),   this, SLOT( addCol() ) );
+  connect( myDelRowBtn,    SIGNAL( clicked() ),   this, SLOT( delRow() ) );
+  connect( myDelColBtn,    SIGNAL( clicked() ),   this, SLOT( delCol() ) );
+  connect( myAdjustBtn,    SIGNAL( clicked() ),   this, SLOT( adjustTable() ) );
+  connect( mySelectAllBtn, SIGNAL( clicked() ),   this, SLOT( selectAll() ) );
+  connect( myClearBtn,     SIGNAL( clicked() ),   this, SLOT( clearTable() ) );
+  connect( myTable->horizontalHeader(), SIGNAL( sectionClicked( int ) ),
+           this, SLOT( columnClicked( int ) ) );
+  connect( myTable->verticalHeader(), SIGNAL( sectionClicked( int ) ),
+           this, SLOT( rowClicked( int ) ) );
+  myTable->horizontalHeader()->installEventFilter( this );
+  myTable->verticalHeader()->installEventFilter( this );
+  myTable->installEventFilter( this );
+
+  updateButtonsState();
+}
+
+/*!
+  Destructor
+*/
+VISU_TableDlg::TableWidget::~TableWidget()
+{
+}
+
+/*!
+  Initialize widget
+*/
+void VISU_TableDlg::TableWidget::initialize( _PTR(Study) study, VISU::Table_i* table, int type )
+{
+  myStudy = study;
+  myTableObj = table;
+  myType = type;
+
+  setUnitsTitle( VISU_TableDlg::tr( "UNITS_TLT" ) );
+  setEditEnabled( false );
+  showColumnTitles( false );
+
+  updateTableFromServant();
+  updateButtonsState();
+}
+
+void VISU_TableDlg::TableWidget::updateTableFromServant()
+{
+  _PTR(SObject) aSObject = myStudy->FindObjectID( myTableObj->GetObjectEntry() );
+  if ( aSObject ) {
+    int i, j;
+    switch ( myType ) {
+    case ttInt:
+      myTable->setItemDelegate( new NumDelegateItem( this, NumDelegateItem::NV_Int ) );
+      if ( aSObject->FindAttribute( myAttr, "AttributeTableOfInteger" ) ) {
+        _PTR(AttributeTableOfInteger) intAttr  = myAttr;
+        try {
+          // title
+          setTableTitle( intAttr->GetTitle().c_str() );
+          // nb of rows & cols
+          int nbRows = intAttr->GetNbRows() ; 
+          int nbCols = intAttr->GetNbColumns();
+          setNumRows( nbRows );
+          setNumCols( nbCols );
+          // rows titles
+          QStringList strlist;
+          std::vector<std::string> titles = intAttr->GetRowTitles();
+          for ( i = 0; i < nbRows; i++ ) {
+            if ( titles.size() > 0 )
+              strlist.append( titles[i].c_str() );
+            else
+              strlist.append( "" );
+          }
+          setRowTitles( strlist );
+          // columns titles
+          strlist.clear();
+          titles = intAttr->GetColumnTitles();
+          for ( i = 0; i < nbCols; i++ ) {
+            if ( titles.size() > 0 )
+              strlist.append( titles[i].c_str() );
+            else
+              strlist.append( "" );
+          }
+          setColTitles( strlist );
+          // units
+          strlist.clear();
+          titles = intAttr->GetRowUnits();
+          if ( titles.size() > 0 ) {
+            for ( i = 0; i < nbRows; i++ )
+              strlist.append( titles[i].c_str() );
+            setUnits( strlist );
+          }
+          // data
+          for ( i = 1; i <= nbRows; i++ ) {
+            strlist.clear();
+            for ( j = 1; j <= nbCols; j++ ) {
+              if ( intAttr->HasValue( i, j ) )
+                strlist.append( QString::number( intAttr->GetValue( i, j ) ) );
+              else
+                strlist.append( QString::null );
+            }
+            setRowData( i-1, strlist );
+          }
+          adjustTable();
+        }
+        catch( ... ) {
+          MESSAGE("VISU_TableDlg::TableWidget::initialize : Exception has been caught !!!");
+        }
+      }
+      break;
+    case ttReal:
+      myTable->setItemDelegate( new NumDelegateItem( this, NumDelegateItem::NV_Real ) );
+      if ( aSObject->FindAttribute( myAttr, "AttributeTableOfReal" ) ) {
+        _PTR(AttributeTableOfReal) realAttr = myAttr;
+        try {
+          // title
+          setTableTitle( realAttr->GetTitle().c_str() );
+          // nb of rows & cols
+          int nbRows = realAttr->GetNbRows() ; 
+          int nbCols = realAttr->GetNbColumns();
+          setNumRows( nbRows );
+          setNumCols( nbCols );
+          // rows titles
+          QStringList strlist;
+          std::vector<std::string> titles = realAttr->GetRowTitles();
+          for ( i = 0; i < nbRows; i++ ) {
+            if ( titles.size() > 0 )
+              strlist.append( titles[i].c_str() );
+            else
+              strlist.append( "" );
+          }
+          setRowTitles( strlist );
+          // columns titles
+          strlist.clear();
+          titles = realAttr->GetColumnTitles();
+          for ( i = 0; i < nbCols; i++ ) {
+            if ( titles.size() > 0 )
+              strlist.append( titles[i].c_str() );
+            else
+              strlist.append( "" );
+          }
+          setColTitles( strlist );
+          // units
+          strlist.clear();
+          titles = realAttr->GetRowUnits();
+          if ( titles.size() > 0 ) {
+            for ( i = 0; i < nbRows; i++ )
+              strlist.append( titles[i].c_str() );
+            setUnits( strlist );
+          }
+          // data
+          for ( i = 1; i <= nbRows; i++ ) {
+            strlist.clear();
+            for ( j = 1; j <= nbCols; j++ ) {
+              if ( realAttr->HasValue( i, j ) )
+                strlist.append( QString::number( realAttr->GetValue( i, j ) ) );
+              else
+                strlist.append( QString::null );
+            }
+            setRowData( i-1, strlist );
+          }
+          adjustTable();
+        }
+        catch( ... ) {
+          MESSAGE("VISU_TableDlg::TableWidget::initialize : Exception has been caught !!!");
+        }
+      }
+      break;
+    default:
+      break;
+    }
+  }
+}
+
+/*!
+  Enable / disable editing
+*/
+void VISU_TableDlg::TableWidget::setEditEnabled( bool enable )
+{
+  if( !enable ) {
+    myTable->horizontalHeader()->setSortIndicatorShown( false );
+    myTable->verticalHeader()->setSortIndicatorShown( false );
+    adjustTable();
+  }
+
+  mySortPolicyLabel->setEnabled( enable );
+  mySortPolicyCombo->setEnabled( enable );
+
+  // the rest features have been temporarily disabled
+  enable = false;
+
+  myTitleEdit->setReadOnly( !enable );
+  myTable->setEditTriggers( enable ? 
+                            QAbstractItemView::DoubleClicked   | 
+                            QAbstractItemView::SelectedClicked | 
+                            QAbstractItemView::EditKeyPressed  :
+                            QAbstractItemView::NoEditTriggers );
+  myAddRowBtn->setVisible( enable );
+  myDelRowBtn->setVisible( enable );
+  myAddColBtn->setVisible( enable );
+  myDelColBtn->setVisible( enable );
+  mySelectAllBtn->setVisible( enable );
+  myClearBtn->setVisible( enable );
+}
+
+/*!
+  Show / hide column titles
+*/
+void VISU_TableDlg::TableWidget::showColumnTitles( bool showTitles )
+{
+  if ( myOrientation == Qt::Horizontal )
+    myTable->horizontalHeader()->setVisible( showTitles );
+  else
+    myTable->verticalHeader()->setVisible( showTitles );
+}
+  
+/*!
+  Sets table title
+*/
+void VISU_TableDlg::TableWidget::setTableTitle( const QString& title )
+{
+  myTitleEdit->setText( title );
+}
+
+/*!
+  Gets table title
+*/
+QString VISU_TableDlg::TableWidget::getTableTitle()
+{
+  return myTitleEdit->text();
+}
+
+/*!
+  Sets total number of rows
+*/
+void VISU_TableDlg::TableWidget::setNumRows( const int num )
+{
+  myOrientation == Qt::Horizontal ? myTable->setRowCount( num ) : myTable->setColumnCount( num );
+}
+
+/*!
+  Gets total number of rows
+*/
+int VISU_TableDlg::TableWidget::getNumRows()
+{
+  return myOrientation == Qt::Horizontal ? myTable->rowCount() : myTable->columnCount();
+}
+
+/*!
+  Sets total number of columns
+*/
+void VISU_TableDlg::TableWidget::setNumCols( const int num )
+{
+  // !!! first column contains units !!!
+  myOrientation == Qt::Horizontal ? myTable->setColumnCount( num+1 ) : myTable->setRowCount( num+1 );
+//  myOrientation == Qt::Horizontal ? myTable->setColumnReadOnly( 0, true ) : myTable->setRowReadOnly( 0, true );
+}
+
+/*!
+  Gets total number of columns
+*/
+int VISU_TableDlg::TableWidget::getNumCols()
+{
+  // !!! first column contains units !!!
+  return myOrientation == Qt::Horizontal ? myTable->columnCount()-1 : myTable->rowCount()-1;
+}
+/*!
+  Sets rows titles
+*/
+void VISU_TableDlg::TableWidget::setRowTitles( QStringList& tlts )
+{
+  QStringList aLabels;
+  for ( int i = 0; i < tlts.count(); i++ )
+    tlts[i].isNull() ? aLabels.append("") : aLabels.append( tlts[i] );
+
+  myOrientation == Qt::Horizontal ?
+    myTable->setVerticalHeaderLabels( aLabels ) :
+    myTable->setHorizontalHeaderLabels( aLabels );
+    
+    //  myTable->verticalHeader()->setLabel( i, tlts[i] ) : 
+    //myTable->horizontalHeader()->setLabel( i, tlts[i] );
+  //}
+}
+/*!
+  Gets rows titles
+*/
+void VISU_TableDlg::TableWidget::getRowTitles( QStringList& tlts )
+{
+  tlts.clear();
+  if ( myOrientation == Qt::Horizontal ) {
+    for ( int i = 0; i < myTable->rowCount(); i++ ) {
+      tlts.append( myTable->verticalHeaderItem(i) ? myTable->verticalHeaderItem(i)->text() : "" );
+    }
+  }
+  else {
+    for ( int i = 0; i < myTable->columnCount(); i++ ) {
+      tlts.append( myTable->horizontalHeaderItem(i) ? myTable->horizontalHeaderItem(i)->text() : "" );
+    }
+  }
+}
+/*!
+  Sets columns titles
+*/
+void VISU_TableDlg::TableWidget::setColTitles( QStringList& tlts )
+{
+  QStringList aLabels;
+
+  // !!! first column contains units !!!
+  aLabels.append(""); // it'll be initialized below - in setUnitsTitle() method
+
+  for ( int i = 0; i < tlts.count(); i++ )
+    tlts[i].isNull() ? aLabels.append("") : aLabels.append( tlts[i] );
+
+  myOrientation == Qt::Horizontal ?
+    myTable->setHorizontalHeaderLabels( aLabels ) :
+    myTable->setVerticalHeaderLabels( aLabels );
+  
+  setUnitsTitle( VISU_TableDlg::tr( "UNITS_TLT" ) );
+}
+/*!
+  Sets columns titles
+*/
+void VISU_TableDlg::TableWidget::getColTitles( QStringList& tlts )
+{
+  // !!! first column contains units !!!
+  tlts.clear();
+  if ( myOrientation == Qt::Horizontal ) {
+    for ( int i = 1; i < myTable->columnCount(); i++ ) {
+      tlts.append( myTable->horizontalHeaderItem(i) ? myTable->horizontalHeaderItem(i)->text() : "" );
+    }    
+  }
+  else {
+    for ( int i = 1; i < myTable->rowCount(); i++ ) {
+      tlts.append( myTable->verticalHeaderItem(i) ? myTable->verticalHeaderItem(i)->text() : "" );
+    }
+  }
+}
+/*!
+  Sets units title
+*/
+void VISU_TableDlg::TableWidget::setUnitsTitle( const QString& tlt ) {
+  // !!! first column contains units !!!
+  myTable->model()->setHeaderData( 0, myOrientation, QVariant(tlt.isNull() ? "" : tlt), Qt::DisplayRole );
+}
+/*!
+  Sets units
+*/
+void VISU_TableDlg::TableWidget::setUnits( QStringList& units )
+{
+  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
+  if ( aModel )
+  {
+    QModelIndex anIndex;
+    for ( int i = 0; i < units.count(); i++ )
+    {
+      myOrientation == Qt::Horizontal ?
+        anIndex = aModel->index( i, 0 ) :
+        anIndex = aModel->index( 0, i );
+
+      aModel->setData( anIndex, QVariant( units[i].isNull() ? "" : units[i] ) );      
+    }
+  }
+}
+/*!
+  Gets units
+*/
+void VISU_TableDlg::TableWidget::getUnits( QStringList& units )
+{
+  units.clear();
+  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
+  if ( aModel )
+  {
+    if ( myOrientation == Qt::Horizontal )
+    {
+      for ( int i = 0; i < myTable->rowCount(); i++ )
+        units.append( aModel->index( i, 0 ).data().toString() );
+    }
+    else {
+      for ( int i = 0; i < myTable->columnCount(); i++ )
+        units.append( aModel->index( 0, i ).data().toString() );
+    }
+  }
+}
+/*!
+  Sets row data
+*/
+void VISU_TableDlg::TableWidget::setRowData( int row, QStringList& data )
+{
+  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
+  if ( aModel )
+  {
+    QModelIndex anIndex; 
+    if ( row >= 0 && row < getNumRows() ) {
+      for ( int i = 0; i < data.count(); i++ )
+      {
+        myOrientation == Qt::Horizontal ? anIndex = aModel->index( row, i+1 ) :
+                                          anIndex = aModel->index( i+1, row );
+        aModel->setData( anIndex, QVariant( data[i] ) );
+          
+      }
+    }
+  }
+}
+/*!
+  Gets row data
+*/
+void VISU_TableDlg::TableWidget::getRowData( int row, QStringList& data )
+{
+  data.clear();
+  QAbstractTableModel* aModel = qobject_cast<QAbstractTableModel*>( myTable->model() );
+  if ( aModel )
+  {
+    if ( row >= 0 && row < getNumRows() )
+    {
+      if ( myOrientation == Qt::Horizontal )
+      {
+        for ( int i = 1; i < myTable->columnCount(); i++ )
+          data.append( aModel->index( row, i ).data().toString() );
+      }
+      else {
+        for ( int i = 1; i < myTable->rowCount(); i++ )
+          data.append( aModel->index( i, row ).data().toString() );
+      }
+    }
+  }
+}
+/*!
+  Adjusts table cell to see contents, <Adjust Cells> button slot
+*/
+void VISU_TableDlg::TableWidget::adjustTable()
+{
+  myTable->resizeRowsToContents();
+  myTable->resizeColumnsToContents();
+}
+/*!
+  Called when selection changed in table
+*/
+void VISU_TableDlg::TableWidget::updateButtonsState()
+{
+  if ( myTable->editTriggers() == QAbstractItemView::NoEditTriggers )
+    return;
+  bool bDR = false; // <Delete Row(s)>
+  bool bDC = false; // <Delete Column(s)>
+  bool bSA = false; // <Select All>
+  bool bCT = false; // <Clear>
+  int i;
+  //TO DO column/row selection check
+  /*int c = myOrientation == Qt::Horizontal ? 0 : 1;
+  for ( i = c; i < myTable->rowCount(); i++ ) {
+    
+    if ( myTable->isRowSelected( i, true ) )
+      bDR = true;
+    else 
+      bSA = true;
+  }
+  c = myOrientation == Qt::Horizontal ? 1 : 0;
+  for ( i = c; i < myTable->columnCount(); i++ ) {
+    if ( myTable->isColumnSelected( i, true ) )
+      bDC = true;
+    else 
+      bSA = true;
+      }*/
+  /*int nbSel = myTable->numSelections();
+  for ( i = 0; i < nbSel; i++ ) {
+    QTableSelection ts = myTable->selection( i );
+    for ( int j = ts.topRow(); j < ts.bottomRow()+1; j++) {
+      for ( int k = ts.leftCol(); k < ts.rightCol()+1; k++) {
+        if ( myTable->item( j, k ) )
+          bCT = true;
+      }
+    }
+    }*/
+  QList<QTableWidgetItem*> aSelection = myTable->selectedItems();
+  QList<QTableWidgetItem*>::ConstIterator anIt = aSelection.constBegin(),
+    anEndIt = aSelection.constEnd();
+  for ( ; anIt !=  anEndIt; anIt++ )
+  {
+    if( *anIt )
+    {
+      bCT = true;
+      break;
+    }
+  }
+  
+  if ( myTable->item( myTable->currentRow(), myTable->currentColumn() ) )
+    bCT = true;
+  myDelRowBtn->setEnabled( bDR );
+  myDelColBtn->setEnabled( bDC );
+  mySelectAllBtn->setEnabled( bSA );
+  myClearBtn->setEnabled( bCT );
+}
+/*!
+  <Add row> button slot
+*/
+void VISU_TableDlg::TableWidget::addRow()
+{
+  myTable->insertRow( myTable->rowCount() );
+  updateButtonsState();
+}
+/*!
+  <Add column> button slot
+*/
+void VISU_TableDlg::TableWidget::addCol()
+{
+  myTable->insertColumn( myTable->columnCount() );
+  updateButtonsState();
+}
+/*!
+  <Delete row(s)> button slot
+*/
+void VISU_TableDlg::TableWidget::delRow()
+{
+  //TODO
+  /*int c = myOrientation == Qt::Horizontal ? 0 : 1;
+  QList<int> il;
+  int i;
+  for ( i = c; i < myTable->rowCount(); i++ )
+    if ( myTable->isRowSelected( i, true ) )
+      il.append( i );
+  if ( il.count() > 0 ) {
+    QMemArray<int> ildel( il.count() );
+    for ( i = 0; i < il.count(); i++ )
+      ildel[ i ] = il[ i ];
+    myTable->removeRows( ildel );
+    }*/
+  
+  updateButtonsState();
+}
+/*!
+  <Delete column(s)> button slot
+*/
+void VISU_TableDlg::TableWidget::delCol()
+{
+  //TODO
+  /*int c = myOrientation == Qt::Horizontal ? 1 : 0;
+  QValueList<int> il;
+  int i;
+  for ( i = c; i < myTable->numCols(); i++ )
+    if ( myTable->isColumnSelected( i, true ) )
+      il.append( i );
+  if ( il.count() > 0 ) {
+    QMemArray<int> ildel( il.count() );
+    for ( i = 0; i < il.count(); i++ )
+      ildel[ i ] = il[ i ];
+    myTable->removeColumns( ildel );
+    }*/
+  updateButtonsState();
+}
+/*!
+  <Select All> button slot
+*/
+void VISU_TableDlg::TableWidget::selectAll()
+{
+  /*myTable->clearSelection();
+  QTableSelection ts;
+  ts.init( 0, 0 ); ts.expandTo( myTable->numRows()-1, myTable->numCols()-1 );
+  myTable->addSelection( ts );*/
+  myTable->selectAll();
+  updateButtonsState();
+}
+/*!
+  <Clear> button slot
+*/
+void VISU_TableDlg::TableWidget::clearTable()
+{
+  /*int nbSel = myTable->numSelections();
+  for ( int i = 0; i < nbSel; i++ ) {
+    QTableSelection ts = myTable->selection( i );
+    for ( int j = ts.topRow(); j < ts.bottomRow()+1; j++) {
+      if ( myOrientation == Qt::Vertical && j == 0 ) {
+//      continue;      // UNITS
+      }
+      for ( int k = ts.leftCol(); k < ts.rightCol()+1; k++) {
+        if ( myOrientation == Qt::Horizontal && k == 0 ) {
+//        continue;   // UNITS
+        }
+        myTable->clearCell( j, k );
+      }
+    }
+  }
+  if ( nbSel == 0 )
+    myTable->clearCell( myTable->currentRow(), myTable->currentColumn() );
+    myTable->clearSelection();*/
+  myTable->clearContents();
+  updateButtonsState();
+}
+/*!
+  Column clicked slot
+*/
+void VISU_TableDlg::TableWidget::columnClicked( int column )
+{
+  if ( myTableObj && mySortPolicyCombo->isEnabled() ) {
+    myTableObj->SortByRow( column + 1,
+                           ( VISU::SortOrder )myTable->horizontalHeader()->sortIndicatorOrder(),
+                           ( VISU::SortPolicy )mySortPolicyCombo->currentIndex() );
+    myTable->horizontalHeader()->setSortIndicatorShown( true );
+    myTable->verticalHeader()->setSortIndicatorShown( false );
+    updateTableFromServant();
+  }
+}
+/*!
+  Row clicked slot
+*/
+void VISU_TableDlg::TableWidget::rowClicked( int row )
+{
+  /* the feature has been temporarily disabled
+  if ( myTableObj && mySortPolicyCombo->isEnabled() && row > 0 ) { // first row contains units
+    myTableObj->SortByColumn( row,
+                              ( VISU::SortOrder )myTable->verticalHeader()->sortIndicatorOrder(),
+                              ( VISU::SortPolicy )mySortPolicyCombo->currentIndex() );
+    myTable->horizontalHeader()->setSortIndicatorShown( false );
+    myTable->verticalHeader()->setSortIndicatorShown( true );
+    updateTableFromServant();
+  }
+  */
+}
+/*!
+  Event filter - handles titles editing
+*/
+bool VISU_TableDlg::TableWidget::eventFilter( QObject* o, QEvent* e )
+{
+  if ( e->type() == QEvent::MouseButtonDblClick) {
+    //TODO
+    /*QMouseEvent* me = ( QMouseEvent* )e;
+    if ( me->button() == Qt::LeftButton && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers ) ) {
+      if ( o == myTable->horizontalHeader() ) {
+        for ( int i = 0; i < myTable->horizontalHeader()->count(); i++ ) {
+          QRect rect = myTable->horizontalHeader()->sectionRect( i );
+          rect.addCoords( 1, 1, -1, -1 );
+          if ( rect.contains( myTable->horizontalHeader()->mapFromGlobal( me->globalPos() ) ) ) {
+            if ( myOrientation == Qt::Vertical || i != 0 ) {
+              bool bOk;
+              QString tlt = QInputDialog::getText( tr( "SET_TITLE_TLT" ), 
+                                                   tr( "TITLE_LBL" ),
+                                                   QLineEdit::Normal,
+                                                   myTable->horizontalHeader()->label( i ),
+                                                   &bOk,
+                                                   this );
+              if ( bOk && !tlt.isNull() )
+                myTable->horizontalHeader()->setLabel( i, tlt );
+              break;
+            }
+          }
+        }
+      }
+      if ( o == myTable->verticalHeader() ) {
+        for ( int i = 0; i < myTable->verticalHeader()->count(); i++ ) {
+          QRect rect = myTable->verticalHeader()->sectionRect( i );
+          rect.addCoords( 1, 1, -1, -1 );
+          if ( rect.contains( myTable->verticalHeader()->mapFromGlobal( me->globalPos() ) ) ) {
+            if ( myOrientation == Qt::Horizontal || i != 0 ) {
+              bool bOk;
+              QString tlt = QInputDialog::getText( tr( "SET_TITLE_TLT" ), 
+                                                   tr( "TITLE_LBL" ),
+                                                   QLineEdit::Normal,
+                                                   myTable->verticalHeader()->label( i ),
+                                                   &bOk,
+                                                   this );
+              if ( bOk && !tlt.isNull() )
+                myTable->verticalHeader()->setLabel( i, tlt );
+              break;
+            }
+          }
+        }
+      }
+      }*/    
+  }     
+  else if ( e->type() == QEvent::KeyRelease && o == myTable ) {
+    QKeyEvent* ke = (QKeyEvent*)e;
+    if ( ke->key() == Qt::Key_Delete && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers) ) {
+      clearTable();
+    }
+    else if ( ke->key() == Qt::Key_Backspace && (myTable->editTriggers() != QAbstractItemView::NoEditTriggers) ) {
+      clearTable();
+      int i = myTable->currentRow();
+      int j = myTable->currentColumn() - 1;
+      if ( j < 0 ) { j = myTable->columnCount()-1; i--; }
+      if ( i >= 0 && j >= 0 )
+        myTable->setCurrentCell( i, j );
+    }
+  }
+  return QWidget::eventFilter( o, e );
+}
diff --git a/src/VISU_I/VISU_TableDlg.h b/src/VISU_I/VISU_TableDlg.h
new file mode 100644
index 00000000..a911a6ce
--- /dev/null
+++ b/src/VISU_I/VISU_TableDlg.h
@@ -0,0 +1,184 @@
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+//  File   : VISU_TableDlg.h
+//  Author : Vadim SANDLER
+//  Module : VISU
+//
+#ifndef VISU_TABLEDLG_H
+#define VISU_TABLEDLG_H
+
+#include "VISU_I.hxx"
+
+#include <SALOMEDSClient_Study.hxx>
+
+#include <QDialog>
+#include <QItemDelegate>
+#include <QMap>
+
+class QLabel;
+class QLineEdit;
+class QPushButton;
+class QCheckBox;
+class QComboBox;
+class QTableWidget;
+
+namespace VISU
+{
+  class Table_i;
+}
+
+class VISU_I_EXPORT VISU_TableDlg : public QDialog
+{ 
+  Q_OBJECT
+
+  class TableWidget;
+  class WidgetCointainer;
+
+  enum { tcTitle, tcTable, tcControls, tcButtons };
+
+public:
+
+  enum { ttNone, ttInt, ttReal, ttAll, ttAuto };
+  enum { teNone      = 0x00,
+         teAddRemove = 0x01,
+         teEditData  = 0x02,
+         teRowColumn = 0x04,
+         teAll       = teAddRemove | teEditData | teRowColumn
+  };
+
+  VISU_TableDlg( QWidget* parent, 
+                 _PTR(Study) study, 
+                 VISU::Table_i* table,
+                 bool allowEdition = false,
+                 int which = ttAuto, 
+                 Qt::Orientation orient = Qt::Horizontal,
+                 bool showColumnTitles = true );
+  ~VISU_TableDlg();
+
+protected:
+  void keyPressEvent( QKeyEvent* e );
+
+private slots:
+  void help(); 
+
+private:
+  QString tableTitle( int type );
+
+private:
+  typedef QMap<int, TableWidget*>      TableMap;
+  typedef QMap<int, WidgetCointainer*> ContMap;
+
+  TableMap               myTableMap;
+  ContMap                myContMap;
+  QCheckBox*             myEditCheck;
+  QCheckBox*             myUpdateCheck;
+  QPushButton*           myOKBtn;
+  QPushButton*           myHelpBtn;
+
+  _PTR(Study)            myStudy;
+  VISU::Table_i*         myTable;
+};
+ 
+class VISU_I_EXPORT VISU_TableDlg::TableWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  TableWidget( QWidget* parent = 0, Qt::Orientation orientation = Qt::Horizontal );
+  ~TableWidget();
+
+  void    initialize( _PTR(Study) study, VISU::Table_i* table, int type );
+
+  void    setTableTitle( const QString& title );
+  QString getTableTitle();
+  void    setNumRows( const int num );
+  int     getNumRows();
+  void    setNumCols( const int num );
+  int     getNumCols();
+  void    setRowTitles( QStringList& tlts );
+  void    getRowTitles( QStringList& tlts );
+  void    setColTitles( QStringList& tlts );
+  void    getColTitles( QStringList& tlts );
+  void    setUnitsTitle( const QString& tlt );
+  void    setUnits( QStringList& units );
+  void    getUnits( QStringList& units );
+  void    setRowData( int row, QStringList& data );
+  void    getRowData( int row, QStringList& data );
+
+  bool    eventFilter( QObject* o, QEvent* e);
+
+public slots:
+  void    setEditEnabled( bool enable );
+  void    showColumnTitles( bool showTitles );
+
+  void    updateButtonsState();
+  void    addRow();
+  void    addCol();
+  void    delRow();
+  void    delCol();
+  void    adjustTable();
+  void    selectAll();
+  void    clearTable();
+
+  void    columnClicked( int );
+  void    rowClicked( int );
+
+protected:
+  void    updateTableFromServant();
+
+private:
+  _PTR(Study)            myStudy;
+  VISU::Table_i*         myTableObj;
+  _PTR(GenericAttribute) myAttr;
+  int                    myType;
+
+  QLineEdit*       myTitleEdit;
+  QTableWidget*    myTable;
+  QPushButton*     myAddRowBtn;
+  QPushButton*     myAddColBtn;
+  QPushButton*     myDelRowBtn;
+  QPushButton*     myDelColBtn;
+  QPushButton*     myAdjustBtn;
+  QPushButton*     mySelectAllBtn;
+  QPushButton*     myClearBtn;
+  QLabel*          mySortPolicyLabel;
+  QComboBox*       mySortPolicyCombo;
+  Qt::Orientation  myOrientation;
+};
+
+class VISU_I_EXPORT NumDelegateItem: public QItemDelegate
+{
+public:
+  enum NumValidator{ NV_Int, NV_Real };
+
+  NumDelegateItem( QObject* parent, NumValidator mode = NV_Int );
+  virtual ~NumDelegateItem();
+
+  virtual QWidget* createEditor( QWidget* parent,
+                                 const QStyleOptionViewItem& option,
+                                 const QModelIndex& index ) const;
+  virtual void     setEditorData( QWidget* editor,
+                                  const QModelIndex& index ) const;
+private:
+  int myMode;
+};
+
+#endif // VISU_TABLEDLG_H
+
diff --git a/src/VISU_I/VISU_Table_i.cc b/src/VISU_I/VISU_Table_i.cc
index 6d6fdf0b..22166fd5 100644
--- a/src/VISU_I/VISU_Table_i.cc
+++ b/src/VISU_I/VISU_Table_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Table_i.cc
 //  Author : Vadim SANDLER
@@ -137,7 +138,7 @@ VISU::Table_i
       aReal->SortRow( theRow, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
                       (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
     }
-    UpdateCurves();
+    UpdateCurves( std::map<int, int>() );
   }
 }
 
@@ -160,7 +161,7 @@ VISU::Table_i
       aReal->SortColumn( theColumn, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
                          (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
     }
-    UpdateCurves();
+    UpdateCurves( std::map<int, int>() );
   }
 }
 
@@ -183,7 +184,7 @@ VISU::Table_i
       aReal->SortByRow( theRow, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
                         (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
     }
-    UpdateCurves();
+    UpdateCurves( std::map<int, int>() );
   }
 }
 
@@ -195,25 +196,29 @@ VISU::Table_i
   SALOMEDS::SObject_var SO = mySObj;
   SALOMEDS::StudyBuilder_var Builder = GetStudyDocument()->NewBuilder();
   if ( !SO->_is_nil() ) {
+    SALOMEDS::LongSeq_var aRowIndices;
     SALOMEDS::GenericAttribute_var anAttr;
     if ( Builder->FindAttribute( SO, anAttr, "AttributeTableOfInteger" ) ) {
       SALOMEDS::AttributeTableOfInteger_var anInt = SALOMEDS::AttributeTableOfInteger::_narrow( anAttr );
-      anInt->SortByColumn( theColumn, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
-                           (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
+      aRowIndices = anInt->SortByColumn( theColumn, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
+                                         (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
     }
     else if ( Builder->FindAttribute( SO, anAttr, "AttributeTableOfReal" ) ) {
       SALOMEDS::AttributeTableOfReal_var aReal = SALOMEDS::AttributeTableOfReal::_narrow( anAttr );
-      aReal->SortByColumn( theColumn, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
-                           (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
+      aRowIndices = aReal->SortByColumn( theColumn, (SALOMEDS::AttributeTable::SortOrder)theSortOrder,
+                                         (SALOMEDS::AttributeTable::SortPolicy)theSortPolicy );
     }
-    UpdateCurves();
+    std::map<int, int> aMixData;
+    for ( int i = 0, n = aRowIndices->length(); i < n; i++ )
+      aMixData[ aRowIndices[i] ] = i+1;
+    UpdateCurves( aMixData );
   }
 }
 
 //----------------------------------------------------------------------------
 void
 VISU::Table_i
-::UpdateCurves()
+::UpdateCurves(std::map<int,int> theMixData)
 {
   SALOMEDS::SObject_var SO = mySObj;
   SALOMEDS::StudyBuilder_var Builder = GetStudyDocument()->NewBuilder();
@@ -221,9 +226,16 @@ VISU::Table_i
   for ( CI->InitEx( true ); CI->More(); CI->Next() ) {
     CORBA::Object_var anObj = SObjectToObject( CI->Value() );
     VISU::Curve_var aCurve = VISU::Curve::_narrow( anObj );
-    if ( !aCurve->_is_nil() )
-      if( VISU::Curve_i* pCurve = dynamic_cast<VISU::Curve_i*>( GetServant( aCurve ).in() ) )
-        UpdatePlot2d( NULL, eDisplay, pCurve ); // first parameter is null to update curves in all views
+    if ( !aCurve->_is_nil() ) {
+      if ( VISU::Curve_i* pCurve = dynamic_cast<VISU::Curve_i*>( GetServant( aCurve ).in() ) ) {
+        int aHRow = pCurve->GetHRow(), aVRow = pCurve->GetVRow();
+        if ( theMixData.find( aHRow ) != theMixData.end() )
+          pCurve->SetHRow( theMixData[ aHRow ] );
+        if ( theMixData.find( aVRow ) != theMixData.end() )
+          pCurve->SetVRow( theMixData[ aVRow ] );
+        UpdatePlot2d( pCurve, eUpdateData );
+      }
+    }
   }
 }
 
diff --git a/src/VISU_I/VISU_Table_i.hh b/src/VISU_I/VISU_Table_i.hh
index 33279cf7..3db4f3b5 100644
--- a/src/VISU_I/VISU_Table_i.hh
+++ b/src/VISU_I/VISU_Table_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Table_i.hh
 //  Author : Vadim SANDLER
@@ -63,7 +64,7 @@ namespace VISU{
 
   protected:
     Storable* Build(int theRestoring);
-    void      UpdateCurves();
+    void      UpdateCurves(std::map<int, int> theMixData);
 
   protected:
     VISU::Table::Orientation myOrientation;
@@ -144,10 +145,17 @@ namespace VISU{
   public:
     virtual Storable* Create();
 
-    int GetHRow() const { return myHRow;}
-    int GetVRow() const { return myVRow;}
-    int GetZRow() const { return myZRow;}
-    int GetIsV2() const { return myIsV2;}
+    int  GetHRow() const { return myHRow; }
+    void SetHRow( const int theHRow ) { myHRow = theHRow; }
+
+    int  GetVRow() const { return myVRow; }
+    void SetVRow( const int theVRow ) { myVRow = theVRow; }
+
+    int  GetZRow() const { return myZRow; }
+    void SetZRow( const int theZRow ) { myZRow = theZRow; }
+
+    int  GetIsV2() const { return myIsV2; }
+    void SetIsV2( const int theIsV2 ) { myIsV2 = theIsV2; }
 
     virtual Storable* Restore( const Storable::TRestoringMap& theMap, SALOMEDS::SObject_ptr theSO);
 
diff --git a/src/VISU_I/VISU_TimeAnimation.cxx b/src/VISU_I/VISU_TimeAnimation.cxx
index 43a7035f..6e45c8bd 100644
--- a/src/VISU_I/VISU_TimeAnimation.cxx
+++ b/src/VISU_I/VISU_TimeAnimation.cxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_TimeAnimation.cxx
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_TimeAnimation.h b/src/VISU_I/VISU_TimeAnimation.h
index c23ce541..ececa386 100644
--- a/src/VISU_I/VISU_TimeAnimation.h
+++ b/src/VISU_I/VISU_TimeAnimation.h
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_TimeAnimation.h
 //  Author : Vitaly SMETANNIKOV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Tools.cxx b/src/VISU_I/VISU_Tools.cxx
index e2963b9d..1b33516f 100644
--- a/src/VISU_I/VISU_Tools.cxx
+++ b/src/VISU_I/VISU_Tools.cxx
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Tools.cxx
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Tools.h b/src/VISU_I/VISU_Tools.h
index bae032d8..a0ec2b53 100644
--- a/src/VISU_I/VISU_Tools.h
+++ b/src/VISU_I/VISU_Tools.h
@@ -1,7 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  This library is free software; you can redistribute it and/or
 //  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : VISU_Tools.h
 //  Author : Oleg UVAROV
 //  Module : VISU
diff --git a/src/VISU_I/VISU_Vectors_i.cc b/src/VISU_I/VISU_Vectors_i.cc
index d2d4cfd3..ba2a6b21 100644
--- a/src/VISU_I/VISU_Vectors_i.cc
+++ b/src/VISU_I/VISU_Vectors_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Vectors_i.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_Vectors_i.hh b/src/VISU_I/VISU_Vectors_i.hh
index 0e55168e..42b49e8b 100644
--- a/src/VISU_I/VISU_Vectors_i.hh
+++ b/src/VISU_I/VISU_Vectors_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_PrsObject_i.hxx
 //  Author : Alexey PETROV
diff --git a/src/VISU_I/VISU_ViewManager_i.cc b/src/VISU_I/VISU_ViewManager_i.cc
index cde37b44..e591ba5a 100644
--- a/src/VISU_I/VISU_ViewManager_i.cc
+++ b/src/VISU_I/VISU_ViewManager_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ViewManager_i.cc
 //  Author : Alexey PETROV
@@ -94,19 +95,19 @@ namespace VISU {
       QList<SUIT_Application*> anApplications = aSession->applications();
       QList<SUIT_Application*>::Iterator anIter = anApplications.begin();
       while ( anIter != anApplications.end() ) {
-	SUIT_Application* anApp = *anIter;
-	if (SUIT_Study* aSStudy = anApp->activeStudy()) {
-	  if (SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(aSStudy)) {
+        SUIT_Application* anApp = *anIter;
+        if (SUIT_Study* aSStudy = anApp->activeStudy()) {
+          if (SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(aSStudy)) {
             if (_PTR(Study) aCStudy = aStudy->studyDS()) {
               //if (myStudyName == aCStudy->Name()) {
               if (myStudyId == aCStudy->StudyId()) {
-	        myResult = dynamic_cast<SalomeApp_Application*>(anApp);
-	        break;
-	      }
-	    }
-	  }
-	}
-	anIter++;
+                myResult = dynamic_cast<SalomeApp_Application*>(anApp);
+                break;
+              }
+            }
+          }
+        }
+        anIter++;
       }
       if (!myResult) {
         //MESSAGE("Error: application is not found for study : " << myStudyName);
@@ -150,7 +151,7 @@ namespace VISU {
     {
       VISU::View3D_i* aView = new View3D_i (myApplication);
       if (aView->Create(0))
-	myResult = aView->_this();
+        myResult = aView->_this();
     }
   };
 
@@ -178,11 +179,11 @@ namespace VISU {
     {
       //if (CheckStudy(myStudyDocument)) {
       if (myApplication) {
-	TViewFrame* pView = new TViewFrame (myApplication);
-	if (pView->Create(1)) {
-	  myResult = pView->_this();
-	  qApp->processEvents(); // Fix for bug 9929
-	}
+        TViewFrame* pView = new TViewFrame (myApplication);
+        if (pView->Create(1)) {
+          myResult = pView->_this();
+          qApp->processEvents(); // Fix for bug 9929
+        }
       }
     }
   };
@@ -215,7 +216,7 @@ namespace VISU {
     Table_ptr myTable;
   public:
     TCreateTableViewFrameEvent (SalomeApp_Application* theApplication,
-				Table_ptr theTable):
+                                Table_ptr theTable):
       TCreateViewEvent(theApplication),
       myTable(theTable),
       myResult(VISU::TableView::_nil())
@@ -224,9 +225,9 @@ namespace VISU {
     virtual void Execute()
     {
       //if (CheckStudy(myStudyDocument)) {
-	VISU::TableView_i* pView = new TableView_i (myApplication);
-	if (pView->Create(myTable) != NULL)
-	  myResult = pView->_this();
+        VISU::TableView_i* pView = new TableView_i (myApplication);
+        if (pView->Create(myTable) != NULL)
+          myResult = pView->_this();
       //}
     }
     typedef VISU::TableView_ptr TResult;
@@ -246,15 +247,15 @@ namespace VISU {
       View_ptr myView;
     public:
       TEvent(View_ptr theView):
-	myView(theView)
+        myView(theView)
       {}
       virtual void Execute(){
-	if (!CORBA::is_nil(myView)) {
-	  if (VISU::View_i* pView = dynamic_cast<VISU::View_i*>(VISU::GetServant(myView).in())) {
-	    pView->Close();
-	    pView->_remove_ref();
-	  }
-	}
+        if (!CORBA::is_nil(myView)) {
+          if (VISU::View_i* pView = dynamic_cast<VISU::View_i*>(VISU::GetServant(myView).in())) {
+            pView->Close();
+            pView->_remove_ref();
+          }
+        }
       }
     };
 
@@ -297,19 +298,19 @@ namespace VISU {
     VISU_Actor *anVISUActor = NULL, *aResActor = NULL;
     for(anActColl->InitTraversal(); (anActor = anActColl->GetNextActor()) != NULL;){
       if(anActor->IsA("VISU_Actor")){
-	anVISUActor = VISU_Actor::SafeDownCast(anActor);
-	if (thePrs == anVISUActor->GetPrs3d()) {
-	  aResActor = anVISUActor;
-	  if(theDisplaing < eErase)
-	    aResActor->VisibilityOn();
-	  else
-	    aResActor->VisibilityOff();
-	} else {
-	  if(theDisplaing == eEraseAll || theDisplaing == eDisplayOnly)
-	    anVISUActor->VisibilityOff();
-	  else if ( theDisplaing == eDisplayAll )
-	    anVISUActor->VisibilityOn();
-	}
+        anVISUActor = VISU_Actor::SafeDownCast(anActor);
+        if (thePrs == anVISUActor->GetPrs3d()) {
+          aResActor = anVISUActor;
+          if(theDisplaing < eErase)
+            aResActor->VisibilityOn();
+          else
+            aResActor->VisibilityOff();
+        } else {
+          if(theDisplaing == eEraseAll || theDisplaing == eDisplayOnly)
+            anVISUActor->VisibilityOff();
+          else if ( theDisplaing == eDisplayAll )
+            anVISUActor->VisibilityOn();
+        }
       }
     }
     if (aResActor) {
@@ -318,14 +319,14 @@ namespace VISU {
     }
     if(thePrs != NULL && theDisplaing < eErase){
       try{
-	anVISUActor = thePrs->CreateActor();
-	vf->AddActor(anVISUActor);
+        anVISUActor = thePrs->CreateActor();
+        vf->AddActor(anVISUActor);
       }catch(std::exception& exc){
-	if(MYDEBUG) INFOS(exc.what());
-	return NULL;
+        if(MYDEBUG) INFOS(exc.what());
+        return NULL;
       }catch(...){
-	if(MYDEBUG) INFOS("Unknown exception was occured!!!");
-	return NULL;
+        if(MYDEBUG) INFOS("Unknown exception was occured!!!");
+        return NULL;
       }
     }
     RepaintView(theViewWindow);
@@ -334,12 +335,12 @@ namespace VISU {
 
   struct TUpdatePlot2dEvent: public SALOME_Event
   {
-    int               myDisplaying;
     Curve_i*          myCurve;
+    int               myDisplaying;
 
-    TUpdatePlot2dEvent (const int theDisplaying, Curve_i* theCurve):
-      myDisplaying(theDisplaying),
-      myCurve(theCurve)
+    TUpdatePlot2dEvent (Curve_i* theCurve, const int theDisplaying):
+      myCurve(theCurve),
+      myDisplaying(theDisplaying)
     {}
 
     virtual void Execute()
@@ -374,7 +375,7 @@ namespace VISU {
         if (Plot2d_ViewManager* aManager = dynamic_cast<Plot2d_ViewManager*>(aViewManager)) {
           if (SPlot2d_Viewer* aViewer = dynamic_cast<SPlot2d_Viewer*>(aManager->getViewModel())) {
             if (Plot2d_ViewFrame* aViewFrame = aViewer->getActiveViewFrame()) {
-              UpdatePlot2d(aViewFrame, myDisplaying, myCurve);
+              UpdatePlot2d(myCurve, myDisplaying, aViewFrame);
             }
           }            
         }
@@ -382,128 +383,93 @@ namespace VISU {
     }
   };
 
-  void UpdatePlot2d (Plot2d_ViewFrame *theView,int theDisplaying, Curve_i* theCurve)
+  void UpdatePlot2d (Curve_i* theCurve, int theDisplaying, Plot2d_ViewFrame* theView)
   {
     if(MYDEBUG) MESSAGE("UpdatePlot2d - theDisplaying = " << theDisplaying);
     if (!theView) {
       // update all views
-      ProcessVoidEvent(new TUpdatePlot2dEvent(theDisplaying, theCurve));
+      ProcessVoidEvent(new TUpdatePlot2dEvent(theCurve, theDisplaying));
       return;
     }
     QList<Plot2d_Curve*> clist;
     theView->getCurves(clist);
     if (theDisplaying == eEraseAll) {
       for (int i = 0; i < clist.count(); i++) {
-	if(MYDEBUG) MESSAGE("UpdatePlot2d - erasing all : curve - " << clist.at(i));
-	theView->eraseCurve(clist.at(i));
+        if(MYDEBUG) MESSAGE("UpdatePlot2d - erasing all : curve - " << clist.at(i));
+        theView->eraseCurve(clist.at(i));
       }
     } else if (theDisplaying == eErase) {
       if (theCurve) {
-	for (int i = 0; i < clist.count(); i++) {
-	  SPlot2d_Curve* aSPlot2dC = dynamic_cast<SPlot2d_Curve*>(clist.at(i));
-	  if (aSPlot2dC->hasIO() &&
-	      !strcmp(theCurve->GetEntry().c_str(), aSPlot2dC->getIO()->getEntry())) {
-	    if(MYDEBUG) MESSAGE("UpdatePlot2d - erasing : curve - " << aSPlot2dC);
-	    theView->eraseCurve(aSPlot2dC);
-	  }
-	}
-      }
-    } else if (theDisplaying == eDisplay) {
-      if (theCurve) {
-	bool bFound = false;
-	for (int i = 0; i < clist.count(); i++) {
-	  SPlot2d_Curve* aSPlot2dC = dynamic_cast<SPlot2d_Curve*>(clist.at(i));
-	  if (aSPlot2dC->hasIO() &&
-	      !strcmp(theCurve->GetEntry().c_str(), aSPlot2dC->getIO()->getEntry())) {
-	    if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying : curve - " << aSPlot2dC);
-	    aSPlot2dC->setHorTitle( theCurve->GetHorTitle().c_str() );
-	    aSPlot2dC->setVerTitle( theCurve->GetVerTitle().c_str() );
-	    aSPlot2dC->setHorUnits( theCurve->GetHorUnits().c_str() );
-	    aSPlot2dC->setVerUnits( theCurve->GetVerUnits().c_str() );
-	    double* xList = 0;
-	    double* yList = 0;
-	    QStringList zList;
-	    int     nbPoints = theCurve->GetData( xList, yList, zList );
-	    if (nbPoints > 0 && xList && yList) {
-	      aSPlot2dC->setData( xList, yList, nbPoints, zList );
-	    }
-	    if (!theCurve->IsAuto()) {
-	      aSPlot2dC->setLine((Plot2d::LineType)theCurve->GetLine(),
-				 theCurve->GetLineWidth());
-	      aSPlot2dC->setMarker((Plot2d::MarkerType)theCurve->GetMarker());
-	      SALOMEDS::Color color = theCurve->GetColor();
-	      aSPlot2dC->setColor(QColor((int)(color.R*255.),
-					 (int)(color.G*255.),
-					 (int)(color.B*255.)));
-	    }
-	    aSPlot2dC->setAutoAssign(theCurve->IsAuto());
-	    theView->displayCurve(aSPlot2dC);
-	    bFound = true;
-	  }
-	}
-	if (!bFound) {
-	  Plot2d_Curve* crv = theCurve->CreatePresentation();
-	  if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying : curve (new) - "<<crv );
-	  if (crv) {
-	    theView->displayCurve( crv );
-	    theCurve->SetLine( (VISU::Curve::LineType)crv->getLine(), crv->getLineWidth() );
-	    theCurve->SetMarker( (VISU::Curve::MarkerType)crv->getMarker());
-	    SALOMEDS::Color newColor;
-	    newColor.R = crv->getColor().red()/255.;
-	    newColor.G = crv->getColor().green()/255.;
-	    newColor.B = crv->getColor().blue()/255.;
-	    theCurve->SetColor( newColor );
-	    crv->setAutoAssign( theCurve->IsAuto() );
-	  }
-	}
+        for (int i = 0; i < clist.count(); i++) {
+          SPlot2d_Curve* aSPlot2dC = dynamic_cast<SPlot2d_Curve*>(clist.at(i));
+          if (aSPlot2dC->hasIO() &&
+              !strcmp(theCurve->GetEntry().c_str(), aSPlot2dC->getIO()->getEntry())) {
+            if(MYDEBUG) MESSAGE("UpdatePlot2d - erasing : curve - " << aSPlot2dC);
+            theView->eraseCurve(aSPlot2dC);
+          }
+        }
       }
-    } else if (theDisplaying == eDisplayOnly) {
+    } else if (theDisplaying == eDisplay ||
+               theDisplaying == eDisplayOnly ||
+               theDisplaying == eUpdateData) {
       if (theCurve) {
-	bool bFound = false;
-	for (int i = 0; i < clist.count(); i++) {
-	  SPlot2d_Curve* aSPlot2dC = dynamic_cast<SPlot2d_Curve*>(clist.at(i));
-	  if (aSPlot2dC->hasIO() &&
-	      !strcmp(theCurve->GetEntry().c_str(), aSPlot2dC->getIO()->getEntry())) {
-	    if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying only : curve - " << aSPlot2dC);
-	    aSPlot2dC->setHorTitle( theCurve->GetHorTitle().c_str() );
-	    aSPlot2dC->setVerTitle( theCurve->GetVerTitle().c_str() );
-	    aSPlot2dC->setHorUnits( theCurve->GetHorUnits().c_str() );
-	    aSPlot2dC->setVerUnits( theCurve->GetVerUnits().c_str() );
-	    double* xList = 0;
-	    double* yList = 0;
-	    QStringList zList;
-	    int     nbPoints = theCurve->GetData( xList, yList, zList );
-	    if ( nbPoints > 0 && xList && yList ) {
-	      aSPlot2dC->setData( xList, yList, nbPoints, zList );
-	    }
-	    if ( !theCurve->IsAuto() ) {
-	      aSPlot2dC->setLine((Plot2d::LineType)theCurve->GetLine(), theCurve->GetLineWidth());
-	      aSPlot2dC->setMarker((Plot2d::MarkerType)theCurve->GetMarker());
-	      SALOMEDS::Color color = theCurve->GetColor();
-	      aSPlot2dC->setColor(QColor((int)(color.R*255.), (int)(color.G*255.), (int)(color.B*255.)));
-	    }
-	    aSPlot2dC->setAutoAssign(theCurve->IsAuto());
-	    theView->displayCurve(aSPlot2dC);
-	    bFound = true;
-	  } else {
-	    theView->eraseCurve(aSPlot2dC);
-	  }
-	}
-	if (!bFound) {
-	  Plot2d_Curve* crv = theCurve->CreatePresentation();
-	  if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying only : curve (new) - " << crv);
-	  if (crv) {
-	    theView->displayCurve(crv);
-	    theCurve->SetLine((VISU::Curve::LineType)crv->getLine(), crv->getLineWidth());
-	    theCurve->SetMarker((VISU::Curve::MarkerType)crv->getMarker());
-	    SALOMEDS::Color newColor;
-	    newColor.R = crv->getColor().red()/255.;
-	    newColor.G = crv->getColor().green()/255.;
-	    newColor.B = crv->getColor().blue()/255.;
-	    theCurve->SetColor(newColor);
-	    crv->setAutoAssign(theCurve->IsAuto());
-	  }
-	}
+        bool bFound = false;
+        for (int i = 0; i < clist.count(); i++) {
+          SPlot2d_Curve* aSPlot2dC = dynamic_cast<SPlot2d_Curve*>(clist.at(i));
+          if (aSPlot2dC->hasIO() &&
+              !strcmp(theCurve->GetEntry().c_str(), aSPlot2dC->getIO()->getEntry())) {
+            if (theDisplaying == eUpdateData) {
+              if(MYDEBUG) MESSAGE("UpdatePlot2d - updating data : curve - " << aSPlot2dC);
+            }
+            else {
+              if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying : curve - " << aSPlot2dC);
+            }
+            double* xList = 0;
+            double* yList = 0;
+            QStringList zList;
+            int     nbPoints = theCurve->GetData( xList, yList, zList );
+            if (nbPoints > 0 && xList && yList) {
+              aSPlot2dC->setData( xList, yList, nbPoints, zList );
+            }
+            if (theDisplaying == eUpdateData) {
+              theView->updateCurve(aSPlot2dC, true);
+            } else {
+              aSPlot2dC->setHorTitle( theCurve->GetHorTitle().c_str() );
+              aSPlot2dC->setVerTitle( theCurve->GetVerTitle().c_str() );
+              aSPlot2dC->setHorUnits( theCurve->GetHorUnits().c_str() );
+              aSPlot2dC->setVerUnits( theCurve->GetVerUnits().c_str() );
+              if (!theCurve->IsAuto()) {
+                aSPlot2dC->setLine((Plot2d::LineType)theCurve->GetLine(),
+                                   theCurve->GetLineWidth());
+                aSPlot2dC->setMarker((Plot2d::MarkerType)theCurve->GetMarker());
+                SALOMEDS::Color color = theCurve->GetColor();
+                aSPlot2dC->setColor(QColor((int)(color.R*255.),
+                                           (int)(color.G*255.),
+                                           (int)(color.B*255.)));
+              }
+              aSPlot2dC->setAutoAssign(theCurve->IsAuto());
+              theView->displayCurve(aSPlot2dC);
+              bFound = true;
+            }
+          } else if (theDisplaying == eDisplayOnly) {
+            theView->eraseCurve(aSPlot2dC);
+          }
+        }
+        if (!bFound && theDisplaying != eUpdateData) {
+          Plot2d_Curve* crv = theCurve->CreatePresentation();
+          if(MYDEBUG) MESSAGE("UpdatePlot2d - displaying : curve (new) - "<<crv );
+          if (crv) {
+            theView->displayCurve( crv );
+            theCurve->SetLine( (VISU::Curve::LineType)crv->getLine(), crv->getLineWidth() );
+            theCurve->SetMarker( (VISU::Curve::MarkerType)crv->getMarker());
+            SALOMEDS::Color newColor;
+            newColor.R = crv->getColor().red()/255.;
+            newColor.G = crv->getColor().green()/255.;
+            newColor.B = crv->getColor().blue()/255.;
+            theCurve->SetColor( newColor );
+            crv->setAutoAssign( theCurve->IsAuto() );
+          }
+        }
       }
     }
   }
@@ -594,18 +560,18 @@ namespace VISU {
       QList<SUIT_Application*> anApplications = aSession->applications();
       QList<SUIT_Application*>::Iterator anIter = anApplications.begin();
       while ( anIter != anApplications.end() ) {
-	SUIT_Application* aSUITApp = *anIter;
-	if (SUIT_Study* aSStudy = aSUITApp->activeStudy()) {
+        SUIT_Application* aSUITApp = *anIter;
+        if (SUIT_Study* aSStudy = aSUITApp->activeStudy()) {
           if (SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(aSStudy)) {
             if (_PTR(Study) aCStudy = aStudy->studyDS()) {
               if (aStudyName == aCStudy->Name()) {
                 anApp = dynamic_cast<SalomeApp_Application*>(aSUITApp);
-		break;
-	      }
-	    }
-	  }
+                break;
+              }
+            }
+          }
         }
-	anIter++;
+        anIter++;
       }
       if (!anApp)
         return;
@@ -635,23 +601,23 @@ namespace VISU {
       QList<SUIT_ViewManager*>::Iterator anVMIter = aViewManagerList.begin();
       for (; anVMIter != aViewManagerList.end(); anVMIter++ ) {
         SUIT_ViewManager* aViewManager = *anVMIter;
-	QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
-	for (int i = 0, iEnd = aViews.size(); i < iEnd; i++) {
-	  if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
-	    if (Plot2d_ViewWindow* vw = dynamic_cast<Plot2d_ViewWindow*>(aViewWindow)) {
+        QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
+        for (int i = 0, iEnd = aViews.size(); i < iEnd; i++) {
+          if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
+            if (Plot2d_ViewWindow* vw = dynamic_cast<Plot2d_ViewWindow*>(aViewWindow)) {
               Plot2d_ViewFrame* vf = vw->getViewFrame();
-	      QList<Plot2d_Curve*> clist;
-	      vf->getCurves(clist);
-	      for (int i = 0; i < clist.count(); i++) {
+              QList<Plot2d_Curve*> clist;
+              vf->getCurves(clist);
+              for (int i = 0; i < clist.count(); i++) {
                 if (SPlot2d_Curve* cu = dynamic_cast<SPlot2d_Curve*>(clist.at(i))) {
-	          if (cu->hasIO() &&
-		      strcmp(myPrs->GetEntry().c_str(), cu->getIO()->getEntry())) {
-	            vf->eraseCurve(cu);
-	          }
-	        }
-	      }
-	      vf->Repaint();
-	      //jfa tmp:aViewFrame->unHighlightAll();
+                  if (cu->hasIO() &&
+                      strcmp(myPrs->GetEntry().c_str(), cu->getIO()->getEntry())) {
+                    vf->eraseCurve(cu);
+                  }
+                }
+              }
+              vf->Repaint();
+              //jfa tmp:aViewFrame->unHighlightAll();
             }
           }
         }
@@ -679,10 +645,10 @@ namespace VISU {
           if (_PTR(Study) aCStudy = aStudy->studyDS()) {
             if (aStudyName == aCStudy->Name()) {
               anApp = dynamic_cast<SalomeApp_Application*>(aSUITApp);
-	      break;
-	    }
-	  }
-	}
+              break;
+            }
+          }
+        }
       }
     }
     if (!anApp)
@@ -715,21 +681,21 @@ namespace VISU {
       SUIT_ViewManager* aViewManager = anVMIter.current();
       QPtrVector<SUIT_ViewWindow> aViews = aViewManager->getViews();
       for (int i = 0, iEnd = aViews.size(); i < iEnd; i++) {
-	if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
-	  if (Plot2d_ViewWindow* vw = dynamic_cast<Plot2d_ViewWindow*>(aViewWindow)) {
+        if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
+          if (Plot2d_ViewWindow* vw = dynamic_cast<Plot2d_ViewWindow*>(aViewWindow)) {
             Plot2d_ViewFrame* vf = vw->getViewFrame();
             QList<Plot2d_Curve> clist;
             vf->getCurves(clist);
-	    for (int i = 0; i < clist.count(); i++) {
+            for (int i = 0; i < clist.count(); i++) {
               if (SPlot2d_Curve* cu = dynamic_cast<SPlot2d_Curve*>(clist.at(i))) {
-	        if (cu->hasIO() &&
-		    strcmp(cu->getIO()->getEntry(), thePrs->GetEntry()) == 0) {
-	          vf->eraseCurve(cu);
-	        }
-	      }
-	    }
-	    vf->Repaint();
-	    //jfa tmp:aViewFrame->unHighlightAll();
+                if (cu->hasIO() &&
+                    strcmp(cu->getIO()->getEntry(), thePrs->GetEntry()) == 0) {
+                  vf->eraseCurve(cu);
+                }
+              }
+            }
+            vf->Repaint();
+            //jfa tmp:aViewFrame->unHighlightAll();
           }
         }
       }
@@ -755,10 +721,10 @@ namespace VISU {
           if (_PTR(Study) aCStudy = aStudy->studyDS()) {
             if (aStudyName == aCStudy->Name()) {
               anApp = dynamic_cast<SalomeApp_Application*>(aSUITApp);
-	      break;
-	    }
-	  }
-	}
+              break;
+            }
+          }
+        }
       }
       anIter++;
     }
@@ -792,22 +758,22 @@ namespace VISU {
       SUIT_ViewManager* aViewManager = *anVMIter;
       QVector<SUIT_ViewWindow*> aViews = aViewManager->getViews();
       for (int i = 0, iEnd = aViews.size(); i < iEnd; i++) {
-	if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
-	  if (SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>(aViewWindow)) {
+        if (SUIT_ViewWindow* aViewWindow = aViews.at(i)) {
+          if (SVTK_ViewWindow* vw = dynamic_cast<SVTK_ViewWindow*>(aViewWindow)) {
             VISU_Actor* anActor = NULL;
-	    VTK::ActorCollectionCopy aCopy(vw->getRenderer()->GetActors());
+            VTK::ActorCollectionCopy aCopy(vw->getRenderer()->GetActors());
             vtkActorCollection *anActColl = aCopy.GetActors();
-	    anActColl->InitTraversal();
+            anActColl->InitTraversal();
             vtkActor *aVTKActor = anActColl->GetNextActor();
-	    for (; !anActor && aVTKActor; aVTKActor = anActColl->GetNextActor()) {
+            for (; !anActor && aVTKActor; aVTKActor = anActColl->GetNextActor()) {
               if (VISU_Actor* anVISUActor = dynamic_cast<VISU_Actor*>(aVTKActor)) {
-	        if (thePrs == anVISUActor->GetPrs3d()) {
-	          anActor = anVISUActor;
+                if (thePrs == anVISUActor->GetPrs3d()) {
+                  anActor = anVISUActor;
                 }
               }
             }
             if (anActor) {
-	      vw->RemoveActor(anActor);
+              vw->RemoveActor(anActor);
             }
           }
         }
diff --git a/src/VISU_I/VISU_ViewManager_i.hh b/src/VISU_I/VISU_ViewManager_i.hh
index 25237ca8..b951d461 100644
--- a/src/VISU_I/VISU_ViewManager_i.hh
+++ b/src/VISU_I/VISU_ViewManager_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_ViewManager_i.hh
 //  Author : Alexey PETROV
@@ -71,9 +72,9 @@ namespace VISU {
 
   void RepaintView (SUIT_ViewWindow* theViewWindow);
 
-  enum Displaing {eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll};
+  enum Displaing {eDisplayAll, eDisplay, eDisplayOnly, eErase, eEraseAll, eUpdateData};
   VISU_I_EXPORT VISU_Actor* UpdateViewer (SUIT_ViewWindow* theViewWindow, int theDisplaing, Prs3d_i* thePrs = NULL);
-  void UpdatePlot2d (Plot2d_ViewFrame *theView, int theDisplaying, Curve_i* theCurve);
+  void UpdatePlot2d (Curve_i* theCurve, int theDisplaying, Plot2d_ViewFrame* theView = NULL);
 
   VISU_I_EXPORT VISU_Actor* FindActor(SVTK_ViewWindow* theViewWindow, VISU::Prs3d_i* thePrs3d);
   VISU_I_EXPORT VISU_ActorBase* FindActorBase(SVTK_ViewWindow* theViewWindow, VISU::TActorFactory* theActor);
diff --git a/src/VISU_I/VISU_View_i.cc b/src/VISU_I/VISU_View_i.cc
index 89ebe9d2..51aed177 100644
--- a/src/VISU_I/VISU_View_i.cc
+++ b/src/VISU_I/VISU_View_i.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_View_i.cc
 //  Author : Alexey PETROV
@@ -32,8 +33,7 @@
 #include "VISU_PointMap3d_i.hh"
 #include "VISU_ScalarMap_i.hh"
 #include "VISU_ViewManager_i.hh"
-
-#include "VisuGUI_TableDlg.h"
+#include "VISU_TableDlg.h"
 
 #include "VISU_Actor.h"
 #include "VISU_ScalarMapAct.h"
@@ -1336,7 +1336,7 @@ namespace VISU {
     {
       // is it Curve ?
       if (Curve_i* aCurve = dynamic_cast<Curve_i*>(VISU::GetServant(myPrsObj).in())) {
-	UpdatePlot2d(myView,myDisplaing,aCurve);
+	UpdatePlot2d(aCurve,myDisplaing,myView);
       }
       // is it Container ?
       if (Container_i* aContainer = dynamic_cast<Container_i*>(VISU::GetServant(myPrsObj).in())) {
@@ -1344,7 +1344,7 @@ namespace VISU {
 	for ( int i = 1; i <= nbCurves; i++ ) {
 	  VISU::Curve_i* aCurve = aContainer->GetCurve( i );
 	  if ( aCurve && aCurve->IsValid() ) {
-	    UpdatePlot2d(myView,myDisplaing,aCurve);
+	    UpdatePlot2d(aCurve,myDisplaing,myView);
 	  }
 	}
 	myView->Repaint();
@@ -1366,8 +1366,8 @@ namespace VISU {
 	    if (!CORBA::is_nil(childObject)) {
 	      CORBA::Object_ptr aCurve = VISU::Curve::_narrow(childObject);
 	      if (!CORBA::is_nil(aCurve))
-		UpdatePlot2d(myView, myDisplaing,
-			     dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aCurve).in()));
+		UpdatePlot2d(dynamic_cast<VISU::Curve_i*>(VISU::GetServant(aCurve).in()),
+                             myDisplaing, myView);
 	    }
 	  }
 	  myView->Repaint();
@@ -1471,7 +1471,7 @@ namespace VISU {
     SalomeApp_Application* myApplication;
     VISU::Table_i*         myTable;
 
-    typedef VisuGUI_TableDlg* TResult;
+    typedef VISU_TableDlg* TResult;
     TResult myResult;
 
     TCreateTableViewEvent (SalomeApp_Application* theApplication,
@@ -1489,15 +1489,13 @@ namespace VISU {
 	if (SUIT_Study* aSStudy = myApplication->activeStudy()) {
 	  if (SalomeApp_Study* aStudy = dynamic_cast<SalomeApp_Study*>(aSStudy)) {
 	    if (_PTR(Study) aCStudy = aStudy->studyDS()) {
-	      _PTR(SObject) aSObject = aCStudy->FindObjectID(myTable->GetObjectEntry());
-	      if (aSObject) {
-		myResult = new VisuGUI_TableDlg (myApplication->desktop(),
-						 aSObject,
-						 false,
-						 VisuGUI_TableDlg::ttAuto,
-						 Qt::Vertical);
-		myResult->show();
-	      }
+              myResult = new VISU_TableDlg (myApplication->desktop(),
+                                            aCStudy,
+                                            myTable,
+                                            false,
+                                            VISU_TableDlg::ttAuto,
+                                            Qt::Vertical);
+              myResult->show();
 	    }
 	  }
 	}
@@ -1528,8 +1526,8 @@ namespace VISU {
 
   void TableView_i::SetTitle (const char* theTitle)
   {
-    ProcessVoidEvent(new TVoidMemFun1ArgEvent<VisuGUI_TableDlg,const QString&,QString>
-                     (myView, &VisuGUI_TableDlg::setWindowTitle, QString(theTitle)));
+    ProcessVoidEvent(new TVoidMemFun1ArgEvent<VISU_TableDlg,const QString&,QString>
+                     (myView, &VISU_TableDlg::setWindowTitle, QString(theTitle)));
   }
 
   char* TableView_i::GetTitle()
diff --git a/src/VISU_I/VISU_View_i.hh b/src/VISU_I/VISU_View_i.hh
index 6e644af5..bd8db9f6 100644
--- a/src/VISU_I/VISU_View_i.hh
+++ b/src/VISU_I/VISU_View_i.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_View_i.hh
 //  Author : Alexey PETROV
@@ -32,7 +33,7 @@
 
 class QWidget;
 
-class VisuGUI_TableDlg;
+class VISU_TableDlg;
 
 class SalomeApp_Application;
 
@@ -212,7 +213,7 @@ namespace VISU
 
     virtual void Close();
   protected:
-    VisuGUI_TableDlg* myView;
+    VISU_TableDlg* myView;
   public:
     virtual Storable* Create (VISU::Table_ptr theTable);
   };
diff --git a/src/VISU_SWIG/Makefile.am b/src/VISU_SWIG/Makefile.am
index c093a267..1a904e97 100644
--- a/src/VISU_SWIG/Makefile.am
+++ b/src/VISU_SWIG/Makefile.am
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : Makefile.am
 #  Author : Paul RASCLE, EDF
diff --git a/src/VISU_SWIG/VISU_Example_01.py b/src/VISU_SWIG/VISU_Example_01.py
index bc0e6190..a6e697a7 100644
--- a/src/VISU_SWIG/VISU_Example_01.py
+++ b/src/VISU_SWIG/VISU_Example_01.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # T 2.23, 28: Displaying fields (scalar and vectorial) on nodes, change presentation options.
 # Uses MED files ResOK_0000.med and Fields_group3D.med
 # This script is equivalent to non-regression test script 003/A1
diff --git a/src/VISU_SWIG/VISU_Example_02.py b/src/VISU_SWIG/VISU_Example_02.py
index 6e5efbb8..f4c538a9 100644
--- a/src/VISU_SWIG/VISU_Example_02.py
+++ b/src/VISU_SWIG/VISU_Example_02.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # T 2.24: Save/retrieve view parameters.
 # Uses MED file fra.med from ${DATA_DIR}/MedFiles directory.
 # This script is equivalent to non-regression test script 003/A3
diff --git a/src/VISU_SWIG/VISU_Example_03.py b/src/VISU_SWIG/VISU_Example_03.py
index dd9c9bf7..5fccc221 100644
--- a/src/VISU_SWIG/VISU_Example_03.py
+++ b/src/VISU_SWIG/VISU_Example_03.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Animation of "vitesse" field, stored in file TimeStamps.med
 # This script is equivalent to non-regression test script 003/A5
 #
diff --git a/src/VISU_SWIG/VISU_Example_04.py b/src/VISU_SWIG/VISU_Example_04.py
index 03291662..5e379a64 100644
--- a/src/VISU_SWIG/VISU_Example_04.py
+++ b/src/VISU_SWIG/VISU_Example_04.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Show some results presentations in different 3D and 2D viewers
 # with different options (view parameters and display modes).
 # Uses MED files fra.med and TimeStamps.med from ${DATA_DIR}/MedFiles directory.
diff --git a/src/VISU_SWIG/VISU_Example_05.py b/src/VISU_SWIG/VISU_Example_05.py
index 50598141..553a1de1 100644
--- a/src/VISU_SWIG/VISU_Example_05.py
+++ b/src/VISU_SWIG/VISU_Example_05.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Create a table and show it in Plot2d viewer
 # This script is equivalent to script VISU_SWIG/visu_big_table.py
 #
diff --git a/src/VISU_SWIG/VISU_Example_06.py b/src/VISU_SWIG/VISU_Example_06.py
index e353c5c8..d1bde21f 100644
--- a/src/VISU_SWIG/VISU_Example_06.py
+++ b/src/VISU_SWIG/VISU_Example_06.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Import a table from file and show it in Plot2d viewer
 #
 import salome
diff --git a/src/VISU_SWIG/VISU_Example_07.py b/src/VISU_SWIG/VISU_Example_07.py
index 9aff5913..64708ef1 100644
--- a/src/VISU_SWIG/VISU_Example_07.py
+++ b/src/VISU_SWIG/VISU_Example_07.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Manage view parameters of presentations:
 # Representation Mode, Shrink, Shading, Opacity, Line Width
 #
diff --git a/src/VISU_SWIG/VISU_Example_08.py b/src/VISU_SWIG/VISU_Example_08.py
index c58ecbd8..8142e236 100644
--- a/src/VISU_SWIG/VISU_Example_08.py
+++ b/src/VISU_SWIG/VISU_Example_08.py
@@ -1,8 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +17,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Set different point markers for presentation
 #
 import salome
diff --git a/src/VISU_SWIG/VISU_Example_09.py b/src/VISU_SWIG/VISU_Example_09.py
index 8e588018..d53d8df4 100644
--- a/src/VISU_SWIG/VISU_Example_09.py
+++ b/src/VISU_SWIG/VISU_Example_09.py
@@ -1,8 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +17,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Displaying curves attached to different Y axes of Plot2d view
 #
 import salome
diff --git a/src/VISU_SWIG/VISU_Gen_s.cc b/src/VISU_SWIG/VISU_Gen_s.cc
index 74b9f9ea..7fcc7b55 100644
--- a/src/VISU_SWIG/VISU_Gen_s.cc
+++ b/src/VISU_SWIG/VISU_Gen_s.cc
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Gen_s.cc
 //  Author : Alexey PETROV
diff --git a/src/VISU_SWIG/VISU_Gen_s.hh b/src/VISU_SWIG/VISU_Gen_s.hh
index 0b3c7838..e88d7316 100644
--- a/src/VISU_SWIG/VISU_Gen_s.hh
+++ b/src/VISU_SWIG/VISU_Gen_s.hh
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU OBJECT : interactive object for VISU entities implementation
 //  File   : VISU_Gen_s.hh
 //  Author : Alexey PETROV
diff --git a/src/VISU_SWIG/VISU_shared_modules.py b/src/VISU_SWIG/VISU_shared_modules.py
index 3804c8e8..98c77730 100644
--- a/src/VISU_SWIG/VISU_shared_modules.py
+++ b/src/VISU_SWIG/VISU_shared_modules.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 """
 
 """
diff --git a/src/VISU_SWIG/batchmode_visu.py b/src/VISU_SWIG/batchmode_visu.py
index dc7e8e3d..a957c04b 100644
--- a/src/VISU_SWIG/batchmode_visu.py
+++ b/src/VISU_SWIG/batchmode_visu.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : batchmode_visu.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/batchmode_visu_table.py b/src/VISU_SWIG/batchmode_visu_table.py
index 31868214..043d1e6d 100644
--- a/src/VISU_SWIG/batchmode_visu_table.py
+++ b/src/VISU_SWIG/batchmode_visu_table.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_big_table.py
 #  Author : Vadim SANDLER
diff --git a/src/VISU_SWIG/batchmode_visu_view.py b/src/VISU_SWIG/batchmode_visu_view.py
index e0ea3097..3c686489 100644
--- a/src/VISU_SWIG/batchmode_visu_view.py
+++ b/src/VISU_SWIG/batchmode_visu_view.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : test_table.py
 #  Author : Alexey Petrov
diff --git a/src/VISU_SWIG/batchmode_visu_view3d.py b/src/VISU_SWIG/batchmode_visu_view3d.py
index 28a71342..e9453c5b 100644
--- a/src/VISU_SWIG/batchmode_visu_view3d.py
+++ b/src/VISU_SWIG/batchmode_visu_view3d.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : batchmode_visu_view3d.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/libVISU_Swig.i b/src/VISU_SWIG/libVISU_Swig.i
index 9925172b..cbf7f852 100644
--- a/src/VISU_SWIG/libVISU_Swig.i
+++ b/src/VISU_SWIG/libVISU_Swig.i
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  VISU VISU_SWIG : binding of C++ implementation and Python
 //  File   : libVISU_Swig.i
 //  Author : Paul RASCLE, EDF
diff --git a/src/VISU_SWIG/visu.py b/src/VISU_SWIG/visu.py
index ba3f2422..d1d65e67 100644
--- a/src/VISU_SWIG/visu.py
+++ b/src/VISU_SWIG/visu.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_apply_properties.py b/src/VISU_SWIG/visu_apply_properties.py
index 7b98ebb7..4a9f6093 100644
--- a/src/VISU_SWIG/visu_apply_properties.py
+++ b/src/VISU_SWIG/visu_apply_properties.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_apply_properties.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_apply_properties_successive.py b/src/VISU_SWIG/visu_apply_properties_successive.py
index b7633cc5..ed05fff1 100644
--- a/src/VISU_SWIG/visu_apply_properties_successive.py
+++ b/src/VISU_SWIG/visu_apply_properties_successive.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_apply_properties_consecutive.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_big_table.py b/src/VISU_SWIG/visu_big_table.py
index cdd08844..76c5fbef 100644
--- a/src/VISU_SWIG/visu_big_table.py
+++ b/src/VISU_SWIG/visu_big_table.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_big_table.py
 #  Author : Vadim SANDLER
diff --git a/src/VISU_SWIG/visu_cache.py b/src/VISU_SWIG/visu_cache.py
index 87c6e269..08b98461 100644
--- a/src/VISU_SWIG/visu_cache.py
+++ b/src/VISU_SWIG/visu_cache.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 import os
 import time
 import VISU
diff --git a/src/VISU_SWIG/visu_delete.py b/src/VISU_SWIG/visu_delete.py
index a79a3b8e..d05ef3db 100644
--- a/src/VISU_SWIG/visu_delete.py
+++ b/src/VISU_SWIG/visu_delete.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 import VISU
 import SALOMEDS
 import salome
diff --git a/src/VISU_SWIG/visu_evolution.py b/src/VISU_SWIG/visu_evolution.py
index bd78885b..99b23fa8 100755
--- a/src/VISU_SWIG/visu_evolution.py
+++ b/src/VISU_SWIG/visu_evolution.py
@@ -1,8 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +17,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_evolution.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_gui.py b/src/VISU_SWIG/visu_gui.py
index 18b27af1..5342fcd1 100644
--- a/src/VISU_SWIG/visu_gui.py
+++ b/src/VISU_SWIG/visu_gui.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_gui.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_med.py b/src/VISU_SWIG/visu_med.py
index c3b26e3f..e7014657 100644
--- a/src/VISU_SWIG/visu_med.py
+++ b/src/VISU_SWIG/visu_med.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_med.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_pointmap3d.py b/src/VISU_SWIG/visu_pointmap3d.py
index 172dd4a3..45c05c3e 100755
--- a/src/VISU_SWIG/visu_pointmap3d.py
+++ b/src/VISU_SWIG/visu_pointmap3d.py
@@ -1,8 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,6 +17,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 import os
 import VISU
 import salome
diff --git a/src/VISU_SWIG/visu_prs_example.py b/src/VISU_SWIG/visu_prs_example.py
index bbcc2d32..85dfbb85 100644
--- a/src/VISU_SWIG/visu_prs_example.py
+++ b/src/VISU_SWIG/visu_prs_example.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_prs_exam.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_split_views.py b/src/VISU_SWIG/visu_split_views.py
index 9edbbb5f..c3f3cee8 100644
--- a/src/VISU_SWIG/visu_split_views.py
+++ b/src/VISU_SWIG/visu_split_views.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 import VISU
 import SALOMEDS
 import salome
diff --git a/src/VISU_SWIG/visu_succcessive_animation.py b/src/VISU_SWIG/visu_succcessive_animation.py
index 43db1288..af70c1e7 100644
--- a/src/VISU_SWIG/visu_succcessive_animation.py
+++ b/src/VISU_SWIG/visu_succcessive_animation.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_view3d.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_table.py b/src/VISU_SWIG/visu_table.py
index 6e6b9244..1d4746c9 100644
--- a/src/VISU_SWIG/visu_table.py
+++ b/src/VISU_SWIG/visu_table.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_table.py
 #  Author : Vadim SANDLER
diff --git a/src/VISU_SWIG/visu_view.py b/src/VISU_SWIG/visu_view.py
index 3287ed13..2e4b1c2f 100644
--- a/src/VISU_SWIG/visu_view.py
+++ b/src/VISU_SWIG/visu_view.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_view.py
 #  Author : Alexey Petrov
diff --git a/src/VISU_SWIG/visu_view3d.py b/src/VISU_SWIG/visu_view3d.py
index c7943d6d..8b574f87 100644
--- a/src/VISU_SWIG/visu_view3d.py
+++ b/src/VISU_SWIG/visu_view3d.py
@@ -1,5 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 #  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -20,6 +20,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_view3d.py
 #  Module : VISU
diff --git a/src/VISU_SWIG/visu_view3d_parameters.py b/src/VISU_SWIG/visu_view3d_parameters.py
index 2d769b7e..c3fdf104 100755
--- a/src/VISU_SWIG/visu_view3d_parameters.py
+++ b/src/VISU_SWIG/visu_view3d_parameters.py
@@ -1,8 +1,5 @@
 #  -*- coding: iso-8859-1 -*-
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -20,11 +17,11 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  VISU VISU_SWIG : binding of C++ implementation and Python
 #  File   : visu_view3d.py
 #  Module : VISU
 #
-
 import salome
 import visu_gui
 import VISU
diff --git a/src/VVTK/Makefile.am b/src/VVTK/Makefile.am
deleted file mode 100755
index c739d489..00000000
--- a/src/VVTK/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-#
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
-#
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
-#
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-#
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-#
-#  File   : Makefile.in
-#  Author : Alexander Solovyov(OCN)
-#  Module : VVTK
-# $Header: 
-#
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-lib_LTLIBRARIES= libVVTK.la
-
-# header files
-salomeinclude_HEADERS= \
-	VVTK.h \
-	VVTK_PrimitiveBox.h \
-	VVTK_SizeBox.h
-
-dist_libVVTK_la_SOURCES= \
-	VVTK_PrimitiveBox.cxx \
-	VVTK_SizeBox.cxx
-
-MOC_FILES= \
-	VVTK_PrimitiveBox_moc.cxx \
-	VVTK_SizeBox_moc.cxx
-
-nodist_libVVTK_la_SOURCES=$(MOC_FILES)
-
-libVVTK_la_CPPFLAGS= \
-	$(QT_INCLUDES) \
-	@CAS_CXXFLAGS@ @CAS_CPPFLAGS@ \
-	$(VTK_INCLUDES) \
-	$(BOOST_CPPFLAGS) \
-	$(KERNEL_CXXFLAGS) \
-	$(GUI_CXXFLAGS) \
-	$(MED_CXXFLAGS) \
-	-I$(srcdir)/../OBJECT -I$(srcdir)/../PIPELINE -I$(srcdir)/../CONVERTOR \
-	-I$(srcdir)/../GUITOOLS
-
-libVVTK_la_LDFLAGS= \
-	../OBJECT/libVisuObject.la \
-	../PIPELINE/libVisuPipeLine.la \
-	../CONVERTOR/libVisuConvertor.la \
-	../GUITOOLS/libVISUGUITOOLS.la \
-	$(KERNEL_LDFLAGS) -lOpUtil \
-	$(GUI_LDFLAGS) -lsuit -lCAM -lSalomeObject -lSVTK \
-	$(QT_MT_LIBS) \
-	$(OCC_LIBS) \
-	$(VTK_LIBS)
diff --git a/src/VVTK/VVTK.h b/src/VVTK/VVTK.h
deleted file mode 100755
index 9564091c..00000000
--- a/src/VVTK/VVTK.h
+++ /dev/null
@@ -1,34 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifdef WNT
-#if defined VISU_VVTK_EXPORTS || defined VVTK_EXPORTS
-#define VVTK_EXPORT __declspec(dllexport)
-#else
-#define VVTK_EXPORT __declspec(dllimport)
-#endif
-#else
-#define VVTK_EXPORT
-#endif
-
-#if defined WNT
-#pragma warning ( disable: 4251 )
-#endif
diff --git a/src/VVTK/VVTK_ImageWriter.cxx b/src/VVTK/VVTK_ImageWriter.cxx
deleted file mode 100755
index 326498f2..00000000
--- a/src/VVTK/VVTK_ImageWriter.cxx
+++ /dev/null
@@ -1,114 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#include "VVTK_ImageWriter.h"
-
-#include <QSemaphore>
-
-#include "utilities.h"
-
-#include <vtkImageData.h>
-#include <vtkImageClip.h>
-#include <vtkJPEGWriter.h>
-#include <vtkSmartPointer.h>
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
-
-//----------------------------------------------------------------------------
-VVTK_ImageWriter
-::VVTK_ImageWriter(QSemaphore* theSemaphore,
-                   vtkImageData* theImageData,
-                   const std::string& theName,
-                   int theProgressive,
-                   int theQuality):
-  mySemaphore(theSemaphore),
-  myImageData(theImageData),
-  myName(theName),
-  myProgressive(theProgressive),
-  myQuality(theQuality),
-  myConstraint16Flag(true)
-{}
-
-//----------------------------------------------------------------------------
-VVTK_ImageWriter
-::~VVTK_ImageWriter()
-{
-  if(MYDEBUG) MESSAGE("VVTK_ImageWriter::~VVTK_ImageWriter - this = "<<this);
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_ImageWriter
-::run()
-{
-  vtkJPEGWriter *aWriter = vtkJPEGWriter::New();
-  vtkImageData *anImageData = myImageData;
-  vtkSmartPointer<vtkImageClip> anImageClip;
-  //
-  if(myConstraint16Flag){ 
-    int uExtent[6];
-    myImageData->UpdateInformation();
-    myImageData->GetUpdateExtent(uExtent);
-    unsigned int width = uExtent[1] - uExtent[0] + 1;
-    unsigned int height = uExtent[3] - uExtent[2] + 1;
-    width = (width / 16) * 16;
-    height= (height / 16) * 16;
-    uExtent[1] = uExtent[0] + width - 1;
-    uExtent[3] = uExtent[2] + height - 1;
-    //
-    anImageClip = vtkImageClip::New();
-    anImageClip->Delete();
-
-    anImageClip->SetInput(myImageData);
-    anImageClip->SetOutputWholeExtent(uExtent);
-    anImageClip->ClipDataOn();
-    anImageData = anImageClip->GetOutput();
-  }
-  //
-  aWriter->WriteToMemoryOff();
-  aWriter->SetFileName(myName.c_str());
-  aWriter->SetQuality(myQuality);
-  aWriter->SetProgressive(myProgressive);
-  aWriter->SetInput(anImageData);
-  aWriter->Write();
-
-  aWriter->Delete();
-  myImageData->Delete();
-
-  if(MYDEBUG) MESSAGE("VVTK_ImageWriter::run "<<
-                "- this = "<<this<<
-                //"; total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available() );
-  mySemaphore->release();
-}
-
diff --git a/src/VVTK/VVTK_ImageWriter.h b/src/VVTK/VVTK_ImageWriter.h
deleted file mode 100755
index e20baec2..00000000
--- a/src/VVTK/VVTK_ImageWriter.h
+++ /dev/null
@@ -1,62 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#ifndef _VVTK_ImageWriter_Header_File_
-#define _VVTK_ImageWriter_Header_File_
-
-#include <QThread>
-#include <string>
-
-class vtkImageData;
-class QSemaphore;
-
-
-class VVTK_ImageWriter : public QThread 
-{
-public:
-  VVTK_ImageWriter(QSemaphore* theSemaphore,
-                   vtkImageData* theImageData,
-                   const std::string& theName,
-                   int theProgressive,
-                   int theQuality);
-
-  ~VVTK_ImageWriter();
-
- protected:
-  virtual
-  void
-  run();
-  
- protected:
-  QSemaphore* mySemaphore;
-  vtkImageData *myImageData;
-  std::string myName;
-  int   myProgressive;
-  int   myQuality;
-  bool  myConstraint16Flag;
-};
-#endif
diff --git a/src/VVTK/VVTK_ImageWriterMgr.cxx b/src/VVTK/VVTK_ImageWriterMgr.cxx
deleted file mode 100755
index bba9094a..00000000
--- a/src/VVTK/VVTK_ImageWriterMgr.cxx
+++ /dev/null
@@ -1,105 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#include "VVTK_ImageWriterMgr.h"
-#include "VVTK_ImageWriter.h"
-
-#include <vtkImageData.h>
-
-#include <QSemaphore>
-
-#include "utilities.h"
-
-#include <limits>
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
-//----------------------------------------------------------------------------
-VVTK_ImageWriterMgr
-::VVTK_ImageWriterMgr()
-{
-  int aMax = std::numeric_limits<int>::max() / 2;
-  mySemaphore = new QSemaphore(aMax);
-  mySemaphore->acquire( aMax );
-  if(MYDEBUG) MESSAGE("VVTK_ImageWriterMgr::VVTK_ImageWriterMgr "<<
-                //"- total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available() );
-}
-
-
-//----------------------------------------------------------------------------
-VVTK_ImageWriterMgr
-::~VVTK_ImageWriterMgr()
-{
-  Stop();
-  delete mySemaphore;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_ImageWriterMgr
-::StartImageWriter(vtkImageData *theImageData,
-                   const std::string& theName,
-                   const int theProgressive,
-                   const int theQuality)
-{
-  VVTK_ImageWriter *anImageWriter = 
-    new VVTK_ImageWriter(mySemaphore,
-                         theImageData,
-                         theName,
-                         theProgressive,
-                         theQuality);
-  myThreads.push_back(anImageWriter);
-
-  anImageWriter->start();
-
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_ImageWriterMgr
-::Stop()
-{
-  if(MYDEBUG) MESSAGE("VVTK_ImageWriterMgr::Stop "<<
-                //"- total = "<<mySemaphore->total()<<
-                "; available = "<<mySemaphore->available() );
-  if(MYDEBUG) MESSAGE("VVTK_ImageWriterMgr::Stop - *mySemaphore += "<<myThreads.size() );
-  mySemaphore->acquire( myThreads.size() );
-
-  for(size_t anId = 0, anEnd = myThreads.size(); anId < anEnd; anId++){
-    VVTK_ImageWriter* anImageWriter = myThreads[anId];
-    anImageWriter->wait();
-    delete anImageWriter;
-  }
-  myThreads.clear();
-}
diff --git a/src/VVTK/VVTK_ImageWriterMgr.h b/src/VVTK/VVTK_ImageWriterMgr.h
deleted file mode 100755
index dcc196e9..00000000
--- a/src/VVTK/VVTK_ImageWriterMgr.h
+++ /dev/null
@@ -1,64 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#ifndef _VVTK_ImageWriterMgr_Header_File_
-#define _VVTK_ImageWriterMgr_Header_File_
-
-#include <string>
-#include <vector>
-
-class QString;
-class vtkImageData;
-class VVTK_ImageWriter;
-class QSemaphore;
-
-class VVTK_ImageWriterMgr
-{
- public:
-  VVTK_ImageWriterMgr();
-  ~VVTK_ImageWriterMgr();
-  
-  void
-  StartImageWriter(vtkImageData *theImageData,
-                   const std::string& theName,
-                   const int theProgressive,
-                   const int theQuality);
-
-  void
-  Stop();
-
-  typedef std::vector<VVTK_ImageWriter*> TWriterThreads;
-
- protected:
-  TWriterThreads myThreads;
-
-  QSemaphore* mySemaphore;
-};
-
-
-#endif
-
diff --git a/src/VVTK/VVTK_InteractorStyle.cxx b/src/VVTK/VVTK_InteractorStyle.cxx
deleted file mode 100644
index c50c8cd0..00000000
--- a/src/VVTK/VVTK_InteractorStyle.cxx
+++ /dev/null
@@ -1,292 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   : VVTK_InteractorStyle.cxx
-//  Author : Christophe ATTANASIO
-//  Module : SALOME
-//  $Header$
-//
-#include "VVTK_InteractorStyle.h"
-#include "VISU_GaussPtsSettings.h"
-#include "SVTK_Selector.h"
-#include "VISU_Event.h" 
-
-#include <vtkObjectFactory.h>
-#include <vtkRenderWindowInteractor.h>
-#include <vtkCallbackCommand.h>
-#include <vtkCommand.h>
-#include <vtkRenderer.h>
-#include <vtkCamera.h>
-
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(VVTK_InteractorStyle);
-//----------------------------------------------------------------------------
-
-VVTK_InteractorStyle
-::VVTK_InteractorStyle():
-  myIsMidButtonDown( false ),
-  myIsLeftButtonDown( false ),
-  mySMDecreaseMagnificationBtn(10),
-  mySMIncreaseMagnificationBtn(11)
-{
-}
-
-//----------------------------------------------------------------------------
-VVTK_InteractorStyle
-::~VVTK_InteractorStyle() 
-{
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::OnLeftButtonDown(int ctrl, int shift, 
-                   int x, int y) 
-{
-  myIsLeftButtonDown = true;
-
-  if (this->HasObserver(vtkCommand::LeftButtonPressEvent)) {
-    this->InvokeEvent(vtkCommand::LeftButtonPressEvent,NULL);
-    return;
-  }
-  this->FindPokedRenderer(x, y);
-  if (this->CurrentRenderer == NULL) {
-    return;
-  }
-  myShiftState = shift;
-  // finishing current viewer operation
-  if (State != VTK_INTERACTOR_STYLE_CAMERA_NONE) {
-    onFinishOperation();
-    startOperation(VTK_INTERACTOR_STYLE_CAMERA_NONE);
-  }
-  myOtherPoint = myPoint = QPoint(x, y);
-  if (ForcedState != VTK_INTERACTOR_STYLE_CAMERA_NONE) {
-    startOperation(ForcedState);
-  } 
-  else {
-    if (!(ctrl||shift)){
-      if (myIsMidButtonDown){
-        startOperation(VTK_INTERACTOR_STYLE_CAMERA_ZOOM);
-      }
-      else{
-        startOperation(VTK_INTERACTOR_STYLE_CAMERA_ROTATE);
-      }
-    }
-  }
-  return;
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::OnMiddleButtonDown(int ctrl,
-                     int shift, 
-                     int x, int y) 
-{
-  myIsMidButtonDown = true;
-
-  if (this->HasObserver(vtkCommand::MiddleButtonPressEvent))  {
-    this->InvokeEvent(vtkCommand::MiddleButtonPressEvent,NULL);
-    return;
-  }
-  this->FindPokedRenderer(x, y);
-  if (this->CurrentRenderer == NULL)    {
-    return;
-  }
-  myShiftState = shift;
-  // finishing current viewer operation
-  if (State != VTK_INTERACTOR_STYLE_CAMERA_NONE) {
-    onFinishOperation();
-    startOperation(VTK_INTERACTOR_STYLE_CAMERA_NONE);
-  }
-  myOtherPoint = myPoint = QPoint(x, y);
-  if (ForcedState != VTK_INTERACTOR_STYLE_CAMERA_NONE) {
-    startOperation(ForcedState);
-  }
-  else {
-    if (!(ctrl||shift)){
-      if ( myIsLeftButtonDown ){
-        startOperation(VTK_INTERACTOR_STYLE_CAMERA_ZOOM);
-      }
-      else{
-        startOperation(VTK_INTERACTOR_STYLE_CAMERA_PAN);
-      }
-    }
-  }
-}
-
-//----------------------------------------------------------------------------
-void 
-VVTK_InteractorStyle
-::OnLeftButtonUp(int ctrl, int shift, int x, int y)
-{
-  myIsLeftButtonDown = false;
-  SVTK_InteractorStyle::OnLeftButtonUp( ctrl, shift, x, y );
-
-  if ( myIsMidButtonDown )
-    OnMiddleButtonDown( ctrl, shift, x, y );
-}
-
-//----------------------------------------------------------------------------
-void  
-VVTK_InteractorStyle
-::OnMiddleButtonUp(int ctrl, int shift, int x, int y)
-{
-  myIsMidButtonDown = false;
-  SVTK_InteractorStyle::OnMiddleButtonUp( ctrl, shift, x, y );
-
-  if ( myIsLeftButtonDown )
-    OnLeftButtonDown( ctrl, shift, x, y );
-}
-//----------------------------------------------------------------------------
-void  VVTK_InteractorStyle::onFinishOperation()
-{
-  Superclass::onFinishOperation();
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::SetInteractor( vtkRenderWindowInteractor* theInteractor )
-{
-  // register EventCallbackCommand as observer of standard events (keypress, mousemove, etc)
-  Superclass::SetInteractor( theInteractor );
- 
-  if(theInteractor){ 
-    theInteractor->AddObserver( VISU::SetSMDecreaseMagnificationEvent, EventCallbackCommand, Priority );
-    theInteractor->AddObserver( VISU::SetSMIncreaseMagnificationEvent, EventCallbackCommand, Priority );
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::ProcessEvents( vtkObject* object,
-                 unsigned long event,
-                 void* clientData, 
-                 void* callData )
-{
-  if ( clientData ) {
-    vtkObject* anObject = reinterpret_cast<vtkObject*>( clientData );
-    VVTK_InteractorStyle* self = dynamic_cast<VVTK_InteractorStyle*>( anObject );
-    if( self ){
-      switch ( event ) {
-      case VISU::SetSMDecreaseMagnificationEvent:
-        self->mySMDecreaseMagnificationBtn = *((int*)callData);
-        return;
-      case VISU::SetSMIncreaseMagnificationEvent:
-        self->mySMIncreaseMagnificationBtn = *((int*)callData);
-        return;
-      }
-    }
-  }
-
-  Superclass::ProcessEvents( object, event, clientData, callData );
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::onSpaceMouseButton( int button )
-{
-  if( mySMDecreaseMagnificationBtn == button )    
-    DecreaseGaussPointMagnification();
-  if( mySMIncreaseMagnificationBtn == button )    
-    IncreaseGaussPointMagnification();
-
-  Superclass::onSpaceMouseButton( button );
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::DecreaseGaussPointMagnification()
-{
-  Interactor->InvokeEvent(VISU::SetSMDecreaseMagnificationEvent,NULL);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_InteractorStyle
-::IncreaseGaussPointMagnification()
-{
-  Interactor->InvokeEvent(VISU::SetSMIncreaseMagnificationEvent,NULL);
-}
-//============================================================================
-//
-//  Controllers
-//
-vtkStandardNewMacro(VVTK_ControllerIncrement);
-//----------------------------------------------------------------------------
-VVTK_ControllerIncrement::VVTK_ControllerIncrement()
-{
-  myIncrement=10;
-}
-//----------------------------------------------------------------------------
-VVTK_ControllerIncrement::~VVTK_ControllerIncrement()
-{
-}
-//----------------------------------------------------------------------------
-int VVTK_ControllerIncrement::Increase()
-{
-  myIncrement*=2;
-  return myIncrement;
-}
-//----------------------------------------------------------------------------
-int VVTK_ControllerIncrement::Decrease()
-{
-  myIncrement/=2;
-  if (!myIncrement){
-    myIncrement=1;
-  }
-  return myIncrement;
-}
-//
-vtkStandardNewMacro(VVTK_ControllerOnKeyDown);
-//----------------------------------------------------------------------------
-VVTK_ControllerOnKeyDown::VVTK_ControllerOnKeyDown()
-{
-}
-//----------------------------------------------------------------------------
-VVTK_ControllerOnKeyDown::~VVTK_ControllerOnKeyDown()
-{
-}
-//----------------------------------------------------------------------------
-bool VVTK_ControllerOnKeyDown::OnKeyDown(vtkInteractorStyle* theIS)
-{
-  SVTK_InteractorStyle *pIS=dynamic_cast<SVTK_InteractorStyle *>(theIS);
-  if (pIS){
-    if(pIS->GetSelector()->SelectionMode()==GaussPointSelection){
-      char key = pIS->GetInteractor()->GetKeyCode();
-      //
-      if (key == 'S') {
-        pIS->ActionPicking();
-        return false;
-      }
-    }
-  }
-  return Superclass::OnKeyDown(theIS);
-}
diff --git a/src/VVTK/VVTK_InteractorStyle.h b/src/VVTK/VVTK_InteractorStyle.h
deleted file mode 100644
index 86702bed..00000000
--- a/src/VVTK/VVTK_InteractorStyle.h
+++ /dev/null
@@ -1,148 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   : VVTK_InteractorStyle.h
-//  Author : Christophe ATTANASIO
-//  Module : SALOME
-//  $Header$
-//
-#ifndef __VVTK_InteractorStyle_h
-#define __VVTK_InteractorStyle_h
-
-
-#include "VVTK.h"
-
-#include "SVTK_InteractorStyle.h"
-//
-//-------------------------------------------
-//! Control the value of increment in new style of interaction.
-/*!
-  This class controls of value of increment,
-  for pan/rotate/zoom operations in new style 
-  of interaction
-*/
-class VVTK_ControllerIncrement : public SVTK_ControllerIncrement {
- public:
-  vtkTypeMacro(VVTK_ControllerIncrement,SVTK_ControllerIncrement);
-  static VVTK_ControllerIncrement* New();
-  
-  //! Increace the increment value by multiplying on 2
-  virtual int Increase();
-
-  //! Decreace the increment value by division on 2
-  virtual int Decrease();
-  
- protected:
-  VVTK_ControllerIncrement();
-  virtual ~VVTK_ControllerIncrement();
-  //
- private:
-  VVTK_ControllerIncrement(const VVTK_ControllerIncrement&);  //Not implemented
-  void operator=(const VVTK_ControllerIncrement&);  //Not implemented
-};
-//
-//-------------------------------------------
-//! Control the behaviour of KeyDown event in new style of interaction.
-/*!
-  This class controls of behaviour of of KeyDown event
-  in new style of interaction.
-*/
-class VVTK_ControllerOnKeyDown : public SVTK_ControllerOnKeyDown{
- public:
-  vtkTypeMacro(VVTK_ControllerOnKeyDown, SVTK_ControllerOnKeyDown);
-  static VVTK_ControllerOnKeyDown* New();
-
-  //! Provides the action on event 
-  virtual bool OnKeyDown(vtkInteractorStyle* );
-
- protected:
-  VVTK_ControllerOnKeyDown();
-  virtual ~VVTK_ControllerOnKeyDown();
-  
- private:
-  VVTK_ControllerOnKeyDown(const VVTK_ControllerOnKeyDown&);//Not implemented
-  void operator=(const VVTK_ControllerOnKeyDown&);          //Not implemented
-};
-
-
-//! Introduce new style of interaction (keyboard free)
-class VVTK_EXPORT VVTK_InteractorStyle : public SVTK_InteractorStyle
-{
- public:
-  static VVTK_InteractorStyle *New();
-  vtkTypeMacro(VVTK_InteractorStyle,SVTK_InteractorStyle);
-
-  //! Redefined from SVTK_InteractorStyle::SetInteractor in order to add an observer (callback) for custorm event (space mouse event)
-  virtual
-  void
-  SetInteractor( vtkRenderWindowInteractor* );
-  
- protected:
-  VVTK_InteractorStyle();
-  ~VVTK_InteractorStyle();
-
-  VVTK_InteractorStyle(const VVTK_InteractorStyle&); // Not implemented
-  void operator=(const VVTK_InteractorStyle&); // Not implemented
-
-  // Generic event bindings must be overridden in subclasses
-
-  //! Redefine SVTK_InteractorStyle::OnLeftButtonDown
-  virtual void OnLeftButtonDown(int ctrl, int shift, int x, int y);
-
-  //! Redefine SVTK_InteractorStyle::OnMiddleButtonDown
-  virtual void OnMiddleButtonDown(int ctrl, int shift, int x, int y);
-
-  //! Redefine SVTK_InteractorStyle::OnLeftButtonUp
-  virtual void OnLeftButtonUp(int ctrl, int shift, int x, int y);
-
-  //! Redefine SVTK_InteractorStyle::OnMiddleButtonUp
-  virtual void OnMiddleButtonUp(int ctrl, int shift, int x, int y);
-
-  //! Redefine SVTK_InteractorStyle::onFinishOperation
-  virtual void onFinishOperation();
-
-  //! Main process VTK event method
-  static 
-  void
-  ProcessEvents(vtkObject* object, 
-                unsigned long event,
-                void* clientData, 
-                void* callData );
-
-  //! Redefine SVTK_InteractorStyle::onSpaceMouseButton
-  virtual void onSpaceMouseButton( int button );
-  
-  //! To decrease magnification of the Gauss Points
-  void DecreaseGaussPointMagnification();
-
-  //! To increase magnification of the Gauss Points
-  void IncreaseGaussPointMagnification();
-
-  //! SpaceMouse short cuts
-  int mySMDecreaseMagnificationBtn;
-  int mySMIncreaseMagnificationBtn;
-  
-  bool myIsMidButtonDown;
-  bool myIsLeftButtonDown;
-};
-
-#endif
diff --git a/src/VVTK/VVTK_MainWindow.cxx b/src/VVTK/VVTK_MainWindow.cxx
deleted file mode 100644
index b0324408..00000000
--- a/src/VVTK/VVTK_MainWindow.cxx
+++ /dev/null
@@ -1,474 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME OBJECT : implementation of interactive object visualization for OCC and VTK viewers
-//  File   : 
-//  Author : 
-//  Module : 
-//  $Header$
-//
-#include "VVTK_MainWindow.h"
-#include "VVTK_InteractorStyle.h"
-#include "VVTK_Recorder.h"
-#include "VVTK_RecorderDlg.h"
-#include "VISU_WidgetCtrl.hxx"
-#include "VISU_GaussPtsAct.h"
-#include "VISU_Event.h" 
-
-#include "SVTK_ViewWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
-#include "VVTK_Renderer.h"
-#include "VVTK_PickingDlg.h"
-#include "VVTK_SegmentationCursorDlg.h"
-
-#include "SUIT_Application.h"
-#include "SUIT_Session.h"
-#include "SUIT_Tools.h"
-#include "SUIT_ViewWindow.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Accel.h"
-#include "SUIT_MessageBox.h"
-#include "QtxAction.h"
-#include "QtxMultiAction.h"
-#include "QtxActionToolMgr.h"
-
-#include <QImage>
-#include <QToolBar>
-#include <QSplitter>
-#include <QFileDialog>
-#include <QApplication>
-
-//----------------------------------------------------------------------------
-VVTK_MainWindow::VVTK_MainWindow(QWidget* theParent, 
-                                 const char* theName,
-                                 SUIT_ResourceMgr* theResourceMgr,
-                                 SUIT_ViewWindow* theViewWindow):
-  SVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow),
-  myControllerIncrement(VVTK_ControllerIncrement::New()),
-  myControllerOnKeyDown(VVTK_ControllerOnKeyDown::New())
-{
-  myToolMgr = new QtxActionToolMgr( this );
-
-  myControllerIncrement->Delete();
-  myControllerOnKeyDown->Delete();
-
-  // Recording
-  myRecordingToolBar = new QToolBar(tr("LBL_TOOLBAR_RECORD_LABEL"), this);
-  addToolBar(Qt::LeftToolBarArea, myRecordingToolBar );
-  myViewWindow->toolMgr()->remove( NonIsometric, myToolBar );
-  
-
-  myStartAction = new QtxAction(tr("MNU_VVTK_RECORDING_START"), 
-                                theResourceMgr->loadPixmap( "VISU", tr( "ICON_VVTK_RECORDING_START" ) ),
-                                tr( "MNU_VVTK_RECORDING_START" ), 0, this);
-  myStartAction->setStatusTip(tr("DSC_VVTK_RECORDING_START"));
-  //myStartAction->addTo( myRecordingToolBar );
-  myRecordingToolBar->addAction( myStartAction  );
-  connect( myStartAction, SIGNAL( triggered ( bool ) ), this, SLOT( OnStartRecording() ) );
-
-  myPlayAction = new QtxAction(tr("MNU_VVTK_RECORDING_PLAY"), 
-                               theResourceMgr->loadPixmap( "VISU", tr( "ICON_VVTK_RECORDING_PLAY" ) ),
-                               tr( "MNU_VVTK_RECORDING_PLAY" ), 0, this);
-  myPlayAction->setStatusTip(tr("DSC_VVTK_RECORDING_PLAY"));
-  myPlayAction->setEnabled( false );
-  //myPlayAction->addTo( myRecordingToolBar );
-  myRecordingToolBar->addAction( myPlayAction  );
-  connect( myPlayAction, SIGNAL( triggered ( bool ) ), this, SLOT( OnPlayRecording() ) );
-
-  myPauseAction = new QtxAction(tr("MNU_VVTK_RECORDING_PAUSE"), 
-                                theResourceMgr->loadPixmap( "VISU", tr( "ICON_VVTK_RECORDING_PAUSE" ) ),
-                                tr( "MNU_VVTK_RECORDING_PAUSE" ), 0, this);
-  myPauseAction->setStatusTip(tr("DSC_VVTK_RECORDING_PAUSE"));
-  myPauseAction->setEnabled( false );
-  //myPauseAction->addTo( myRecordingToolBar );
-  myRecordingToolBar->addAction( myPauseAction  );
-  connect( myPauseAction, SIGNAL( triggered ( bool ) ), this, SLOT( OnPauseRecording() ) );
-
-  myStopAction = new QtxAction(tr("MNU_VVTK_RECORDING_STOP"), 
-                               theResourceMgr->loadPixmap( "VISU", tr( "ICON_VVTK_RECORDING_STOP" ) ),
-                               tr( "MNU_VVTK_RECORDING_STOP" ), 0, this);
-  myStopAction->setStatusTip(tr("DSC_VVTK_RECORDING_STOP"));
-  myStopAction->setEnabled( false );
-  //myStopAction->addTo( myRecordingToolBar );
-  myRecordingToolBar->addAction( myStopAction  );
-  connect( myStopAction, SIGNAL( triggered ( bool ) ), this, SLOT( OnStopRecording() ) );
-  
-  myRecorder = VVTK_Recorder::New();
-  //myRecorder->CheckExistAVIMaker();
-  //if(myRecorder->ErrorStatus())
-  //  myRecordingToolBar->setEnabled(false);
-}
-
-//----------------------------------------------------------------------------
-
-QtxActionToolMgr* VVTK_MainWindow::toolMgr() const
-{
-  return myToolMgr;
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::Initialize(SVTK_RenderWindowInteractor* theInteractor)
-{ 
-  vtkInteractorStyle* aStyle = theInteractor->GetInteractorStyle();
-  if(SVTK_InteractorStyle *anInteractorStyle = dynamic_cast<SVTK_InteractorStyle*>(aStyle)){
-    anInteractorStyle->SetControllerIncrement(myControllerIncrement.GetPointer());
-    anInteractorStyle->SetControllerOnKeyDown(myControllerOnKeyDown.GetPointer());
-  }
-
-  myRecorder->SetNbFPS(17.3);
-  myRecorder->SetQuality(100);
-  myRecorder->SetProgressiveMode(true);
-  myRecorder->SetUseSkippedFrames(true);
-  myRecorder->SetRenderWindow(theInteractor->getRenderWindow());
-
-  disconnect( SVTK_MainWindow::action( DumpId ), SIGNAL( activated() ),
-              myViewWindow, SLOT( onDumpView() ) );
-
-  connect( SVTK_MainWindow::action( DumpId ), SIGNAL( activated() ),
-           this, SLOT( onDumpView() ) );
-
-  SVTK_MainWindow::Initialize(theInteractor);
-  addToolBar( Qt::LeftToolBarArea, getToolBar() );
-}
-
-VVTK_MainWindow::~VVTK_MainWindow()
-{
-  if(myRecorder)
-    myRecorder->Delete();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::onDumpView()
-{
-  QImage img = dumpView();
-  if( img.isNull() )
-    return; 
-
-  SUIT_Application* app = SUIT_Session::session()->activeApplication();
-  QString fileName = app->getFileName( false, QString::null,
-                                       tr( "TLT_IMAGE_FILES" ),
-                                       tr( "TLT_DUMP_VIEW" ), 0 );
-  if( fileName.isEmpty() )
-    return;
-
-  QString fmt = SUIT_Tools::extension( fileName ).toUpper();
-  if( fmt.isEmpty() )
-    fmt = QString( "BMP" ); // default format
-  else if( fmt == "JPG" )
-    fmt = "JPEG";
-
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-  img.save( fileName, fmt.toLatin1() );
-  QApplication::restoreOverrideCursor();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::OnStartRecording()
-{
-  myRecorder->CheckExistAVIMaker();
-  if (myRecorder->ErrorStatus()) {
-    SUIT_MessageBox::warning(this, tr("ERROR"), tr("MSG_NO_AVI_MAKER") );
-  }
-  else {
-    VVTK_RecorderDlg* aRecorderDlg = new VVTK_RecorderDlg( this, myRecorder );
-
-    if( !aRecorderDlg->exec() )
-      return;
-
-    myStartAction->setEnabled( false );
-    myPlayAction->setEnabled( false );
-    myPauseAction->setEnabled( true );
-    myStopAction->setEnabled( true );
-
-    myRecorder->Record();
-  }
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::OnPlayRecording()
-{
-  myStartAction->setEnabled( false );
-  myPlayAction->setEnabled( false );
-  myPauseAction->setEnabled( true );
-  myStopAction->setEnabled( true );
-  //
-  myRecorder->Pause();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::OnPauseRecording()
-{
-  myStartAction->setEnabled( false );
-  myPlayAction->setEnabled( true );
-  myPauseAction->setEnabled( false );
-  myStopAction->setEnabled( true );
-  //
-  myRecorder->Pause();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::OnStopRecording()
-{
-  myStartAction->setEnabled( true );
-  myPlayAction->setEnabled( false );
-  myPauseAction->setEnabled( false );
-  myStopAction->setEnabled( false );
-  //
-  myRecorder->Stop();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow::action( const int accelAction  )
-{
-  if ( accelAction == SUIT_Accel::ZoomFit )
-    onFitAll();
-  else {
-    int anEvent = SVTK::convertAction( accelAction );
-    InvokeEvent( anEvent, 0 );
-  }
-}
-
-//----------------------------------------------------------------------------
-VVTK_MainWindow1::VVTK_MainWindow1(QSplitter* theParent, 
-                                   const char* theName,
-                                   SUIT_ResourceMgr* theResourceMgr,
-                                   SUIT_ViewWindow* theViewWindow):
-  VVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow),
-  mySplitter(theParent),
-  myPickingDlg(NULL)
-{
-  myPtsToolBar = new QToolBar( tr("LBL_TOOLBAR_GAUSS_LABEL"), this );
-  addToolBar( Qt::LeftToolBarArea, myPtsToolBar );
-
-  QPixmap aPixmap;
-  QtxAction* anAction;
-
-  aPixmap = theResourceMgr->loadPixmap("VISU",tr("ICON_VVTK_SELECTION_MODE_SWITCH"));
-  myPickingAction = new QtxAction(tr("MNU_VVTK_SELECTION_MODE_SWITCH"), 
-                                  aPixmap,
-                                  tr( "MNU_VVTK_SELECTION_MODE_SWITCH" ), 
-                                  0, 
-                                  this, 
-                                  //"VVTK/SVTK SelectionSwitch", 
-                                  true);
-  myPickingAction->setCheckable(true);
-  myPickingAction->setStatusTip(tr("DSC_VVTK_SELECTION_MODE_SWITCH"));
-  myPtsToolBar->addAction( myPickingAction );
-  connect(myPickingAction, SIGNAL(toggled(bool)), this, SLOT(OnSelectionModeSwitch(bool)));
-
-  myPickingDlg = new VVTK_PickingDlg( myPickingAction, this, "PickingDlg" );
-
-  // Plane/Sphere Segmentation
-  aPixmap = theResourceMgr->loadPixmap("VISU",tr("ICON_VVTK_PLANE_SEGMENTATION_SWITCH"));
-  myPlaneSegmentationAction = new QtxAction(tr("MNU_VVTK_PLANE_SEGMENTATION_SWITCH"), 
-                                            aPixmap,
-                                            tr( "MNU_VVTK_PLANE_SEGMENTATION_SWITCH" ), 
-                                            0, 
-                                            this, 
-                                            //"VVTK/SVTK PlaneSegmentationSwitch", 
-                                            true);
-  myPlaneSegmentationAction->setCheckable(true);
-  myPlaneSegmentationAction->setStatusTip(tr("DSC_VVTK_PLANE_SEGMENTATION_SWITCH"));
-  //myPlaneSegmentationAction->addTo( myPtsToolBar );
-  connect( myPlaneSegmentationAction, SIGNAL( triggered() ), this, SLOT( OnSegmentationSwitch() ) );
-
-  aPixmap = theResourceMgr->loadPixmap("VISU",tr("ICON_VVTK_SPHERE_SEGMENTATION_SWITCH"));
-  mySphereSegmentationAction = new QtxAction(tr("MNU_VVTK_SPHERE_SEGMENTATION_SWITCH"), 
-                                             aPixmap,
-                                             tr( "MNU_VVTK_SPHERE_SEGMENTATION_SWITCH" ), 
-                                             0, 
-                                             this, 
-                                             //"VVTK/SVTK SphereSegmentationSwitch", 
-                                             true);
-  mySphereSegmentationAction->setCheckable(true);
-  mySphereSegmentationAction->setStatusTip(tr("DSC_VVTK_SPHERE_SEGMENTATION_SWITCH"));
-  //mySphereSegmentationAction->addTo( myPtsToolBar );
-  connect( mySphereSegmentationAction, SIGNAL( activated() ), this, SLOT( OnSegmentationSwitch() ) );
-
-  mySegmentationCursorDlg = new VVTK_SegmentationCursorDlg( this, "SegmentationCursorDlg" );
-  mySegmentationCursorDlg->SetPlaneAction( myPlaneSegmentationAction );
-  mySegmentationCursorDlg->SetSphereAction( mySphereSegmentationAction );
-  connect( mySegmentationCursorDlg, SIGNAL( scgClose() ), this, SLOT( OnSegmentationSwitch() ) );
-
-  //SUIT_ToolButton* aSegmentationButton = new SUIT_ToolButton( myPtsToolBar );
-  QtxMultiAction* aSegmentationAction = new QtxMultiAction( this );
-  aSegmentationAction->insertAction( myPlaneSegmentationAction );
-  aSegmentationAction->insertAction( mySphereSegmentationAction );
-  myPtsToolBar->addAction( aSegmentationAction );
-}
-
-void VVTK_MainWindow1::Initialize(SVTK_RenderWindowInteractor* theInteractor,
-                                  VVTK_Renderer1* theRenderer)
-{
-  myRenderer = theRenderer;
-  VVTK_MainWindow::Initialize(theInteractor);
-
-  mySegmentationCursorDlg->SetWidgetCtrl( theRenderer->GetWidgetCtrl() );
-  mySegmentationCursorDlg->SetInteractor( theInteractor );
-
-  connect( theInteractor, SIGNAL( selectionChanged() ), SLOT( OnSelectionChanged() ) );
-  myPickingDlg->SetInteractor( theInteractor );
-}
-
-VVTK_MainWindow1::~VVTK_MainWindow1()
-{}
-
-//----------------------------------------------------------------------------
-VVTK_MainWindow2* VVTK_MainWindow1::CreateMainWindow2(QWidget* theParent, 
-                                                      const char* theName,
-                                                      SUIT_ResourceMgr* theResourceMgr,
-                                                      SUIT_ViewWindow* theViewWindow)
-{
-  myMainWindow2 = new VVTK_MainWindow2(theParent,
-                                       theName,
-                                       theResourceMgr,
-                                       theViewWindow);
-  return myMainWindow2;
-}
-
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow1::OnSelectionModeSwitch(bool theIsSelectionOn)
-{
-  if ( theIsSelectionOn && !isVisible() )
-    return;
-  
-  Selection_Mode aSelectionMode = SelectionMode();
-  if(theIsSelectionOn && aSelectionMode != GaussPointSelection)
-    SetSelectionMode(GaussPointSelection);
-  else if(!theIsSelectionOn && aSelectionMode == GaussPointSelection)
-    SetSelectionMode(ActorSelection);
-
-  if( theIsSelectionOn )
-  {
-    myPickingDlg->Update();
-    myPickingDlg->show();
-  }
-  else
-    myPickingDlg->hide();
-}
-
-void VVTK_MainWindow1::OnSelectionChanged()
-{
-  Selection_Mode aSelectionMode = SelectionMode();
-  if(myPickingAction->isChecked() && aSelectionMode != GaussPointSelection)
-    myPickingAction->setChecked(false);
-  else if(!myPickingAction->isChecked() && aSelectionMode == GaussPointSelection)
-    myPickingAction->setChecked(true);
-}
-
-
-//----------------------------------------------------------------------------
-VISU_WidgetCtrl* VVTK_MainWindow1::GetWidgetCtrl()
-{
-  return myRenderer->GetWidgetCtrl();
-}
-
-VISU_InsideCursorSettings* VVTK_MainWindow1::GetInsideCursorSettings()
-{
-  return mySegmentationCursorDlg->GetInsideCursorSettings();
-}
-
-VISU_OutsideCursorSettings* VVTK_MainWindow1::GetOutsideCursorSettings()
-{
-  return mySegmentationCursorDlg->GetOutsideCursorSettings();
-}
-
-VISU_PickingSettings* VVTK_MainWindow1::GetPickingSettings()
-{
-  return myPickingDlg->GetPickingSettings();
-}
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow1::SetPlanesSegementation(bool theIsOn)
-{
-  myPlaneSegmentationAction->setChecked( theIsOn );
-  OnSegmentationSwitch(myPlaneSegmentationAction);
-}
-
-void VVTK_MainWindow1::SetSphereSegementation(bool theIsOn)
-{
-  mySphereSegmentationAction->setChecked( theIsOn );
-  OnSegmentationSwitch(mySphereSegmentationAction);
-}
-
-void VVTK_MainWindow1::OnSegmentationSwitch(QtxAction* theAction)
-{
-  bool anIsSegmentationOn = myPlaneSegmentationAction->isChecked() ||
-    mySphereSegmentationAction->isChecked();
-
-  if( !theAction )
-    return;
-  
-  VISU_WidgetCtrl *aWidgetCtrl = myRenderer->GetWidgetCtrl();
-  
-  if (anIsSegmentationOn) {
-    int anIndex = (theAction == myPlaneSegmentationAction) ? 0 : 1;
-    aWidgetCtrl->SetActiveIndex(anIndex);
-  }
-  aWidgetCtrl->SetEnabled(anIsSegmentationOn);
-
-  if( theAction == myPlaneSegmentationAction && anIsSegmentationOn )
-    mySphereSegmentationAction->setChecked( false );
-  else if( theAction == mySphereSegmentationAction && anIsSegmentationOn )
-    myPlaneSegmentationAction->setChecked( false );
-
-  if( anIsSegmentationOn )
-  {
-    myMainWindow2->show();
-    mySegmentationCursorDlg->SetIsPlaneSegmentation( theAction == myPlaneSegmentationAction );
-    mySegmentationCursorDlg->UpdateSegmentation();
-    mySegmentationCursorDlg->UpdateInsideGaussPoints();
-    mySegmentationCursorDlg->UpdateOutsideGaussPoints();
-    mySegmentationCursorDlg->show();
-  }
-  else
-  {
-    myMainWindow2->hide();
-    mySegmentationCursorDlg->hide();
-  }
-}
-
-void VVTK_MainWindow1::OnSegmentationSwitch()
-{
-  QtxAction* anAction = ( QtxAction* )sender();
-  OnSegmentationSwitch(anAction);
-}
-
-
-//----------------------------------------------------------------------------
-VVTK_MainWindow2::VVTK_MainWindow2(QWidget* theParent, 
-                                   const char* theName,
-                                   SUIT_ResourceMgr* theResourceMgr,
-                                   SUIT_ViewWindow* theViewWindow):
-  VVTK_MainWindow(theParent,theName,theResourceMgr,theViewWindow)
-{}
-
-VVTK_MainWindow2::~VVTK_MainWindow2()
-{}
-
-
-//----------------------------------------------------------------------------
-void VVTK_MainWindow2::Initialize(SVTK_RenderWindowInteractor* theInteractor)
-{
-  VVTK_MainWindow::Initialize(theInteractor);
-}
-
diff --git a/src/VVTK/VVTK_MainWindow.h b/src/VVTK/VVTK_MainWindow.h
deleted file mode 100644
index 81491724..00000000
--- a/src/VVTK/VVTK_MainWindow.h
+++ /dev/null
@@ -1,201 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef VVTK_MAINWINDOW_H
-#define VVTK_MAINWINDOW_H
-
-#ifdef WIN32
-#pragma warning( disable:4251 )
-#endif
-
-#include "VVTK.h"
-#include "SVTK_MainWindow.h"
-
-class QSplitter;
-
-class VISU_WidgetCtrl;
-class VVTK_SegmentationCursorDlg;
-class VISU_InsideCursorSettings;
-class VISU_OutsideCursorSettings;
-class VISU_PickingSettings;
-class VVTK_InteractorStyle;
-class VVTK_ControllerIncrement;
-class VVTK_ControllerOnKeyDown;
-class VVTK_PickingDlg;
-class VVTK_MainWindow2;
-class VVTK_Renderer1;
-class VVTK_Renderer2;
-class VVTK_Recorder;
-
-//----------------------------------------------------------------------------
-//! Customize SVTK_MainWindow to provide VVTK functionality
-class VVTK_EXPORT VVTK_MainWindow: public SVTK_MainWindow
-{
-  Q_OBJECT;
-
-public:
-  //! Construct instance of the class
-  VVTK_MainWindow(QWidget* theParent, 
-                  const char* theName,
-                  SUIT_ResourceMgr* theResourceMgr,
-                  SUIT_ViewWindow* theViewWindow);
-
-  //! Reimplement SVTK_MainWindow::Initialize
-  virtual void Initialize(SVTK_RenderWindowInteractor* theInteractor);
-
-  //! Destroy instance of the class
-  virtual ~VVTK_MainWindow();
-
- public slots:
-
-  virtual void onDumpView();
-
-  virtual void action( const int );
-
-  virtual void OnStartRecording();
-
-  virtual void OnPlayRecording();
-
-  virtual void OnPauseRecording();
-
-  virtual void OnStopRecording();
-
- protected:
-  virtual QtxActionToolMgr* toolMgr() const;
-
-  vtkSmartPointer<VVTK_ControllerIncrement> myControllerIncrement;
-  vtkSmartPointer<VVTK_ControllerOnKeyDown> myControllerOnKeyDown; 
-
-  QToolBar* myRecordingToolBar;
-  QtxAction* myStartAction;
-  QtxAction* myPlayAction;
-  QtxAction* myPauseAction;
-  QtxAction* myStopAction;
-
-  VVTK_Recorder *myRecorder;
-  QtxActionToolMgr* myToolMgr;
-};
-
-
-//----------------------------------------------------------------------------
-//! Extend VVTK_MainWindow to implement functionality for base view
-class VVTK_EXPORT VVTK_MainWindow1: public VVTK_MainWindow
-{
-  Q_OBJECT;
-
-public:
-  //! Construct instance of the class
-  VVTK_MainWindow1(QSplitter* theParent, 
-                   const char* theName,
-                   SUIT_ResourceMgr* theResourceMgr,
-                   SUIT_ViewWindow* theViewWindow);
-
-  //! Reimplement VVTK_MainWindow::Initialize
-  virtual void Initialize(SVTK_RenderWindowInteractor* theInteractor,
-                          VVTK_Renderer1* theRenderer);
-
-  //! Destroy instance of the class
-  virtual ~VVTK_MainWindow1();
-
-  //! Create instance of the segmented VVTK_MainWindow
-  /*!
-    The two views (VVTK_MainWindow1 and VVTK_MainWindow2) should change its behaviour in the same time.
-    So, it is necessary to synhronize them through sharing some common pointers.
-  */
-  VVTK_MainWindow2* CreateMainWindow2(QWidget* theParent, 
-                                      const char* theName,
-                                      SUIT_ResourceMgr* theResourceMgr,
-                                      SUIT_ViewWindow* theViewWindow);
-
-  VISU_WidgetCtrl*  GetWidgetCtrl();
-
-  void SetPlanesSegementation(bool theIsOn);
-
-  void SetSphereSegementation(bool theIsOn);
-
-  VISU_InsideCursorSettings* GetInsideCursorSettings();
-
-  //! Get contained VISU_OutsideCursorSettings
-  VISU_OutsideCursorSettings* GetOutsideCursorSettings();
-
-  //! Get contained VISU_PickingSettings
-  VISU_PickingSettings* GetPickingSettings();
-
- public slots:
-  //! To activate/ deactivate the segementation cursor at run-time
-  void OnSegmentationSwitch();//bool theIsSegmentationOn); 
-
-  void OnSegmentationSwitch(QtxAction* theAction);//bool theIsSegmentationOn); 
-
-   //! To change active selection mode at run-time
-  virtual void OnSelectionModeSwitch(bool theIsSelectionOn); 
-
-   //! To adjust to the current selection mode
-  virtual void OnSelectionChanged(); 
-
- protected:
-  VVTK_Renderer1* myRenderer; //!< Keeps extended version of SVTK_Renderer
-
-  VVTK_MainWindow2* myMainWindow2; //!< Refer to segmented view
-
-  QToolBar* myPtsToolBar; //!< Additional tool bar
-
-  //! To implement show/hide segmented view on acttivate/ deactivate segementation cursor
-  QSplitter* mySplitter; 
-
-  QtxAction* myPickingAction; //!< Action for switch selection mode
-  QtxAction* myPlaneSegmentationAction; //!< Action for switch segmentation mode to plane
-  QtxAction* mySphereSegmentationAction; //!< Action for switch segmentation mode to sphere
-
-  //! Keep reference to VVTK_SegmentationCursorDlg
-  VVTK_SegmentationCursorDlg* mySegmentationCursorDlg; 
-  VVTK_PickingDlg* myPickingDlg; //!< Keep reference to VVTK_PickingDlg
-};
-
-
-//----------------------------------------------------------------------------
-//! Extend VVTK_MainWindow to implement functionality for segmented view
-class VVTK_EXPORT VVTK_MainWindow2: public VVTK_MainWindow
-{
-  Q_OBJECT;
-
-  friend class VVTK_MainWindow1;
-
-  //! Construct instance of the class
-  VVTK_MainWindow2(QWidget* theParent, 
-                   const char* theName,
-                   SUIT_ResourceMgr* theResourceMgr,
-                   SUIT_ViewWindow* theViewWindow);
-public:
-  //! Destroy instance of the class
-  virtual ~VVTK_MainWindow2();
-
-  //! Reimplement SVTK_MainWindow::Initialize
-  virtual void Initialize(SVTK_RenderWindowInteractor* theInteractor);
-
-};
-
-
-#ifdef WIN32
-#pragma warning( default:4251 )
-#endif
-
-#endif
diff --git a/src/VVTK/VVTK_PickingDlg.cxx b/src/VVTK/VVTK_PickingDlg.cxx
deleted file mode 100644
index 68a5141c..00000000
--- a/src/VVTK/VVTK_PickingDlg.cxx
+++ /dev/null
@@ -1,724 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VVTK_PickingDlg.cxx
-//  Author : Oleg Uvarov
-//  Module : VISU
-//
-#include "VVTK_PickingDlg.h"
-#include <VisuGUI_GUITools.h>
-
-#include "VISU_GaussPtsAct.h"
-#include "VISU_PickingSettings.h"
-#include "VISU_GaussPointsPL.hxx"
-
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-
-#include "CAM_Module.h"
-
-#include "SVTK_Selector.h"
-#include "SVTK_MainWindow.h"
-#include "SVTK_RenderWindowInteractor.h"
-
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
-
-#include <vtkActorCollection.h>
-#include <vtkCallbackCommand.h>
-#include <vtkObjectFactory.h>
-#include <vtkRenderer.h>
-#include <vtkGenericRenderWindowInteractor.h>
-#include <vtkSmartPointer.h>
-
-#include "utilities.h"
-
-#include <QCheckBox>
-#include <QColorDialog>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QLabel>
-#include <QLayout>
-#include <QPushButton>
-#include <QVBoxLayout>
-#include <QKeyEvent>
-#include <QIntValidator>
-
-#include "QtxAction.h"
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-#include "QtxColorButton.h"
-
-#include "LightApp_Application.h"
-
-namespace
-{
-  struct SelectorHelper
-  {
-  public:
-    SelectorHelper( SVTK_RenderWindowInteractor* theInteractor ):
-      myInteractor( theInteractor )
-    {}
-
-    bool
-    get()
-    {
-      bool aResult = false;
-      myMapIndex.Clear();
-      mySelector = NULL;
-      myPipeLine = NULL;
-      myActor = NULL;
-
-      if ( !myInteractor )
-        return aResult;
-      
-      mySelector = myInteractor->GetSelector();
-      if ( !mySelector )
-        return aResult;
-      
-      const SALOME_ListIO& aListIO = mySelector->StoredIObjects();
-      if ( aListIO.Extent() != 1 ) 
-        return aResult;
-      
-      myIO = aListIO.First();
-      if ( mySelector->HasIndex( myIO ) )
-        mySelector->GetIndex(myIO, myMapIndex);
-        
-      VTK::ActorCollectionCopy aCopy(myInteractor->getRenderer()->GetActors());
-      myActor = SVTK::Find<VISU_GaussPtsAct>(aCopy.GetActors(),
-                                             SVTK::TIsSameIObject<VISU_GaussPtsAct>( myIO ));
-      if ( !myActor )
-        return aResult;
-      
-      myPipeLine = myActor->GetGaussPointsPL();
-
-      return true;
-    }
-
-    SVTK_RenderWindowInteractor* myInteractor;
-    TColStd_IndexedMapOfInteger myMapIndex;
-    Handle(SALOME_InteractiveObject) myIO;
-    SVTK_Selector* mySelector;
-
-    VISU_GaussPointsPL* myPipeLine;
-    VISU_GaussPtsAct* myActor;
-  };
-
-
-  
-  class GaussPtsIDValidator: public QIntValidator
-  {
-  public:
-    GaussPtsIDValidator( SVTK_RenderWindowInteractor* theInteractor,
-                         QObject * theParent ):
-      QIntValidator( 0, VTK_LARGE_ID, theParent ),
-      myHelper(theInteractor)
-    {}
-
-    virtual 
-    State
-    validate ( QString & theInput, int & thePos ) const
-    {
-      if ( QIntValidator::validate( theInput, thePos ) == QValidator::Invalid)
-        return QValidator::Invalid;
-      
-      if ( !myHelper.get() )
-        return QValidator::Invalid;
-
-      return QValidator::Acceptable;
-    }
-
-  protected:
-    mutable SelectorHelper myHelper;
-  };
-
-
-  class GaussCellIDValidator: public GaussPtsIDValidator
-  {
-  public:
-    GaussCellIDValidator( QLineEdit* theLocalPointLabel,
-                          SVTK_RenderWindowInteractor* theInteractor,
-                          QObject * theParent ):
-      GaussPtsIDValidator( theInteractor, theParent ),
-      myLocalPointLineEdit( theLocalPointLabel )
-    {}
-
-    virtual 
-    State
-    validate ( QString & theInput, int & thePos ) const
-    {
-      if ( GaussPtsIDValidator::validate( theInput, thePos ) == QValidator::Invalid)
-        return QValidator::Invalid;
-
-      VISU::TCellID aCellID = theInput.toInt();
-      VISU::TLocalPntID aLocalPntID = myLocalPointLineEdit->text().toInt();
-      VISU::PGaussPtsIDMapper anIDMapper = myHelper.myPipeLine->GetGaussPtsIDMapper();
-      if ( anIDMapper->GetVTKID( VISU::TGaussPointID( aCellID, aLocalPntID ) ) < 0 )
-        return QValidator::Intermediate;
-
-      return QValidator::Acceptable;
-    }
-
-  private:
-    QLineEdit* myLocalPointLineEdit;
-  };
-
-
-  class GaussLocalPointIDValidator: public GaussPtsIDValidator
-  {
-  public:
-    GaussLocalPointIDValidator( QLineEdit* theParentElementLineEdit,
-                                SVTK_RenderWindowInteractor* theInteractor,
-                                QObject * theParent ):
-      GaussPtsIDValidator( theInteractor, theParent ),
-      myParentElementLineEdit( theParentElementLineEdit )
-    {}
-
-    virtual 
-    State
-    validate ( QString & theInput, int & thePos ) const
-    {
-      if ( GaussPtsIDValidator::validate( theInput, thePos ) == QValidator::Invalid)
-        return QValidator::Invalid;
-
-      VISU::TLocalPntID aLocalPntID = theInput.toInt();
-      VISU::TCellID aCellID = myParentElementLineEdit->text().toInt();
-      VISU::PGaussPtsIDMapper anIDMapper = myHelper.myPipeLine->GetGaussPtsIDMapper();
-      if ( anIDMapper->GetVTKID( VISU::TGaussPointID( aCellID, aLocalPntID ) ) < 0 )
-        return QValidator::Intermediate;
-
-      return QValidator::Acceptable;
-    }
-
-  private:
-    QLineEdit* myParentElementLineEdit;
-  };
-}
-
-
-VVTK_ValidatedLineEdit::VVTK_ValidatedLineEdit( QWidget* parent ):
-  QLineEdit( parent )
-{
-  connect( this, SIGNAL( textChanged( const QString& ) ), this, SLOT( MarkValidated( const QString& ) ) );
-}
-
-void VVTK_ValidatedLineEdit::MarkValidated( const QString& theText )
-{
-  if ( !validator() )
-    return;
-  
-  int aPos;
-  QString aText( theText );
-  QPalette pal = palette();
-  switch ( validator()->validate( aText, aPos ) ) {
-  case QValidator::Invalid:
-  case QValidator::Intermediate:
-    pal.setColor( foregroundRole(), QColor( 255, 0, 0 ));
-    setPalette( pal );
-    break;
-  case QValidator::Acceptable:
-    pal.setColor( foregroundRole(), QColor( 0, 0, 0 ));
-    setPalette( pal );
-    break;
-  }
-}
-
-//---------------------------------------------------------------------------------
-
-VVTK_PickingDlg::VVTK_PickingDlg(QtxAction* theAction,
-                                 SVTK_MainWindow* theParent,
-                                 const char* theName):
-  SVTK_DialogBase(theAction,
-                  theParent, 
-                  theName),
-  myEventCallbackCommand( vtkCallbackCommand::New() ),
-  myPickingSettings( VISU_PickingSettings::New() )
-{
-  myPriority = 0.0;
-  myEventCallbackCommand->Delete();
-  myEventCallbackCommand->SetClientData(this); 
-  myEventCallbackCommand->SetCallback(VVTK_PickingDlg::ProcessEvents);
-
-  setWindowTitle( tr( "PICKING_DLG_TITLE" ) );
-  setSizeGripEnabled(TRUE);
-
-  QVBoxLayout* TopLayout = new QVBoxLayout( this );
-  TopLayout->setSpacing(6);
-  TopLayout->setMargin(11);
-
-  QWidget* aBox = new QWidget( this );
-  QVBoxLayout* BoxLayout = new QVBoxLayout( aBox );
-  BoxLayout->setMargin(0);
-  BoxLayout->setSpacing(6);
-
-  // Cursor
-  QGroupBox* CursorGroup = new QGroupBox( tr( "CURSOR_TITLE" ), aBox );
-  //CursorGroup->setColumnLayout(0, Qt::Vertical );
-  //CursorGroup->layout()->setSpacing( 0 );
-  //CursorGroup->layout()->setMargin( 0 );
-
-  QGridLayout* CursorGroupLayout = new QGridLayout (CursorGroup);
-  CursorGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  CursorGroupLayout->setSpacing(6);
-  CursorGroupLayout->setMargin(11);
-
-  QLabel* CursorSizeLabel = new QLabel( tr( "CURSOR_SIZE" ), CursorGroup );
-  myCursorSizeSpinBox = new SalomeApp_DoubleSpinBox( CursorGroup );
-  VISU::initSpinBox( myCursorSizeSpinBox, 0, 1, 0.1, "parametric_precision" );
-  myCursorSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  QLabel* PyramidHeightLabel = new QLabel( tr( "PYRAMID_HEIGHT" ), CursorGroup );
-  double aHeightMin=1.e-7;
-  double aHeightMax=10.;
-  double aHeightStep=0.1;
-  myPyramidHeightSpinBox = new SalomeApp_DoubleSpinBox( CursorGroup );
-  VISU::initSpinBox( myPyramidHeightSpinBox, aHeightMin, aHeightMax, aHeightStep, "length_precision" );
-  myPyramidHeightSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  
-  QLabel* SelectionColorLabel = new QLabel( tr( "SELECTION_COLOR" ), CursorGroup );
-  mySelectionColorButton = new QtxColorButton( CursorGroup );
-  mySelectionColorButton->setColor( Qt::blue );
-  //QPalette aPalette( mySelectionColorButton->palette() );
-  //aPalette.setColor( mySelectionColorButton->backgroundRole(), Qt::blue );
-  //mySelectionColorButton->setPalette( aPalette );
-  //connect( mySelectionColorButton, SIGNAL( clicked() ), this, SLOT( onColorButtonPressed() ) );
-
-  CursorGroupLayout->addWidget( CursorSizeLabel, 0, 0 );
-  CursorGroupLayout->addWidget( myCursorSizeSpinBox, 0, 1 );
-  CursorGroupLayout->addWidget( PyramidHeightLabel, 1, 0 );
-  CursorGroupLayout->addWidget( myPyramidHeightSpinBox, 1, 1 );
-  CursorGroupLayout->addWidget( SelectionColorLabel, 2, 0 );
-  CursorGroupLayout->addWidget( mySelectionColorButton, 2, 1 );
-
-  BoxLayout->addWidget( CursorGroup );
-
-  // Tolerance
-  QGroupBox* ToleranceGroup = new QGroupBox( tr( "TOLERANCE_TITLE" ), aBox );
-  //ToleranceGroup->setColumnLayout(0, Qt::Vertical );
-  //ToleranceGroup->layout()->setSpacing( 0 );
-  //ToleranceGroup->layout()->setMargin( 0 );
-
-  QGridLayout* ToleranceGroupLayout = new QGridLayout (ToleranceGroup);
-  ToleranceGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  ToleranceGroupLayout->setSpacing(6);
-  ToleranceGroupLayout->setMargin(11);
-
-  QLabel* PointToleranceLabel = new QLabel( tr( "POINT_TOLERANCE" ), ToleranceGroup );
-  myPointToleranceSpinBox = new SalomeApp_DoubleSpinBox( ToleranceGroup );
-  VISU::initSpinBox( myPointToleranceSpinBox, 0.001, 10.0, 0.01, "len_tol_precision" ); 
-  myPointToleranceSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  ToleranceGroupLayout->addWidget( PointToleranceLabel, 0, 0 );
-  ToleranceGroupLayout->addWidget( myPointToleranceSpinBox, 0, 1 );
-
-  BoxLayout->addWidget( ToleranceGroup );
-
-  // Information window
-  QGroupBox* InfoWindowGroup = new QGroupBox( tr( "INFO_WINDOW_TITLE" ), aBox );
-  //InfoWindowGroup->setColumnLayout(0, Qt::Vertical );
-  //InfoWindowGroup->layout()->setSpacing( 0 );
-  //InfoWindowGroup->layout()->setMargin( 0 );
-
-  QGridLayout* InfoWindowGroupLayout = new QGridLayout (InfoWindowGroup);
-  InfoWindowGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  InfoWindowGroupLayout->setSpacing(6);
-  InfoWindowGroupLayout->setMargin(11);
-
-  QLabel* TransparencyLabel = new QLabel( tr( "TRANSPARENCY" ), InfoWindowGroup );
-  myTransparencySpinBox = new SalomeApp_IntSpinBox( InfoWindowGroup );
-  VISU::initSpinBox( myTransparencySpinBox, 0, 100, 10 );  
-  myTransparencySpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  InfoWindowGroupLayout->addWidget( TransparencyLabel, 0, 0 );
-  InfoWindowGroupLayout->addWidget( myTransparencySpinBox, 0, 1 );
-
-  QLabel* PositionLabel = new QLabel( tr( "POSITION" ), InfoWindowGroup );
-  myPositionComboBox = new QComboBox( InfoWindowGroup );
-  myPositionComboBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  myPositionComboBox->addItem( tr( "BELOW_POINT" ) );
-  myPositionComboBox->addItem( tr( "TOP_LEFT_CORNER" ) );
-
-  InfoWindowGroupLayout->addWidget( TransparencyLabel, 0, 0 );
-  InfoWindowGroupLayout->addWidget( myTransparencySpinBox, 0, 1 );
-  InfoWindowGroupLayout->addWidget( PositionLabel, 1, 0 );
-  InfoWindowGroupLayout->addWidget( myPositionComboBox, 1, 1 );
-
-  BoxLayout->addWidget( InfoWindowGroup );
-
-  // Movement of the camera
-  QGroupBox* CameraGroup = new QGroupBox( tr( "CAMERA_TITLE" ), aBox );
-  //CameraGroup->setColumnLayout(0, Qt::Vertical );
-  //CameraGroup->layout()->setSpacing( 0 );
-  //CameraGroup->layout()->setMargin( 0 );
-
-  QGridLayout* CameraGroupLayout = new QGridLayout (CameraGroup);
-  CameraGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  CameraGroupLayout->setSpacing(6);
-  CameraGroupLayout->setMargin(11);
-
-  QLabel* ZoomFactorLabel = new QLabel( tr( "ZOOM_FACTOR" ), CameraGroup );
-  myZoomFactorSpinBox = new SalomeApp_DoubleSpinBox( CameraGroup );
-  VISU::initSpinBox( myZoomFactorSpinBox, 0.1, 10.0, 0.1, "parametric_precision" );    
-  myZoomFactorSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  QLabel* StepNumberLabel = new QLabel( tr( "STEP_NUMBER" ), CameraGroup );
-  myStepNumberSpinBox = new SalomeApp_IntSpinBox( CameraGroup );
-  VISU::initSpinBox( myStepNumberSpinBox, 1, 100, 1 );      
-  myStepNumberSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  CameraGroupLayout->addWidget( ZoomFactorLabel, 0, 0 );
-  CameraGroupLayout->addWidget( myZoomFactorSpinBox, 0, 1 );
-  CameraGroupLayout->addWidget( StepNumberLabel, 1, 0 );
-  CameraGroupLayout->addWidget( myStepNumberSpinBox, 1, 1 );
-
-  BoxLayout->addWidget( CameraGroup );
-
-  // Display parent mesh element
-  QGroupBox* PositionGroup = new QGroupBox( tr( "DATA_POSITION" ), aBox );
-  //PositionGroup->setColumnLayout(0, Qt::Vertical );
-  //PositionGroup->layout()->setSpacing( 0 );
-  //PositionGroup->layout()->setMargin( 0 );
-
-  QGridLayout* PositionGroupLayout = new QGridLayout (PositionGroup);
-  PositionGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  PositionGroupLayout->setSpacing(6);
-  PositionGroupLayout->setMargin(11);
-
-  QLabel* ParentElementLabel = new QLabel( tr( "PARENT_ELEMENT" ), PositionGroup );
-
-  myParentElementLineEdit = new VVTK_ValidatedLineEdit( PositionGroup );
-
-  QLabel* LocalPointLabel = new QLabel( tr( "LOCAL_POINT" ), PositionGroup );
-
-  myLocalPointLineEdit = new VVTK_ValidatedLineEdit( PositionGroup );
-
-  myDisplayParentMeshCheckBox = new QCheckBox( tr( "DISPLAY_PARENT_MESH" ), PositionGroup );
-
-  PositionGroupLayout->addWidget( ParentElementLabel,          0, 0, 1, 3 );
-  PositionGroupLayout->addWidget( myParentElementLineEdit,     0, 3 );
-  PositionGroupLayout->addWidget( LocalPointLabel,             1, 0, 1, 3 );
-  PositionGroupLayout->addWidget( myLocalPointLineEdit,        1, 3 );
-  PositionGroupLayout->addWidget( myDisplayParentMeshCheckBox, 2, 0, 1, 4 );
-
-  BoxLayout->addWidget( PositionGroup );
-
-  // Common buttons ===========================================================
-  QGroupBox* GroupButtons = new QGroupBox( this );
-  //GroupButtons->setColumnLayout(0, Qt::Vertical );
-  //GroupButtons->layout()->setSpacing( 0 );
-  //GroupButtons->layout()->setMargin( 0 );
-  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons );
-  GroupButtonsLayout->setAlignment( Qt::AlignTop );
-  GroupButtonsLayout->setSpacing( 6 );
-  GroupButtonsLayout->setMargin( 11 );
-
-  QPushButton* buttonApply = new QPushButton( tr( "&Apply" ), GroupButtons );
-  buttonApply->setAutoDefault( TRUE );
-  buttonApply->setDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonApply, 0, 0 );
-  GroupButtonsLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
-
-  QPushButton* buttonClose = new QPushButton( tr( "&Close" ) , GroupButtons );
-  buttonClose->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonClose, 0, 2 );
-
-  QPushButton* buttonHelp = new QPushButton( tr( "&Help" ) , GroupButtons );
-  buttonHelp->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonHelp, 0, 3 );
-
-  TopLayout->addWidget( aBox );
-  TopLayout->addWidget( GroupButtons );
-
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( onClickApply() ) );
-  connect( buttonClose, SIGNAL( clicked() ), this, SLOT( onClickClose() ) );
-  connect( buttonHelp,  SIGNAL( clicked() ), this, SLOT( onClickHelp() ) );
-
-  connect( myParentElementLineEdit, SIGNAL( textChanged( const QString& ) ), this, SLOT( onSelectionValidate() ) );
-  connect( myLocalPointLineEdit,    SIGNAL( textChanged( const QString& ) ), this, SLOT( onSelectionValidate() ) );
-
-}
-
-VVTK_PickingDlg::~VVTK_PickingDlg()
-{
-}
-
-void VVTK_PickingDlg::AddActor( VISU_GaussPtsAct* theActor )
-{
-  //theActor->SetPickingSettings( myPickingSettings.GetPointer() );
-}
-
-void VVTK_PickingDlg::RemoveActor( VISU_GaussPtsAct* theActor )
-{
-  //theActor->SetPickingSettings( NULL );
-}
-
-void VVTK_PickingDlg::Update()
-{
-  float aCursorSize = 0.5;
-  float aPyramidHeight = 10.0;
-  float aPointTolerance = 0.1;
-  QColor aColor = Qt::yellow;
-  int anInfoWindowTransparency = 50;
-  int anInfoWindowPosition = VISU_PickingSettings::BelowPoint;
-  float aZoomFactor = 1.5;
-  int aStepNumber = 10;
-  bool aDisplayParentMesh = false;
-
-  //if( !myPickingSettings->GetInitial() )
-  {
-    myCursorSizeSpinBox->setValue( myPickingSettings->GetCursorSize() );
-    myPyramidHeightSpinBox->setValue( myPickingSettings->GetPyramidHeight() );
-    myPointToleranceSpinBox->setValue( myPickingSettings->GetPointTolerance() );
-    myTransparencySpinBox->setValue( int(myPickingSettings->GetInfoWindowTransparency() * 100.0) );
-    myPositionComboBox->setCurrentIndex( myPickingSettings->GetInfoWindowPosition() );
-    myZoomFactorSpinBox->setValue( myPickingSettings->GetZoomFactor() );
-    myStepNumberSpinBox->setValue( myPickingSettings->GetStepNumber() );
-    myDisplayParentMeshCheckBox->setChecked( myPickingSettings->GetDisplayParentMesh() );
-
-    vtkFloatingPointType* aColor = myPickingSettings->GetColor();
-   
-    //QPalette aPalette( mySelectionColorButton->palette() );
-    /*aPalette.setColor( mySelectionColorButton->backgroundRole(),
-                       QColor( ( int )( aColor[0] * 255.0 ),
-                               ( int )( aColor[1] * 255.0 ),
-                               ( int )( aColor[2] * 255.0 ) ) );
-                               mySelectionColorButton->setPalette( aPalette );*/
-    mySelectionColorButton->setColor(
-                 QColor( ( int )( aColor[0] * 255.0 ),
-                 ( int )( aColor[1] * 255.0 ),
-                 ( int )( aColor[2] * 255.0 ) ) );
-    
-    return;
-  }
-
-  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
-  aCursorSize = aResourceMgr->doubleValue( "VISU", "picking_cursor_size", aCursorSize );
-  myCursorSizeSpinBox->setValue( aCursorSize );
-
-  aPyramidHeight = aResourceMgr->doubleValue( "VISU", "picking_pyramid_height", aPyramidHeight );
-  myPyramidHeightSpinBox->setValue( aPyramidHeight );
-
-  aPointTolerance = aResourceMgr->doubleValue( "VISU", "picking_point_tolerance", aPointTolerance );
-  myPointToleranceSpinBox->setValue( aPointTolerance );
-
-  aColor = aResourceMgr->colorValue( "VISU", "picking_selection_color", aColor );
-  //QPalette aPalette( mySelectionColorButton->palette() );
-  //aPalette.setColor( mySelectionColorButton->backgroundRole(), aColor );
-  mySelectionColorButton->setColor( aColor );
-
-  anInfoWindowTransparency = aResourceMgr->integerValue( "VISU", "picking_transparency", anInfoWindowTransparency );
-  myTransparencySpinBox->setValue( anInfoWindowTransparency );
-
-  anInfoWindowPosition = aResourceMgr->integerValue( "VISU", "picking_position", anInfoWindowPosition );
-  myPositionComboBox->setCurrentIndex( anInfoWindowPosition );
-
-  aZoomFactor = aResourceMgr->doubleValue( "VISU", "picking_zoom_factor", aZoomFactor );
-  myZoomFactorSpinBox->setValue( aZoomFactor );
-
-  aStepNumber = aResourceMgr->integerValue( "VISU", "picking_step_number", aStepNumber );
-  myStepNumberSpinBox->setValue( aStepNumber );
-
-  aDisplayParentMesh = aResourceMgr->booleanValue( "VISU", "picking_display_parent_mesh", aDisplayParentMesh );
-  myDisplayParentMeshCheckBox->setChecked( aDisplayParentMesh );
-
-  onClickApply();
-}
-
-void VVTK_PickingDlg::onSelectionValidate() 
-{
-  myParentElementLineEdit->MarkValidated( myParentElementLineEdit->text() );
-  myLocalPointLineEdit->MarkValidated( myLocalPointLineEdit->text() );
-}
-
-void VVTK_PickingDlg::onSelectionEvent() 
-{
-  SelectorHelper aHelper( myInteractor );
-  if ( !aHelper.get() )
-    return;
-
-  const TColStd_IndexedMapOfInteger& aMapIndex = aHelper.myMapIndex;
-  if ( aMapIndex.Extent() != 1 )
-    return;
-
-  int anObjId = aHelper.myMapIndex(1);
-
-  VISU::TGaussPointID aGaussPointID = aHelper.myPipeLine->GetObjID( anObjId );
-
-  VISU::TCellID aCellID = aGaussPointID.first;
-  myParentElementLineEdit->setText( QString::number( aCellID ) );
-
-  VISU::TLocalPntID aLocalPntID = aGaussPointID.second;
-  myLocalPointLineEdit->setText( QString::number( aLocalPntID ) );
-}
-
-VISU_PickingSettings* 
-VVTK_PickingDlg
-::GetPickingSettings()
-{
-  return myPickingSettings.GetPointer();
-}
-
-void VVTK_PickingDlg::SetInteractor( SVTK_RenderWindowInteractor* theInteractor )
-{
-  myInteractor = theInteractor;
-
-  theInteractor->GetDevice()->AddObserver(vtkCommand::KeyPressEvent, 
-                                          myEventCallbackCommand.GetPointer(), 
-                                          myPriority);
-  theInteractor->GetDevice()->AddObserver(vtkCommand::EndPickEvent, 
-                                          myEventCallbackCommand.GetPointer(), 
-                                          myPriority);
-  {
-    QValidator* aValidator = new GaussCellIDValidator( myLocalPointLineEdit, theInteractor, myParentElementLineEdit );
-    myParentElementLineEdit->setValidator( aValidator );
-  }
-  {
-    QValidator* aValidator = new GaussLocalPointIDValidator( myParentElementLineEdit, theInteractor, myLocalPointLineEdit );
-    myLocalPointLineEdit->setValidator( aValidator );
-  }
-}
-
-void VVTK_PickingDlg::ProcessEvents(vtkObject* vtkNotUsed(theObject), 
-                                    unsigned long theEvent,
-                                    void* theClientData, 
-                                    void* vtkNotUsed(theCallData))
-{
-  VVTK_PickingDlg* self = reinterpret_cast<VVTK_PickingDlg*>(theClientData);
-
-  switch(theEvent){
-  case vtkCommand::KeyPressEvent:
-    self->KeyPressed();
-    break;
-  case vtkCommand::EndPickEvent:
-    self->onSelectionEvent();
-    break;
-  }
-}
-
-void VVTK_PickingDlg::KeyPressed()
-{
-  if( myInteractor->GetDevice()->GetKeyCode() == 'P' )
-  {
-    bool aDisplayParentMesh = !myPickingSettings->GetDisplayParentMesh();
-    myPickingSettings->SetDisplayParentMesh( aDisplayParentMesh );
-
-    myDisplayParentMeshCheckBox->setChecked( aDisplayParentMesh );
-
-    myPickingSettings->InvokeEvent(VISU::UpdatePickingSettingsEvent,NULL);
-  }
-}
-
-void VVTK_PickingDlg::onClickApply()
-{
-  //myPickingSettings->SetInitial( false );
-
-  myPickingSettings->SetCursorSize( myCursorSizeSpinBox->value() );
-  myPickingSettings->SetPyramidHeight( myPyramidHeightSpinBox->value() );
-  myPickingSettings->SetPointTolerance( myPointToleranceSpinBox->value() );
-  myPickingSettings->SetInfoWindowTransparency( myTransparencySpinBox->value() / 100.0 );
-  myPickingSettings->SetInfoWindowPosition( myPositionComboBox->currentIndex() );
-  myPickingSettings->SetZoomFactor( myZoomFactorSpinBox->value() );
-  myPickingSettings->SetStepNumber( myStepNumberSpinBox->value() );
-  myPickingSettings->SetDisplayParentMesh( myDisplayParentMeshCheckBox->isChecked() );
-
-  //QPalette aPalette( mySelectionColorButton->palette() );
-  QColor aButtonColor = mySelectionColorButton->color();//aPalette.color(mySelectionColorButton->backgroundRole() );
-  vtkFloatingPointType aColor[3];
-  aColor[0] = aButtonColor.red() / 255.0;
-  aColor[1] = aButtonColor.green() / 255.0;
-  aColor[2] = aButtonColor.blue() / 255.0;
-  myPickingSettings->SetColor( aColor );
-
-  myPickingSettings->InvokeEvent( VISU::UpdatePickingSettingsEvent,NULL );
-
-  SelectorHelper aHelper( myInteractor );
-  if ( !aHelper.get() )
-    return;
-
-  VISU::TCellID aCellID = myParentElementLineEdit->text().toInt();
-  VISU::TLocalPntID aLocalPntID = myLocalPointLineEdit->text().toInt();
-  VISU::PGaussPtsIDMapper anIDMapper = aHelper.myPipeLine->GetGaussPtsIDMapper();
-  vtkIdType anObjId = anIDMapper->GetVTKID( VISU::TGaussPointID( aCellID, aLocalPntID ) );
-  if ( anObjId < 0 )
-    return;
-
-  aHelper.myMapIndex.Clear();
-  aHelper.myMapIndex.Add( anObjId );
-  aHelper.mySelector->AddOrRemoveIndex( aHelper.myIO, aHelper.myMapIndex, false );
-  aHelper.myActor->Highlight( aHelper.myIO );
-  myInteractor->GetDevice()->CreateTimer( VTKI_TIMER_FIRST );
-}
-
-void VVTK_PickingDlg::onClickClose()
-{
-  reject();
-}
-
-void VVTK_PickingDlg::onClickHelp()
-{
-  QString aHelpFileName = "picking.htm";
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
-  else {
-                QString platform;
-#ifdef WIN32
-                platform = "winapplication";
-#else
-                platform = "application";
-#endif
-        SUIT_MessageBox::warning( 0,
-                                  QObject::tr("WRN_WARNING"),
-                                  QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                                    arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName),
-                                  QObject::tr("BUT_OK"));
-  }
-}
-
-/*void VVTK_PickingDlg::onColorButtonPressed()
-{
-  QPalette aPalette( mySelectionColorButton->palette() );
-  QColor aColor = QColorDialog::
-    getColor( aPalette.color(mySelectionColorButton->backgroundRole() ), this );
-
-  if( aColor.isValid() )
-  {
-      aPalette.setColor( mySelectionColorButton->backgroundRole(),
-                     aColor );
-      mySelectionColorButton->setPalette( aPalette );
-  }
-}*/
-
-void VVTK_PickingDlg::keyPressEvent( QKeyEvent* e )
-{
-  QDialog::keyPressEvent( e );
-  if ( e->isAccepted() )
-    return;
-
-  if ( e->key() == Qt::Key_F1 )
-    {
-      e->accept();
-      onClickHelp();
-    }
-}
diff --git a/src/VVTK/VVTK_PickingDlg.h b/src/VVTK/VVTK_PickingDlg.h
deleted file mode 100644
index cd77197b..00000000
--- a/src/VVTK/VVTK_PickingDlg.h
+++ /dev/null
@@ -1,140 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VVTK_PickingDlg.h
-//  Author : Oleg Uvarov
-//  Module : VISU
-//
-#ifndef VVTK_PICKINGDLG_H
-#define VVTK_PICKINGDLG_H
-
-#include "SVTK_DialogBase.h"
-
-#include <vtkObject.h>
-#include <vtkSmartPointer.h>
-
-#include <QLineEdit>
-
-class vtkActorCollection;
-class vtkCallbackCommand;
-class vtkImageData;
-
-class QLabel;
-class QComboBox;
-class QCheckBox;
-class QPushButton;
-
-class QtxAction;
-class SalomeApp_DoubleSpinBox;
-class SalomeApp_IntSpinBox;
-class QtxColorButton;
-
-class VISU_GaussPtsAct;
-class VISU_PickingSettings;
-
-class SVTK_MainWindow;
-class SVTK_RenderWindowInteractor;
-class VVTK_ValidatedLineEdit;
-
-//! Picking Dialog.
-/*!
- * Uses for set up picking preferenses and apply
- * them to all actors in the current renderer.
- */
-class VVTK_PickingDlg : public SVTK_DialogBase
-{
-  Q_OBJECT
-
-public:
-  VVTK_PickingDlg(QtxAction* theAction,
-                  SVTK_MainWindow* theParent,
-                  const char* theName);
-
-  ~VVTK_PickingDlg();
-
-  //! Make an actor to listen the event of Update Picking Settings event.
-  void             AddActor( VISU_GaussPtsAct* );
-  void             RemoveActor( VISU_GaussPtsAct* );
-
-  //! Update dialog contents.
-  void             Update();
-
-  VISU_PickingSettings* GetPickingSettings();
-
-  void             SetInteractor( SVTK_RenderWindowInteractor* );
-
-protected slots:
-  void             onSelectionEvent();
-  void             onClickApply();
-  void             onClickClose();
-  void             onClickHelp();
-
-  //void             onColorButtonPressed();
-  void             onSelectionValidate();
-
-private:
-  static void      ProcessEvents(vtkObject* theObject, 
-                                 unsigned long theEvent,
-                                 void* theClientData, 
-                                 void* theCallData);
-
-  void             KeyPressed();
-  void             keyPressEvent( QKeyEvent* e );
-
-private:
-  SalomeApp_DoubleSpinBox* myCursorSizeSpinBox;
-  SalomeApp_DoubleSpinBox* myPyramidHeightSpinBox;
-  QtxColorButton*   mySelectionColorButton;
-  SalomeApp_DoubleSpinBox* myPointToleranceSpinBox;
-  SalomeApp_IntSpinBox*    myTransparencySpinBox;
-  QComboBox*        myPositionComboBox;
-  SalomeApp_DoubleSpinBox* myZoomFactorSpinBox;
-  SalomeApp_IntSpinBox*    myStepNumberSpinBox;
-  QCheckBox*        myDisplayParentMeshCheckBox;
-
-  QtxAction*        myAction;
-  vtkSmartPointer<VISU_PickingSettings> 
-                    myPickingSettings;
-
-  VVTK_ValidatedLineEdit*      
-                    myParentElementLineEdit;
-  VVTK_ValidatedLineEdit*     
-                    myLocalPointLineEdit;
-
-  SVTK_RenderWindowInteractor* 
-                    myInteractor;
-
-  float             myPriority;
-  vtkSmartPointer<vtkCallbackCommand> 
-                    myEventCallbackCommand;
-};
-
-class VVTK_ValidatedLineEdit : public QLineEdit
-{
-  Q_OBJECT;
-public:
-  VVTK_ValidatedLineEdit( QWidget* parent );
-  
-public slots:
-  void MarkValidated( const QString& theText );
-};
-
-#endif
diff --git a/src/VVTK/VVTK_PrimitiveBox.cxx b/src/VVTK/VVTK_PrimitiveBox.cxx
deleted file mode 100644
index c51539b3..00000000
--- a/src/VVTK/VVTK_PrimitiveBox.cxx
+++ /dev/null
@@ -1,377 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_PrimitiveBox.cxx
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#include "VVTK_PrimitiveBox.h"
-#include <VisuGUI_GUITools.h>
-
-#include "VISU_OpenGLPointSpriteMapper.hxx"
-
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-
-#include <QLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QButtonGroup>
-#include <QRadioButton>
-#include <QPushButton>
-#include <QFileDialog>
-
-#include <iostream>
-
-using namespace std;
-
-VVTK_PrimitiveBox::VVTK_PrimitiveBox( QWidget* parent ) :
-  QGroupBox( parent )
-{
-  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
-  setTitle( tr( "PRIMITIVE_TITLE" ) );
-  //setColumnLayout(0, Qt::Vertical );
-  //layout()->setSpacing( 0 );
-  //layout()->setMargin( 0 );
-
-  QGridLayout* aLayout = new QGridLayout( this );
-  aLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  aLayout->setSpacing(6);
-  aLayout->setMargin(11);
-
-  myPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
-
-  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
-  myMainTexture = aRootDir + "sprite_texture.bmp";
-  myAlphaTexture = aRootDir + "sprite_alpha.bmp";
-
-  // Primitive Type
-  QGroupBox* aPrimitiveTypeGroup = new QGroupBox( this );
-  aPrimitiveTypeGroup->setMinimumWidth( 450 );
-  QHBoxLayout* aPrimLayout = new QHBoxLayout( aPrimitiveTypeGroup );
-  aPrimLayout->setMargin( 0 );
-
-  //QButtonGroup* aPrimitiveTypeGroup = new QButtonGroup( 3, Qt::Horizontal, this, "PrimitiveTypeGroup" );
-  //aPrimitiveTypeGroup->setMinimumWidth( 450 );
-  //aPrimitiveTypeGroup->setRadioButtonExclusive( true );
-  //aPrimitiveTypeGroup->setFrameStyle( QFrame::NoFrame );
-  //aPrimitiveTypeGroup->layout()->setMargin( 0 );
-
-  myPointSpriteButton = new QRadioButton( tr( "POINT_SPRITE" ), aPrimitiveTypeGroup );
-  myOpenGLPointButton = new QRadioButton( tr( "OPENGL_POINT" ), aPrimitiveTypeGroup );
-  myGeomSphereButton = new QRadioButton( tr( "GEOMETRICAL_SPHERE" ), aPrimitiveTypeGroup );
-
-  aPrimLayout->addWidget( myPointSpriteButton );
-  aPrimLayout->addWidget( myOpenGLPointButton );
-  aPrimLayout->addWidget( myGeomSphereButton );
-
-  aLayout->addWidget( aPrimitiveTypeGroup, 0, 0, 1, 2 );
-
-  // Clamp ( Point Sprite & OpenGL Point )
-  myClampLabel = new QLabel( tr( "CLAMP" ), this );
-  myClampSpinBox = new SalomeApp_DoubleSpinBox( this );
-  VISU::initSpinBox( myClampSpinBox, 1.0, 512.0, 1.0, "parametric_precision" );
-  myClampSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  aLayout->addWidget( myClampLabel, 1, 0 );
-  aLayout->addWidget( myClampSpinBox, 1, 1, 1, 2 );
-
-  // Main Texture ( Point Sprite )
-  myMainTextureLabel = new QLabel( tr( "MAIN_TEXTURE" ), this );
-  myMainTextureLineEdit = new QLineEdit( this );
-  myMainTextureButton = new QPushButton( this );
-  myMainTextureButton->setAutoDefault( false );
-  myMainTextureButton->setIcon( aResourceMgr->loadPixmap( "VISU", tr( "ICON_LOAD_TEXTURE" ) ) );
-  connect( myMainTextureButton, SIGNAL( clicked() ), this, SLOT( onBrowseMainTexture() ) );
-
-  aLayout->addWidget( myMainTextureLabel, 2, 0 );
-  aLayout->addWidget( myMainTextureLineEdit, 2, 1 );
-  aLayout->addWidget( myMainTextureButton, 2, 2 );
-
-  // Alpha Texture ( Point Sprite )
-  myAlphaTextureLabel = new QLabel( tr( "ALPHA_TEXTURE" ), this );
-  myAlphaTextureLineEdit = new QLineEdit( this );
-  myAlphaTextureButton = new QPushButton( this );
-  myAlphaTextureButton->setAutoDefault( false );
-  myAlphaTextureButton->setIcon( aResourceMgr->loadPixmap( "VISU", tr( "ICON_LOAD_TEXTURE" ) ) );
-  connect( myAlphaTextureButton, SIGNAL( clicked() ), this, SLOT( onBrowseAlphaTexture() ) );
-
-  aLayout->addWidget( myAlphaTextureLabel, 3, 0 );
-  aLayout->addWidget( myAlphaTextureLineEdit, 3, 1 );
-  aLayout->addWidget( myAlphaTextureButton, 3, 2 );
-
-  // Alpha Threshold ( Point Sprite )
-  myAlphaThresholdLabel = new QLabel( tr( "ALPHA_THRESHOLD" ), this );
-  myAlphaThresholdSpinBox = new SalomeApp_DoubleSpinBox( this );
-  VISU::initSpinBox( myAlphaThresholdSpinBox,  0.0, 1.0, 0.1, "parametric_precision" );  
-  myAlphaThresholdSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  aLayout->addWidget( myAlphaThresholdLabel, 4, 0 );
-  aLayout->addWidget( myAlphaThresholdSpinBox, 4, 1, 1, 2 );
-
-  // Resolution ( Geometrical Sphere )
-  myResolutionLabel = new QLabel( tr( "RESOLUTION" ), this );
-  myResolutionSpinBox = new SalomeApp_IntSpinBox( this );
-  VISU::initSpinBox( myResolutionSpinBox, 3, 100, 1 );    
-  myResolutionSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  connect( myResolutionSpinBox, SIGNAL( valueChanged( int ) ), this, SLOT( onResolutionChanged( int ) ) );
-
-  aLayout->addWidget( myResolutionLabel, 5, 0 );
-  aLayout->addWidget( myResolutionSpinBox, 5, 1, 1, 2 );
-
-  // Number of faces ( Geometrical Sphere )
-  myFaceNumberLabel = new QLabel( tr( "FACE_NUMBER" ), this );
-  myFaceNumberLineEdit = new QLineEdit( this );
-  myFaceNumberLineEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myFaceNumberLineEdit->setEnabled( false );
-  //myFaceNumberLineEdit->setReadOnly( true );
-
-  aLayout->addWidget( myFaceNumberLabel, 6, 0 );
-  aLayout->addWidget( myFaceNumberLineEdit, 6, 1, 1, 2 );
-
-  // Notification ( Geometrical Sphere )
-  myFaceLimitLabel = new QLabel( tr( "FACE_LIMIT" ), this );
-  myFaceLimitSpinBox = new SalomeApp_IntSpinBox( this );
-  VISU::initSpinBox( myFaceLimitSpinBox, 10, 1000000, 10 );      
-  myFaceLimitSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  aLayout->addWidget( myFaceLimitLabel, 7, 0 );
-  aLayout->addWidget( myFaceLimitSpinBox, 7, 1, 1, 2 );
-
-  connect( myPointSpriteButton, SIGNAL( clicked() ), this, SLOT( onTogglePointSprite() ) );
-  connect( myOpenGLPointButton, SIGNAL( clicked() ), this, SLOT( onToggleOpenGLPoint() ) );
-  connect( myGeomSphereButton,  SIGNAL( clicked() ), this, SLOT( onToggleGeomSphere() ) );
-}
-
-void VVTK_PrimitiveBox::onTogglePointSprite()
-{
-  myPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
-
-  myClampLabel->show();
-  myClampSpinBox->show();
-
-  myMainTextureLabel->show();
-  myMainTextureLineEdit->show();
-  myMainTextureButton->show();
-
-  myAlphaTextureLabel->show();
-  myAlphaTextureLineEdit->show();
-  myAlphaTextureButton->show();
-
-  myAlphaThresholdLabel->show();
-  myAlphaThresholdSpinBox->show();
-
-  myResolutionLabel->hide();
-  myResolutionSpinBox->hide();
-
-  myFaceNumberLabel->hide();
-  myFaceNumberLineEdit->hide();
-
-  myFaceLimitLabel->hide();
-  myFaceLimitSpinBox->hide();
-}
-
-void VVTK_PrimitiveBox::onToggleOpenGLPoint()
-{
-  myPrimitiveType = VISU_OpenGLPointSpriteMapper::OpenGLPoint;
-
-  myClampLabel->show();
-  myClampSpinBox->show();
-
-  myMainTextureLabel->hide();
-  myMainTextureLineEdit->hide();
-  myMainTextureButton->hide();
-
-  myAlphaTextureLabel->hide();
-  myAlphaTextureLineEdit->hide();
-  myAlphaTextureButton->hide();
-
-  myAlphaThresholdLabel->hide();
-  myAlphaThresholdSpinBox->hide();
-
-  myResolutionLabel->hide();
-  myResolutionSpinBox->hide();
-
-  myFaceNumberLabel->hide();
-  myFaceNumberLineEdit->hide();
-
-  myFaceLimitLabel->hide();
-  myFaceLimitSpinBox->hide();
-}
-
-void VVTK_PrimitiveBox::onToggleGeomSphere()
-{
-  myPrimitiveType = VISU_OpenGLPointSpriteMapper::GeomSphere;
-
-  myClampLabel->hide();
-  myClampSpinBox->hide();
-
-  myMainTextureLabel->hide();
-  myMainTextureLineEdit->hide();
-  myMainTextureButton->hide();
-
-  myAlphaTextureLabel->hide();
-  myAlphaTextureLineEdit->hide();
-  myAlphaTextureButton->hide();
-
-  myAlphaThresholdLabel->hide();
-  myAlphaThresholdSpinBox->hide();
-
-  myResolutionLabel->show();
-  myResolutionSpinBox->show();
-
-  myFaceNumberLabel->show();
-  myFaceNumberLineEdit->show();
-
-  myFaceLimitLabel->show();
-  myFaceLimitSpinBox->show();
-}
-
-void VVTK_PrimitiveBox::onResolutionChanged( int theResolution )
-{
-  setFaceNumber( 2 * theResolution * ( theResolution - 2 ) );
-}
-
-void VVTK_PrimitiveBox::setPrimitiveType( int theType )
-{
-  myPrimitiveType = theType;
-
-  switch( myPrimitiveType )
-  {
-    case VISU_OpenGLPointSpriteMapper::PointSprite :
-      myPointSpriteButton->setChecked( true );
-      onTogglePointSprite();
-      break;
-    case VISU_OpenGLPointSpriteMapper::OpenGLPoint :
-      myOpenGLPointButton->setChecked( true );
-      onToggleOpenGLPoint();
-      break;
-    case VISU_OpenGLPointSpriteMapper::GeomSphere :
-      myGeomSphereButton->setChecked( true );
-      onToggleGeomSphere();
-      break;
-    default : break;
-  }
-}
-
-float VVTK_PrimitiveBox::getClamp() const
-{
-  return myClampSpinBox->value();
-}
-
-void VVTK_PrimitiveBox::setClamp( float theClamp )
-{
-  myClampSpinBox->setValue( theClamp );
-}
-
-void VVTK_PrimitiveBox::setClampMaximum( float theClampMaximum )
-{
-  myClampSpinBox->setMaximum( theClampMaximum );
-}
-
-void VVTK_PrimitiveBox::setMainTexture( const QString& theMainTexture )
-{
-  myMainTexture = theMainTexture;
-  myMainTextureLineEdit->setText( theMainTexture.section( '/', -1 ) );
-}
-
-void VVTK_PrimitiveBox::setAlphaTexture( const QString& theAlphaTexture )
-{
-  myAlphaTexture = theAlphaTexture;
-  myAlphaTextureLineEdit->setText( theAlphaTexture.section( '/', -1 ) );
-}
-
-float VVTK_PrimitiveBox::getAlphaThreshold() const
-{
-  return myAlphaThresholdSpinBox->value();
-}
-
-void VVTK_PrimitiveBox::setAlphaThreshold( float theAlphaThreshold )
-{
-  myAlphaThresholdSpinBox->setValue( theAlphaThreshold );
-}
-
-int VVTK_PrimitiveBox::getResolution() const
-{
-  return myResolutionSpinBox->value();
-}
-
-void VVTK_PrimitiveBox::setResolution( int theResolution )
-{
-  myResolutionSpinBox->setValue( theResolution );
-}
-
-int VVTK_PrimitiveBox::getFaceNumber() const
-{
-  int aResolution = getResolution();
-  return 2 * aResolution * ( aResolution - 2 );
-  //return myFaceNumberLineEdit->text().toInt();
-}
-
-void VVTK_PrimitiveBox::setFaceNumber( int theFaceNumber )
-{
-  myFaceNumberLineEdit->setText( QString::number( theFaceNumber ) );
-}
-
-int VVTK_PrimitiveBox::getFaceLimit() const
-{
-  return myFaceLimitSpinBox->value();
-}
-
-void VVTK_PrimitiveBox::setFaceLimit( int theFaceLimit )
-{
-  myFaceLimitSpinBox->setValue( theFaceLimit );
-}
-
-void VVTK_PrimitiveBox::onBrowseMainTexture()
-{
-  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
-  QString aFileName = QFileDialog::getOpenFileName( this,
-                                                    0,
-                                                    aRootDir,
-                                                    "Bitmap (*.bmp *.jpg *.png)" );
-
-  if( aFileName.isNull() )
-    return;
-
-  myMainTexture = aFileName;
-  myMainTextureLineEdit->setText( aFileName.section( '/', -1 ) );
-}
-
-void VVTK_PrimitiveBox::onBrowseAlphaTexture()
-{
-  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/";
-  QString aFileName = QFileDialog::getOpenFileName( this,
-                                                    0,
-                                                    aRootDir,
-                                                    "Bitmap (*.bmp *.jpg *.png)" );
-
-  if( aFileName.isNull() )
-    return;
-
-  myAlphaTexture = aFileName;
-  myAlphaTextureLineEdit->setText( aFileName.section( '/', -1 ) );
-}
diff --git a/src/VVTK/VVTK_PrimitiveBox.h b/src/VVTK/VVTK_PrimitiveBox.h
deleted file mode 100644
index ed4ff5a0..00000000
--- a/src/VVTK/VVTK_PrimitiveBox.h
+++ /dev/null
@@ -1,122 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_PrimitiveBox.h
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#ifndef VVTK_PRIMITIVEBOX_H
-#define VVTK_PRIMITIVEBOX_H
-
-#include "VVTK.h"
-
-#include <QGroupBox>
-
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QRadioButton;
-
-class SalomeApp_DoubleSpinBox;
-class SalomeApp_IntSpinBox;
-
-class VVTK_EXPORT VVTK_PrimitiveBox : public QGroupBox
-{
-  Q_OBJECT
-
-public:
-  VVTK_PrimitiveBox( QWidget* );
-  ~VVTK_PrimitiveBox() {}
-
-public:
-  int                      getPrimitiveType() const { return myPrimitiveType; }
-  void                     setPrimitiveType( int );
-
-  float                    getClamp() const;
-  void                     setClamp( float );
-  void                     setClampMaximum( float );
-
-  QString                  getMainTexture() const { return myMainTexture; }
-  void                     setMainTexture( const QString& );
-
-  QString                  getAlphaTexture() const { return myAlphaTexture; }
-  void                     setAlphaTexture( const QString& );
-
-  float                    getAlphaThreshold() const;
-  void                     setAlphaThreshold( float );
-
-  int                      getResolution() const;
-  void                     setResolution( int );
-
-  int                      getFaceNumber() const;
-  void                     setFaceNumber( int );
-
-  int                      getFaceLimit() const;
-  void                     setFaceLimit( int );
-
-protected slots:
-  void                     onTogglePointSprite();
-  void                     onToggleOpenGLPoint();
-  void                     onToggleGeomSphere();
-
-  void                     onBrowseMainTexture();
-  void                     onBrowseAlphaTexture();
-
-  void                     onResolutionChanged( int );
-
-private:
-  int                      myPrimitiveType;
-
-  QRadioButton*            myPointSpriteButton;
-  QRadioButton*            myOpenGLPointButton;
-  QRadioButton*            myGeomSphereButton;
-
-  QString                  myMainTexture;
-  QString                  myAlphaTexture;
-
-  QLabel*                  myClampLabel;
-  SalomeApp_DoubleSpinBox* myClampSpinBox;
-
-  QLabel*                  myMainTextureLabel;
-  QLineEdit*               myMainTextureLineEdit;
-  QPushButton*             myMainTextureButton;
-
-  QLabel*                  myAlphaTextureLabel;
-  QLineEdit*               myAlphaTextureLineEdit;
-  QPushButton*             myAlphaTextureButton;
-
-  QLabel*                  myAlphaThresholdLabel;
-  SalomeApp_DoubleSpinBox* myAlphaThresholdSpinBox;
-
-  QLabel*                  myResolutionLabel;
-  SalomeApp_IntSpinBox*    myResolutionSpinBox;
-
-  QLabel*                  myFaceNumberLabel;
-  QLineEdit*               myFaceNumberLineEdit;
-
-  QLabel*                  myFaceLimitLabel;
-  SalomeApp_IntSpinBox*    myFaceLimitSpinBox;
-};
-
-
-
-#endif
diff --git a/src/VVTK/VVTK_Recorder.cxx b/src/VVTK/VVTK_Recorder.cxx
deleted file mode 100755
index 9ef0f6dc..00000000
--- a/src/VVTK/VVTK_Recorder.cxx
+++ /dev/null
@@ -1,490 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#include "VVTK_Recorder.h"
-
-#include "VVTK_ImageWriter.h"
-#include "VVTK_ImageWriterMgr.h"
-
-#include <vtkObjectFactory.h>
-#include <vtkObject.h>
-#include <vtkCallbackCommand.h>
-#include <vtkRenderWindow.h>
-#include <vtkTimerLog.h>
-#include <vtkWindowToImageFilter.h>
-#include <vtkJPEGWriter.h>
-#include <vtkImageData.h>
-
-#include <sstream>
-#include <iomanip>
-#include <iostream>
-
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include <QApplication>
-#include <QFileInfo>
-#include <QDir>
-
-#include "utilities.h"
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
-
-namespace
-{
-  //----------------------------------------------------------------------------
-  inline
-  void
-  GetNameJPEG(const std::string& thePreffix,  
-              const int theIndex,
-              std::string& theName)
-  {
-    using namespace std;
-    ostringstream aStream;
-    aStream<<thePreffix<<"_"<<setw(6)<<setfill('0')<<theIndex<<".jpeg";
-    theName = aStream.str();
-  }
-}
-
-//----------------------------------------------------------------------------
-vtkCxxRevisionMacro(VVTK_Recorder,"$Revision$");
-vtkStandardNewMacro(VVTK_Recorder);
-
-
-//----------------------------------------------------------------------------
-VVTK_Recorder
-::VVTK_Recorder():
-  myRenderWindow(NULL),
-  myState(VVTK_Recorder_Stop),
-  myNbFPS(5.5),
-  myQuality(100),
-  myProgressiveMode(true),
-  myUseSkippedFrames(true),
-  myErrorStatus(0),
-  myCommand(vtkCallbackCommand::New()),
-  myPriority(0.0),
-  myTimeStart(0.0),
-  myFrameIndex(0),
-  myPaused(0),
-  myFilter(vtkWindowToImageFilter::New()),
-  myWriterMgr(new VVTK_ImageWriterMgr),
-  myNbWrittenFrames(0),
-  myNameAVIMaker("jpeg2yuv")
-{
-  myCommand->SetClientData(this); 
-  myCommand->SetCallback(VVTK_Recorder::ProcessEvents);
-}
-
-
-//----------------------------------------------------------------------------
-VVTK_Recorder
-::~VVTK_Recorder()
-{
-  myCommand->Delete();
-  myFilter->Delete();
-  delete myWriterMgr;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::CheckExistAVIMaker()
-{
-  myErrorStatus = 0;
-  using namespace std;
-  ostringstream aStream;
-  aStream<<"which "<<myNameAVIMaker<<" >& /dev/null";
-  std::string anAVIMakeCheck = aStream.str();
-  int iErr = system(anAVIMakeCheck.c_str());
-  if(iErr != 0)
-    myErrorStatus = 127;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::SetName(const char* theName)
-{
-  myName = theName;
-}
-
-const char* 
-VVTK_Recorder::Name() const
-{
-  return myName.c_str();
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::SetNbFPS(const double theNbFPS)
-{
-  myNbFPS = theNbFPS;
-}
-
-double
-VVTK_Recorder
-::NbFPS() const
-{
-  return myNbFPS;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::SetQuality(int theQuality)
-{
-  myQuality = theQuality;
-}
-
-int
-VVTK_Recorder
-::GetQuality() const
-{
-  return myQuality;
-}
-
-
-//----------------------------------------------------------------------------
-void 
-VVTK_Recorder
-::SetRenderWindow(vtkRenderWindow* theRenderWindow)
-{
-  myRenderWindow = theRenderWindow;
-}
-
-vtkRenderWindow* 
-VVTK_Recorder
-::RenderWindow()
-{
-  return myRenderWindow;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::SetProgressiveMode(bool theProgressiveMode)
-{
-  myProgressiveMode = theProgressiveMode;
-}
-
-bool
-VVTK_Recorder
-::GetProgressiveMode() const
-{
-  return myProgressiveMode;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::SetUseSkippedFrames(bool theUseSkippedFrames)
-{
-  myUseSkippedFrames = theUseSkippedFrames;
-}
-
-bool
-VVTK_Recorder
-::UseSkippedFrames() const
-{
-  return myUseSkippedFrames;
-}
-
-
-//----------------------------------------------------------------------------
-int
-VVTK_Recorder
-::ErrorStatus() const
-{
-  return myErrorStatus;
-}
-
-int
-VVTK_Recorder
-::State() const
-{
-  return myState;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::ProcessEvents(vtkObject* vtkNotUsed(theObject), 
-                unsigned long theEvent,
-                void* theClientData, 
-                void* vtkNotUsed(theCallData))
-{
-  if(vtkObject* anObj = reinterpret_cast<vtkObject*>(theClientData)){ 
-    if(VVTK_Recorder* aSelf = dynamic_cast<VVTK_Recorder*>(anObj)){
-      if(theEvent==vtkCommand::EndEvent){
-        if(aSelf->State() == VVTK_Recorder::VVTK_Recorder_Record){
-          aSelf->DoRecord();
-        }
-      }
-    }
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::Record()
-{
-  if(myState == VVTK_Recorder_Stop){
-    if(myRenderWindow){
-      myState = VVTK_Recorder_Record;
-      myFilter->SetInput(myRenderWindow);
-      myFrameIndex = -1;
-      myNbWrittenFrames = 0;
-      myRenderWindow->RemoveObserver(myCommand);
-      myRenderWindow->AddObserver(vtkCommand::EndEvent,
-                                  myCommand,
-                                  myPriority);
-      myRenderWindow->Render();
-    }
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::Stop()
-{
-  QApplication::setOverrideCursor( Qt::WaitCursor );
-
-  if(myState == VVTK_Recorder_Record){ 
-    if(!myPaused)
-      DoRecord();
-
-    myWriterMgr->Stop();
-
-    if(myUseSkippedFrames)
-      AddSkippedFrames();
-
-    myFrameIndexes.clear();
-
-    MakeFileAVI();
-  }
-  myState = VVTK_Recorder_Stop;
-  myPaused = 0;
-
-  QApplication::restoreOverrideCursor();
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::Pause()
-{
-  myPaused = myPaused ? 0 : 1;
-  if(myPaused && !myFrameIndexes.empty()){
-    myFrameIndexes.back() *= -1;
-    if(MYDEBUG) MESSAGE("VVTK_Recorder::Pause - myFrameIndexes.back() = "<<myFrameIndexes.back());
-  }
-}
-
-
-//----------------------------------------------------------------------------
-inline 
-int
-GetFrameIndex(double theStartTime,
-              double theFPS)
-{
-  double aTimeNow = vtkTimerLog::GetCurrentTime();
-  double aDelta = aTimeNow - theStartTime;
-  return int(aDelta*theFPS);
-}
-
-void
-VVTK_Recorder
-::DoRecord()
-{
-  if(myPaused)
-    return;
-
-  if(myFrameIndex < 0){
-    myFrameIndex = 0;
-    myTimeStart = vtkTimerLog::GetCurrentTime();
-  }else{
-    int aFrameIndex = GetFrameIndex(myTimeStart,myNbFPS);
-    if(aFrameIndex <= myFrameIndex)
-      return;
-
-    // If there was a "pause" we correct the myTimeStart
-    int aLastFrameIndex = myFrameIndexes.back();
-    if(aLastFrameIndex < 0){
-      myFrameIndexes.back() = abs(myFrameIndexes.back());
-      double aPauseTime = fabs((double)(aFrameIndex - myFrameIndex - 1)) / myNbFPS;
-      if(MYDEBUG) 
-        MESSAGE("VVTK_Recorder::DoRecord - aFrameIndex = "<<aFrameIndex<<
-          "; aPauseTime = "<<aPauseTime);
-      myTimeStart += aPauseTime;
-    }
-
-    aFrameIndex = GetFrameIndex(myTimeStart,myNbFPS);
-    if(aFrameIndex <= myFrameIndex)
-      return;
-
-    myFrameIndex = aFrameIndex;
-  }
-
-  myFrameIndexes.push_back(myFrameIndex);
-  if(MYDEBUG) MESSAGE("VVTK_Recorder::DoRecord - myFrameIndex = "<<myFrameIndex);
-
-  myRenderWindow->RemoveObserver(myCommand);
-  myFilter->Modified();
-
-  std::string aName;
-  GetNameJPEG(myName,myFrameIndex,aName);
-
-  PreWrite();
-
-  vtkImageData *anImageData = vtkImageData::New(); 
-  anImageData->DeepCopy(myFilter->GetOutput());
-
-  myWriterMgr->StartImageWriter(anImageData,aName,myProgressiveMode,myQuality);
-  myNbWrittenFrames++;
-
-  myRenderWindow->AddObserver(vtkCommand::EndEvent,
-                              myCommand,
-                              myPriority);
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::PreWrite()
-{
-  vtkImageData *anImageData = myFilter->GetOutput();
-  //
-  if(!anImageData){
-    myErrorStatus = 20;
-    return;
-  }
-  anImageData->UpdateInformation();
-  int *anExtent = anImageData->GetWholeExtent();
-  anImageData->SetUpdateExtent(anExtent[0], anExtent[1],
-                               anExtent[2], anExtent[3],
-                               0,0);
-  anImageData->UpdateData();
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::AddSkippedFrames()
-{
-  myErrorStatus = 0;
-
-  if(myFrameIndexes.size() < 2)
-    return;
-
-  size_t anId = 0, anEnd = myFrameIndexes.size() - 1;
-  for(; anId < anEnd; anId++){
-    int aStartIndex = myFrameIndexes[anId];
-    if(aStartIndex < 0)
-      continue;
-
-    int aFinishIndex = abs(myFrameIndexes[anId + 1]);
-    if(aStartIndex + 1 == aFinishIndex)
-      continue;
-
-    std::string anInitialName;
-    std::ostringstream aStream;
-    GetNameJPEG(myName,aStartIndex,anInitialName);
-    for(int anIndex = aStartIndex + 1; anIndex < aFinishIndex; anIndex++){
-      myNbWrittenFrames++;
-      std::string anCurrentName;
-      GetNameJPEG(myName,anIndex,anCurrentName);
-      aStream<<"ln -s "<< anInitialName<<" "<<anCurrentName<<";";
-      if(anIndex + 1 < aFinishIndex)
-        aStream<<" \\";
-      aStream<<endl;
-    }
-    std::string aString(aStream.str());
-    system(aString.c_str());
-    if(MYDEBUG) MESSAGE("VVTK_Recorder::AddSkippedFrames - "<<aString);
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Recorder
-::MakeFileAVI()
-{
-  myErrorStatus = 0;
-  std::ostringstream aStream;
-  aStream<<myNameAVIMaker<<
-    " -I p"<<
-    " -v 0"<<
-    //" -f "<<int(myNbFPS)<<" "<<
-    " -f "<<myNbFPS<<" "<<
-    " -n "<<myNbWrittenFrames<<" "<<
-    " -j "<<myName<<"_\%06d.jpeg "<<
-    "| yuv2lav"<<
-    " -o "<<myName;
-   
-  std::string aString(aStream.str());
-  myErrorStatus = system(aString.c_str());
-
-  if(MYDEBUG) MESSAGE("VVTK_Recorder::MakeFileAVI - "<<aString);
-
-  QFileInfo aFileInfo(myName.c_str());
-  QString aDirPath = aFileInfo.absoluteDir().path();
-  QString aBaseName = aFileInfo.fileName();
-  QString aCommand = 
-    QString("(cd ") + aDirPath + 
-    "; ls " +
-    " | egrep '" + aBaseName + "_[0-9]*.jpeg'" +
-    " | xargs rm " +
-    ")";
-
-  aCommand = 
-    QString("rm ") + aDirPath + "/" + aBaseName + "*.jpeg";
-
-  if(MYDEBUG) MESSAGE("VVTK_Recorder::MakeFileAVI - "<<aCommand.toLatin1().data() );
-  system((const char*)aCommand.toLatin1());
-}
diff --git a/src/VVTK/VVTK_Recorder.h b/src/VVTK/VVTK_Recorder.h
deleted file mode 100755
index f4f6c58f..00000000
--- a/src/VVTK/VVTK_Recorder.h
+++ /dev/null
@@ -1,165 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   : 
-//  Author : 
-//  Module : SALOME
-//  $Header$
-//
-#ifndef _VVTK_Recorder_Header_File_
-#define _VVTK_Recorder_Header_File_
-
-#include <list>
-#include <string>
-#include <vector>
-
-#include <vtkObject.h>
-
-class vtkRenderWindow;
-class vtkCallbackCommand;
-class vtkWindowToImageFilter;
-class VVTK_ImageWriterMgr;
-//
-class VVTK_Recorder : public vtkObject 
-{
- protected:
-  enum State {
-    VVTK_Recorder_Unknown=0,
-    VVTK_Recorder_Record,
-    VVTK_Recorder_Stop
-  };
-  
- public:
-  static VVTK_Recorder *New();
-  vtkTypeRevisionMacro(VVTK_Recorder,vtkObject);
-
-  void
-  SetRenderWindow(vtkRenderWindow* theRenderWindow);
-
-  vtkRenderWindow* 
-  RenderWindow();
-
-  void 
-  SetName(const char *theName);
-
-  const char* 
-  Name() const;
-
-  void
-  SetNbFPS(const double theNbFPS);
-
-  double
-  NbFPS() const;
-
-  void
-  SetQuality(int theQuality);
-
-  int
-  GetQuality() const;
-
-  void
-  SetProgressiveMode(bool theProgressiveMode);
-
-  bool
-  GetProgressiveMode() const;
-
-  void
-  SetUseSkippedFrames(bool theUseSkippedFrames);
-
-  bool
-  UseSkippedFrames() const;
-
-  void
-  Record();
-
-  void
-  Pause();
-
-  void
-  Stop();
-
-  int
-  State() const;
-
-  int  
-  ErrorStatus() const;
-
-  void
-  CheckExistAVIMaker();
-
-protected :
-  VVTK_Recorder();
-
-  ~VVTK_Recorder();
-
-  void
-  DoRecord();
-
-  void
-  MakeFileAVI();
-
-  void
-  AddSkippedFrames();
-
-  void
-  PreWrite();
-
-  static
-  void
-  ProcessEvents(vtkObject* theObject, 
-                unsigned long theEvent,
-                void* theClientData, 
-                void* theCallData);
-
-protected :
-  int myState;
-  int myPaused;
-  int myErrorStatus;
-
-  float myPriority;
-  double myTimeStart;
-
-  int myFrameIndex;
-  int myNbWrittenFrames;
-
-  double myNbFPS;
-  int myQuality;
-  bool myProgressiveMode;
-
-  typedef std::vector<int> TFrameIndexes;
-  TFrameIndexes myFrameIndexes;
-  bool myUseSkippedFrames;
-
-  std::string myName;
-  std::string myNameAVIMaker;
-
-  vtkCallbackCommand *myCommand;
-  vtkRenderWindow *myRenderWindow;
-  vtkWindowToImageFilter *myFilter;
-  VVTK_ImageWriterMgr *myWriterMgr;
-
-
-private:
-  VVTK_Recorder(const VVTK_Recorder&);  //Not implemented
-  void operator=(const VVTK_Recorder&); //Not implemented
-};
-#endif
diff --git a/src/VVTK/VVTK_RecorderDlg.cxx b/src/VVTK/VVTK_RecorderDlg.cxx
deleted file mode 100644
index 0904de52..00000000
--- a/src/VVTK/VVTK_RecorderDlg.cxx
+++ /dev/null
@@ -1,231 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_RecorderDlg.cxx
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#include "VVTK_RecorderDlg.h"
-#include "VVTK_Recorder.h"
-#include <VisuGUI_GUITools.h>
-
-#include "SUIT_FileDlg.h"
-#include "SUIT_MessageBox.h"
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-
-#include "LightApp_Application.h"
-
-#include "CAM_Module.h"
-
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QPushButton>
-
-/*!
- * Constructor
- */
-VVTK_RecorderDlg::VVTK_RecorderDlg( QWidget* theParent, VVTK_Recorder* theRecorder ):
-  QDialog( theParent ),
-  myRecorder( theRecorder )
-{
-  setWindowTitle( tr( "DLG_RECORDER_TITLE" ) );
-
-  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
-  QVBoxLayout* aTopLayout = new QVBoxLayout( this );
-  aTopLayout->setSpacing( 6 );
-  aTopLayout->setMargin( 6 );
-  //aTopLayout->setAutoAdd( true );
-
-  // Settings
-  QGroupBox* mySettingsBox = new QGroupBox( tr( "SETTINGS" ), this );
-  //mySettingsBox->setColumnLayout( 0, Qt::Vertical );
-  //mySettingsBox->layout()->setSpacing( 0 );
-  //mySettingsBox->layout()->setMargin( 0 );
-
-  QGridLayout* aSettingsLayout = new QGridLayout( mySettingsBox );
-  aSettingsLayout->setSpacing( 6 );
-  aSettingsLayout->setMargin( 11 );
-
-  QLabel* aFileNameLabel = new QLabel( tr( "FILE_NAME" ), mySettingsBox );
-  myFileNameLineEdit = new QLineEdit( mySettingsBox );
-  myFileNameLineEdit->setMinimumWidth( 250 );
-  myFileNameLineEdit->setReadOnly( true );
-
-  QLabel* aRecordingModeLabel = new QLabel( tr( "RECORDING_MODE" ), mySettingsBox );
-  myRecordingModeComboBox = new QComboBox( mySettingsBox );
-  myRecordingModeComboBox->addItem( tr( "SKIPPED_FRAMES" ) );
-  myRecordingModeComboBox->addItem( tr( "ALL_DISLPAYED_FRAMES" ) );
-  myRecordingModeComboBox->setCurrentIndex( aResourceMgr->integerValue( "VISU", "recorder_mode", 1 ) );
-
-  QLabel* aFPSLabel = new QLabel( tr( "FPS" ), mySettingsBox );
-  myFPSSpinBox = new SalomeApp_DoubleSpinBox( mySettingsBox );
-  VISU::initSpinBox( myFPSSpinBox, 0.1, 100.0, 1.0, "parametric_precision" );
-  myFPSSpinBox->setValue( aResourceMgr->doubleValue( "VISU", "recorder_fps", 10.0 ) );
-
-  QLabel* aQualityLabel = new QLabel( tr( "QUALITY" ), mySettingsBox );
-  myQualitySpinBox = new SalomeApp_IntSpinBox( mySettingsBox );
-  VISU::initSpinBox( myQualitySpinBox, 1, 100, 1 );  
-  myQualitySpinBox->setValue( aResourceMgr->integerValue( "VISU", "recorder_quality", 80 ) );
-
-  myProgressiveCheckBox = new QCheckBox( tr( "PROGRESSIVE" ), mySettingsBox );
-  myProgressiveCheckBox->setChecked( aResourceMgr->booleanValue( "VISU", "recorder_progressive", false ) );
-
-  aSettingsLayout->addWidget( aFileNameLabel, 0, 0 );
-  aSettingsLayout->addWidget( myFileNameLineEdit, 1, 0, 1, 2 );
-  //aSettingsLayout->addWidget( aFileNameButton, 1, 2 );
-  aSettingsLayout->addWidget( aRecordingModeLabel, 2, 0 );
-  aSettingsLayout->addWidget( myRecordingModeComboBox, 2, 1 );
-  aSettingsLayout->addWidget( aFPSLabel, 3, 0 );
-  aSettingsLayout->addWidget( myFPSSpinBox, 3, 1 );
-  aSettingsLayout->addWidget( aQualityLabel, 4, 0 );
-  aSettingsLayout->addWidget( myQualitySpinBox, 4, 1 );
-  aSettingsLayout->addWidget( myProgressiveCheckBox, 5, 0 );
-
-  aTopLayout->addWidget( mySettingsBox );
-
-  // Start / Close
-  QGroupBox* CommonGroup = new QGroupBox( this );
-  //CommonGroup->setColumnLayout(0, Qt::Vertical );
-  //CommonGroup->layout()->setSpacing( 0 );
-  //CommonGroup->layout()->setMargin( 0 );
-  QGridLayout* CommonGroupLayout = new QGridLayout( CommonGroup );
-  CommonGroupLayout->setAlignment( Qt::AlignTop );
-  CommonGroupLayout->setSpacing( 6 );
-  CommonGroupLayout->setMargin( 11 );
-
-  QPushButton* aStartButton = new QPushButton( tr( "START" ), CommonGroup );
-  aStartButton->setAutoDefault( true );
-  aStartButton->setDefault( true );
-  CommonGroupLayout->addWidget( aStartButton, 0, 0 );
-  CommonGroupLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
-
-  QPushButton* aCloseButton = new QPushButton( tr( "CLOSE" ), CommonGroup );
-  aCloseButton->setAutoDefault( true );
-  CommonGroupLayout->addWidget( aCloseButton, 0, 2 );
-
-  QPushButton* aHelpButton = new QPushButton( tr( "HELP" ), CommonGroup );
-  aHelpButton->setAutoDefault( true );
-  CommonGroupLayout->addWidget( aHelpButton, 0, 3 );
-
-  aTopLayout->addWidget( CommonGroup );
-
-  connect( aStartButton, SIGNAL( clicked() ), this, SLOT( onStart() ) );
-  connect( aCloseButton, SIGNAL( clicked() ), this, SLOT( onClose() ) );
-  connect( aHelpButton,  SIGNAL( clicked() ), this, SLOT( onHelp() ) );
-}
-
-VVTK_RecorderDlg::~VVTK_RecorderDlg()
-{
-}
-
-void VVTK_RecorderDlg::onStart()
-{
-  if( myFileName.isNull() )
-    return;
-
-  myRecorder->SetName( (const char*)myFileName.toLatin1() );
-
-  myRecorder->SetUseSkippedFrames( myRecordingModeComboBox->currentIndex() == 0 );
-  myRecorder->SetNbFPS( myFPSSpinBox->value() );
-  myRecorder->SetQuality( myQualitySpinBox->value() );
-  myRecorder->SetProgressiveMode( myProgressiveCheckBox->isChecked() );
-
-  accept();
-
-}
-
-void VVTK_RecorderDlg::onClose()
-{
-  reject();
-}
-
-void VVTK_RecorderDlg::onHelp()
-{
-  QString aHelpFileName = "animation_in_gauss_viewer.htm";
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
-  else {
-                QString platform;
-#ifdef WIN32
-                platform = "winapplication";
-#else
-                platform = "application";
-#endif
-    SUIT_MessageBox::warning(0, QObject::tr("WRN_WARNING"),
-                             QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                             arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName) );
-  }
-}
-
-bool VVTK_RecorderDlg::onBrowseFile()
-{
-  QString aRootDir = QString( getenv( "VISU_ROOT_DIR") );
-
-  QStringList aFilter;
-  aFilter.append( tr( "FLT_AVI_FILES" ) );
-  aFilter.append( tr( "FLT_ALL_FILES" ) );
-
-  QString aFileName = SUIT_FileDlg::getFileName( this, getenv( "HOME" ), aFilter,
-                                                 tr( "FILE_NAME" ), false );
-
-  if( aFileName.isNull() )
-    return false;
-
-  myFileName = aFileName;
-  myFileNameLineEdit->setText( aFileName.section( '/', -1 ) );
-
-  return true;
-}
-
-int VVTK_RecorderDlg::exec()
-{
-  if( !onBrowseFile() )
-  {
-    reject();
-    return 0;
-  }
-  return QDialog::exec();
-}
-
-void VVTK_RecorderDlg::keyPressEvent( QKeyEvent* e )
-{
-  QDialog::keyPressEvent( e );
-  if ( e->isAccepted() )
-    return;
-
-  if ( e->key() == Qt::Key_F1 )
-    {
-      e->accept();
-      onHelp();
-    }
-}
diff --git a/src/VVTK/VVTK_RecorderDlg.h b/src/VVTK/VVTK_RecorderDlg.h
deleted file mode 100644
index 7bdf6197..00000000
--- a/src/VVTK/VVTK_RecorderDlg.h
+++ /dev/null
@@ -1,83 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_RecorderDlg.h
-//  Author : Oleg UVAROV
-//  Module : VISU
-//  $Header$
-//
-#ifndef VVTK_RECORDERDLG_H
-#define VVTK_RECORDERDLG_H
-
-#include <QDateTime>
-#include <QDialog>
-
-class QCheckBox;
-class QComboBox;
-class QGroupBox;
-class QLCDNumber;
-class QLineEdit;
-class QPushButton;
-class QTimer;
-
-class SalomeApp_DoubleSpinBox;
-class SalomeApp_IntSpinBox;
-
-class VVTK_Recorder;
-
-//! Recorder Dialog.
-class VVTK_RecorderDlg : public QDialog
-{
-  Q_OBJECT
-
-public:
-  VVTK_RecorderDlg( QWidget*, VVTK_Recorder* );
-  ~VVTK_RecorderDlg();
-
-  int              exec();
-
-  QString          fileName() const { return myFileName; }
-
-private:
-  virtual void     keyPressEvent( QKeyEvent* );
-
-protected slots:
-  void             onStart();
-  void             onClose();
-  void             onHelp();
-
-  bool             onBrowseFile();
-
-private:
-  VVTK_Recorder*   myRecorder;
-  QString          myFileName;
-
-  QLineEdit*       myFileNameLineEdit;
-
-  QComboBox*        myRecordingModeComboBox;
-  SalomeApp_DoubleSpinBox* myFPSSpinBox;
-  SalomeApp_IntSpinBox*    myQualitySpinBox;
-  QCheckBox*        myProgressiveCheckBox;
-
-};
-
-#endif
diff --git a/src/VVTK/VVTK_Renderer.cxx b/src/VVTK/VVTK_Renderer.cxx
deleted file mode 100644
index 23cc1c54..00000000
--- a/src/VVTK/VVTK_Renderer.cxx
+++ /dev/null
@@ -1,437 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   :
-//  Author :
-//  Module :
-//  $Header$
-//
-#include "VVTK_Renderer.h"
-
-#include "VISU_GaussPtsAct.h"
-#include "VISU_GaussPointsPL.hxx"
-#include "VISU_WidgetCtrl.hxx"
-#include "VISU_PlanesWidget.hxx"
-#include "VISU_SphereWidget.hxx"
-
-#include <VTKViewer_Algorithm.h>
-
-#include <vtkObjectFactory.h>
-#include <vtkProperty.h>
-#include <vtkPointPicker.h>
-
-#include <vtkRenderWindowInteractor.h>
-#include <vtkCallbackCommand.h>
-#include <vtkCommand.h>
-#include <vtkPlane.h>
-
-#include <vtkPropCollection.h>
-#include <vtkProp.h>
-#include <vtkActor.h>
-#include <vtkMapper.h>
-#include <vtkPolyDataMapper.h>
-#include <vtkPolyData.h>
-#include <vtkTextMapper.h>
-#include <vtkTextActor.h> 
-#include <vtkTextProperty.h>
-#include <vtkRenderer.h>
-
-#include <vtkPropCollection.h>
-#include <vtkProp.h>
-#include <vtkActor.h>
-#include <vtkMapper.h>
-#include <vtkPolyDataMapper.h>
-#include <vtkPolyData.h>
-#include <vtkTextMapper.h>
-#include <vtkTextActor.h> 
-#include <vtkTextProperty.h>
-#include <vtkRenderer.h>
-
-#include "utilities.h"
-
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
-//======================================================================
-class VISU_FPSActor : public vtkTextActor 
-{
-public:
-  vtkTypeMacro( VISU_FPSActor, vtkTextActor);
-  static
-  VISU_FPSActor* 
-  New();
-
-  virtual
-  int
-  RenderOpaqueGeometry(vtkViewport *theViewport);
-};
-
-//======================================================================
-vtkStandardNewMacro(VISU_FPSActor);
-
-//======================================================================
-// function: RenderOpaqueGeometry
-// purpose :
-//======================================================================
-int
-VISU_FPSActor
-::RenderOpaqueGeometry(vtkViewport *theViewport) 
-{
-  // It's impossible to render opaque geometry of text actor
-  // if the size of the viewport is less than 1.0
-  int *size = theViewport->GetSize();
-  if( size[0] <= 1.0 || size[1] <= 1.0 )
-    return 1;
-
-  if(vtkRenderer *aRenderer = dynamic_cast<vtkRenderer*>(theViewport)){
-    static float aTol = 1.e-6;
-    float aLastRenderTimeInSeconds = aRenderer->GetLastRenderTimeInSeconds();
-    if(aLastRenderTimeInSeconds > aTol){
-      size_t aNumberOfCells = 0;
-      VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
-      if(vtkActorCollection *anActorCollection = aCopy.GetActors()){
-        anActorCollection->InitTraversal();
-        while(vtkActor *anActor = anActorCollection->GetNextActor()){
-          if(anActor->GetVisibility()){
-            if(SALOME_Actor *aSActor = dynamic_cast<SALOME_Actor*>(anActor)){
-              if(vtkMapper *aMapper = aSActor->GetMapper()){
-                if(vtkDataSet *aDataSet = aMapper->GetInput()){
-                  aNumberOfCells += aDataSet->GetNumberOfCells();
-                }
-              }
-            }
-          }
-        }
-      }
-      std::ostringstream aStr;
-      float aFPS = 1.0 / aLastRenderTimeInSeconds;
-      aStr<<"FPS: "<<aFPS<<"\n NumberOfCells: "<<aNumberOfCells;
-      std::string anInput = aStr.str();
-      SetInput(anInput.c_str());
-      return Superclass::RenderOpaqueGeometry(theViewport);
-    }
-  }
-  return 1;
-}
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(VVTK_Renderer);
-
-//----------------------------------------------------------------------------
-VVTK_Renderer
-::VVTK_Renderer():
-  myFPSActor(VISU_FPSActor::New()),
-  myInsideCursorSettings(NULL),
-  myPickingSettings(NULL),
-  myGaussPointPicker(vtkPointPicker::New()),
-  myGaussPreHighlightProperty(vtkProperty::New()),
-  myGaussHighlightProperty(vtkProperty::New())
-{
-  if(MYDEBUG) INFOS("VVTK_Renderer() - "<<this);
-
-  myFPSActor->Delete();
-
-  vtkTextMapper* aTextMapper = vtkTextMapper::New();
-  vtkTextProperty *aTextProperty = aTextMapper->GetTextProperty();
-  aTextProperty->SetJustificationToRight();
-  aTextProperty->SetVerticalJustificationToTop();
-  aTextProperty->SetFontSize(10);
-
-  myFPSActor->SetPickable(false); 
-  myFPSActor->ScaledTextOff();
-  myFPSActor->SetAlignmentPoint(8);
-  myFPSActor->SetPosition2 (1., 1.);
-  myFPSActor->SetMapper(aTextMapper);
-  aTextMapper->Delete();
-
-  //GetDevice()->AddActor2D(myFPSActor.GetPointer());
-
-  myGaussPointPicker->Delete();
-
-  myGaussPreHighlightProperty->Delete();
-  myGaussPreHighlightProperty->SetColor(0,1,1);
-
-  myGaussHighlightProperty->Delete();
-  myGaussHighlightProperty->SetColor(1,1,0);
-
-}
-
-VVTK_Renderer
-::~VVTK_Renderer()
-{
-  if(MYDEBUG) INFOS("~VVTK_Renderer() - "<<this);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer
-::AddActor(VTKViewer_Actor* theActor)
-{
-  Superclass::AddActor(theActor);
-  if(VISU_GaussPtsAct* anActor = dynamic_cast<VISU_GaussPtsAct*>(theActor)){
-    anActor->SetPointPicker(myGaussPointPicker.GetPointer());
-    anActor->SetPreHighlightProperty(myGaussPreHighlightProperty.GetPointer());
-    anActor->SetHighlightProperty(myGaussHighlightProperty.GetPointer());
-
-    anActor->SetInsideCursorSettings(myInsideCursorSettings);
-    //anActor->SetPickingSettings(myPickingSettings);
-  }
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer
-::RemoveActor(VTKViewer_Actor* theActor)
-{
-  Superclass::RemoveActor(theActor);
-  if(VISU_GaussPtsAct* anActor = dynamic_cast<VISU_GaussPtsAct*>(theActor)){
-    anActor->SetPointPicker(NULL);
-    anActor->SetPreHighlightProperty(NULL);
-    anActor->SetHighlightProperty(NULL);
-
-    anActor->SetInsideCursorSettings(NULL);
-    //anActor->SetPickingSettings(NULL);
-  }
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer
-::SetInsideCursorSettings(VISU_InsideCursorSettings* theInsideCursorSettings)
-{
-  myInsideCursorSettings = theInsideCursorSettings;
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer
-::SetPickingSettings(VISU_PickingSettings* thePickingSettings)
-{
-  myPickingSettings = thePickingSettings;
-}
-
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(VVTK_Renderer1);
-
-//----------------------------------------------------------------------------
-VVTK_Renderer1::VVTK_Renderer1():
-  myWidgetCtrl(VISU_WidgetCtrl::New()),
-  myOutsideCursorSettings(NULL)
-{
-  if(MYDEBUG) INFOS("VVTK_Renderer1() - "<<this);
-
-  myWidgetCtrl->SetPlaceFactor(1.1);
-  //
-  VISU_PlanesWidget *aPlanesWidget = myWidgetCtrl->GetPlanesWidget();
-  aPlanesWidget->SetOutlineTranslation(false);
-  vtkProperty* aSelectedPlaneProperty = aPlanesWidget->GetSelectedPlaneProperty();
-  vtkProperty* aPlaneProperty = aPlanesWidget->GetPlaneProperty();
-  aPlaneProperty->SetOpacity(aSelectedPlaneProperty->GetOpacity()*1.5);
-  //
-  //myWidgetCtrl->Delete();
-}
-
-VVTK_Renderer1
-::~VVTK_Renderer1()
-{
-  if(MYDEBUG) INFOS("~VVTK_Renderer1() - "<<this);
-  myWidgetCtrl->SetInteractor(NULL);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer1
-::AddActor(VTKViewer_Actor* theActor)
-{
-  Superclass::AddActor(theActor);
-  if(VISU_GaussPtsAct1* anActor = dynamic_cast<VISU_GaussPtsAct1*>(theActor)){
-    anActor->SetWidgetCtrl(GetWidgetCtrl());
-    anActor->SetOutsideCursorSettings(myOutsideCursorSettings);
-    AdjustWidgetCtrl();
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer1
-::RemoveActor(VTKViewer_Actor* theActor)
-{
-  Superclass::RemoveActor(theActor);
-  if(VISU_GaussPtsAct1* anActor = dynamic_cast<VISU_GaussPtsAct1*>(theActor)){
-    anActor->SetWidgetCtrl(NULL);
-    anActor->SetOutsideCursorSettings(NULL);
-    AdjustWidgetCtrl();
-  }
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer1
-::AdjustWidgetCtrl()
-{
-  VISU_PlanesWidget *aPlanesWidget = myWidgetCtrl->GetPlanesWidget();
-  aPlanesWidget->InitialPlaceWidget(myBndBox);
-  aPlanesWidget->SetOrigin(0.5*(myBndBox[1] + myBndBox[0]),
-                           0.5*(myBndBox[3] + myBndBox[2]),
-                           0.5*(myBndBox[5] + myBndBox[4]));
-  //
-  VISU_SphereWidget *aSphereWidget = myWidgetCtrl->GetSphereWidget();
-  aSphereWidget->SetCenter(0.5*(myBndBox[1] + myBndBox[0]),
-                           0.5*(myBndBox[3] + myBndBox[2]),
-                           0.5*(myBndBox[5] + myBndBox[4]));
-  
-  float aMinLength = VTK_LARGE_FLOAT;
-  for (int i=0; i<3; ++i) {
-    float aLength = myBndBox[2*i+1]-myBndBox[2*i];
-    aMinLength = std::min(aMinLength,aLength);
-  }
-  aSphereWidget->SetRadius(aMinLength);
-}
-
-//----------------------------------------------------------------------------
-void 
-VVTK_Renderer1
-::Initialize(vtkRenderWindowInteractor* theInteractor,
-             SVTK_Selector* theSelector)
-{
-  SVTK_Renderer::Initialize(theInteractor,theSelector);
-  myWidgetCtrl->SetInteractor(theInteractor);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer1
-::SetOutsideCursorSettings(VISU_OutsideCursorSettings* theOutsideCursorSettings)
-{
-  myOutsideCursorSettings = theOutsideCursorSettings;
-}
-
-//----------------------------------------------------------------------------
-VISU_WidgetCtrl* 
-VVTK_Renderer1
-::GetWidgetCtrl()
-{
-  return myWidgetCtrl;//.GetPointer();
-}
-
-//----------------------------------------------------------------------------
-bool
-VVTK_Renderer1
-::OnAdjustActors()
-{
-  return SVTK_Renderer::OnAdjustActors();
-}
-
-
-//----------------------------------------------------------------------------
-vtkStandardNewMacro(VVTK_Renderer2);
-
-//----------------------------------------------------------------------------
-VVTK_Renderer2
-::VVTK_Renderer2():
-  myEventCallbackCommand(vtkCallbackCommand::New())
-{
-  if(MYDEBUG) INFOS("VVTK_Renderer2() - "<<this);
-  myEventCallbackCommand->Delete();
-
-  myPriority = 0.0;
-  myEventCallbackCommand->SetClientData(this); 
-  myEventCallbackCommand->SetCallback(VVTK_Renderer2::ProcessEvents);
-}
-
-VVTK_Renderer2
-::~VVTK_Renderer2()
-{
-  if(MYDEBUG) INFOS("~VVTK_Renderer2() - "<<this);
-}
-
-//----------------------------------------------------------------------------
-void VVTK_Renderer2::SetWidgetCtrl(VISU_WidgetCtrl* theWidgetCtrl)
-{
-  theWidgetCtrl->AddObserver(vtkCommand::EndInteractionEvent, 
-                             myEventCallbackCommand.GetPointer(), 
-                             myPriority);
-  theWidgetCtrl->AddObserver(vtkCommand::EnableEvent, 
-                             myEventCallbackCommand.GetPointer(), 
-                             myPriority);
-  theWidgetCtrl->AddObserver(vtkCommand::DisableEvent, 
-                             myEventCallbackCommand.GetPointer(), 
-                             myPriority);
-  myWidgetCtrl = theWidgetCtrl;
-}
-
-void 
-VVTK_Renderer2
-::ProcessEvents(vtkObject* vtkNotUsed(theObject), 
-                unsigned long theEvent,
-                void* theClientData, 
-                void* vtkNotUsed(theCallData))
-{
-  VVTK_Renderer2* self = reinterpret_cast<VVTK_Renderer2*>(theClientData);
-
-  switch(theEvent){
-  case vtkCommand::EnableEvent:
-  case vtkCommand::EndInteractionEvent:
-    self->OnEndInteractionEvent();  
-    break;
-  }
-}
-
-void
-VVTK_Renderer2
-::OnEndInteractionEvent()
-{
-  AdjustActors();
-  myInteractor->Render();
-}
-
-
-//----------------------------------------------------------------------------
-void VVTK_Renderer2::AddActor(VTKViewer_Actor* theActor)
-{
-  if(VISU_GaussPtsAct1* anActor = dynamic_cast<VISU_GaussPtsAct1*>(theActor)){
-    if(VISU::TGaussPtsActorFactory* aFactory = anActor->GetGaussPtsFactory()){
-      if(VISU_GaussPtsAct2* anActor2 = aFactory->CloneActor(anActor)){
-        anActor2->SetWidgetCtrl(myWidgetCtrl);
-        Superclass::AddActor(anActor2);
-      }
-    }
-  }
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_Renderer2
-::RemoveActor(VTKViewer_Actor* theActor)
-{
-  using namespace VISU;  
-  if(VISU_GaussPtsAct2* anActor = dynamic_cast<VISU_GaussPtsAct2*>(theActor)){
-    anActor->SetWidgetCtrl(NULL);
-    Superclass::RemoveActor(theActor);
-  }
-}
diff --git a/src/VVTK/VVTK_Renderer.h b/src/VVTK/VVTK_Renderer.h
deleted file mode 100644
index ae558db2..00000000
--- a/src/VVTK/VVTK_Renderer.h
+++ /dev/null
@@ -1,179 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   : 
-//  Author : 
-//  Module : SALOME
-//  $Header$
-//
-#ifndef VVTK_Renderer_h
-#define VVTK_Renderer_h
-
-#include "VVTK.h"
-
-#include "SVTK_Renderer.h"
-
-class VISU_WidgetCtrl;
-class VISU_InsideCursorSettings;
-class VISU_OutsideCursorSettings;
-class VISU_PickingSettings;
-class VISU_FPSActor;
-
-class vtkPointPicker;
-class vtkImplicitFunction;
-
-//----------------------------------------------------------------------------
-//! To customize SVTK_Renderer according to VVTK functionality
-class VVTK_EXPORT VVTK_Renderer : public SVTK_Renderer
-{
- public:
-  vtkTypeMacro(VVTK_Renderer,SVTK_Renderer);
-  static VVTK_Renderer* New();
-
-  //! Reimplement SVTK_Renderer::AddActor
-  /*!
-    Perform an additional action - apply picking settings on the published VISU_GaussPtsAct actors
-  */
-  virtual
-  void 
-  AddActor(VTKViewer_Actor* theActor);
-
-  //! Reimplement SVTK_Renderer::RemoveActor (remove additional settings)
-  virtual
-  void 
-  RemoveActor(VTKViewer_Actor* theActor);
-
-  //! To set VISU_PickingSettings to share them among all VISU_GaussPtsAct actors published into the view 
-  void
-  SetInsideCursorSettings(VISU_InsideCursorSettings* theInsideCursorSettings);
-
-  void
-  SetPickingSettings(VISU_PickingSettings* thePickingSettings);
-
- protected:
-  VVTK_Renderer();
-  ~VVTK_Renderer();
-
-  VISU_PickingSettings* myPickingSettings; //! Keeps reference of the VISU_PickingSettings
-  VISU_InsideCursorSettings* myInsideCursorSettings; //! Keeps reference of the VISU_InsideCursorSettings
-  vtkSmartPointer<VISU_FPSActor> myFPSActor; //!< To show FPS of the rendering at run-time
-
-  vtkSmartPointer<vtkPointPicker> myGaussPointPicker;
-  vtkSmartPointer<vtkProperty>    myGaussPreHighlightProperty;
-  vtkSmartPointer<vtkProperty>    myGaussHighlightProperty;
-};
-
-
-//----------------------------------------------------------------------------
-//! To extend VVTK_Renderer to implement base view functionality
-class VVTK_EXPORT VVTK_Renderer1 : public VVTK_Renderer
-{
- public:
-  vtkTypeMacro(VVTK_Renderer1,VVTK_Renderer);
-  static VVTK_Renderer1* New();
-
-  //! Reimplement SVTK_Renderer::Initialize
-  virtual
-  void 
-  Initialize(vtkRenderWindowInteractor* theInteractor,
-             SVTK_Selector* theSelector);
-
-  //! Reimplement VVTK_Renderer::AddActor to apply to the actor additional settings
-  virtual
-  void 
-  AddActor(VTKViewer_Actor* theActor);
-
-  //! Reimplement VVTK_Renderer::RemoveActor
-  virtual
-  void 
-  RemoveActor(VTKViewer_Actor* theActor);
-
-  //! To set VISU_PickingSettings to share them among all VISU_GaussPtsAct1 actors published into the view 
-  void
-  SetOutsideCursorSettings(VISU_OutsideCursorSettings* theOutsideCursorSettings);
-
-  VISU_WidgetCtrl*  GetWidgetCtrl();
-
- protected:
-  VVTK_Renderer1();
-  ~VVTK_Renderer1();
-
-  //! Reimplement VVTK_Renderer::OnAdjustActors
-  virtual
-  bool
-  OnAdjustActors();
-
-  void AdjustWidgetCtrl();
-
-  VISU_WidgetCtrl* myWidgetCtrl;
-  //vtkSmartPointer<VISU_WidgetCtrl> myWidgetCtrl;
-  VISU_OutsideCursorSettings* myOutsideCursorSettings;
-  vtkSmartPointer<VISU_FPSActor> myTextActor;
-};
-
-
-//----------------------------------------------------------------------------
-class VVTK_EXPORT VVTK_Renderer2 : public VVTK_Renderer
-{
- public:
-  vtkTypeMacro(VVTK_Renderer2,VVTK_Renderer);
-  static VVTK_Renderer2* New();
-
-  //! Reimplement VVTK_Renderer::AddActor to apply to the actor additional settings
-  virtual
-  void 
-  AddActor(VTKViewer_Actor* theActor);
-
-  //! Reimplement VVTK_Renderer::RemoveActor
-  virtual
-  void 
-  RemoveActor(VTKViewer_Actor* theActor);
-
-  void SetWidgetCtrl(VISU_WidgetCtrl* theWidgetCtrl);
-
-  //! To handle vtkCommand::EndInteractionEvent to redraw the view
-  void
-  OnEndInteractionEvent();
-
- protected:
-  VVTK_Renderer2();
-  ~VVTK_Renderer2();
-
-  //! Main process VTK event method
-  static
-  void
-  ProcessEvents(vtkObject* theObject, 
-                unsigned long theEvent,
-                void* theClientData, 
-                void* theCallData);
-
-  //! Used to process VTK events
-  vtkSmartPointer<vtkCallbackCommand> myEventCallbackCommand;
-
-  //! Priority at which events are processed
-  float myPriority;
-
-  VISU_WidgetCtrl* myWidgetCtrl;
-};
-
-
-#endif
diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.cxx b/src/VVTK/VVTK_SegmentationCursorDlg.cxx
deleted file mode 100644
index 8190bb3c..00000000
--- a/src/VVTK/VVTK_SegmentationCursorDlg.cxx
+++ /dev/null
@@ -1,871 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VVTK_SegmentationCursorDlg.cxx
-//  Author : Oleg Uvarov
-//  Module : VISU
-//
-#include "VVTK_SegmentationCursorDlg.h"
-#include "VVTK_PrimitiveBox.h"
-#include "VVTK_SizeBox.h"
-#include <VisuGUI_GUITools.h>
-
-#include "VISU_GaussPtsAct.h"
-#include "VISU_GaussPtsSettings.h"
-
-#include "VISU_WidgetCtrl.hxx"
-#include "VISU_PlanesWidget.hxx"
-#include "VISU_SphereWidget.hxx"
-
-#include "VISU_GaussPointsPL.hxx"
-#include "VISU_OpenGLPointSpriteMapper.hxx"
-
-#include <LightApp_Application.h>
-#include <SUIT_MessageBox.h>
-#include <SUIT_ResourceMgr.h>
-#include <SUIT_Session.h>
-
-#include <SVTK_RenderWindowInteractor.h>
-#include <VTKViewer_Algorithm.h>
-
-#include <vtkActorCollection.h>
-#include <vtkCallbackCommand.h>
-#include <vtkObjectFactory.h>
-#include <vtkRenderer.h>
-#include <vtkRenderWindowInteractor.h>
-#include <vtkSmartPointer.h>
-#include <vtkImageData.h>
-
-#include "utilities.h"
-
-#include <QButtonGroup>
-#include <QColorDialog>
-#include <QFileDialog>
-#include <QGroupBox>
-#include <QKeyEvent>
-#include <QLabel>
-#include <QLayout>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QRadioButton>
-#include <QTabWidget>
-
-#include <QtxAction.h>
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-#include <CAM_Module.h>
-
-//----------------------------------------------------------------
-VVTK_SegmentationCursorDlg::VVTK_SegmentationCursorDlg( QWidget* parent, const char* name )
-  :QDialog( parent,
-            Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
-   myEventCallbackCommand( vtkCallbackCommand::New() ),
-   myInsideCursorSettings( VISU_InsideCursorSettings::New() ),
-   myOutsideCursorSettings( VISU_OutsideCursorSettings::New() ),
-   myIsPlaneSegmentation( true ),
-   myWidgetCtrl(NULL),
-   myInteractor(NULL)
-{
-  setAccessibleName( name );
-
-  myPriority = 0.0;
-  myEventCallbackCommand->Delete();
-  myEventCallbackCommand->SetClientData(this); 
-  myEventCallbackCommand->SetCallback(VVTK_SegmentationCursorDlg::ProcessEvents);
-
-  myInsideCursorSettings->AddObserver(VISU::UpdateFromSettingsEvent, 
-                                      myEventCallbackCommand.GetPointer(), 
-                                      myPriority);
-
-  setWindowTitle( tr( "SEGMENTATION_CURSOR_DLG_TITLE" ) );
-  setSizeGripEnabled(TRUE);
-
-  QVBoxLayout* TopLayout = new QVBoxLayout( this );
-  TopLayout->setSpacing(6);
-  TopLayout->setMargin(11);
-
-  myTabBox = new QTabWidget( this );
-
-  // Segmentation cursor pane
-  mySegmentationCursorBox = new QWidget( this );
-  QVBoxLayout* SCBoxLayout = new QVBoxLayout( mySegmentationCursorBox );
-  SCBoxLayout->setMargin(11);
-  SCBoxLayout->setSpacing(6);
-  SCBoxLayout->setAlignment(Qt::AlignTop);
-
-  // Origin
-  myOriginGroup = new QGroupBox( tr( "ORIGIN_TITLE" ), mySegmentationCursorBox );
-  //myOriginGroup->setColumnLayout( 0, Qt::Vertical );
-  //myOriginGroup->layout()->setSpacing( 0 );
-  //myOriginGroup->layout()->setMargin( 0 );
-
-  QGridLayout* OriginGroupLayout = new QGridLayout( myOriginGroup );
-  OriginGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  OriginGroupLayout->setSpacing(6);
-  OriginGroupLayout->setMargin(11);
-
-  QLabel* XOriginLabel = new QLabel( tr( "ORIGIN_X" ), myOriginGroup );
-  myXOriginSpinBox = new SalomeApp_DoubleSpinBox( myOriginGroup );
-  VISU::initSpinBox( myXOriginSpinBox, -1000.0, 1000.0, 0.1, "length_precision" );  
-  myXOriginSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myXOriginSpinBox->setMinimumWidth( 100 );
-  myXOriginSpinBox->setValue( 0.0 );
-
-  QLabel* YOriginLabel = new QLabel( tr( "ORIGIN_Y" ), myOriginGroup );
-  myYOriginSpinBox = new SalomeApp_DoubleSpinBox( myOriginGroup );
-  VISU::initSpinBox( myYOriginSpinBox, -1000.0, 1000.0, 0.1, "length_precision" );    
-  myYOriginSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myYOriginSpinBox->setMinimumWidth( 100 );
-  myYOriginSpinBox->setValue( 0.0 );
-
-  QLabel* ZOriginLabel = new QLabel( tr( "ORIGIN_Z" ), myOriginGroup );
-  myZOriginSpinBox = new SalomeApp_DoubleSpinBox( myOriginGroup );
-  VISU::initSpinBox( myZOriginSpinBox, -1000.0, 1000.0, 0.1, "length_precision" );    
-  //myZOriginSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myZOriginSpinBox->setMinimumWidth( 100 );
-  myZOriginSpinBox->setValue( 1.0 );
-
-  OriginGroupLayout->addWidget(   XOriginLabel,   0, 0 );
-  OriginGroupLayout->addWidget( myXOriginSpinBox, 0, 1 );
-  OriginGroupLayout->addWidget(   YOriginLabel,   0, 2 );
-  OriginGroupLayout->addWidget( myYOriginSpinBox, 0, 3 );
-  OriginGroupLayout->addWidget(   ZOriginLabel,   0, 4 );
-  OriginGroupLayout->addWidget( myZOriginSpinBox, 0, 5 );
-
-  SCBoxLayout->addWidget( myOriginGroup );
-
-  // Direction ( Plane Segmentation )
-  myDirectionGroup = new QGroupBox( tr( "DIRECTION_TITLE" ), mySegmentationCursorBox );
-  //myDirectionGroup->setColumnLayout( 0, Qt::Vertical );
-  //myDirectionGroup->layout()->setSpacing( 0 );
-  //myDirectionGroup->layout()->setMargin( 0 );
-
-  QGridLayout* DirectionGroupLayout = new QGridLayout( myDirectionGroup );
-  DirectionGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  DirectionGroupLayout->setSpacing(6);
-  DirectionGroupLayout->setMargin(11);
-
-  QLabel* DXDirectionLabel = new QLabel( tr( "DIRECTION_DX" ), myDirectionGroup );
-  myDXDirectionSpinBox = new SalomeApp_DoubleSpinBox( myDirectionGroup );
-  VISU::initSpinBox( myDXDirectionSpinBox, -1.0, 1.0, 0.1, "length_precision" );    
-  myDXDirectionSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myDXDirectionSpinBox->setMinimumWidth( 100 );
-  myDXDirectionSpinBox->setValue( 0.0 );
-
-  QLabel* DYDirectionLabel = new QLabel( tr( "DIRECTION_DY" ), myDirectionGroup );
-  myDYDirectionSpinBox = new SalomeApp_DoubleSpinBox( myDirectionGroup );
-  VISU::initSpinBox( myDYDirectionSpinBox, -1.0, 1.0, 0.1, "length_precision" );
-  myDYDirectionSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myDYDirectionSpinBox->setMinimumWidth( 100 );
-  myDYDirectionSpinBox->setValue( 0.0 );
-
-  QLabel* DZDirectionLabel = new QLabel( tr( "DIRECTION_DZ" ), myDirectionGroup );
-  myDZDirectionSpinBox = new SalomeApp_DoubleSpinBox( myDirectionGroup );
-  VISU::initSpinBox( myDZDirectionSpinBox, -1.0, 1.0, 0.1, "length_precision" );  
-  myDZDirectionSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myDZDirectionSpinBox->setMinimumWidth( 100 );
-  myDZDirectionSpinBox->setValue( 1.0 );
-
-  DirectionGroupLayout->addWidget(   DXDirectionLabel,   0, 0 );
-  DirectionGroupLayout->addWidget( myDXDirectionSpinBox, 0, 1 );
-  DirectionGroupLayout->addWidget(   DYDirectionLabel,   0, 2 );
-  DirectionGroupLayout->addWidget( myDYDirectionSpinBox, 0, 3 );
-  DirectionGroupLayout->addWidget(   DZDirectionLabel,   0, 4 );
-  DirectionGroupLayout->addWidget( myDZDirectionSpinBox, 0, 5 );
-
-  SCBoxLayout->addWidget( myDirectionGroup );
-
-  // Depth ( Plane Segmentation )
-  myDepthGroup = new QGroupBox( tr( "DEPTH_TITLE" ), mySegmentationCursorBox );
-  //myDepthGroup->setColumnLayout( 0, Qt::Vertical );
-  //myDepthGroup->layout()->setSpacing( 0 );
-  //myDepthGroup->layout()->setMargin( 0 );
-
-  QGridLayout* DepthGroupLayout = new QGridLayout( myDepthGroup );
-  DepthGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  DepthGroupLayout->setSpacing(6);
-  DepthGroupLayout->setMargin(11);
-
-  QLabel* DepthLabel = new QLabel( tr( "DEPTH" ), myDepthGroup );
-  myDepthSpinBox = new SalomeApp_DoubleSpinBox( myDepthGroup );
-  VISU::initSpinBox( myDepthSpinBox, 0.0, VTK_LARGE_FLOAT, 0.1, "length_precision" );  
-  myDepthSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myDepthSpinBox->setMinimumWidth( 100 );
-  myDepthSpinBox->setValue( 1.0 );
-
-  DepthGroupLayout->addWidget(   DepthLabel,   0, 0 );
-  DepthGroupLayout->addWidget( myDepthSpinBox, 0, 1 );
-
-  SCBoxLayout->addWidget( myDepthGroup );
-
-  // Radius ( Sphere Segmentation )
-  myRadiusGroup = new QGroupBox( tr( "RADIUS_TITLE" ), mySegmentationCursorBox );
-  //myRadiusGroup->setColumnLayout( 0, Qt::Vertical );
-  //myRadiusGroup->layout()->setSpacing( 0 );
-  //myRadiusGroup->layout()->setMargin( 0 );
-
-  QGridLayout* RadiusGroupLayout = new QGridLayout( myRadiusGroup );
-  RadiusGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  RadiusGroupLayout->setSpacing(6);
-  RadiusGroupLayout->setMargin(11);
-
-  QLabel* RadiusLabel = new QLabel( tr( "RADIUS" ),myRadiusGroup  );
-  myRadiusSpinBox = new SalomeApp_DoubleSpinBox( myRadiusGroup  );
-  VISU::initSpinBox( myRadiusSpinBox, 0.0, 1000.0, 1.0, "length_precision" );    
-  myRadiusSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myRadiusSpinBox->setMinimumWidth( 100 );
-  myRadiusSpinBox->setValue( 100.0 );
-
-  QLabel* RatioLabel = new QLabel( tr( "RATIO" ), myRadiusGroup );
-  myRatioSpinBox = new SalomeApp_DoubleSpinBox( myRadiusGroup );
-  VISU::initSpinBox( myRatioSpinBox, 0.1, 10.0, 0.1, "parametric_precision" );
-  myRatioSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-  myRatioSpinBox->setMinimumWidth( 100 );
-  myRatioSpinBox->setValue( 2.0 );
-
-  RadiusGroupLayout->addWidget( RadiusLabel,     0, 0 );
-  RadiusGroupLayout->addWidget( myRadiusSpinBox, 0, 1 );
-  RadiusGroupLayout->addWidget( RatioLabel,      0, 2 );
-  RadiusGroupLayout->addWidget( myRatioSpinBox,  0, 3 );
-
-  SCBoxLayout->addWidget( myRadiusGroup );
-
-  myTabBox->addTab( mySegmentationCursorBox, tr( "SEGMENTATION_CURSOR_TAB" ) );
-
-  // Gauss points pane
-  myGaussPointsBox = new QWidget( this );
-  QVBoxLayout* GPBoxLayout = new QVBoxLayout( myGaussPointsBox );
-  GPBoxLayout->setMargin(11);
-  GPBoxLayout->setSpacing(6);
-
-  // Inside Gauss points
-  QGroupBox* anInsideGroup = new QGroupBox( tr( "INSIDE_GAUSS_POINTS" ), myGaussPointsBox );
-  //anInsideGroup->setColumnLayout( 0, Qt::Vertical );
-  //anInsideGroup->layout()->setSpacing( 0 );
-  //anInsideGroup->layout()->setMargin( 0 );
-
-  QGridLayout* anInsideGroupLayout = new QGridLayout( anInsideGroup );
-  anInsideGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  anInsideGroupLayout->setSpacing(6);
-  anInsideGroupLayout->setMargin(11);
-
-  // Primitive
-  myInsidePrimitiveBox = new VVTK_PrimitiveBox( anInsideGroup );
-
-  // Size
-  myInsideSizeBox = new VVTK_SizeBox( anInsideGroup );
-  myInsideSizeBox->setType( VVTK_SizeBox::Inside );
-
-  anInsideGroupLayout->addWidget( myInsidePrimitiveBox, 0, 0 );
-  anInsideGroupLayout->addWidget( myInsideSizeBox, 1, 0 );
-
-  GPBoxLayout->addWidget( anInsideGroup );
-
-  // Outside Gauss points
-  QGroupBox* anOutsideGroup = new QGroupBox( tr( "OUTSIDE_GAUSS_POINTS" ), myGaussPointsBox );
-  //anOutsideGroup->setColumnLayout( 0, Qt::Vertical );
-  //anOutsideGroup->layout()->setSpacing( 0 );
-  //anOutsideGroup->layout()->setMargin( 0 );
-
-  QGridLayout* anOutsideGroupLayout = new QGridLayout( anOutsideGroup );
-  anOutsideGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  anOutsideGroupLayout->setSpacing(6);
-  anOutsideGroupLayout->setMargin(11);
-
-  // Primitive
-  myOutsidePrimitiveBox = new VVTK_PrimitiveBox( anOutsideGroup );
-
-  // Size
-  myOutsideSizeBox = new VVTK_SizeBox( anOutsideGroup );
-  myOutsideSizeBox->setType( VVTK_SizeBox::Outside );
-
-  anOutsideGroupLayout->addWidget( myOutsidePrimitiveBox, 0, 0 );
-  anOutsideGroupLayout->addWidget( myOutsideSizeBox, 1, 0 );
-
-  GPBoxLayout->addWidget( anOutsideGroup );
-
-  // Magnification
-  QGroupBox* MagnificationGroup = new QGroupBox ( tr( "MAGNIFICATION_TITLE" ), myGaussPointsBox );
-  //MagnificationGroup->setColumnLayout(0, Qt::Vertical );
-  //MagnificationGroup->layout()->setSpacing( 0 );
-  //MagnificationGroup->layout()->setMargin( 0 );
-
-  QGridLayout* MagnificationGroupLayout = new QGridLayout ( MagnificationGroup );
-  MagnificationGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  MagnificationGroupLayout->setSpacing(6);
-  MagnificationGroupLayout->setMargin(11);
-
-  myMagnificationLabel = new QLabel( tr( "MAGNIFICATION" ), MagnificationGroup );
-  myMagnificationSpinBox = new SalomeApp_IntSpinBox( MagnificationGroup );
-  VISU::initSpinBox( myMagnificationSpinBox,  1, 10000, 10 );  
-  myMagnificationSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  MagnificationGroupLayout->addWidget( myMagnificationLabel, 0, 0 );
-  MagnificationGroupLayout->addWidget( myMagnificationSpinBox, 0, 1 );
-
-  // Increment
-  myIncrementLabel = new QLabel( tr( "INCREMENT" ), MagnificationGroup );
-  myIncrementSpinBox = new SalomeApp_DoubleSpinBox( MagnificationGroup );
-  VISU::initSpinBox( myIncrementSpinBox, 0.01, 10, 0.1, "parametric_precision" );    
-  myIncrementSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  MagnificationGroupLayout->addWidget( myIncrementLabel, 0, 2 );
-  MagnificationGroupLayout->addWidget( myIncrementSpinBox, 0, 3 );
-
-
-  myTabBox->addTab( myGaussPointsBox, tr( "GAUSS_POINTS_TAB" ) );
-  //myTabBox->showPage( myGaussPointsBox );
-  myTabBox->setCurrentWidget( myGaussPointsBox );
-
-  GPBoxLayout->addWidget( MagnificationGroup );
-
-
-  // Common buttons ===========================================================
-  QGroupBox* GroupButtons = new QGroupBox( this );
-  //GroupButtons->setColumnLayout(0, Qt::Vertical );
-  //GroupButtons->layout()->setSpacing( 0 );
-  //GroupButtons->layout()->setMargin( 0 );
-  QGridLayout* GroupButtonsLayout = new QGridLayout( GroupButtons );
-  GroupButtonsLayout->setAlignment( Qt::AlignTop );
-  GroupButtonsLayout->setSpacing( 6 );
-  GroupButtonsLayout->setMargin( 11 );
-
-  QPushButton* buttonApply = new QPushButton( tr( "&Apply" ), GroupButtons );
-  buttonApply->setAutoDefault( TRUE );
-  buttonApply->setDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonApply, 0, 0 );
-  GroupButtonsLayout->addItem( new QSpacerItem( 5, 5, QSizePolicy::Expanding, QSizePolicy::Minimum ), 0, 1 );
-
-  QPushButton* buttonClose = new QPushButton( tr( "&Close" ) , GroupButtons );
-  buttonClose->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonClose, 0, 2 );
-
-  QPushButton* buttonHelp = new QPushButton( tr( "&Help" ) , GroupButtons );
-  buttonHelp->setAutoDefault( TRUE );
-  GroupButtonsLayout->addWidget( buttonHelp, 0, 3 );
-
-  TopLayout->addWidget( myTabBox );
-  TopLayout->addWidget( GroupButtons );
-
-  connect( buttonApply, SIGNAL( clicked() ), this, SLOT( onClickApply() ) );
-  connect( buttonClose, SIGNAL( clicked() ), this, SLOT( onClickClose() ) );
-  connect( buttonHelp,  SIGNAL( clicked() ), this, SLOT( onClickHelp() ) );
-
-  connect(parent, SIGNAL(Show( QShowEvent * )), this, SLOT(onParentShow()));
-  connect(parent, SIGNAL(Hide( QHideEvent * )), this, SLOT(onParentHide()));
-}
-
-VVTK_SegmentationCursorDlg::~VVTK_SegmentationCursorDlg()
-{
-  SetWidgetCtrl(NULL);
-}
-
-float VVTK_SegmentationCursorDlg::getMagnification() const
-{
-  return myMagnificationSpinBox->value() / 100.0;
-}
-
-void VVTK_SegmentationCursorDlg::setMagnification( float theMagnification )
-{
-  myMagnificationSpinBox->setValue( ( int )( theMagnification * 100 ) );
-}
-
-float VVTK_SegmentationCursorDlg::getIncrement() const
-{
-  return myIncrementSpinBox->value();
-}
-
-void VVTK_SegmentationCursorDlg::setIncrement( float theIncrement )
-{
-  myIncrementSpinBox->setValue( theIncrement );
-}
-
-
-void VVTK_SegmentationCursorDlg::SetWidgetCtrl( VISU_WidgetCtrl* theWidgetCtrl )
-{
-  if(myWidgetCtrl == theWidgetCtrl)
-    return;
-
-  if(myWidgetCtrl)
-    myWidgetCtrl->RemoveObserver(myEventCallbackCommand.GetPointer());
-
-  myWidgetCtrl = theWidgetCtrl;
-
-  if(theWidgetCtrl)
-    theWidgetCtrl->AddObserver(vtkCommand::EndInteractionEvent, 
-                               myEventCallbackCommand.GetPointer(), 
-                               myPriority);
-}
-
-void VVTK_SegmentationCursorDlg::ProcessEvents(vtkObject* vtkNotUsed(theObject), 
-                                               unsigned long theEvent,
-                                               void* theClientData, 
-                                               void* vtkNotUsed(theCallData))
-{
-  VVTK_SegmentationCursorDlg* self = reinterpret_cast<VVTK_SegmentationCursorDlg*>(theClientData);
-
-  switch(theEvent){
-  case vtkCommand::EndInteractionEvent:
-    self->UpdateSegmentation();
-    break;
-  case VISU::UpdateFromSettingsEvent:
-    self->GetOutsideCursorSettings()->SetMagnification( self->GetInsideCursorSettings()->GetMagnification() );
-    self->GetOutsideCursorSettings()->SetIncrement( self->GetInsideCursorSettings()->GetIncrement() );
-
-    self->UpdateInsideGaussPoints();
-    self->UpdateOutsideGaussPoints();
-
-    self->GetInsideCursorSettings()->InvokeEvent(VISU::UpdateInsideSettingsEvent,NULL);
-    self->GetOutsideCursorSettings()->InvokeEvent(VISU::UpdateOutsideSettingsEvent,NULL);
-    break;
-  }
-}
-
-void VVTK_SegmentationCursorDlg::UpdateSegmentation()
-{
-  if( myIsPlaneSegmentation )
-  {
-    myDirectionGroup->show();
-    myDepthGroup->show();
-    myRadiusGroup->hide();
-
-    VISU_PlanesWidget *pPlanesWidget=myWidgetCtrl->GetPlanesWidget();
-    vtkFloatingPointType origin[3];
-    pPlanesWidget->GetOrigin( origin );
-    myXOriginSpinBox->setValue( origin[0] );
-    myYOriginSpinBox->setValue( origin[1] );
-    myZOriginSpinBox->setValue( origin[2] );
-
-    vtkFloatingPointType normal[3];
-    pPlanesWidget->GetNormal( normal );
-    myDXDirectionSpinBox->setValue( normal[0] );
-    myDYDirectionSpinBox->setValue( normal[1] );
-    myDZDirectionSpinBox->setValue( normal[2] );
-
-    myDepthSpinBox->setValue( pPlanesWidget->Distance() );
-  }
-  else
-  {
-    myDirectionGroup->hide();
-    myDepthGroup->hide();
-    myRadiusGroup->show();
-    
-    VISU_SphereWidget *pSphereWidget=myWidgetCtrl->GetSphereWidget();
-    vtkFloatingPointType origin[3], aRadius;
-    pSphereWidget->GetCenter(origin);
-    myXOriginSpinBox->setValue( origin[0] );
-    myYOriginSpinBox->setValue( origin[1] );
-    myZOriginSpinBox->setValue( origin[2] );
-    aRadius=pSphereWidget->GetRadius();
-    myRadiusSpinBox->setValue(aRadius);
-    myRatioSpinBox->setValue(pSphereWidget->GetRatio());
-  }
-}
-
-void VVTK_SegmentationCursorDlg::UpdateInsideGaussPoints()
-{
-  int aPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
-  vtkFloatingPointType aClamp = 200.0;
-  QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_texture.bmp";
-  QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_alpha.bmp";
-  vtkFloatingPointType anAlphaThreshold = 0.1;
-  int aResolution = 8;
-  int aMinSize = 3;
-  int aMaxSize = 33;
-  int aMagnification = 100;
-  vtkFloatingPointType anIncrement = 2.0;
-
-  if( !myInsideCursorSettings->GetInitial() )
-  {
-    myInsidePrimitiveBox->setPrimitiveType( myInsideCursorSettings->GetPrimitiveType() );
-    myInsidePrimitiveBox->setClamp( myInsideCursorSettings->GetClamp() );
-    myInsidePrimitiveBox->setMainTexture( myInsideMainTexture );
-    myInsidePrimitiveBox->setAlphaTexture( myInsideAlphaTexture );
-    myInsidePrimitiveBox->setAlphaThreshold( myInsideCursorSettings->GetAlphaThreshold() );
-    myInsidePrimitiveBox->setResolution( myInsideCursorSettings->GetResolution() );
-
-    myInsideSizeBox->setMinSize( myInsideCursorSettings->GetMinSize() );
-    myInsideSizeBox->setMaxSize( myInsideCursorSettings->GetMaxSize() );
-
-    this->setMagnification( myInsideCursorSettings->GetMagnification() );
-    this->setIncrement( myInsideCursorSettings->GetIncrement() );
-
-    return;
-  }
-
-  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
-  aPrimitiveType = aResourceMgr->integerValue( "VISU", "inside_point_sprite_primitive_type", aPrimitiveType );
-  myInsidePrimitiveBox->setPrimitiveType( aPrimitiveType );
-
-  aClamp = aResourceMgr->doubleValue( "VISU", "inside_point_sprite_clamp", aClamp );
-  myInsidePrimitiveBox->setClamp( aClamp );
-
-  aMainTexture = aResourceMgr->stringValue( "VISU", "inside_point_sprite_main_texture", aMainTexture );
-  myInsidePrimitiveBox->setMainTexture( aMainTexture );
-
-  anAlphaTexture = aResourceMgr->stringValue( "VISU", "inside_point_sprite_alpha_texture", anAlphaTexture );
-  myInsidePrimitiveBox->setAlphaTexture( anAlphaTexture );
-
-  anAlphaThreshold = aResourceMgr->doubleValue( "VISU", "inside_point_sprite_alpha_threshold", anAlphaThreshold );
-  myInsidePrimitiveBox->setAlphaThreshold( anAlphaThreshold );
-
-  aResolution = aResourceMgr->integerValue( "VISU", "inside_geom_sphere_resolution", aResolution );
-  myInsidePrimitiveBox->setResolution( aResolution );
-
-  aMinSize = aResourceMgr->integerValue( "VISU", "inside_point_sprite_min_size", aMinSize );
-  myInsideSizeBox->setMinSize( aMinSize / 100.0 );
-
-  aMaxSize = aResourceMgr->integerValue( "VISU", "inside_point_sprite_max_size", aMaxSize );
-  myInsideSizeBox->setMaxSize( aMaxSize / 100.0 );
-
-  aMagnification = aResourceMgr->integerValue( "VISU", "inside_point_sprite_magnification", aMagnification );
-  this->setMagnification( aMagnification / 100.0 );
-
-  anIncrement = aResourceMgr->doubleValue( "VISU", "inside_point_sprite_increment", anIncrement );
-  this->setIncrement( anIncrement );
-
-  myInsidePrimitiveBox->setFaceLimit( 50000 );
-
-  ApplyInsideGaussPoints();
-}
-
-void VVTK_SegmentationCursorDlg::UpdateOutsideGaussPoints()
-{
-  vtkFloatingPointType aClamp = 256.0;
-  int aPrimitiveType = VISU_OpenGLPointSpriteMapper::PointSprite;
-  QString aMainTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_texture.bmp";
-  QString anAlphaTexture = QString( getenv( "VISU_ROOT_DIR") ) + "/share/salome/resources/visu/sprite_alpha.bmp";
-  vtkFloatingPointType anAlphaThreshold = 0.1;
-  int aResolution = 8;
-  int aSize = 25;
-  bool aUniform = false;
-  QColor aColor = Qt::blue;
-
-  if( !myOutsideCursorSettings->GetInitial() )
-  {
-    myOutsidePrimitiveBox->setPrimitiveType( myOutsideCursorSettings->GetPrimitiveType() );
-    myOutsidePrimitiveBox->setClamp( myOutsideCursorSettings->GetClamp() );
-    myOutsidePrimitiveBox->setMainTexture( myOutsideMainTexture );
-    myOutsidePrimitiveBox->setAlphaTexture( myOutsideAlphaTexture );
-    myOutsidePrimitiveBox->setAlphaThreshold( myOutsideCursorSettings->GetAlphaThreshold() );
-    myOutsidePrimitiveBox->setResolution( myOutsideCursorSettings->GetResolution() );
-
-    myOutsideSizeBox->setOutsideSize( myOutsideCursorSettings->GetSize() );
-    myOutsideSizeBox->setUniform( myOutsideCursorSettings->GetUniform() );
-
-    vtkFloatingPointType* aColor = myOutsideCursorSettings->GetColor();
-    myOutsideSizeBox->setColor( QColor( ( int )( aColor[0] * 255.0 ),
-                                        ( int )( aColor[1] * 255.0 ),
-                                        ( int )( aColor[2] * 255.0 ) ) );
-
-    return;
-  }
-
-  SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr();
-
-  aPrimitiveType = aResourceMgr->integerValue( "VISU", "outside_point_sprite_primitive_type", aPrimitiveType );
-  myOutsidePrimitiveBox->setPrimitiveType( aPrimitiveType );
-
-  aClamp = aResourceMgr->doubleValue( "VISU", "outside_point_sprite_clamp", aClamp );
-  myOutsidePrimitiveBox->setClamp( aClamp );
-
-  aMainTexture = aResourceMgr->stringValue( "VISU", "outside_point_sprite_main_texture", aMainTexture );
-  myOutsidePrimitiveBox->setMainTexture( aMainTexture );
-
-  anAlphaTexture = aResourceMgr->stringValue( "VISU", "outside_point_sprite_alpha_texture", anAlphaTexture );
-  myOutsidePrimitiveBox->setAlphaTexture( anAlphaTexture );
-
-  anAlphaThreshold = aResourceMgr->doubleValue( "VISU", "outside_point_sprite_alpha_threshold", anAlphaThreshold );
-  myOutsidePrimitiveBox->setAlphaThreshold( anAlphaThreshold );
-
-  aResolution = aResourceMgr->integerValue( "VISU", "outside_geom_sphere_resolution", aResolution );
-  myOutsidePrimitiveBox->setResolution( aResolution );
-
-  aSize = aResourceMgr->integerValue( "VISU", "outside_point_sprite_size", aSize );
-  myOutsideSizeBox->setOutsideSize( aSize / 100.0 );
-
-  aUniform = aResourceMgr->booleanValue( "VISU", "outside_point_sprite_uniform", aUniform );
-  myOutsideSizeBox->setUniform( aUniform );
-
-  aColor = aResourceMgr->colorValue( "VISU", "outside_point_sprite_color", aColor );
-  myOutsideSizeBox->setColor( aColor );
-
-  myOutsidePrimitiveBox->setFaceLimit( 50000 );
-
-  ApplyOutsideGaussPoints();
-}
-
-VISU_InsideCursorSettings* VVTK_SegmentationCursorDlg::GetInsideCursorSettings()
-{
-  return myInsideCursorSettings.GetPointer();
-}
-
-VISU_OutsideCursorSettings* VVTK_SegmentationCursorDlg::GetOutsideCursorSettings()
-{
-  return myOutsideCursorSettings.GetPointer();
-}
-
-VISU::TTextureValue 
-VVTK_SegmentationCursorDlg
-::MakeImageData( bool theInside,
-                 const QString& theMainTexture, 
-                 const QString& theAlphaTexture )
-{
-  if( theInside )
-  {
-    bool updateMainTexture = myInsideMainTexture != theMainTexture;
-    bool updateAlphaTexture = myInsideAlphaTexture != theAlphaTexture;
-    if( !updateMainTexture && !updateAlphaTexture )
-      return 0;
-
-    myInsideMainTexture = theMainTexture;
-    myInsideAlphaTexture = theAlphaTexture;
-  }
-  else
-  {
-    bool updateMainTexture = myOutsideMainTexture != theMainTexture;
-    bool updateAlphaTexture = myOutsideAlphaTexture != theAlphaTexture;
-    if( !updateMainTexture && !updateAlphaTexture )
-      return 0;
-
-    myOutsideMainTexture = theMainTexture;
-    myOutsideAlphaTexture = theAlphaTexture;
-  }
-
-  return VISU::GetTexture( (const char*)theMainTexture.toLatin1(), 
-                           (const char*)theAlphaTexture.toLatin1());
-}
-
-void VVTK_SegmentationCursorDlg::onClickApply()
-{
-  if( myTabBox->currentWidget() == mySegmentationCursorBox )
-    ApplySegmentationCursor();
-  else
-  {
-    QString aWarning = "The number of faces needed to perform the 'Geometrical Sphere' primitive\n";
-    aWarning.append( "presentation might be too important to ensure an acceptable frame rate.\n\n" );
-    aWarning.append( "Can you please confirm that you want to continue anyway?" );
-    bool toApply = CheckNumberOfFaces() ||
-      SUIT_MessageBox::warning( this, tr( "Warning" ), aWarning,
-                              tr( "&OK" ), tr( "&Cancel" ), 0, 1, 1 ) == 0;
-
-    if( toApply )
-    {
-      ApplyInsideGaussPoints();
-      ApplyOutsideGaussPoints();
-    }
-  }
-}
-
-void VVTK_SegmentationCursorDlg::ApplySegmentationCursor()
-{
-  if( myIsPlaneSegmentation )
-  {
-    VISU_PlanesWidget *pPlanesWidget=myWidgetCtrl->GetPlanesWidget();
-    vtkFloatingPointType origin[3];
-    origin[0] = myXOriginSpinBox->value();
-    origin[1] = myYOriginSpinBox->value();
-    origin[2] = myZOriginSpinBox->value();
-    pPlanesWidget->SetOrigin( origin );
-
-    vtkFloatingPointType normal[3];
-    normal[0] = myDXDirectionSpinBox->value();
-    normal[1] = myDYDirectionSpinBox->value();
-    normal[2] = myDZDirectionSpinBox->value();
-    
-    if( normal[0] == 0.0 && normal[1] == 0.0 && normal[2] == 0.0 )
-    {
-      normal[2] = 1.0;
-      myDZDirectionSpinBox->setValue( 1.0 );
-    }
-    pPlanesWidget->SetNormal( normal );
-
-    pPlanesWidget->SetDistance( myDepthSpinBox->value() );
-    
-    myWidgetCtrl->InvokeEvent(vtkCommand::EndInteractionEvent,NULL);
-    myWidgetCtrl->GetInteractor()->Render();
-  }
-  else
-  {
-    VISU_SphereWidget *pSphereWidget=myWidgetCtrl->GetSphereWidget();
-    vtkFloatingPointType origin[3], aRadius;
-    origin[0] = myXOriginSpinBox->value();
-    origin[1] = myYOriginSpinBox->value();
-    origin[2] = myZOriginSpinBox->value();
-    pSphereWidget->SetCenter(origin);
-    
-    aRadius=myRadiusSpinBox->value();
-    pSphereWidget->SetRadius(aRadius);
-
-    pSphereWidget->SetRatio(myRatioSpinBox->value());
-
-    myWidgetCtrl->InvokeEvent(vtkCommand::EndInteractionEvent,NULL);
-    myWidgetCtrl->GetInteractor()->Render();
-  }
-}
-
-void VVTK_SegmentationCursorDlg::ApplyInsideGaussPoints()
-{
-  QString anInsideMainTexture = myInsidePrimitiveBox->getMainTexture();
-  QString anInsideAlphaTexture = myInsidePrimitiveBox->getAlphaTexture();
-  VISU::TTextureValue aTexture = MakeImageData( true, anInsideMainTexture, anInsideAlphaTexture );
-
-  if( aTexture.GetPointer() )
-    myInsideCursorSettings->SetTexture( aTexture.GetPointer() );
-
-  myInsideCursorSettings->SetInitial( false );
-  myInsideCursorSettings->SetPrimitiveType( myInsidePrimitiveBox->getPrimitiveType() );
-  myInsideCursorSettings->SetClamp( myInsidePrimitiveBox->getClamp() );
-  myInsideCursorSettings->SetAlphaThreshold( myInsidePrimitiveBox->getAlphaThreshold() );
-  myInsideCursorSettings->SetResolution( myInsidePrimitiveBox->getResolution() );
-
-  myInsideCursorSettings->SetMinSize( myInsideSizeBox->getMinSize() );
-  myInsideCursorSettings->SetMaxSize( myInsideSizeBox->getMaxSize() );
-
-  myInsideCursorSettings->SetMagnification( this->getMagnification() );
-  myInsideCursorSettings->SetIncrement( this->getIncrement() );
-
-  myInsideCursorSettings->InvokeEvent(VISU::UpdateInsideSettingsEvent,NULL);
-}
-
-void VVTK_SegmentationCursorDlg::ApplyOutsideGaussPoints()
-{
-  QString anOutsideMainTexture = myOutsidePrimitiveBox->getMainTexture();
-  QString anOutsideAlphaTexture = myOutsidePrimitiveBox->getAlphaTexture();
-  VISU::TTextureValue aTexture = MakeImageData( false, anOutsideMainTexture, anOutsideAlphaTexture );
-
-  if( aTexture.GetPointer() )
-    myOutsideCursorSettings->SetTexture( aTexture.GetPointer() );
-
-  myOutsideCursorSettings->SetInitial( false );
-  myOutsideCursorSettings->SetPrimitiveType( myOutsidePrimitiveBox->getPrimitiveType() );
-  myOutsideCursorSettings->SetClamp( myOutsidePrimitiveBox->getClamp() );
-  myOutsideCursorSettings->SetAlphaThreshold( myOutsidePrimitiveBox->getAlphaThreshold() );
-  myOutsideCursorSettings->SetResolution( myOutsidePrimitiveBox->getResolution() );
-
-  myOutsideCursorSettings->SetSize( myOutsideSizeBox->getOutsideSize() );
-  myOutsideCursorSettings->SetUniform( myOutsideSizeBox->getUniform() );
-
-  QColor aButtonColor = myOutsideSizeBox->getColor();
-  vtkFloatingPointType aColor[3];
-  aColor[0] = aButtonColor.red() / 255.0;
-  aColor[1] = aButtonColor.green() / 255.0;
-  aColor[2] = aButtonColor.blue() / 255.0;
-  myOutsideCursorSettings->SetColor( aColor );
-
-  myOutsideCursorSettings->SetMagnification( this->getMagnification() );
-  myOutsideCursorSettings->SetIncrement( this->getIncrement() );
-
-  myOutsideCursorSettings->InvokeEvent(VISU::UpdateOutsideSettingsEvent,NULL);
-}
-
-void VVTK_SegmentationCursorDlg::onClickClose()
-{
-  myPlaneAction->setChecked( false );
-  mySphereAction->setChecked( false );
-
-  emit scgClose();
-
-  reject();
-}
-
-void VVTK_SegmentationCursorDlg::onClickHelp()
-{
-  QString aHelpFileName = "segmentation.htm";
-  LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication());
-  if (app)
-    app->onHelpContextModule(app->activeModule() ? app->moduleName(app->activeModule()->moduleName()) : QString(""), aHelpFileName);
-  else {
-                QString platform;
-#ifdef WIN32
-                platform = "winapplication";
-#else
-                platform = "application";
-#endif
-    SUIT_MessageBox::warning( 0, QObject::tr("WRN_WARNING"),
-                              QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE").
-                              arg(app->resourceMgr()->stringValue("ExternalBrowser", platform)).arg(aHelpFileName),
-                              QObject::tr("BUT_OK"));
-  }
-}
-
-void VVTK_SegmentationCursorDlg::done( int r )
-{
-  myPlaneAction->setChecked( false );
-  mySphereAction->setChecked( false );
-
-  emit scgClose();
-
-  QDialog::done( r );
-}
-
-void VVTK_SegmentationCursorDlg::onParentShow()
-{
-  if(myPlaneAction->isChecked() || mySphereAction->isChecked())
-    show();
-  else
-    hide();
-}
-
-void VVTK_SegmentationCursorDlg::onParentHide()
-{
-  hide();
-}
-
-bool VVTK_SegmentationCursorDlg::CheckNumberOfFaces()
-{
-  if( !myInteractor )
-    return false;
-
-  vtkRenderer* aRenderer = myInteractor->getRenderer();
-
-  if( !aRenderer )
-    return false;
-
-  int aNumberOfPoints = 0;
-
-  vtkActor* anActor;
-  VTK::ActorCollectionCopy aCopy(aRenderer->GetActors());
-  vtkActorCollection* anActColl = aCopy.GetActors();
-  for( anActColl->InitTraversal(); ( anActor = anActColl->GetNextActor() ) != NULL; )
-  {
-    if( VISU_GaussPtsAct1* aGaussActor = VISU_GaussPtsAct1::SafeDownCast( anActor ) )
-      aNumberOfPoints += aGaussActor->GetInput()->GetNumberOfCells();
-  }
-  return !( myInsidePrimitiveBox->getPrimitiveType() == VISU_OpenGLPointSpriteMapper::GeomSphere &&
-            aNumberOfPoints * myInsidePrimitiveBox->getFaceNumber() * 2 > myInsidePrimitiveBox->getFaceLimit() ||
-            myOutsidePrimitiveBox->getPrimitiveType() == VISU_OpenGLPointSpriteMapper::GeomSphere &&
-            aNumberOfPoints * myOutsidePrimitiveBox->getFaceNumber() > myOutsidePrimitiveBox->getFaceLimit() );
-}
-
-void VVTK_SegmentationCursorDlg::keyPressEvent( QKeyEvent* e )
-{
-  QDialog::keyPressEvent( e );
-  if ( e->isAccepted() )
-    return;
-
-  if ( e->key() == Qt::Key_F1 )
-    {
-      e->accept();
-      onClickHelp();
-    }
-}
diff --git a/src/VVTK/VVTK_SegmentationCursorDlg.h b/src/VVTK/VVTK_SegmentationCursorDlg.h
deleted file mode 100644
index 54750222..00000000
--- a/src/VVTK/VVTK_SegmentationCursorDlg.h
+++ /dev/null
@@ -1,199 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  File   : VVTK_SegmentationCursorDlg.h
-//  Author : Oleg Uvarov
-//  Module : VISU
-//
-#ifndef VVTK_SEGMENTATIONCURSORDLG_H
-#define VVTK_SEGMENTATIONCURSORDLG_H
-
-#include "VVTK.h"
-
-#include "VISU_GaussPtsDeviceActor.h"
-
-#include <QDialog>
-
-#include <vtkObject.h>
-#include <vtkSmartPointer.h>
-
-class vtkActorCollection;
-class vtkCallbackCommand;
-class vtkImageData;
-
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QRadioButton;
-class QTabWidget;
-class QGroupBox;
-class QWidget;
-//class QVBox;
-
-class QtxAction;
-class SalomeApp_DoubleSpinBox;
-class SalomeApp_IntSpinBox;
-
-class VISU_GaussPtsAct1;
-class VISU_InsideCursorSettings;
-class VISU_OutsideCursorSettings;
-class VISU_WidgetCtrl;
-
-class VVTK_PrimitiveBox;
-class VVTK_SizeBox;
-
-class SVTK_RenderWindowInteractor;
-
-
-//! Segmentation Cursor Dialog.
-/*!
- * Uses for set up Segmentation and Outside Cursor Gauss Points preferenses
- * and apply them to all actors in the current renderer.
- */
-class VVTK_SegmentationCursorDlg : public QDialog
-{
-  Q_OBJECT
-
-public:
-  VVTK_SegmentationCursorDlg( QWidget* parent = 0, const char* name = 0 );
-  ~VVTK_SegmentationCursorDlg();
-
-  void             SetWidgetCtrl( VISU_WidgetCtrl* );
-  void             SetPlaneAction( QtxAction* theAction ) { myPlaneAction = theAction; }
-  void             SetSphereAction( QtxAction* theAction ) { mySphereAction = theAction; }
-
-  bool             GetIsPlaneSegmentation() const { return myIsPlaneSegmentation; }
-  void             SetIsPlaneSegmentation( bool on ) { myIsPlaneSegmentation = on; }
-
-  //! Update contents of the Segmentation tab.
-  void             UpdateSegmentation();
-  void             UpdateInsideGaussPoints();
-  void             UpdateOutsideGaussPoints();
-
-  //! Update contents of the Outside Cursor tab.
-  void             UpdateOutsideCursor();
-
-  VISU_InsideCursorSettings*  GetInsideCursorSettings();
-  VISU_OutsideCursorSettings* GetOutsideCursorSettings();
-
-  vtkSmartPointer<vtkCallbackCommand> GetEventCallbackCommand() { return myEventCallbackCommand; }
-
-  void             SetInteractor( SVTK_RenderWindowInteractor* theInteractor ) { myInteractor = theInteractor; }
-
-public:
-  float            getMagnification() const;
-  void             setMagnification( float );
-
-  float            getIncrement() const;
-  void             setIncrement( float );
-
-protected:
-  void             ApplySegmentationCursor();
-  void             ApplyInsideGaussPoints();
-  void             ApplyOutsideGaussPoints();
-
-  bool             CheckNumberOfFaces();
-
-  VISU::TTextureValue
-  MakeImageData( bool theInside,
-                 const QString& theMainTexture, 
-                 const QString& theAlphaTexture );
-
-private:
-  static void      ProcessEvents(vtkObject* theObject, 
-                                 unsigned long theEvent,
-                                 void* theClientData, 
-                                 void* theCallData);
-  
-  void             keyPressEvent( QKeyEvent* e );
-
-protected slots:
-  virtual void     done( int );
-  void             onParentShow();
-  void             onParentHide();
-
-  void             onClickApply();
-  void             onClickClose();
-  void             onClickHelp();
-
-signals:
-  void             scgClose();
-
-private:
-  SVTK_RenderWindowInteractor* myInteractor;
-
-  QTabWidget*       myTabBox;
-
-  // Segmentation cursor
-  QWidget*          mySegmentationCursorBox;
-
-  QGroupBox*        myOriginGroup;
-  SalomeApp_DoubleSpinBox* myXOriginSpinBox;
-  SalomeApp_DoubleSpinBox* myYOriginSpinBox;
-  SalomeApp_DoubleSpinBox* myZOriginSpinBox;
-
-  QGroupBox*        myDirectionGroup;
-  SalomeApp_DoubleSpinBox* myDXDirectionSpinBox;
-  SalomeApp_DoubleSpinBox* myDYDirectionSpinBox;
-  SalomeApp_DoubleSpinBox* myDZDirectionSpinBox;
-
-  QGroupBox*        myDepthGroup;
-  SalomeApp_DoubleSpinBox* myDepthSpinBox;
-
-  QGroupBox*        myRadiusGroup;
-  SalomeApp_DoubleSpinBox* myRadiusSpinBox;
-  SalomeApp_DoubleSpinBox* myRatioSpinBox;
-
-  bool              myIsPlaneSegmentation;
-
-  float             myPriority;
-  vtkSmartPointer<vtkCallbackCommand> myEventCallbackCommand;
-
-  VISU_WidgetCtrl*  myWidgetCtrl;
-  QtxAction*        myPlaneAction;
-  QtxAction*        mySphereAction;
-
-  // Gauss Points
-  QWidget*          myGaussPointsBox;
-
-  VVTK_PrimitiveBox* myInsidePrimitiveBox;
-  VVTK_SizeBox*     myInsideSizeBox;
-
-  QString           myInsideMainTexture;
-  QString           myInsideAlphaTexture;
-
-  vtkSmartPointer<VISU_InsideCursorSettings> myInsideCursorSettings;
-
-  VVTK_PrimitiveBox* myOutsidePrimitiveBox;
-  VVTK_SizeBox*     myOutsideSizeBox;
-
-  QString           myOutsideMainTexture;
-  QString           myOutsideAlphaTexture;
-
-  vtkSmartPointer<VISU_OutsideCursorSettings> myOutsideCursorSettings;
-
-  QLabel*           myMagnificationLabel;
-  SalomeApp_IntSpinBox*    myMagnificationSpinBox;
-  QLabel*           myIncrementLabel;
-  SalomeApp_DoubleSpinBox* myIncrementSpinBox;
-};
-
-#endif
diff --git a/src/VVTK/VVTK_SizeBox.cxx b/src/VVTK/VVTK_SizeBox.cxx
deleted file mode 100644
index d12c3c9e..00000000
--- a/src/VVTK/VVTK_SizeBox.cxx
+++ /dev/null
@@ -1,382 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_SizeBox.cxx
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#include "VVTK_SizeBox.h"
-
-#include <VisuGUI_GUITools.h>
-
-#include "SUIT_ResourceMgr.h"
-#include "SUIT_Session.h"
-
-#include <SalomeApp_DoubleSpinBox.h>
-#include <SalomeApp_IntSpinBox.h>
-#include <QtxColorButton.h>
-
-#include <QLayout>
-#include <QLabel>
-#include <QLineEdit>
-#include <QCheckBox>
-#include <QGroupBox>
-#include <QButtonGroup>
-#include <QRadioButton>
-#include <QPushButton>
-#include <QColorDialog>
-
-using namespace std;
-
-VVTK_SizeBox::VVTK_SizeBox( QWidget* parent ) :
-  QWidget( parent )
-{
-  QVBoxLayout* aMainLayout = new QVBoxLayout( this );
-  aMainLayout->setSpacing( 0 );
-  aMainLayout->setMargin( 0 );
-
-  // Size
-  QGroupBox* SizeGroup = new QGroupBox ( tr( "SIZE_TITLE" ), this );
-  //SizeGroup->setColumnLayout(0, Qt::Vertical );
-  //SizeGroup->layout()->setSpacing( 0 );
-  //SizeGroup->layout()->setMargin( 0 );
-
-  QGridLayout* SizeGroupLayout = new QGridLayout (SizeGroup);
-  SizeGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignCenter);
-  SizeGroupLayout->setSpacing(6);
-  SizeGroupLayout->setMargin(11);
-
-  // Outside Size
-  myOutsideSizeLabel = new QLabel( tr( "OUTSIDE_SIZE" ), SizeGroup );
-  myOutsideSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
-  VISU::initSpinBox( myOutsideSizeSpinBox, 0, 100, 1 );
-  myOutsideSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myOutsideSizeLabel, 0, 0 );
-  SizeGroupLayout->addWidget( myOutsideSizeSpinBox, 0, 1 );
-
-  // Geometry Size
-  myGeomSizeLabel = new QLabel( tr( "GEOM_SIZE" ), SizeGroup );
-  myGeomSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
-  VISU::initSpinBox( myGeomSizeSpinBox, 0, 100, 1 );  
-  myGeomSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myGeomSizeLabel, 0, 0 );
-  SizeGroupLayout->addWidget( myGeomSizeSpinBox, 0, 1 );
-
-  // Min Size
-  myMinSizeLabel = new QLabel( tr( "MIN_SIZE" ), SizeGroup );
-  myMinSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
-  VISU::initSpinBox( myMinSizeSpinBox, 0, 100, 1 );
-  myMinSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myMinSizeLabel, 1, 0 );
-  SizeGroupLayout->addWidget( myMinSizeSpinBox, 1, 1 );
-
-  // Max Size
-  myMaxSizeLabel = new QLabel( tr( "MAX_SIZE" ), SizeGroup );
-  myMaxSizeSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
-  VISU::initSpinBox( myMaxSizeSpinBox, 0, 100, 1 );
-  myMaxSizeSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myMaxSizeLabel, 1, 2 );
-  SizeGroupLayout->addWidget( myMaxSizeSpinBox, 1, 3 );
-
-  // Magnification
-  myMagnificationLabel = new QLabel( tr( "MAGNIFICATION" ), SizeGroup );
-  myMagnificationSpinBox = new SalomeApp_IntSpinBox( SizeGroup );
-  VISU::initSpinBox( myMagnificationSpinBox, 1, 10000, 10 );  
-  myMagnificationSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myMagnificationLabel, 2, 0 );
-  SizeGroupLayout->addWidget( myMagnificationSpinBox, 2, 1 );
-
-  // Increment
-  myIncrementLabel = new QLabel( tr( "INCREMENT" ), SizeGroup );
-  myIncrementSpinBox = new SalomeApp_DoubleSpinBox( SizeGroup );
-  VISU::initSpinBox( myIncrementSpinBox, 0.01, 10, 0.1, "parametric_precision" );
-  myIncrementSpinBox->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ) );
-
-  SizeGroupLayout->addWidget( myIncrementLabel, 2, 2 );
-  SizeGroupLayout->addWidget( myIncrementSpinBox, 2, 3 );
-
-  aMainLayout->addWidget( SizeGroup );
-
-  // Color
-  myColorGroup = new QGroupBox ( tr( "COLOR_TITLE" ), this );
-  //myColorGroup->setColumnLayout(0, Qt::Vertical );
-  //myColorGroup->layout()->setSpacing( 0 );
-  //myColorGroup->layout()->setMargin( 0 );
-
-  QGridLayout* ColorGroupLayout = new QGridLayout ( myColorGroup );
-  ColorGroupLayout->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-  ColorGroupLayout->setSpacing(6);
-  ColorGroupLayout->setMargin(11);
-
-  myUniformCheckBox = new QCheckBox( tr( "UNIFORM_COLOR" ), myColorGroup );
-
-  myColorLabel = new QLabel( tr( "COLOR" ), myColorGroup );
-  myColorButton = new QtxColorButton( myColorGroup );
-
-  ColorGroupLayout->addWidget( myUniformCheckBox, 0, 0 );
-  ColorGroupLayout->addWidget( myColorLabel, 0, 1 );
-  ColorGroupLayout->addWidget( myColorButton, 0, 2 );
-
-  aMainLayout->addWidget( myColorGroup );
-
-  connect( myUniformCheckBox, SIGNAL( toggled( bool ) ), myColorButton, SLOT( setEnabled( bool ) ) );
-  //connect( myColorButton, SIGNAL( clicked() ), this, SLOT( onColorButtonPressed() ) );
-
-  setType( VVTK_SizeBox::Results );
-}
-
-void VVTK_SizeBox::onToggleResults()
-{
-  myType = VVTK_SizeBox::Results;
-
-  myOutsideSizeLabel->hide();
-  myOutsideSizeSpinBox->hide();
-
-  myGeomSizeLabel->hide();
-  myGeomSizeSpinBox->hide();
-
-  myMinSizeLabel->show();
-  myMinSizeSpinBox->show();
-
-  myMaxSizeLabel->show();
-  myMaxSizeSpinBox->show();
-
-  myMagnificationLabel->show();
-  myMagnificationSpinBox->show();
-
-  myIncrementLabel->show();
-  myIncrementSpinBox->show();
-
-  myColorGroup->hide();
-
-  myUniformCheckBox->hide();
-}
-
-void VVTK_SizeBox::onToggleGeometry()
-{
-  myType = VVTK_SizeBox::Geometry;
-
-  myOutsideSizeLabel->hide();
-  myOutsideSizeSpinBox->hide();
-
-  myGeomSizeLabel->show();
-  myGeomSizeSpinBox->show();
-
-  myMinSizeLabel->hide();
-  myMinSizeSpinBox->hide();
-
-  myMaxSizeLabel->hide();
-  myMaxSizeSpinBox->hide();
-
-  myMagnificationLabel->show();
-  myMagnificationSpinBox->show();
-
-  myIncrementLabel->show();
-  myIncrementSpinBox->show();
-
-  myColorGroup->show();
-
-  myUniformCheckBox->hide();
-}
-
-void VVTK_SizeBox::onToggleInside()
-{
-  myType = VVTK_SizeBox::Inside;
-
-  myOutsideSizeLabel->hide();
-  myOutsideSizeSpinBox->hide();
-
-  myGeomSizeLabel->hide();
-  myGeomSizeSpinBox->hide();
-
-  myMinSizeLabel->show();
-  myMinSizeSpinBox->show();
-
-  myMaxSizeLabel->show();
-  myMaxSizeSpinBox->show();
-
-  myMagnificationLabel->hide();
-  myMagnificationSpinBox->hide();
-
-  myIncrementLabel->hide();
-  myIncrementSpinBox->hide();
-
-  myColorGroup->hide();
-
-  myUniformCheckBox->hide();
-}
-
-void VVTK_SizeBox::onToggleOutside()
-{
-  myType = VVTK_SizeBox::Outside;
-
-  myOutsideSizeLabel->show();
-  myOutsideSizeSpinBox->show();
-
-  myGeomSizeLabel->hide();
-  myGeomSizeSpinBox->hide();
-
-  myMinSizeLabel->hide();
-  myMinSizeSpinBox->hide();
-
-  myMaxSizeLabel->hide();
-  myMaxSizeSpinBox->hide();
-
-  myMagnificationLabel->hide();
-  myMagnificationSpinBox->hide();
-
-  myIncrementLabel->hide();
-  myIncrementSpinBox->hide();
-
-  myColorGroup->show();
-
-  myUniformCheckBox->show();
-}
-
-void VVTK_SizeBox::setType( int theType )
-{
-  myType = theType;
-
-  switch( myType )
-  {
-    case VVTK_SizeBox::Results  : onToggleResults(); break;
-    case VVTK_SizeBox::Geometry : onToggleGeometry(); break;
-    case VVTK_SizeBox::Inside   : onToggleInside();  break;
-    case VVTK_SizeBox::Outside  : onToggleOutside();  break;
-    default : break;
-  }
-}
-
-float VVTK_SizeBox::getOutsideSize() const
-{
-  return myOutsideSizeSpinBox->value() / 100.0;
-}
-
-void VVTK_SizeBox::setOutsideSize( float theOutsideSize )
-{
-  myOutsideSizeSpinBox->setValue( ( int )( theOutsideSize * 100 ) );
-}
-
-float VVTK_SizeBox::getGeomSize() const
-{
-  return myGeomSizeSpinBox->value() / 100.0;
-}
-
-void VVTK_SizeBox::setGeomSize( float theGeomSize )
-{
-  myGeomSizeSpinBox->setValue( ( int )( theGeomSize * 100 ) );
-}
-
-float VVTK_SizeBox::getMinSize() const
-{
-  return myMinSizeSpinBox->value() / 100.0;
-}
-
-void VVTK_SizeBox::setMinSize( float theMinSize )
-{
-  myMinSizeSpinBox->setValue( ( int )( theMinSize * 100 ) );
-}
-
-float VVTK_SizeBox::getMaxSize() const
-{
-  return myMaxSizeSpinBox->value() / 100.0;
-}
-
-void VVTK_SizeBox::setMaxSize( float theMaxSize )
-{
-  myMaxSizeSpinBox->setValue( ( int )( theMaxSize * 100 ) );
-}
-
-float VVTK_SizeBox::getMagnification() const
-{
-  return myMagnificationSpinBox->value() / 100.0;
-}
-
-void VVTK_SizeBox::setMagnification( float theMagnification )
-{
-  myMagnificationSpinBox->setValue( ( int )( theMagnification * 100 ) );
-}
-
-float VVTK_SizeBox::getIncrement() const
-{
-  return myIncrementSpinBox->value();
-}
-
-void VVTK_SizeBox::setIncrement( float theIncrement )
-{
-  myIncrementSpinBox->setValue( theIncrement );
-}
-
-bool VVTK_SizeBox::getUniform() const
-{
-  return myUniformCheckBox->isChecked();
-}
-
-void VVTK_SizeBox::setUniform( bool theUniform )
-{
-  myUniformCheckBox->setChecked( theUniform );
-  myColorButton->setEnabled( theUniform );
-}
-
-QColor VVTK_SizeBox::getColor() const
-{
-  return myColorButton->color();//palette().color( myColorButton->backgroundRole() );
-  //return myColorButton->paletteBackgroundColor();
-}
-
-void VVTK_SizeBox::setColor( const QColor& theColor )
-{
-  if ( theColor.isValid() )
-  {
-    //QPalette aPalette( myColorButton->palette() );
-    //aPalette.setColor( myColorButton->backgroundRole(), theColor );
-    myColorButton->setColor( theColor );
-  }
-  //myColorButton->setPaletteBackgroundColor( theColor );
-}
-
-void VVTK_SizeBox::enableSizeControls( bool enabled )
-{
-  myMagnificationSpinBox->setEnabled( enabled );
-  myMaxSizeSpinBox->setEnabled( enabled );
-  myMinSizeSpinBox->setEnabled( enabled );
-  myIncrementSpinBox->setEnabled( enabled );
-  myGeomSizeSpinBox->setEnabled( enabled );
-}
-
-/*void VVTK_SizeBox::onColorButtonPressed()
-{
-  QPalette aPalette( myColorButton->palette() );
-  QColor aColor = QColorDialog::
-    getColor( aPalette.color(myColorButton->backgroundRole() ), this );
-
-  if( aColor.isValid() )
-  {
-      aPalette.setColor( myColorButton->backgroundRole(), aColor );
-      myColorButton->setPalette( aPalette );
-  }
-}*/
diff --git a/src/VVTK/VVTK_SizeBox.h b/src/VVTK/VVTK_SizeBox.h
deleted file mode 100644
index 6322c125..00000000
--- a/src/VVTK/VVTK_SizeBox.h
+++ /dev/null
@@ -1,123 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  VISU VISUGUI : GUI of VISU component
-//  File   : VVTK_SizeBox.h
-//  Author : Oleg UVAROV
-//  Module : VISU
-//
-#ifndef VVTK_SIZEBOX_H
-#define VVTK_SIZEBOX_H
-
-#include "VVTK.h"
-
-#include <QWidget>
-
-class QLabel;
-class QLineEdit;
-class QPushButton;
-class QCheckBox;
-class QGroupBox;
-
-class SalomeApp_DoubleSpinBox;
-class SalomeApp_IntSpinBox;
-class QtxColorButton;
-
-class VVTK_EXPORT VVTK_SizeBox : public QWidget
-{
-  Q_OBJECT
-
-public:
-  enum { Results = 0, Geometry, Inside, Outside };
-
-public:
-  VVTK_SizeBox( QWidget* );
-  ~VVTK_SizeBox() {}
-
-public:
-  int                      getType() const { return myType; }
-  void                     setType( int );
-
-  float                    getOutsideSize() const;
-  void                     setOutsideSize( float );
-
-  float                    getGeomSize() const;
-  void                     setGeomSize( float );
-
-  float                    getMinSize() const;
-  void                     setMinSize( float );
-
-  float                    getMaxSize() const;
-  void                     setMaxSize( float );
-
-  float                    getMagnification() const;
-  void                     setMagnification( float );
-
-  float                    getIncrement() const;
-  void                     setIncrement( float );
-
-  bool                     getUniform() const;
-  void                     setUniform( bool );
-
-  QColor                   getColor() const;
-  void                     setColor( const QColor& );
-
-  void                     enableSizeControls( bool enabled );
-
-protected slots:
-  void                     onToggleResults();
-  void                     onToggleGeometry();
-  void                     onToggleInside();
-  void                     onToggleOutside();
-
-  //void                     onColorButtonPressed();
-
-private:
-  int                      myType;
-
-  QLabel*                  myOutsideSizeLabel;
-  SalomeApp_IntSpinBox*    myOutsideSizeSpinBox;
-
-  QLabel*                  myGeomSizeLabel;
-  SalomeApp_IntSpinBox*    myGeomSizeSpinBox;
-
-  QLabel*                  myMinSizeLabel;
-  SalomeApp_IntSpinBox*    myMinSizeSpinBox;
-
-  QLabel*                  myMaxSizeLabel;
-  SalomeApp_IntSpinBox*    myMaxSizeSpinBox;
-
-  QLabel*                  myMagnificationLabel;
-  SalomeApp_IntSpinBox*    myMagnificationSpinBox;
-
-  QLabel*                  myIncrementLabel;
-  SalomeApp_DoubleSpinBox* myIncrementSpinBox;
-
-  QCheckBox*               myUniformCheckBox;  
-
-  QGroupBox*               myColorGroup;
-  QLabel*                  myColorLabel;
-  QtxColorButton*          myColorButton;
-};
-
-
-
-#endif
diff --git a/src/VVTK/VVTK_ViewManager.cxx b/src/VVTK/VVTK_ViewManager.cxx
deleted file mode 100644
index 2c9f8512..00000000
--- a/src/VVTK/VVTK_ViewManager.cxx
+++ /dev/null
@@ -1,49 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#include "VVTK_ViewManager.h"
-#include "VVTK_ViewModel.h"
-
-#include <SUIT_ViewWindow.h>
-
-int VVTK_ViewManager::_VVTKViewMgr_Id = 0;
-
-//***************************************************************
-VVTK_ViewManager
-::VVTK_ViewManager( SUIT_Study* study, 
-                    SUIT_Desktop* theDesktop ) 
-: SVTK_ViewManager( study, theDesktop )
-{
-  myId = ++_VVTKViewMgr_Id;
-  setViewModel( new VVTK_Viewer() );
-}
-
-//***************************************************************
-VVTK_ViewManager::~VVTK_ViewManager()
-{
-}
-
-//***************************************************************
-void VVTK_ViewManager::setViewName(SUIT_ViewWindow* theView)
-{
-  int aPos = myViews.indexOf(theView);
-  theView->setWindowTitle( tr( "VTK_VIEW_TITLE" ).arg( myId ).arg( aPos + 1 ) );
-}
diff --git a/src/VVTK/VVTK_ViewManager.h b/src/VVTK/VVTK_ViewManager.h
deleted file mode 100644
index 5bc84e43..00000000
--- a/src/VVTK/VVTK_ViewManager.h
+++ /dev/null
@@ -1,49 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef VVTK_VIEWMANAGER_H
-#define VVTK_VIEWMANAGER_H
-
-#include "SVTK_ViewManager.h"
-#include "VVTK.h"
-
-class SUIT_Desktop;
-
-//! Extend SUIT_ViewManager to deal with VVTK_Viewer
-class VVTK_EXPORT VVTK_ViewManager : public SVTK_ViewManager
-{
-  Q_OBJECT;
-public:
-  //! Construct the view manager
-  VVTK_ViewManager( SUIT_Study* study, SUIT_Desktop* );
-
-  //! Destroy the view manager
-  virtual ~VVTK_ViewManager();
-
-protected:
-  void setViewName( SUIT_ViewWindow* theView );
-
-private:
-  int               myId;
-  static  int       _VVTKViewMgr_Id;
-};
-
-#endif
diff --git a/src/VVTK/VVTK_ViewModel.cxx b/src/VVTK/VVTK_ViewModel.cxx
deleted file mode 100644
index a06b2ca3..00000000
--- a/src/VVTK/VVTK_ViewModel.cxx
+++ /dev/null
@@ -1,124 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#include "VVTK_ViewModel.h"
-#include "VISU_ActorFactory.h"
-#include "VVTK_ViewWindow.h"
-
-#include "VTKViewer_Algorithm.h"
-#include "SVTK_Functor.h"
-#include "VISU_ActorBase.h"
-#include "SVTK_View.h"
-#include "SVTK_Prs.h"
-
-#include <SUIT_ViewManager.h>
-
-#include <vtkActorCollection.h>
-#include <vtkRenderer.h>
-
-//---------------------------------------------------------------
-VVTK_Viewer::VVTK_Viewer()
-{
-}
-
-//---------------------------------------------------------------
-VVTK_Viewer::~VVTK_Viewer() 
-{
-}
-
-//---------------------------------------------------------------
-SUIT_ViewWindow* VVTK_Viewer::createView( SUIT_Desktop* theDesktop )
-{
-  TViewWindow* aViewWindow = new TViewWindow (theDesktop);
-  aViewWindow->Initialize(this);
-
-  aViewWindow->setBackgroundColor( backgroundColor() );
-  aViewWindow->SetTrihedronSize( trihedronSize() );
-  aViewWindow->SetProjectionMode( projectionMode() );
-  aViewWindow->SetInteractionStyle( interactionStyle() );
-  aViewWindow->SetIncrementalSpeed( incrementalSpeed(), incrementalSpeedMode() );
-  aViewWindow->SetSpacemouseButtons( spacemouseBtn(1), spacemouseBtn(2), spacemouseBtn(3) );
-
-  return aViewWindow;
-}
-
-//---------------------------------------------------------------
-void VVTK_Viewer::Display(const SALOME_VTKPrs* thePrs)
-{
-  // try do downcast object
-  if(const SVTK_Prs* aPrs = dynamic_cast<const SVTK_Prs*>(thePrs)){
-    if(aPrs->IsNull())
-      return;
-    if(vtkActorCollection* aCollection = aPrs->GetObjects()){
-      aCollection->InitTraversal();
-      while(VISU_ActorBase* anActor = dynamic_cast<VISU_ActorBase*>(aCollection->GetNextActor())){
-        if(!anActor->GetFactory()->GetActiveState())
-          continue;
-        QVector<SUIT_ViewWindow*> aViews = myViewManager->getViews();
-        for(int i = 0, iEnd = aViews.size(); i < iEnd; i++){
-          if(SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>(aViews.at(i))){
-            if(SVTK_View* aView = aViewWindow->getView()){
-              aView->Display(anActor, false);
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-//---------------------------------------------------------------
-namespace VVTK
-{
-  struct TIsOneActorVisibleAction
-  {
-    bool& myResult;
-    TIsOneActorVisibleAction(bool& theResult): 
-      myResult(theResult)
-    {
-      myResult = false;
-    }
-    void
-    operator()(SALOME_Actor* theActor)
-    {
-      if(!myResult)
-        myResult = theActor->GetVisibility();
-    }
-  };
-}
-
-//---------------------------------------------------------------
-bool VVTK_Viewer::isVisible( const Handle(SALOME_InteractiveObject)& theIO )
-{
-  QVector<SUIT_ViewWindow*> aViews = myViewManager->getViews();
-  for(int i = 0, iEnd = aViews.size(); i < iEnd; i++)
-    if(SVTK_ViewWindow* aViewWindow = dynamic_cast<SVTK_ViewWindow*>(aViews.at(i))){
-      bool aResult;
-      VVTK::TIsOneActorVisibleAction anAction(aResult);
-      VTK::ActorCollectionCopy aCopy(aViewWindow->getRenderer()->GetActors());
-      SVTK::ForEachIf<SALOME_Actor>(aCopy.GetActors(),
-                                    SVTK::TIsSameIObject<SALOME_Actor>(theIO),
-                                    anAction);
-      return anAction.myResult;
-    }
-  
-  return false;
-}
diff --git a/src/VVTK/VVTK_ViewModel.h b/src/VVTK/VVTK_ViewModel.h
deleted file mode 100644
index 7cfb87c3..00000000
--- a/src/VVTK/VVTK_ViewModel.h
+++ /dev/null
@@ -1,76 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef VVTK_VIEWMODEL_H
-#define VVTK_VIEWMODEL_H
-
-#include <QColor>
-
-#include "VVTK.h"
-#include "SVTK_ViewModel.h"
-
-class VVTK_ViewWindow;
-
-//! VVTK View Model
-class VVTK_EXPORT VVTK_Viewer : public SVTK_Viewer
-{
-  Q_OBJECT;
-
-public:
-  typedef VVTK_ViewWindow TViewWindow;
-
-  static
-  QString
-  Type() 
-  { 
-    return "VVTK"; 
-  }
-
-  VVTK_Viewer();
-
-  virtual
-  ~VVTK_Viewer();
-
-  //! See #SUIT_ViewModel::createView
-  virtual
-  SUIT_ViewWindow* 
-  createView(SUIT_Desktop*);
-
-  //! See SUIT_ViewModel::getType
-  virtual
-  QString 
-  getType() const 
-  { 
-    return Type(); 
-  }
-
-  //! See #SALOME_View::Display( const SALOME_Prs* )
-  virtual
-  void
-  Display(const SALOME_VTKPrs* thePrs); 
-
-  //! See #SALOME_View::isVisible( const Handle(SALOME_InteractiveObject)& )
-  virtual
-  bool
-  isVisible(const Handle(SALOME_InteractiveObject)& theIO);
-};
-
-#endif
diff --git a/src/VVTK/VVTK_ViewWindow.cxx b/src/VVTK/VVTK_ViewWindow.cxx
deleted file mode 100755
index 1d5be16b..00000000
--- a/src/VVTK/VVTK_ViewWindow.cxx
+++ /dev/null
@@ -1,324 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-//  SALOME VTKViewer : build VTK viewer into Salome desktop
-//  File   : 
-//  Author : 
-//  Module : SALOME
-//  $Header$
-//
-#include "VVTK_ViewWindow.h"
-#include "VVTK_ViewModel.h"
-#include "VVTK_MainWindow.h"
-#include "SVTK_View.h"
-
-#include "SUIT_Session.h"
-
-#include "VVTK_Renderer.h"
-#include "SVTK_Selector.h"
-#include "SVTK_InteractorStyle.h"
-#include "SVTK_RenderWindowInteractor.h"
-#include "SVTK_GenericRenderWindowInteractor.h"
-
-#include <vtkRenderWindow.h>
-
-#include <QLayout>
-#include <QList>
-#include <QSplitter>
-#include <QToolBar>
-
-//----------------------------------------------------------------------------
-VVTK_ViewWindow
-::VVTK_ViewWindow(SUIT_Desktop* theDesktop):
-  SVTK_ViewWindow(theDesktop),
-  myMainWindow1(NULL),
-  myMainWindow2(NULL),
-  myView2(NULL),
-  myDumpImage(QImage())
-{}
-
-//----------------------------------------------------------------------------
-void VVTK_ViewWindow::Initialize(SVTK_ViewModelBase* theModel)
-{
-  if(SUIT_ResourceMgr* aResourceMgr = SUIT_Session::session()->resourceMgr()){
-
-    QSplitter* s = new QSplitter( Qt::Vertical, this );
-    setCentralWidget( s );
-
-    VISU_WidgetCtrl* aWidgetCtrl = NULL;
-    VISU_InsideCursorSettings* anInsideCursorSettings = NULL;
-    VISU_OutsideCursorSettings* anOutsideCursorSettings = NULL;
-    VISU_PickingSettings* aPickingSettings = NULL;
-    SVTK_Selector* aSelector = SVTK_Selector::New();
-    {
-      myMainWindow1 = new VVTK_MainWindow1(s,
-                                           "VVTK_MainWindow",
-                                           aResourceMgr,
-                                           this);
-
-      anInsideCursorSettings = myMainWindow1->GetInsideCursorSettings();
-      anOutsideCursorSettings = myMainWindow1->GetOutsideCursorSettings();
-      aPickingSettings = myMainWindow1->GetPickingSettings();
-
-      SVTK_RenderWindowInteractor* anIteractor = 
-        new SVTK_RenderWindowInteractor(myMainWindow1,"SVTK_RenderWindowInteractor1");
-      
-      SVTK_GenericRenderWindowInteractor* aDevice = 
-        SVTK_GenericRenderWindowInteractor::New();
-      aDevice->SetRenderWidget(anIteractor);
-      aDevice->SetSelector(aSelector);
-    
-      VVTK_Renderer1* aRenderer = VVTK_Renderer1::New();
-      aRenderer->Initialize(aDevice,aSelector);
-
-      aWidgetCtrl = aRenderer->GetWidgetCtrl();
-
-      aRenderer->SetInsideCursorSettings(anInsideCursorSettings);
-      aRenderer->SetOutsideCursorSettings(anOutsideCursorSettings);
-      aRenderer->SetPickingSettings(aPickingSettings);
-
-      anIteractor->Initialize(aDevice,aRenderer,aSelector);
-
-      SVTK_InteractorStyle* aStyle = SVTK_InteractorStyle::New();
-      anIteractor->PushInteractorStyle(aStyle);
-      aStyle->Delete();
-
-      aDevice->Delete();
-      aRenderer->Delete();
-
-      myMainWindow1->Initialize(anIteractor,aRenderer);
-
-      myView1 = new SVTK_View(myMainWindow1);
-      SVTK_ViewWindow::Initialize(myView1,theModel);
-
-      anIteractor->getRenderWindow()->Render();
-      myMainWindow1->onResetView();
-    }
-    {
-      myMainWindow2 = myMainWindow1->CreateMainWindow2(s,
-                                                       "VVTK_SegmantationWindow",
-                                                       aResourceMgr,
-                                                       this);
-      SVTK_RenderWindowInteractor* anIteractor = 
-        new SVTK_RenderWindowInteractor(myMainWindow2,"SVTK_RenderWindowInteractor1");
-      
-      SVTK_GenericRenderWindowInteractor* aDevice = 
-        SVTK_GenericRenderWindowInteractor::New();
-      aDevice->SetRenderWidget(anIteractor);
-      aDevice->SetSelector(aSelector);
-    
-      VVTK_Renderer2* aRenderer = VVTK_Renderer2::New();
-      aRenderer->Initialize(aDevice,aSelector);
-      
-      aRenderer->SetWidgetCtrl(aWidgetCtrl);
-      
-      aRenderer->SetInsideCursorSettings(anInsideCursorSettings);
-      aRenderer->SetPickingSettings(aPickingSettings);
-      
-      anIteractor->Initialize(aDevice,aRenderer,aSelector);
-
-      SVTK_InteractorStyle* aStyle = SVTK_InteractorStyle::New();
-      anIteractor->PushInteractorStyle(aStyle);
-      aStyle->Delete();
-
-      aDevice->Delete();
-      aRenderer->Delete();
-
-      myMainWindow2->Initialize(anIteractor);
-      
-      myView2 = new SVTK_View(myMainWindow2);
-      SVTK_ViewWindow::Initialize(myView2,theModel);
-
-      anIteractor->getRenderWindow()->Render();
-      myMainWindow2->onResetView();
-    }
-    aSelector->Delete();
-
-    int h = height() / 2;
-    QList<int> aSizes;
-    aSizes.append( h );
-    aSizes.append( h );
-    s->setSizes( aSizes );
-    myMainWindow2->hide();
-
-    myMainWindow = myMainWindow1;
-    myView = myView1;
-  }
-}
-
-//----------------------------------------------------------------------------
-VVTK_ViewWindow
-::~VVTK_ViewWindow()
-{}
-
-
-//----------------------------------------------------------------------------
-VVTK_MainWindow1* 
-VVTK_ViewWindow
-::getMainWindow1()
-{
-  return myMainWindow1;
-}
-
-VVTK_MainWindow2* 
-VVTK_ViewWindow
-::getMainWindow2()
-{
-  return myMainWindow2;
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::AddActor(VTKViewer_Actor* theActor, 
-           bool theIsUpdate)
-{
-  myMainWindow1->AddActor(theActor,theIsUpdate);
-  myMainWindow2->AddActor(theActor,theIsUpdate);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::RemoveActor(VTKViewer_Actor* theActor, 
-              bool theIsUpdate)
-{
-  myMainWindow1->RemoveActor(theActor,theIsUpdate);
-  myMainWindow2->RemoveActor(theActor,theIsUpdate);
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::Repaint(bool theUpdateTrihedron)
-{
-  myMainWindow1->Repaint(theUpdateTrihedron);
-  myMainWindow2->Repaint(theUpdateTrihedron);
-}
-
-//----------------------------------------------------------------
-void 
-VVTK_ViewWindow
-::unHighlightAll() 
-{
-  myView1->unHighlightAll();
-  myView2->unHighlightAll();
-}
-
-//----------------------------------------------------------------
-void
-VVTK_ViewWindow
-::highlight(const Handle(SALOME_InteractiveObject)& theIO, 
-            bool theIsHighlight, 
-            bool theIsUpdate ) 
-{
-  if(GetSelector()->AddIObject(theIO))
-    GetSelector()->EndPickCallback();
-  myView1->highlight( theIO, theIsHighlight, theIsUpdate );
-  myView2->highlight( theIO, theIsHighlight, theIsUpdate );
-}
-
-//----------------------------------------------------------------
-void
-VVTK_ViewWindow
-::onSelectionChanged()
-{
-  myView1->onSelectionChanged();
-  myView2->onSelectionChanged();
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::onResetView()
-{
-  myMainWindow1->onResetView();
-  myMainWindow2->onResetView();
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::onFitAll()
-{
-  myMainWindow1->onFitAll();
-  myMainWindow2->onFitAll();
-}
-
-//----------------------------------------------------------------------------
-bool 
-VVTK_ViewWindow
-::action( const int accelAction  )
-{
-  if ( myMainWindow1->hasFocus() )
-    myMainWindow1->action( accelAction );
-  else if ( myMainWindow2->hasFocus() )
-    myMainWindow2->action( accelAction );
-  else
-    return false;
-  return true;
-}
-
-//----------------------------------------------------------------------------
-QImage
-VVTK_ViewWindow
-::dumpView()
-{
-  if( myMainWindow1->GetInteractor()->hasFocus() )
-    {
-      if ( myMainWindow1->getToolBar()->testAttribute(Qt::WA_UnderMouse) || myDumpImage.isNull() )
-        return myMainWindow1->dumpView();
-      else
-        return myDumpImage;
-    }
-  
-  if( myMainWindow2->GetInteractor()->hasFocus() )
-    {
-      if ( myMainWindow1->getToolBar()->testAttribute(Qt::WA_UnderMouse) || myDumpImage.isNull() )
-        return myMainWindow2->dumpView();
-      else
-        return myDumpImage;
-    }
-
-  return QImage();
-}
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::setBackgroundColor( const QColor& theColor )
-{
-  myMainWindow1->SetBackgroundColor( theColor );
-  myMainWindow2->SetBackgroundColor( theColor );
-}
-
-
-//----------------------------------------------------------------------------
-void
-VVTK_ViewWindow
-::RefreshDumpImage()
-{ 
-  if( myMainWindow1->GetInteractor()->hasFocus() )
-    myDumpImage = myMainWindow1->dumpView();
-  else if ( myMainWindow2->GetInteractor()->hasFocus() )
-    myDumpImage = myMainWindow2->dumpView();
-}
diff --git a/src/VVTK/VVTK_ViewWindow.h b/src/VVTK/VVTK_ViewWindow.h
deleted file mode 100755
index bedf4b44..00000000
--- a/src/VVTK/VVTK_ViewWindow.h
+++ /dev/null
@@ -1,155 +0,0 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-//
-//  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
-//  This library is free software; you can redistribute it and/or
-//  modify it under the terms of the GNU Lesser General Public
-//  License as published by the Free Software Foundation; either
-//  version 2.1 of the License.
-//
-//  This library is distributed in the hope that it will be useful,
-//  but WITHOUT ANY WARRANTY; without even the implied warranty of
-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-//  Lesser General Public License for more details.
-//
-//  You should have received a copy of the GNU Lesser General Public
-//  License along with this library; if not, write to the Free Software
-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef VVTK_VIEWWINDOW_H
-#define VVTK_VIEWWINDOW_H
-
-#ifdef WIN32
-#pragma warning( disable:4251 )
-#endif
-
-#include "VVTK.h"
-#include "SVTK_ViewWindow.h"
-
-#include <QImage>
-
-#include <string>
-
-class VVTK_MainWindow1;
-class VVTK_MainWindow2;
-class SVTK_View;
-
-//----------------------------------------------------------------------------
-//! Customize the SVTK_ViewWindow in order to manage two SVTK_View (base and segmented one)
-class VVTK_EXPORT VVTK_ViewWindow : public SVTK_ViewWindow
-{
-  Q_OBJECT;
-
-public:
-  //! To construct the class
-  VVTK_ViewWindow(SUIT_Desktop* theDesktop);
-
-  //! Destroy
-  virtual
-  ~VVTK_ViewWindow();
-
-  //! To initialize
-  virtual
-  void
-  Initialize(SVTK_ViewModelBase* theModel);
-
-  //----------------------------------------------------------------------------
-  //! Get access to base SVTK_MainWindow
-  VVTK_MainWindow1* 
-  getMainWindow1();
-
-  //! Get access to segmented SVTK_MainWindow
-  VVTK_MainWindow2* 
-  getMainWindow2();
-
-  //----------------------------------------------------------------------------
-  //! Redefine SVTK_ViewWindow::AddActor method
-  /*!
-    This is an entry point for publication the presentation into the viewer.
-    Pointed actor published into the basic MainWindow. If the actor is
-    a Gauss Points one second actor is created from initial actor and 
-    is put into segemented MainWindow.
-  */
-  virtual
-  void
-  AddActor(VTKViewer_Actor* theActor,
-           bool theIsUpdate = false);
-
-  //! Redefine SVTK_ViewWindow::RemoveActor method
-  virtual
-  void
-  RemoveActor(VTKViewer_Actor* theActor,
-              bool theIsUpdate = false);
-
-  //! Redefine SVTK_ViewWindow::Repaint method
-  virtual
-  void
-  Repaint(bool theUpdateTrihedron = true);
-
-  //----------------------------------------------------------------------------
-  /*  interactive object management */
-  //! Redefine SVTK_ViewWindow::highlight method
-  virtual
-  void
-  highlight(const Handle(SALOME_InteractiveObject)& theIO, 
-            bool theIsHighlight = true, 
-            bool theIsUpdate = true);
-
-  //! Redefine SVTK_ViewWindow::unHighlightAll method
-  virtual
-  void
-  unHighlightAll();
-
-  //! Redefine SVTK_ViewWindow::setBackgroundColor method
-  virtual
-  void
-  setBackgroundColor( const QColor& );
-
-  //----------------------------------------------------------------------------
-
-  //! Refresh dump images of the viewers
-  virtual
-  void RefreshDumpImage();
-  
-public slots:
-  //! Redefine SVTK_ViewWindow::onSelectionChanged method
-  virtual
-  void
-  onSelectionChanged();
-
-  //! Redefine SVTK_ViewWindow::onResetView method
-  virtual
-  void
-  onResetView();     
-
-  //! Redefine SVTK_ViewWindow::onFitAll method
-  virtual
-  void 
-  onFitAll();
-
-  //----------------------------------------------------------------------------
-protected:
-  virtual 
-  bool
-  action( const int );
-
-  virtual QImage dumpView();
-
-  VVTK_MainWindow1* myMainWindow1; //!< The manage base view
-  SVTK_View* myView1; //!< The manage base view
-
-  VVTK_MainWindow2* myMainWindow2; //!< The manage segmented view
-  SVTK_View* myView2; //!< The manage segmented view
-
-private:
-  QImage myDumpImage;
-};
-
-#ifdef WIN32
-#pragma warning( default:4251 )
-#endif
-
-#endif