Merge from V5_1_main 14/05/2010

diff --git a/GUI_version.h.in b/GUI_version.h.in
index 9669a71af4b69ffdf30653bc74c7b49e66a449a6..9619a909417416c4f7b3aac614656d5e3670faf2 100644 (file)
--- a/GUI_version.h.in
+++ b/GUI_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   : GUI_version.h
 //  Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/Makefile.am b/Makefile.am
index e4d25cb24c0e2fcb5527f6bcb4c7aa49bbd8ffd4..78e039f5960fe90eaa084da760b171467f34109f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 #
+
 # -* Makefile *-
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 28/06/2001

diff --git a/SUIT.pro b/SUIT.pro
index 307a12511042f347804c70ea80f7ee1b94f5311e..07e37abf6c6c5c6292518b4fbf46dc60188cfca5 100644 (file)
--- a/SUIT.pro
+++ b/SUIT.pro
@@ -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/adm_local/Makefile.am b/adm_local/Makefile.am
index c3877a44042c123f2ba491b200d8c522af51c97b..6a8b8c3bc512f0393c4879f1ecfec3d787fc1090 100644 (file)
--- a/adm_local/Makefile.am
+++ b/adm_local/Makefile.am
@@ -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,4 +19,5 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 SUBDIRS = unix cmake_files

diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake
index b56514657ac05708c580cdacbf2cd6477878632f..aa7b8abba196cb97d884d40a92cbf4959e149426 100644 (file)
--- a/adm_local/cmake_files/FindCAS.cmake
+++ b/adm_local/cmake_files/FindCAS.cmake
@@ -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

diff --git a/adm_local/cmake_files/FindGUI.cmake b/adm_local/cmake_files/FindGUI.cmake
index 14ca37915f461a1610c971dc146e6547c6dc3b6b..b34c590c846fc90537fe7a867ed9b008bbb7fda5 100644 (file)
--- a/adm_local/cmake_files/FindGUI.cmake
+++ b/adm_local/cmake_files/FindGUI.cmake
@@ -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

diff --git a/adm_local/cmake_files/FindOPENGL.cmake b/adm_local/cmake_files/FindOPENGL.cmake
index f7578bd14bb5ea274d28075d31f735e7eafd46ec..d06dab337b82b956632439f6d30d1d73a7ada85c 100644 (file)
--- a/adm_local/cmake_files/FindOPENGL.cmake
+++ b/adm_local/cmake_files/FindOPENGL.cmake
@@ -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

diff --git a/adm_local/cmake_files/FindQT4.cmake b/adm_local/cmake_files/FindQT4.cmake
index 78f559120a93e67a9ad8ad46a61cc3faa5909a62..587e053ffe70ba7d082212d954ee1413dfc187b2 100644 (file)
--- a/adm_local/cmake_files/FindQT4.cmake
+++ b/adm_local/cmake_files/FindQT4.cmake
@@ -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

diff --git a/adm_local/cmake_files/FindQWT.cmake b/adm_local/cmake_files/FindQWT.cmake
index 528270976f5499f4d9399138f71b79583a7ac7c9..25820bbda65b47d7fa6bcfb473eb9d26036eab97 100644 (file)
--- a/adm_local/cmake_files/FindQWT.cmake
+++ b/adm_local/cmake_files/FindQWT.cmake
@@ -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

diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake
index f1526b1753b7f4c49b2420c8da8f3aa0613e6450..84ac4c878300831f15bb31070d7095c6fe2aee0f 100644 (file)
--- a/adm_local/cmake_files/FindSIPPYQT.cmake
+++ b/adm_local/cmake_files/FindSIPPYQT.cmake
@@ -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
@@ -46,15 +43,18 @@ GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH)
 GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH)
 ENDIF(PYUIC_ROOT)
 
-IF(WINDOWS)
-  SET(PYQT_SIPS ${PYUIC_ROOT}/sip)
-ELSE(WINDOWS)
-  IF(PYUIC_ROOT STREQUAL /usr)
-    SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4)
-  ELSE(PYUIC_ROOT STREQUAL /usr)
-    SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip)
-  ENDIF(PYUIC_ROOT STREQUAL /usr)
-ENDIF(WINDOWS)
+SET(PYQT_SIPS $ENV{PYQT_SIPS})
+IF(NOT PYQT_SIPS)
+  IF(WINDOWS)
+    SET(PYQT_SIPS ${PYUIC_ROOT}/sip)
+  ELSE(WINDOWS)
+    IF(PYUIC_ROOT STREQUAL /usr)
+      SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip/PyQt4)
+    ELSE(PYUIC_ROOT STREQUAL /usr)
+      SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip)
+    ENDIF(PYUIC_ROOT STREQUAL /usr)
+  ENDIF(WINDOWS)
+ENDIF(NOT PYQT_SIPS)
 
 SET(PYQT_INCLUDES -I${PYQT_SIPS})
 SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui)

diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake
index 14a74253267f7be9fcfdbb5ac6e07e4699e5a1c7..4807376789a35f6213d6a1065413dd5d4c68ce09 100644 (file)
--- a/adm_local/cmake_files/FindVTK.cmake
+++ b/adm_local/cmake_files/FindVTK.cmake
@@ -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
@@ -28,25 +25,25 @@ FOREACH(dir ${VTK_INCLUDE_DIRS})
 ENDFOREACH(dir ${VTK_INCLUDE_DIRS})
 
 SET(VTK_LIBS)
-FIND_LIBRARY(VTK_COMMON vtkCommon ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_COMMON vtkCommon ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON})
-FIND_LIBRARY(VTK_GRAPHICS vtkGraphics ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_GRAPHICS vtkGraphics ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS})
-FIND_LIBRARY(VTK_IMAGING vtkImaging ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_IMAGING vtkImaging ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING})
-FIND_LIBRARY(VTK_FILTERING vtkFiltering ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_FILTERING vtkFiltering ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING})
-FIND_LIBRARY(VTK_IO vtkIO ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_IO vtkIO ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO})
-FIND_LIBRARY(VTK_RENDERING vtkRendering ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_RENDERING vtkRendering ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING})
-FIND_LIBRARY(VTK_HYBRID vtkHybrid ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_HYBRID vtkHybrid ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID})
-FIND_LIBRARY(VTK_PARALLEL vtkParallel ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_PARALLEL vtkParallel ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL})
-FIND_LIBRARY(VTK_WIDGETS vtkWidgets ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(VTK_WIDGETS vtkWidgets ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
 SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS})
 
-FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD ${VTK_LIBRARY_DIRS})
-FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD ${VTK_LIBRARY_DIRS})
-FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD ${VTK_LIBRARY_DIRS})
+FIND_LIBRARY(vtkCommonPythonD vtkCommonPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkGraphicsPythonD vtkGraphicsPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)
+FIND_LIBRARY(vtkImagingPythonD vtkImagingPythonD ${VTK_LIBRARY_DIRS} NO_DEFAULT_PATH)

diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am
index d94ed4ebf543cbb1f468092c31aceb5eefcb8764..8c7042d548ad3522a0b0ec1133ea16ac39b632d2 100644 (file)
--- a/adm_local/cmake_files/Makefile.am
+++ b/adm_local/cmake_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_admlocal_cmake_DATA = \

diff --git a/adm_local/unix/Makefile.am b/adm_local/unix/Makefile.am
index 5f6d5f7536c72fc43090c511c2a26518cb92af5d..bacd272b134d1a96d0349796a1ec6d31f4518bca 100644 (file)
--- a/adm_local/unix/Makefile.am
+++ b/adm_local/unix/Makefile.am
@@ -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 $(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 d4be7f0704fbafb304c4085b62c0a4651a941fc7..ae39d272fc7141c8fe2d2a90b169867a6f9d04d8 100644 (file)
--- a/adm_local/unix/config_files/Makefile.am
+++ b/adm_local/unix/config_files/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 dist_admlocalm4_DATA =         \

diff --git a/adm_local/unix/config_files/check_GLViewer.m4 b/adm_local/unix/config_files/check_GLViewer.m4
index 064a60ae06f2a1c333741ec2fd33b0b7482252a2..e6ebf36ea6b23a4eb5c8de965dceb512ecdd3dbc 100644 (file)
--- a/adm_local/unix/config_files/check_GLViewer.m4
+++ b/adm_local/unix/config_files/check_GLViewer.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
+
 #
 # Check configure option --disable-glViewer=[yes|no|DIR] taking into account that
 # DISABLE_GLVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4
index 9314497685c06088cab0f9517ddb5c2b6d194804..7bc5569174b791a5b347352613ae8607a907c112 100755 (executable)
--- a/adm_local/unix/config_files/check_GUI.m4
+++ b/adm_local/unix/config_files/check_GUI.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
+
 #  Check availability of Salome binary distribution
 #
 #  Author : Marc Tajchman (CEA, 2002)

diff --git a/adm_local/unix/config_files/check_OCCViewer.m4 b/adm_local/unix/config_files/check_OCCViewer.m4
index ee23fd53d2eb78647538ed7ed41d3091924badae..f9f2e02a149a5528e90f7008618e54db5466c4d0 100644 (file)
--- a/adm_local/unix/config_files/check_OCCViewer.m4
+++ b/adm_local/unix/config_files/check_OCCViewer.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
+
 #
 # Check configure option --disable-occViewer=[yes|no|DIR] taking into account that
 # DISABLE_OCCVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_Plot2dViewer.m4 b/adm_local/unix/config_files/check_Plot2dViewer.m4
index ebef2706894746504fa9e30f8d0a3e064becd902..754a596830a2d59181338f76587ce36e487431fd 100644 (file)
--- a/adm_local/unix/config_files/check_Plot2dViewer.m4
+++ b/adm_local/unix/config_files/check_Plot2dViewer.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
+
 #
 # Check configure option --disable-plot2dViewer=[yes|no|DIR] taking into account that
 # DISABLE_PLOT2DVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_PyConsole.m4 b/adm_local/unix/config_files/check_PyConsole.m4
index 304867485121579143dbe2333ca1a23f3676eb6a..1eecbd12dd553a9abca630fbd16b4e26241b45ec 100644 (file)
--- a/adm_local/unix/config_files/check_PyConsole.m4
+++ b/adm_local/unix/config_files/check_PyConsole.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
+
 #
 # Check configure option --disable-pyConsole=[yes|no|DIR] taking into account that
 # DISABLE_PYCONSOLE may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_QxGraphViewer.m4 b/adm_local/unix/config_files/check_QxGraphViewer.m4
index ddd2a3c9488d802b4002f3f1ed22fac0af7b5361..6b0a2ae7dd1709ccc8d31b601de68ec450e6f79e 100644 (file)
--- a/adm_local/unix/config_files/check_QxGraphViewer.m4
+++ b/adm_local/unix/config_files/check_QxGraphViewer.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
+
 #
 # Check configure option --disable-qxGraphViewer=[yes|no|DIR] taking into account that
 # DISABLE_QXGRAPHVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_SalomeObject.m4 b/adm_local/unix/config_files/check_SalomeObject.m4
index 76d83431ff34d3403c181faf029ef6f0e633185e..bd5a297ed1328cd0e60fd4a74c559a793557b0e4 100644 (file)
--- a/adm_local/unix/config_files/check_SalomeObject.m4
+++ b/adm_local/unix/config_files/check_SalomeObject.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
+
 #
 # Check configure option --disable-salomeObject=[yes|no|DIR] taking into account that
 # DISABLE_SALOMEOBJECT may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_SupervGraphViewer.m4 b/adm_local/unix/config_files/check_SupervGraphViewer.m4
index 2ba31b6fa0b49461c9b6fc0d8bc5f11095181646..0105863bbc23404a655735dc435953143bef106b 100644 (file)
--- a/adm_local/unix/config_files/check_SupervGraphViewer.m4
+++ b/adm_local/unix/config_files/check_SupervGraphViewer.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
+
 #
 # Check configure option --disable-supervGraphViewer=[yes|no|DIR] taking into account that
 # DISABLE_SUPERVGRAPHVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_TestRecorder.m4 b/adm_local/unix/config_files/check_TestRecorder.m4
index 0dbe0b6aeb689f96a2992b41ed1c70c039cde234..c383a6d7215900a68b487195194c010b37da3a18 100644 (file)
--- a/adm_local/unix/config_files/check_TestRecorder.m4
+++ b/adm_local/unix/config_files/check_TestRecorder.m4
@@ -1,7 +1,4 @@
-dnl  Copyright (C) 2007-2008  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
+dnl  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 dnl
 dnl  This library is free software; you can redistribute it and/or
 dnl  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,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
+
 #
 # Check existence of Test recorder sources and libraries.
 # Set ENABLE_TESTRECORDER to yes|no

diff --git a/adm_local/unix/config_files/check_VTKViewer.m4 b/adm_local/unix/config_files/check_VTKViewer.m4
index 774de209fc38e9208d7db9bf2c1b5f8dc4563952..80b3c267c5c417523558cacf12fc263c39e805ee 100644 (file)
--- a/adm_local/unix/config_files/check_VTKViewer.m4
+++ b/adm_local/unix/config_files/check_VTKViewer.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
+
 #
 # Check configure option --disable-vtkViewer=[yes|no|DIR] taking into account that
 # DISABLE_VTKVIEWER may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4
index 94105766b060a0e123670f8ddbe2a93d25c4b387..3c255839724a953652b7df5c85f468d0f2ab30bb 100644 (file)
--- a/adm_local/unix/config_files/check_disable_Corba.m4
+++ b/adm_local/unix/config_files/check_disable_Corba.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
+
 #
 # Check configure option --disable-corba=[yes|no|DIR] taking into account that
 # GUI_DISABLE_CORBA may be already set during build_configure,

diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4
index afda71bea18b0dd03b95bfb2823e0a5ea6f4bc23..ee2e02291f6ccf5c09f50feebceb8176cee53198 100755 (executable)
--- a/adm_local/unix/config_files/check_msg2qm.m4
+++ b/adm_local/unix/config_files/check_msg2qm.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
+
 # Check availability of Qt's msg2qm tool binary distribution
 #
 # Author : Jerome Roy (CEA, 2003)

diff --git a/adm_local/unix/config_files/check_opengl.m4 b/adm_local/unix/config_files/check_opengl.m4
index dc94b12715c14da06f2376694a5f2c61f22b03c9..5013aaeadcc0ae8689dc5ae5a010f8d7dff6ed5f 100644 (file)
--- a/adm_local/unix/config_files/check_opengl.m4
+++ b/adm_local/unix/config_files/check_opengl.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
+
 AC_DEFUN([CHECK_OPENGL],[
 AC_REQUIRE([AC_PROG_CC])dnl
 AC_REQUIRE([AC_PROG_CPP])dnl

diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4
index f72d4e3411c4417517a44d0113dfdd85cac0754a..c23dac6d5acd09d1753bf7d1b092e393c27ffa21 100644 (file)
--- a/adm_local/unix/config_files/check_pyqt.m4
+++ b/adm_local/unix/config_files/check_pyqt.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
+
 AC_DEFUN([CHECK_PYQT],[
 AC_REQUIRE([CHECK_PYTHON])dnl
 AC_REQUIRE([CHECK_QT])dnl

diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4
index 0f28aef7d9255db367155e1b234aecd3db2e682c..43a3ab1b715debebf0994a840c859b5d7a9f1fbb 100644 (file)
--- a/adm_local/unix/config_files/check_qt.m4
+++ b/adm_local/unix/config_files/check_qt.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
+
 dnl  OPTIONS_QT
 dnl  ------------------------------------------------------------------------
 dnl  Adds the --with-qt=path

diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4
index bae22ac31a3c6f9ccc94a781150b934a43d2f095..e007e76f9af90cbb4a342fe064b3ed174003de5f 100644 (file)
--- a/adm_local/unix/config_files/check_qwt.m4
+++ b/adm_local/unix/config_files/check_qwt.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
+
 AC_DEFUN([CHECK_QWT],[
 AC_REQUIRE([CHECK_QT])dnl
 AC_REQUIRE([AC_LINKER_OPTIONS])dnl

diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4
index 29388c3610f0b2ad8ca625d611bb11a4d5e2fa8b..9fa0d1b9413c2e10cc36d18daa0dd77999bac251 100644 (file)
--- a/adm_local/unix/config_files/check_sip.m4
+++ b/adm_local/unix/config_files/check_sip.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
+
 AC_DEFUN([CHECK_SIP],[
 AC_REQUIRE([CHECK_PYTHON])dnl
 AC_REQUIRE([CHECK_QT])dnl

diff --git a/adm_local/unix/config_files/check_vtk.m4 b/adm_local/unix/config_files/check_vtk.m4
index befc9320b7bdfeaa477c31de809d2a1ca700caa8..219e549ac3b4d473d4940f04a45cec9f27e62ceb 100644 (file)
--- a/adm_local/unix/config_files/check_vtk.m4
+++ b/adm_local/unix/config_files/check_vtk.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
+
 dnl  OPTIONS_VTK
 dnl  ------------------------------------------------------------------------
 dnl  Adds the --with-vtk=path and --with-vtk-version configure options

diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am
index 1911a03391eae243a4c0290a27c9da50081d9bf7..a1effa9ba98ea80247fc3648557e1aac1be1b539 100644 (file)
--- a/adm_local/unix/make_common_starter.am
+++ b/adm_local/unix/make_common_starter.am
@@ -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
@@ -24,6 +24,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/adm_local/unix/make_conclude.in b/adm_local/unix/make_conclude.in
index a21a3b28e0700f740b1d1e0238f803eb7ade3040..4108bb8beabe264923375d6cc9d7196c25c3f786 100644 (file)
--- a/adm_local/unix/make_conclude.in
+++ b/adm_local/unix/make_conclude.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
 #
+
 #=======================================================================
 # This section of this makefile comes from the file 
 # 'adm/unix/make_conclude' which was generated with config.status

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7d549a912d1fa04d6d4057cda8227e4a02b4364f..d09b3bd2370d6c1081e1c7231351544c7b7473da 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -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
 #
+
 # -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : KERNEL

diff --git a/bin/runLightSalome.csh b/bin/runLightSalome.csh
index 51b64d9f596de8393aa4bd36577b559e9500bb18..a7b18e944c5f5cab897e1005323fb482c6e1bf3e 100755 (executable)
--- a/bin/runLightSalome.csh
+++ b/bin/runLightSalome.csh
@@ -1,5 +1,5 @@
 #!/bin/csh -f
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&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/bin/runLightSalome.sh b/bin/runLightSalome.sh
index 8caaaa9165d44e1606378bdff7ea5e4b56861529..2fe2866b9c9513ac659fc83347233d11877c2be2 100755 (executable)
--- a/bin/runLightSalome.sh
+++ b/bin/runLightSalome.sh
@@ -1,5 +1,5 @@
 #!/bin/bash -f
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&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
 #
+
 # File   : runLightSalome.sh
 # Author : Vadim SANDLER, Open CASCADE S.A.S, vadim.sandler@opencascade.com
 ###

diff --git a/build_cmake b/build_cmake
index 844a4f2c4385a9b9b131ee46c982b1b9ba5989df..942a8132a1b0d1831c0407acb89b034412749941 100755 (executable)
--- 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 58a10b0a3551da3120710d19504aa0f5a77a59d4..c656b71a4104a59b10982453e8f8c1dca66558f7 100644 (file)
--- a/build_cmake.bat
+++ b/build_cmake.bat
@@ -1,2 +1,20 @@
-\r
+@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 --gui\r

diff --git a/build_configure b/build_configure
index f41c53c84e47143cb07de1a598d5edc299a32867..2412de77283f50274e61cb1fdfb18ce4e943ad29 100755 (executable)
--- 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 f57f7b3bf98d03cab5f0acc1a75b80d039d61886..75fa9564c0a32013511e0b5bd3388ba0c93c0e71 100755 (executable)
--- a/clean_configure
+++ b/clean_configure
@@ -1,5 +1,5 @@
 #!/bin/sh
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&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
 #
+
 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 a666c53d51f4b970e49c125d57daca484a87ec17..bf6d0b1f6aa869e609238361d0cedb816208d37b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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,13 +19,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) - autotools usage
 #
-AC_INIT([Salome2 Project GUI module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeGUI])
+AC_INIT([Salome2 Project GUI module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeGUI])
 AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -573,6 +574,11 @@ AM_CONDITIONAL(ENABLE_SALOMEOBJECT, [test "$DISABLE_SALOMEOBJECT" = no])
 AM_CONDITIONAL(ENABLE_QXGRAPHVIEWER, [test "$DISABLE_QXGRAPHVIEWER" = no])
 AM_CONDITIONAL(ENABLE_TESTRECORDER, [test "$ENABLE_TESTRECORDER" = yes])
 
+if test "$DISABLE_PYCONSOLE" = "no" ; then
+  AC_DEFINE(SUIT_ENABLE_PYTHON)
+fi
+
+
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
@@ -600,8 +606,10 @@ AC_OUTPUT([ \
   doc/salome/Makefile \
   doc/salome/gui/Makefile \
   doc/salome/gui/doxyfile \
+  doc/salome/gui/static/header.html \
   doc/salome/tui/Makefile \
   doc/salome/tui/doxyfile \
+  doc/salome/tui/static/header.html \
   src/Makefile \
   src/CASCatch/Makefile \
   src/Qtx/Makefile \

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7ab931dd60a489f2c969fa1c8d0974edd8393e3e..bd79b9fcda0ca3698ee1665aeca1be2b94b4e2ad 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -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
 #
+
 # -* Makefile *- 
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001

diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index 7fce292871455cd8f99460d387146e3d70c0fe85..2b6e7fee5aeb923084d15351bf87bf9dbf5ea705 100644 (file)
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -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
 #
+
 # -* Makefile *- 
 # Author : Patrick GOLDBRONN (CEA)
 # Date : 30/11/2001

diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am
index 61de9ca86ceb9b7317e457d89e1d3dadc9409e5b..b66041b9d65e8e6574b90e68fbb03484d718fad5 100644 (file)
--- a/doc/salome/gui/Makefile.am
+++ b/doc/salome/gui/Makefile.am
@@ -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,13 +19,17 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.in
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += images input static
+EXTRA_DIST += images input static/footer.html static/doxygen.css
+
+guidocdir = $(docdir)/gui/GUI
+guidoc_DATA = images/head.png
 
 usr_docs: doxyfile
        echo "Running doxygen in directory: "`pwd`; \

diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in
index dd9ea65289e5171254be8cd8f0a017398bc31854..84772c7769db02ffbfdea6331770570fcadfcee8 100755 (executable)
--- a/doc/salome/gui/doxyfile.in
+++ b/doc/salome/gui/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
@@ -22,7 +22,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME      = "GUI Module Reference Manual v.@VERSION@"
+PROJECT_NAME      = "SALOME GUI User's Guide"
 OUTPUT_DIRECTORY  = GUI
 CREATE_SUBDIRS   = NO
 OUTPUT_LANGUAGE   = English
@@ -46,9 +46,9 @@ IMAGE_PATH        = @srcdir@/images
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
 HTML_OUTPUT       = .
-HTML_HEADER       = @srcdir@/static/header.html
+HTML_HEADER       = @builddir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
-#HTML_STYLESHEET  = @srcdir@/static/doxygen.css
+HTML_STYLESHEET   = @srcdir@/static/doxygen.css
 TOC_EXPAND        = YES
 DISABLE_INDEX     = NO
 GENERATE_TREEVIEW = YES

diff --git a/doc/salome/gui/images/head.png b/doc/salome/gui/images/head.png
new file mode 100755 (executable)
index 0000000..307d9ef
Binary files /dev/null and b/doc/salome/gui/images/head.png differ

diff --git a/doc/salome/gui/images/ppref0.png b/doc/salome/gui/images/ppref0.png
new file mode 100755 (executable)
index 0000000..fbd1821
Binary files /dev/null and b/doc/salome/gui/images/ppref0.png differ

diff --git a/doc/salome/gui/images/ppref3.png b/doc/salome/gui/images/ppref3.png
index 8c31ab8a16ea4fd05481670d54466482b0b69e94..1fcefc17522a094e359ce73822b40cd41b0a1857 100755 (executable)
Binary files a/doc/salome/gui/images/ppref3.png and b/doc/salome/gui/images/ppref3.png differ

diff --git a/doc/salome/gui/images/pref15.png b/doc/salome/gui/images/pref15.png
index e3fbbe2aa4f3aa3c16b5b751df95eb2185b95215..9f1195e5cf42c2e465f2e4befcdffb7e89db26e2 100755 (executable)
Binary files a/doc/salome/gui/images/pref15.png and b/doc/salome/gui/images/pref15.png differ

diff --git a/doc/salome/gui/images/pref21.png b/doc/salome/gui/images/pref21.png
index ab34a6da9d00a6528c8201dfcbc436a4d8936241..caf3519fde1480da7ff0e79f35e841634e3cd9bf 100755 (executable)
Binary files a/doc/salome/gui/images/pref21.png and b/doc/salome/gui/images/pref21.png differ

diff --git a/doc/salome/gui/images/pref22.png b/doc/salome/gui/images/pref22.png
index 154ad1b706b3887256bc9a17671aae5266591243..318d36deffff570906925a63626329ff093ca76e 100755 (executable)
Binary files a/doc/salome/gui/images/pref22.png and b/doc/salome/gui/images/pref22.png differ

diff --git a/doc/salome/gui/images/pref33.png b/doc/salome/gui/images/pref33.png
index a1e42f2c5fdc6a21b1a7a94fcb459e3f27c82896..e37029afc43f2aeff5f2f7856d2e85fab1feb68c 100755 (executable)
Binary files a/doc/salome/gui/images/pref33.png and b/doc/salome/gui/images/pref33.png differ

diff --git a/doc/salome/gui/images/pref35.png b/doc/salome/gui/images/pref35.png
new file mode 100755 (executable)
index 0000000..fc3bb6e
Binary files /dev/null and b/doc/salome/gui/images/pref35.png differ

diff --git a/doc/salome/gui/input/geometry_preferences.doc b/doc/salome/gui/input/geometry_preferences.doc
index 165d329da148aa588d7dbe91326f378adf51b5a5..81161225c67292da1742c35c200c18e378fa9b4f 100644 (file)
--- a/doc/salome/gui/input/geometry_preferences.doc
+++ b/doc/salome/gui/input/geometry_preferences.doc
@@ -5,6 +5,8 @@
 In the \b Geometry module you can set preferences for visualisation of
 geometrical figures which can be used in later sessions with this
 module.
+There is also a special group of preferences controlling input precision for floating-point
+data.
 
 \image html pref15.png
 
@@ -37,6 +39,20 @@ better quality of a shape in the viewer.</li>
 </ul>
 </ul>
 
+<ul>
+<li><b>Input fields precision</b></li>
+<ul>
+<li><b>Length precision</b> - allows to ajust input precision of coordinates and dimensions.</li>
+<li><b>Angular precision</b> - allows to ajust input precision of angles.</li>
+<li><b>Length tolerance precision</b> - allows to ajust input precision of tolerance of coordinates and dimensions.</li>
+<li><b>Angular tolerance precision</b> - allows to ajust input precision of tolerance of angles.</li>
+<li><b>Weight precision</b> - allows to ajust input precision of weight and mass.</li>
+<li><b>Density precision</b> - allows to ajust input precision of density.</li>
+<li><b>Parametric precision</b> - allows to ajust input precision of parametric values.</li>
+<li><b>Parametric tolerance precision</b> - allows to ajust input precision of tolerance in parametric space.</li>
+</ul>
+</ul>
+
 <ul>
 <li><b>Marker of Points</b></li>
 <ul>

diff --git a/doc/salome/gui/input/introduction_to_gui.doc b/doc/salome/gui/input/introduction_to_gui.doc
index ddbccb03f15f0ac846fa33a03e7584da74f9a0e7..5e3de36f388f841ffe92c648de4dbc780479777a 100644 (file)
--- a/doc/salome/gui/input/introduction_to_gui.doc
+++ b/doc/salome/gui/input/introduction_to_gui.doc
@@ -62,6 +62,10 @@ Help for the GUI module provides information about standard
 </ul>
 
 \subpage setting_preferences_page "Preferences" for all Salome modules
-are also described in this section of Salome GUI Help.
+are also described in this section of SALOME GUI Help.
 
-*/
\ No newline at end of file
+\subpage using_input_widgets_page "Using input widgets" sub-section
+covers specific aspects of behavior of certain kinds of SALOME GUI
+input fields.
+
+*/

diff --git a/doc/salome/gui/input/mesh_preferences.doc b/doc/salome/gui/input/mesh_preferences.doc
index e19ee4eb01850025a8c730263b38a9003ad653a3..7fd8a38a25d908050d1bf9c7171eafd5e9579513 100644 (file)
--- a/doc/salome/gui/input/mesh_preferences.doc
+++ b/doc/salome/gui/input/mesh_preferences.doc
@@ -21,10 +21,9 @@ viewer automatically updated whenever you make changes in it.</li>
 object will be displayed in the viewer by default.</li>
 <li>If you toggle <b>Use precision</b> checkbox, you can display numbers in
 <b>Quality Control</b> diagrams at the necessary level of precision.</li>
-</ul>
-<li><b>Precision</b> - can be defined by the <b>Number of digits after point</b> in
-the corresponding field. By default, numbers in <b>Quality Control</b>
+<li><b>Number of digits after point</b> - defines precision for <b>Quality Controls</b>. By default, numbers in <b>Quality Control</b>
 diagrams are presented as integers.</li>
+</ul>
 <li><b>Display mode</b> - allows to set Wireframe, Shading, Nodes or Shrink
 presentation mode as default.</li>
 <li><b>Representation of the 2D quadratic elements</b></li>
@@ -62,6 +61,16 @@ meshed object and the Max Size of segments.</li>
 number of segments on each edge</li>
 </ul>
 </ul>
+<li><b>Input fields precision</b></li>
+<ul>
+<li><b>Length precision</b> - allows to adjust input precision of coordinates and dimensions.</li>
+<li><b>Angular precision</b> - allows to adjust input precision of angles.</li>
+<li><b>Length tolerance precision</b> - allows to adjust input precision of tolerance of coordinates and dimensions.</li>
+<li><b>Parametric precision</b> - allows to adjust input precision of parametric values.</li>
+<li><b>Area precision</b> - allows to adjust input precision of mesh element area.</li>
+<li><b>Volume precision</b> - allows to adjust input precision of mesh element volume.</li>
+</ul>
+</ul>
 
 <h2>Mesh Preferences</h2>
 
@@ -73,7 +82,8 @@ number of segments on each edge</li>
 <li><b>Color</b> -  allows to select the color of nodes. Click on the
 colored line to access to the \ref select_color_and_font_page "Select Color" 
 dialog box.</li>
-<li><b>Size</b> - allows to define the size of nodes.</li>
+<li><b>Type of marker</b> - allows to define the shape of nodes.</li>
+<li><b>Scale of marker</b> - allows to define the size of nodes.</li>
 </ul>
 <li><b>Elements</b></li>
 <ul>

diff --git a/doc/salome/gui/input/postpro_preferences.doc b/doc/salome/gui/input/postpro_preferences.doc
index a919373ecf8d435375e60c4f78317328c340e3cd..54036ef328fb08bd82c3914a4f38b80c63462c35 100644 (file)
--- a/doc/salome/gui/input/postpro_preferences.doc
+++ b/doc/salome/gui/input/postpro_preferences.doc
@@ -5,6 +5,22 @@
 In the Post-Pro module you can set preferences, default settings,
 which can be used in later sessions with this module.
 
+<h2>General Preferences</h2>
+
+\image html ppref0.png
+
+<ul>
+<li><b>Input fields precision</b></li>
+<ul>
+<li><b>Visual data precision</b> - allows to adjust precision of scalar data displayed as text, data values round-up, various visualization options.</li>
+<li><b>Length precision</b> - allows to adjust input precision of coordinates and dimensions.</li>
+<li><b>Angular precision</b> - allows to adjust input precision of angles.</li>
+<li><b>Length tolerance precision</b> - allows to adjust input precision of tolerance of coordinates and dimensions.</li>
+<li><b>Parametric precision</b> - allows to adjust input precision of parametric values.</li>
+<li><b>Memory size precision</b> - allows to adjust input precision of memory size.</li>
+</ul>
+</ul>
+
 <h2>MED import Preferences</h2>
 
 \image html ppref1.png
@@ -131,6 +147,19 @@ Cache</li>
 <li><b>Cycled animation</b> - allows to start a cycled animation of the presentation.</li>
 <li><b>Use proportional timing</b> - allows to render the animation with proportional periods of time between every frame (not depending on the time stamps).</li>
 <li><b>Clean memory at each frame</b> - this option allows to optimize the performance of the operation.</li>
+<li><b>Dump mode</b> - this option allows to choose a mode of dumping
+the animation process. Three modes are available:
+<ul>
+<li><b>No dump</b> - disables dumping.</li>
+<li><b>Save pictures to directory</b> - dumps the animation
+to set of pictures corresponding to each timestamp.</li>
+<li><b>Save animation to AVI file</b> - generates a movie that
+reproduces the animation process.</li>
+</ul></li>
+<li><b>Time stamp frequency</b> - this option is available if
+<b>Save animation to AVI file</b> mode is turned on. It provides a
+possibility to capture only timestamps with indices divisable by the
+specified frequency, that allows to generate less voluminous films.</li>
 </ul>
 
 <li><b>Sweeping preferences</b></li>
@@ -164,6 +193,8 @@ selecting lines or arcs for representation of quadratic elements.</li>
 application to build arcs. </li>
 <li><b>Edge Color</b> - allows selecting the color for representation
 of edges. </li>
+<li><b>Type of marker</b> - allows to choose a shape of point markers.</li>
+<li><b>Scale of marker</b> - allows to choose a scale of point markers.</li>
 <li><b>Use Shading</b> - when this option is checked, the objects will
 be displayed with shading.</li>
 <li><b>Display only on creation</b> - when this option is checked, all
@@ -177,6 +208,25 @@ in the visible area.</li>
 </ul>
 </ul>
 
+<br><h2>Tables</h2>
+
+\image html pref35.png
+
+<ul>
+<li><b>Enable editing</b></li> - allows to edit contents of the tables
+(in particular, to sort table data by clicking on the column header).
+<li><b>Sort policy</b></li> - specify how the empty cells will be processed
+during the sort procedure. The following options are available:
+</li>
+<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>
+</ul>
 
 <br><h2>Feature Edges</h2>
 

diff --git a/doc/salome/gui/input/using_input_widgets.doc b/doc/salome/gui/input/using_input_widgets.doc
new file mode 100755 (executable)
index 0000000..2d0cb9b
--- /dev/null
+++ b/doc/salome/gui/input/using_input_widgets.doc
@@ -0,0 +1,65 @@
+/*!
+
+\page using_input_widgets_page Using input widgets
+
+This section contains some hints that might be useful when working
+with SALOME GUI input widgets.
+
+<h1>Spin boxes</h1>
+
+This type of widgets is used for numeric (integer or floating-point)
+data input. Spin boxes are used in standard \b SALOME modules in case
+if an input value has clearly defined input range (and precision in
+case of floating-point value).
+
+Input precision has specific semantics in \b SALOME floating-point
+spin boxes:
+- Positive value means that a number in a fixed-point format
+(corresponding to "f" format specifier for C printf function) is
+expected. Positive precision value is the maximum allowed number of
+digits after the decimal separator.
+- Negative precision value means that a number either in a fixed-point
+or scientific (exponetial) format is expected. This is similar to
+behavior of "g" format specifier for C printf function. Absolute
+precision value is the maximum allowed number of significant digits in
+mantissa (note that one digit is always before the decimal separator).
+
+To make the user aware of an input value constraints applied by some
+\b SALOME operation, the following basic capabilties are provided by
+spin boxes:
+- Text entered manually into a spin box by the user is checked to be a
+number of valid type (integer or floating-point).
+- The text is converted to a number and checked against the valid
+range.
+- Additionally, for floating-point data the input text is checked
+against the precision rules described above.
+
+In case if the input text in a spin box does not satisfy the
+constraints, the user is informed about this by a message shown in a
+tooltip near the spin box just as he types in it. The tooltip contains
+information about valid data range. For floating-point input, the
+tooltip also contains information about expected precision. 
+
+In standard \bSALOME modules precision value can be adjusted through
+\ref setting_preferences_page "user preferences" of correspodning  modules, and the tooltip contains a
+reference to corresponding parameter in the preferences.
+
+On-line documentation for each standard SALOME module contains the
+list of user preferences that can be used for tuning floating-point
+precision for different type of input quantities.
+
+<h2>Spin boxes and SALOME Notebook</h2>
+
+Apart from numeric input, spin boxes in some \b SALOME modules accept
+names of \b Notebook variables (see \ref using_notebook "Using Notebook" 
+page for more details about \b Notebook).
+
+If some spin box accepts variable names, then it is
+additionally checked whether the manual input text represents a variable name. Variable
+names should satisfy common naming rules for \b Python variables.
+In case if the input is neither a valid number nor a variable name,
+the tooltip is shown informing the user that variable names are
+also acceptable in this spin box.
+
+
+*/

diff --git a/doc/salome/gui/static/doxygen.css b/doc/salome/gui/static/doxygen.css
new file mode 100644 (file)
index 0000000..d6e79e1
--- /dev/null
+++ b/doc/salome/gui/static/doxygen.css
@@ -0,0 +1,430 @@
+body {
+   font-family: Arial, Helvetica, sans-serif;
+   background-color: #ffffff;
+}
+
+h1 { 
+   text-align: center; 
+   text-decoration: none;
+   border: none;
+   line-height: 25px;
+   text-align: center;
+//   text-transform:uppercase;
+   background: #D9f4fd;
+   font-size: 12pt;
+   font-weight: bold;
+   border: 1px solid #CCCCCC;
+   -moz-border-radius: 8px;
+   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+h2 {
+   font-size: 12pt;
+   font-weight: bold;
+}
+
+table {
+   font-size: 10pt;
+}
+
+CAPTION { 
+   font-weight: bold 
+}
+
+/* Link in the top navbar */
+A.qindex {}
+
+A.qindexRef {}
+
+/* Link to any cross-referenced Doxygen element inside a code section 
+   (ex: header)
+*/
+A.code { 
+   text-decoration: none; 
+   font-weight: normal; 
+   color: #4444ee 
+}
+
+A.codeRef { 
+   font-weight: normal; 
+   color: #4444ee 
+}
+
+A:hover { 
+   text-decoration: none; 
+   background-color: lightblue; 
+}
+
+div.contents {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+}
+
+div.navpath {
+  font-size: 11pt;
+}
+
+div.version {
+   background-color:#ffffde;
+   border:1px solid #cccccc;
+   font-family: Arial, Helvetica, sans-serif;
+   font-size: 9pt;
+   text-align: center;
+   width:100px;
+   -moz-border-radius: 8px;
+//   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+div.header {
+  background: url("head.png");
+  background-color: #175783;
+  border: 1px solid;
+  height: 80px;
+  background-repeat: no-repeat;
+  margin-bottom: 10px;
+}
+
+div.tabs {
+  display: none;
+}
+
+div.footer {
+  background-color: #D9f4fd;
+  border: 1px solid #AAAAAA;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 11px;
+  padding: 10px;
+  margin-top: 15px;
+}
+
+DL.el { 
+   margin-left: -1cm 
+}
+
+/* A code fragment (ex: header) */
+div.fragment { 
+   border: none; 
+}
+
+/* In the alpha list (coumpound index), style of an alphabetical index letter */
+DIV.ah { 
+   background-color: #CCCCCC; 
+   font-weight: bold; 
+   color: #ffffff; 
+   margin-bottom: 3px; 
+   margin-top: 3px 
+}
+
+/* Method name (+ type) */
+TD.md { 
+   background-color: lightblue; 
+   font-weight: bold; 
+}
+
+/* Method parameter (some of them) */
+TD.mdname1 { 
+   background-color: lightblue; 
+   font-weight: bold; color: #602020; 
+}
+
+/* Method parameter (some of them) */
+TD.mdname { 
+   background-color: lightblue; 
+   font-weight: bold; 
+   color: #602020; 
+   width: 600px; 
+}
+
+/* Separator between methods group (usually empty, seems not supported by IE) */
+DIV.groupHeader { 
+   margin-left: 16px; 
+   margin-top: 12px; 
+   margin-bottom: 6px; 
+   font-weight: bold 
+}
+
+DIV.groupText { 
+   margin-left: 16px; 
+   font-style: italic; 
+   font-size: smaller 
+}
+
+/*div.div-page { 
+  background-color: #FFFFFF; 
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-top: 1em;
+  margin-bottom: 0.1em;
+
+  padding-left: 1em;
+  padding-right: 1em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
+
+  border: 2px solid #0D299A; 
+  border-width: 2px;
+  border-color: #0D299A; 
+}*/
+
+div.tabs { 
+  text-align: justify; 
+  margin-left    : 2px;         
+  margin-right   : 2px;  
+  margin-top     : 2px; 
+  margin-bottom  : 2px
+  font-weight: bold;
+  color: #FFFFFF;
+}
+
+DIV.div-footer { 
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-bottom: 0.2em;
+  text-align: right;
+  font-size: 9pt; 
+}
+
+/* In File List, Coumpound List, etc, 1st column of the index */
+TD.indexkey { 
+   background-color: #CCCCCC; 
+   font-weight: bold; 
+   padding-right  : 10px; 
+   padding-top    : 2px; 
+   padding-left   : 10px; 
+   padding-bottom : 2px; 
+   margin-left    : 0px; 
+   margin-right   : 0px; 
+   margin-top     : 2px; 
+   margin-bottom  : 2px  
+}
+
+/* In File List, Coumpound List, etc, 2nd column of the index */
+TD.indexvalue { 
+   background-color: #CCCCCC; 
+   font-style: italic; 
+   padding-right  : 10px; 
+   padding-top    : 2px; 
+   padding-left   : 10px; 
+   padding-bottom : 2px; 
+   margin-left    : 0px; 
+   margin-right   : 0px; 
+   margin-top     : 2px; 
+   margin-bottom  : 2px  
+}
+
+span.keyword       { color: #008000 }
+span.keywordtype   { color: #604020 }
+span.keywordflow   { color: #e08000 }
+span.comment       { color: #800000 }
+span.preprocessor  { color: #806020 }
+span.stringliteral { color: #002080 }
+span.charliteral   { color: #008080 }
+
+/* @group Code Colorization */
+
+.fragment {
+       font-family: monospace, fixed;
+       font-size: 10pt;
+}
+
+pre.fragment {
+        width: 95%;
+       border: 1px solid #CCCCCC;
+        -moz-border-radius: 8px;
+        -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+        background-color:#EEF3F5;
+       padding: 4px 6px;
+       margin: 4px 1px 4px 1px;
+}
+
+/* Top Navigation style */
+
+div.navigation {
+  margin-bottom:20px;
+}
+
+/* Left navigation panel style */
+
+body.ftvtree {
+   background-color: #D9f4fd;
+  margin: 10px;
+}
+
+div.directory {
+  margin: 0;
+}
+
+div.directory.p {
+  margin: 0;
+}
+
+h3.swap {
+   font-size: 10pt;
+   margin-bottom: 0;
+}
+
+/* Link to any cross-referenced Doxygen element */
+a.el { 
+   text-decoration: none; 
+   font-family: Arial, Helvetica, sans-serif;
+   font-weight: bold;
+   font-size: 9pt;
+   color: #551a8b;
+}
+
+a.el:hover {
+   background-color: transparent;
+}
+
+a.elRef { 
+   font-weight: normal;
+}
+
+
+#MSearchBox {
+  -moz-border-radius:8px 8px 8px 8px;
+  background-color:white;
+  border:1px solid #84B0C7;
+  margin:0;
+  padding:0;
+  white-space:nowrap;
+}
+
+div.directory img {
+  vertical-align:-30%;
+}
+
+div.directory p {
+  white-space:nowrap;
+  margin: 0;
+}
+
+div.directory-alt div {
+       display: none;
+       margin: 0px;
+}
+
+
+div.directory div {
+       display: none;
+       margin: 0px;
+}
+
+div.version {
+   background-color:#ffffde;
+   border:1px solid #cccccc;
+   font-family: Arial, Helvetica, sans-serif;
+   font-size: 9pt;
+   text-align: center;
+   width:100px;
+   -moz-border-radius: 8px;
+//   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+/* @group Member Descriptions */
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+        background-color: #FAFAFA;
+        border: none;
+        margin: 4px;
+        padding: 1px 0 0 8px;
+}
+
+.mdescLeft, .mdescRight {
+        padding: 0px 8px 4px 8px;
+        color: #555;
+}
+
+.memItemLeft, .memItemRight, .memTemplParams {
+        border-top: 1px solid #ccc;
+}
+
+.memItemLeft, .memTemplItemLeft {
+        white-space: nowrap;
+}
+
+.memTemplParams {
+        color: #606060;
+        white-space: nowrap;
+}
+
+/* @end */
+
+/* Styles for detailed member documentation */
+
+.memtemplate {
+        font-size: 80%;
+        color: #606060;
+        font-weight: normal;
+        margin-left: 3px;
+}
+
+.memnav {
+        background-color: #e8eef2;
+        border: 1px solid #84b0c7;
+        text-align: center;
+        margin: 2px;
+        margin-right: 15px;
+        padding: 2px;
+}
+
+.memitem {
+        padding: 0;
+        margin-bottom: 10px;
+}
+
+.memname {
+        white-space: nowrap;
+        font-weight: bold;
+}
+
+.memproto, .memdoc {
+        border: 1px solid #84b0c7;
+}
+
+.memproto {
+        padding: 0;
+        background-color: #d5e1e8;
+        font-weight: bold;
+        -webkit-border-top-left-radius: 8px;
+        -webkit-border-top-right-radius: 8px;
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 8px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+
+}
+
+
+
+.memdoc {
+        padding: 2px 5px;
+        background-color: #eef3f5;
+        border-top-width: 0;
+        -webkit-border-bottom-left-radius: 8px;
+        -webkit-border-bottom-right-radius: 8px;
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        -moz-border-radius-bottomleft: 8px;
+        -moz-border-radius-bottomright: 8px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+}
+
+.paramkey {
+        text-align: right;
+}
+
+.paramtype {
+        white-space: nowrap;
+}
+
+.paramname {
+        color: #602020;
+        white-space: nowrap;
+}
+.paramname em {
+        font-style: normal;
+}
+
+/* @end */

diff --git a/doc/salome/gui/static/footer.html b/doc/salome/gui/static/footer.html
index 6eab03cf281c95fcba87f89c33eccea18dc3e7c4..fdfb138ca8e38a888e4d933bfa8089036b7329d7 100755 (executable)
--- a/doc/salome/gui/static/footer.html
+++ b/doc/salome/gui/static/footer.html
@@ -3,10 +3,11 @@
 <head>
 </head>
 <body>
-<hr style="width: 100%; height: 2px;">
+<div class="footer">
 <div style="text-align: center;">
-Copyright &copy; 2007-2008  CEA/DEN, EDF R&amp;D, OPEN CASCADE<br>
+Copyright &copy; 2007-2010  CEA/DEN, EDF R&amp;D, OPEN CASCADE<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>
 </html>

diff --git a/doc/salome/gui/static/header.html.in b/doc/salome/gui/static/header.html.in
new file mode 100755 (executable)
index 0000000..6795e96
--- /dev/null
+++ b/doc/salome/gui/static/header.html.in
@@ -0,0 +1,10 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <title>$title</title>
+   <link href="doxygen.css" rel="stylesheet" type="text/css">
+</head>
+<div class="header"></div>
+<div align="right"><div class="version">Version: @VERSION@</div></div>
+

diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index af6eaab262a4e5fd28dd0d269389228ac38986c3..e160cead72e425dea2a3c527e5862817b325de1b 100644 (file)
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -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,13 +19,17 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.in
 #  Author : Vasily Rusyaev (Open Cascade NN)
 #  Module : doc
 #
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST += images static
+EXTRA_DIST += images input static/footer.html static/doxygen.css
+
+tuidocdir = $(docdir)/tui/GUI
+tuidoc_DATA = images/head.png
 
 dev_docs: doxyfile
        echo "Running doxygen in directory: "`pwd`; \

diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in
index 201628e66860f4460ecefcbd2b167ac81cfa5c35..7a40c613744f263b429b3ff38a17e05b1c4a7167 100755 (executable)
--- 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
@@ -24,7 +24,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "GUI Module Programming Guide v.@VERSION@"
+PROJECT_NAME           = "SALOME GUI Developer"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = GUI
 CREATE_SUBDIRS         = NO
@@ -99,8 +99,9 @@ WARN_LOGFILE           =
 INPUT                  = @top_srcdir@/src \
                         @top_srcdir@/bin \
                         @top_srcdir@/idl \
-                        @top_builddir@/bin
-FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@
+                        @top_builddir@/bin \
+                        @srcdir@/input
+FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@ *.doc
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
@@ -137,7 +138,7 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = @srcdir@/static/myheader.html
+HTML_HEADER            = @builddir@/static/header.html
 HTML_FOOTER            = @srcdir@/static/footer.html
 HTML_STYLESHEET        = @srcdir@/static/doxygen.css
 HTML_ALIGN_MEMBERS     = YES

diff --git a/doc/salome/tui/images/guiscreen.png b/doc/salome/tui/images/guiscreen.png
new file mode 100644 (file)
index 0000000..bc900e2
Binary files /dev/null and b/doc/salome/tui/images/guiscreen.png differ

diff --git a/doc/salome/tui/images/head.png b/doc/salome/tui/images/head.png
new file mode 100755 (executable)
index 0000000..307d9ef
Binary files /dev/null and b/doc/salome/tui/images/head.png differ

diff --git a/doc/salome/tui/input/index.doc b/doc/salome/tui/input/index.doc
new file mode 100644 (file)
index 0000000..678dda8
--- /dev/null
+++ b/doc/salome/tui/input/index.doc
@@ -0,0 +1,12 @@
+/*! \mainpage
+
+\image html guiscreen.png
+
+To browse the \b SALOME GUI module Developer Documentation, follow the links below or use navigation menu at the top of the page:
+<ul>
+<li> <a href="namespaces.html">Packages</a> - list of GUI module packages and scripts.</li>
+<li> <a href="annotated.html">Data Structures</a> - list of all data structures and classes with brief descriptions.</li>
+<li> <a href="files.html">Files</a> - list of all files with brief descriptions.</li>
+</ul>
+
+*/
\ No newline at end of file

diff --git a/doc/salome/tui/static/doxygen.css b/doc/salome/tui/static/doxygen.css
index 4893b5e2a4b6bde236f1cd83edd01a7f69b0aefd..ad299dd322024b8c310b38a20e42e7fb490eeca5 100755 (executable)
--- a/doc/salome/tui/static/doxygen.css
+++ b/doc/salome/tui/static/doxygen.css
@@ -1,5 +1,32 @@
-H1 { 
+body {
+   font-family: Arial, Helvetica, sans-serif;
+   background-color: #ffffff;
+}
+
+h1 { 
    text-align: center; 
+   text-decoration: none;
+   border: none;
+   line-height: 25px;
+   text-align: center;
+//   text-transform:uppercase;
+   background: #D9f4fd;
+   font-size: 12pt;
+   font-weight: bold;
+   border: 1px solid #CCCCCC;
+   margin-top: 50px;
+   -moz-border-radius: 8px;
+   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+h2 {
+   font-size: 12pt;
+   font-weight: bold;
+}
+
+table {
+   font-size: 10pt;
+   padding-left: 20px;
 }
 
 CAPTION { 
@@ -11,16 +38,6 @@ A.qindex {}
 
 A.qindexRef {}
 
-/* Link to any cross-referenced Doxygen element */
-A.el { 
-   text-decoration: none; 
-   font-weight: bold 
-}
-
-A.elRef { 
-   font-weight: bold 
-}
-
 /* Link to any cross-referenced Doxygen element inside a code section 
    (ex: header)
 */
@@ -37,7 +54,53 @@ A.codeRef {
 
 A:hover { 
    text-decoration: none; 
-   background-color: lightblue 
+   background-color: lightblue; 
+}
+
+div.contents {
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 10pt;
+  padding: 20px;
+}
+
+div.navpath {
+  font-size: 11pt;
+}
+
+div.header {
+  background: url("head.png");
+  background-color: #175783;
+  border: 1px solid;
+  height: 80px;
+  background-repeat: no-repeat;
+  margin-bottom:20px;
+}
+
+div.tabs { 
+  text-align: justify; 
+  margin-left    : 2px;         
+  margin-right   : 2px;  
+  margin-top     : 2px; 
+  margin-bottom  : 2px
+  font-weight: bold;
+  color: #FFFFFF;
+}
+
+div.footer {
+  background-color: #D9f4fd;
+  border: 1px solid #AAAAAA;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 11px;
+  padding: 10px;
+}
+
+div.div-footer {
+  background-color: #D9f4fd;
+  border: 1px solid #AAAAAA;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 11px;
+  padding: 10px;
+  text-align: center;
 }
 
 DL.el { 
@@ -45,10 +108,8 @@ DL.el {
 }
 
 /* A code fragment (ex: header) */
-DIV.fragment { 
-   width: 100%; 
+div.fragment { 
    border: none; 
-   background-color: #CCCCCC 
 }
 
 /* In the alpha list (coumpound index), style of an alphabetical index letter */
@@ -94,30 +155,36 @@ DIV.groupText {
    font-size: smaller 
 }
 
-BODY { background: #FFFFFF
-}
+/*div.div-page { 
+  background-color: #FFFFFF; 
+  margin-left: 1em;
+  margin-right: 1em;
+  margin-top: 1em;
+  margin-bottom: 0.1em;
+
+  padding-left: 1em;
+  padding-right: 1em;
+  padding-top: 0.5em;
+  padding-bottom: 0.5em;
 
-/* BODY { 
-   background: url(sources/bg_salome.gif) 
-} */
+  border: 2px solid #0D299A; 
+  border-width: 2px;
+  border-color: #0D299A; 
+}*/
 
 div.tabs { 
   text-align: justify; 
+  margin-left    : 2px;         
+  margin-right   : 2px;  
+  margin-top     : 2px; 
+  margin-bottom  : 2px
   font-weight: bold;
   color: #FFFFFF;
 }
 
-DIV.div-footer { 
-  margin-left: 1em;
-  margin-right: 1em;
-  margin-bottom: 0.2em;
-  text-align: right;
-  font-size: 9pt; 
-}
-
 /* In File List, Coumpound List, etc, 1st column of the index */
 TD.indexkey { 
-   background-color: #CCCCCC; 
+   background-color: #DDDDEE; 
    font-weight: bold; 
    padding-right  : 10px; 
    padding-top    : 2px; 
@@ -131,7 +198,7 @@ TD.indexkey {
 
 /* In File List, Coumpound List, etc, 2nd column of the index */
 TD.indexvalue { 
-   background-color: #CCCCCC; 
+   background-color: #EEEEFF; 
    font-style: italic; 
    padding-right  : 10px; 
    padding-top    : 2px; 
@@ -150,3 +217,227 @@ span.comment       { color: #800000 }
 span.preprocessor  { color: #806020 }
 span.stringliteral { color: #002080 }
 span.charliteral   { color: #008080 }
+
+/* @group Code Colorization */
+
+.fragment {
+       font-family: monospace, fixed;
+       font-size: 10pt;
+}
+
+pre.fragment {
+        width: 95%;
+       border: 1px solid #CCCCCC;
+        -moz-border-radius: 8px;
+        -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+        background-color:#EEF3F5;
+       padding: 4px 6px;
+       margin: 20px;
+}
+
+/* Top Navigation style */
+
+div.navigation {
+  margin-bottom:20px;
+}
+
+/* Left navigation panel style */
+
+body.ftvtree {
+   background-color: #D9f4fd;
+  margin: 10px;
+}
+
+div.directory {
+  margin: 0;
+}
+
+div.directory.p {
+  margin: 0;
+}
+
+h3.swap {
+   font-size: 10pt;
+   margin-bottom: 0;
+}
+
+/* Link to any cross-referenced Doxygen element */
+a.el { 
+   text-decoration: none; 
+   font-family: Arial, Helvetica, sans-serif;
+   font-weight: bold;
+   font-size: 10pt;
+   color: #551a8b;
+}
+
+a.el:hover {
+   background-color: transparent;
+   color: #551acc;
+}
+
+a { 
+// text-decoration: none; 
+   font-family: Arial, Helvetica, sans-serif;
+   font-weight: bold;
+   font-size: 10pt;
+   color: #551a8b;
+}
+
+a:hover {
+   background-color: transparent;
+   color: #551acc;
+}
+
+a.elRef { 
+   font-weight: normal;
+}
+
+
+#MSearchBox {
+  -moz-border-radius:8px 8px 8px 8px;
+  background-color:white;
+  border:1px solid #84B0C7;
+  margin:0;
+  padding:0;
+  white-space:nowrap;
+}
+
+div.directory img {
+  vertical-align:-30%;
+}
+
+div.directory p {
+  white-space:nowrap;
+  margin: 0;
+}
+
+div.directory-alt div {
+       display: none;
+       margin: 0px;
+}
+
+
+div.directory div {
+       display: none;
+       margin: 0px;
+}
+
+div.version {
+   background-color:#ffffde;
+   border:1px solid #cccccc;
+   font-family: Arial, Helvetica, sans-serif;
+   font-size: 9pt;
+   text-align: center;
+   width:100px;
+   -moz-border-radius: 8px;
+ //   -moz-box-shadow:5px 5px 5px rgba(0, 0, 0, 0.15);
+}
+
+
+/* @group Member Descriptions */
+
+.mdescLeft, .mdescRight,
+.memItemLeft, .memItemRight,
+.memTemplItemLeft, .memTemplItemRight, .memTemplParams {
+        background-color: #FAFAFA;
+        border: none;
+        margin: 4px;
+        padding: 1px 0 0 8px;
+}
+
+.mdescLeft, .mdescRight {
+        padding: 0px 8px 4px 8px;
+        color: #555;
+}
+
+.memItemLeft, .memItemRight, .memTemplParams {
+        border-top: 1px solid #ccc;
+}
+
+.memItemLeft, .memTemplItemLeft {
+        white-space: nowrap;
+}
+
+.memTemplParams {
+        color: #606060;
+        white-space: nowrap;
+}
+
+/* @end */
+
+/* Styles for detailed member documentation */
+
+.memtemplate {
+        font-size: 80%;
+        color: #606060;
+        font-weight: normal;
+        margin-left: 3px;
+}
+
+.memnav {
+        background-color: #e8eef2;
+        border: 1px solid #84b0c7;
+        text-align: center;
+        margin: 2px;
+        margin-right: 15px;
+        padding: 2px;
+}
+
+.memitem {
+        padding: 0;
+        margin-bottom: 10px;
+}
+
+.memname {
+        white-space: nowrap;
+        font-weight: bold;
+}
+
+.memproto, .memdoc {
+        border: 1px solid #84b0c7;
+}
+
+.memproto {
+        padding: 0;
+        background-color: #d5e1e8;
+        font-weight: bold;
+        -webkit-border-top-left-radius: 8px;
+        -webkit-border-top-right-radius: 8px;
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        -moz-border-radius-topleft: 8px;
+        -moz-border-radius-topright: 8px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+
+}
+
+
+
+.memdoc {
+        padding: 2px 5px;
+        background-color: #eef3f5;
+        border-top-width: 0;
+        -webkit-border-bottom-left-radius: 8px;
+        -webkit-border-bottom-right-radius: 8px;
+        -webkit-box-shadow: 5px 5px 5px rgba(0, 0, 0, 0.15);
+        -moz-border-radius-bottomleft: 8px;
+        -moz-border-radius-bottomright: 8px;
+        -moz-box-shadow: rgba(0, 0, 0, 0.15) 5px 5px 5px;
+}
+
+.paramkey {
+        text-align: right;
+}
+
+.paramtype {
+        white-space: nowrap;
+}
+
+.paramname {
+        color: #602020;
+        white-space: nowrap;
+}
+.paramname em {
+        font-style: normal;
+}
+
+/* @end */

diff --git a/doc/salome/tui/static/footer.html b/doc/salome/tui/static/footer.html
index cb55f397acf510370ed145be8d3c5d7cb09d4f43..fdfb138ca8e38a888e4d933bfa8089036b7329d7 100755 (executable)
--- a/doc/salome/tui/static/footer.html
+++ b/doc/salome/tui/static/footer.html
@@ -1,5 +1,13 @@
-</DIV>
-<DIV class="div-footer">
-Generated on $datetime for $projectname by&nbsp;<A href="http://www.doxygen.org/index.html"><img src="doxygen.png" alt="doxygen" align="middle" border="0"></A> $doxygenversion</DIV>
-</BODY>
-</HTML>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+</head>
+<body>
+<div class="footer">
+<div style="text-align: center;">
+Copyright &copy; 2007-2010  CEA/DEN, EDF R&amp;D, OPEN CASCADE<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>
+</html>

diff --git a/doc/salome/tui/static/header.html.in b/doc/salome/tui/static/header.html.in
new file mode 100755 (executable)
index 0000000..791a37c
--- /dev/null
+++ b/doc/salome/tui/static/header.html.in
@@ -0,0 +1,14 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
+   <title>$title</title>
+<link href="doxygen.css" rel="stylesheet" type="text/css">
+<link href="tabs.css" rel="stylesheet" type="text/css">
+</head>
+<body>
+<div class="header"></div>
+<div align="right"><div class="version">Version: @VERSION@</div></div>
+</body>
+</html>

diff --git a/idl/Makefile.am b/idl/Makefile.am
index c234fd06e3e227d2a18cf68343a4957fc4443e3a..64e19ce54cb0b12eca1f7c1e739f628fbacb5210 100644 (file)
--- a/idl/Makefile.am
+++ b/idl/Makefile.am
@@ -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
 #
+
 # 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/SalomeApp_Engine.idl b/idl/SalomeApp_Engine.idl
index 64fcfdcd3fc9e71504160750648756cb17295e27..17f323ae8c58bc352e982a1d34281a8fafc86786 100644 (file)
--- a/idl/SalomeApp_Engine.idl
+++ b/idl/SalomeApp_Engine.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   : SalomeApp_Engine.idl
 //  Author : Alexander SLADKOV
 //

diff --git a/resources/Makefile.am b/resources/Makefile.am
index 150e510d8fd07d8118ec7a4267c7eb49df4c7c64..bf5e0be007aad31e8f71b3170fc0b35426454df5 100644 (file)
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -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
 #
+
 # -* Makefile *- 
 # Author : Guillaume Boulant (CSSI)
 # Module : KERNEL 

diff --git a/src/CAF/CAF.h b/src/CAF/CAF.h
index 175192827c55fcd86771e65d1a4a1f1ae40c4809..e97aff9f2a911cfc91c04fa572cf60a450912de2 100755 (executable)
--- a/src/CAF/CAF.h
+++ b/src/CAF/CAF.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 CAF_H
 #define CAF_H
 

diff --git a/src/CAF/CAF.pro b/src/CAF/CAF.pro
index 9b05bd52ab931122c06fc28fe26178aeeaabd459..1f3f396998269ece0633ce8deef625344d93a4d2 100644 (file)
--- a/src/CAF/CAF.pro
+++ b/src/CAF/CAF.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = caf
 DESTDIR = ../../lib

diff --git a/src/CAF/CAF_Application.cxx b/src/CAF/CAF_Application.cxx
index 0083bc22a09969c033e24adfdfeedd4161db467e..978034a58d6c54116dacf41019924f15ba820f83 100755 (executable)
--- a/src/CAF/CAF_Application.cxx
+++ b/src/CAF/CAF_Application.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 "CAF_Application.h"
 
 #include "CAF_Tools.h"

diff --git a/src/CAF/CAF_Application.h b/src/CAF/CAF_Application.h
index c96016680c8c8108dff280a155480407423d703b..0cf29e2b396a0d4b8e40ad804243a6d217fa3b18 100755 (executable)
--- a/src/CAF/CAF_Application.h
+++ b/src/CAF/CAF_Application.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 CAF_APPLICATION_H
 #define CAF_APPLICATION_H
 

diff --git a/src/CAF/CAF_Operation.cxx b/src/CAF/CAF_Operation.cxx
index 41ca0863509eefb6b6b64b38a6e4ce3c3646e030..66f721afae796075b4c5ae25cfe241274c553bfa 100755 (executable)
--- a/src/CAF/CAF_Operation.cxx
+++ b/src/CAF/CAF_Operation.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 "CAF_Operation.h"
 
 #include "CAF_Study.h"

diff --git a/src/CAF/CAF_Operation.h b/src/CAF/CAF_Operation.h
index 42781ed14230486c169a4e8601981cb274c46046..0e458b64d833e459324d3686fd46769456a02db8 100755 (executable)
--- a/src/CAF/CAF_Operation.h
+++ b/src/CAF/CAF_Operation.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 CAF_OPERATION_H
 #define CAF_OPERATION_H
 

diff --git a/src/CAF/CAF_Study.cxx b/src/CAF/CAF_Study.cxx
index 3fe00aee1b75e845d89e1b4e12b779719f4996da..1137d52095dc22c711d66250fe4f4064e785344b 100755 (executable)
--- a/src/CAF/CAF_Study.cxx
+++ b/src/CAF/CAF_Study.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 "CAF_Study.h"
 
 #include "CAF_Tools.h"

diff --git a/src/CAF/CAF_Study.h b/src/CAF/CAF_Study.h
index 4cde4fff96acf6020908249c3bd636ed435f3e40..a868e4330a1b650a68c2fe97298708df97d3602d 100755 (executable)
--- a/src/CAF/CAF_Study.h
+++ b/src/CAF/CAF_Study.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 CAF_STUDY_H
 #define CAF_STUDY_H
 

diff --git a/src/CAF/CAF_Tools.cxx b/src/CAF/CAF_Tools.cxx
index f3ea13ed2f2a102d7702ede7f11bc90b98d88dc3..de60a73bbf6372ea9e40558e98f20f6fcb51972a 100755 (executable)
--- a/src/CAF/CAF_Tools.cxx
+++ b/src/CAF/CAF_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
 //
+
 //  File   : CAF_Tools.cxx
 //  Author : UI team
 //

diff --git a/src/CAF/CAF_Tools.h b/src/CAF/CAF_Tools.h
index 2674afeb54016d7d0ae2656a93b4cea85ec4a671..63ea6e8fef9999ed042e774ae567a2def274cb9b 100755 (executable)
--- a/src/CAF/CAF_Tools.h
+++ b/src/CAF/CAF_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
 //
+
 //  File   : CAF_Tools.h
 //  Author : UI team
 //

diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am
index 578822503e16ef332fa32e94cd885ae798d2a354..a0fc8e5ff6412ae40e2d945a0d0732aa1c61e18e 100755 (executable)
--- a/src/CAF/Makefile.am
+++ b/src/CAF/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : caf

diff --git a/src/CAF/resources/CAF_msg_en.ts b/src/CAF/resources/CAF_msg_en.ts
index 06bbb3d24d738d9bf799560788e3af901b03293b..590baaac3825542f843eef01717d4c47fce68250 100644 (file)
--- a/src/CAF/resources/CAF_msg_en.ts
+++ b/src/CAF/resources/CAF_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/CAM/CAM.h b/src/CAM/CAM.h
index 91efa9af1ff2183f8ace5dc942e7348e5d01a355..473c41c9916b81a92340a97d4a2cb457cf70e5b7 100755 (executable)
--- a/src/CAM/CAM.h
+++ b/src/CAM/CAM.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 CAM_H
 #define CAM_H
 

diff --git a/src/CAM/CAM.pro b/src/CAM/CAM.pro
index 565af1498a800b57e06fcfabd4e29ca0996bf5d4..3cc13a84c24e4d008bd34887bca7634ca4f656cf 100644 (file)
--- a/src/CAM/CAM.pro
+++ b/src/CAM/CAM.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = CAM
 DESTDIR = ../../lib

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 3dfe8dbf6ed5eced2ba1355e4ca999b0806eb0fd..139d0807b10bc4dc940d793631762a9f55537302 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.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 "CAM_Application.h"
 
 #include "CAM_Study.h"

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index 14dc928131e07dc555e2ee2ba401de7d4aec6f1e..e47161e786f62498122ad6b3bcec4c75daafdfc7 100755 (executable)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.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 CAM_APPLICATION_H
 #define CAM_APPLICATION_H
 

diff --git a/src/CAM/CAM_DataModel.cxx b/src/CAM/CAM_DataModel.cxx
index dff6f3bb5f39cab24e345d61b0ac55bd42b2dac5..fee2d04d1537770e34dcbc5e8f93cc8b91739e1e 100755 (executable)
--- a/src/CAM/CAM_DataModel.cxx
+++ b/src/CAM/CAM_DataModel.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 "CAM_DataModel.h"
 
 #include "CAM_Module.h"

diff --git a/src/CAM/CAM_DataModel.h b/src/CAM/CAM_DataModel.h
index 5a9b96cfbc48c79b35197e61be00c300320170de..1c3e0bb9e2e1e57ba7b2b5fafe317915239f79e2 100755 (executable)
--- a/src/CAM/CAM_DataModel.h
+++ b/src/CAM/CAM_DataModel.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 CAM_DATAMODEL_H
 #define CAM_DATAMODEL_H
 

diff --git a/src/CAM/CAM_DataObject.cxx b/src/CAM/CAM_DataObject.cxx
index 29563ef8ad38d65495262877c6fc55481677124d..fdf2e4ed31007ce9410924b8255c6e9490d9f256 100755 (executable)
--- a/src/CAM/CAM_DataObject.cxx
+++ b/src/CAM/CAM_DataObject.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 "CAM_DataObject.h"
 
 #include "CAM_Module.h"

diff --git a/src/CAM/CAM_DataObject.h b/src/CAM/CAM_DataObject.h
index a2f9aae40f311b8472d6bd212c332ae07cee44cd..678ef7219821b93cc79e69bafd6db219af5a6088 100755 (executable)
--- a/src/CAM/CAM_DataObject.h
+++ b/src/CAM/CAM_DataObject.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 CAM_DATAOBJECT_H
 #define CAM_DATAOBJECT_H
 

diff --git a/src/CAM/CAM_Module.cxx b/src/CAM/CAM_Module.cxx
index 9cef82bda165feb37eb543c8d5a79fc8f6c6b4ec..39beee2d7045418e1fff437a39dc3bd6f8c6fc75 100755 (executable)
--- a/src/CAM/CAM_Module.cxx
+++ b/src/CAM/CAM_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
 //
+
 #include "CAM_Module.h"
 
 #include "CAM_DataModel.h"

diff --git a/src/CAM/CAM_Module.h b/src/CAM/CAM_Module.h
index 628623f115d4efcaece3e0895f3b09663b7c1ad4..73aaf71b9f51b55190d48de63e7ffdf0d03b3e39 100755 (executable)
--- a/src/CAM/CAM_Module.h
+++ b/src/CAM/CAM_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
 //
+
 #ifndef CAM_MODULE_H
 #define CAM_MODULE_H
 

diff --git a/src/CAM/CAM_Study.cxx b/src/CAM/CAM_Study.cxx
index 95bee0699c8882fa12f4929694542c50ad7abd0d..9f8a60ea1b67da901fdcc6d7525162a10d787b28 100755 (executable)
--- a/src/CAM/CAM_Study.cxx
+++ b/src/CAM/CAM_Study.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 "CAM_Study.h"
 
 #include "CAM_DataModel.h"

diff --git a/src/CAM/CAM_Study.h b/src/CAM/CAM_Study.h
index a90d0e5c5079959b5c5caba81b4accede99a8550..c7d80ec46a7c5c175fd55966649c344582da9ef8 100755 (executable)
--- a/src/CAM/CAM_Study.h
+++ b/src/CAM/CAM_Study.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 CAM_STUDY_H
 #define CAM_STUDY_H
 

diff --git a/src/CAM/Makefile.am b/src/CAM/Makefile.am
index 145a77214271158a63c7df152b5fe49eb147e959..cd568c63fa281c4d4a59877877edfecefdc338b2 100755 (executable)
--- a/src/CAM/Makefile.am
+++ b/src/CAM/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : CAM

diff --git a/src/CAM/resources/CAM_msg_en.ts b/src/CAM/resources/CAM_msg_en.ts
index 949dc1eace41085e455493080e49b3c54a21b57e..831ce43f14ac754a1f85a1eff07d02dea038887c 100644 (file)
--- a/src/CAM/resources/CAM_msg_en.ts
+++ b/src/CAM/resources/CAM_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/CASCatch/CASCatch.hxx b/src/CASCatch/CASCatch.hxx
index 111e69ff018ff94de22ef59707d23ddc63247c27..26132f680bf45042aab119de3aa831d2e63de681 100644 (file)
--- a/src/CASCatch/CASCatch.hxx
+++ b/src/CASCatch/CASCatch.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   : CASCatch.hxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_CatchSignals.cxx b/src/CASCatch/CASCatch_CatchSignals.cxx
index 9d5c588f741b99fcb4479e0dd8ba225adb69cbc8..43004ab218781e3938fde54b0f92882b642701e4 100644 (file)
--- a/src/CASCatch/CASCatch_CatchSignals.cxx
+++ b/src/CASCatch/CASCatch_CatchSignals.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   : CASCatch_CatchSignals.cxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_CatchSignals.hxx b/src/CASCatch/CASCatch_CatchSignals.hxx
index baca0837bf2a3146f8ee39e7f3becb67ab57a1ad..68d3bb8f4339ce0bf6436a7819f31eadb4d7a249 100644 (file)
--- a/src/CASCatch/CASCatch_CatchSignals.hxx
+++ b/src/CASCatch/CASCatch_CatchSignals.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   : CASCatch_CatchSignals.hxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_ErrorHandler.cxx b/src/CASCatch/CASCatch_ErrorHandler.cxx
index b2843e02c0b6f842897bea05e9c422edc775d2d1..09c3b16b5b34aa9a8900c4bd3d3da95083f8de68 100644 (file)
--- a/src/CASCatch/CASCatch_ErrorHandler.cxx
+++ b/src/CASCatch/CASCatch_ErrorHandler.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   : CASCatch_ErrorHandler.cxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_ErrorHandler.hxx b/src/CASCatch/CASCatch_ErrorHandler.hxx
index 7b44dfa03ccfcde198c2fd60075f18b4dc860d4e..eb37d7af1404cea543f31b4cd8da23c2f5b31972 100644 (file)
--- a/src/CASCatch/CASCatch_ErrorHandler.hxx
+++ b/src/CASCatch/CASCatch_ErrorHandler.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   : CASCatch_ErrorHandler.hxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_Failure.cxx b/src/CASCatch/CASCatch_Failure.cxx
index 57274afbba106d57cbbc9558b6af0ea2ae21bd63..f15fc043ff078db958a5df0066bf5cde939a8009 100644 (file)
--- a/src/CASCatch/CASCatch_Failure.cxx
+++ b/src/CASCatch/CASCatch_Failure.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   : CASCatch_Failure.cxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/CASCatch_Failure.hxx b/src/CASCatch/CASCatch_Failure.hxx
index 262a0c836a76023b1fa2c85f95237adc9ba446e2..26b5b871aa0a41c6a8f7ac0a6980b9b5ddf9481d 100644 (file)
--- a/src/CASCatch/CASCatch_Failure.hxx
+++ b/src/CASCatch/CASCatch_Failure.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   : CASCatch_Failure.hxx
 // Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 //

diff --git a/src/CASCatch/Makefile.am b/src/CASCatch/Makefile.am
index 82629d8c81ede928dbb9d9324bcd1a41a0711950..d42f940b4d6763eab4709a3e2e62dab94b577731 100644 (file)
--- a/src/CASCatch/Makefile.am
+++ b/src/CASCatch/Makefile.am
@@ -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   : Makefile.am
 # Author : Sergey RUIN, Open CASCADE S.A.S (sergey.ruin@opencascade.com)
 #

diff --git a/src/DDS/DDS.h b/src/DDS/DDS.h
index 7cfb41ec3932423dc4586a75e343eea445a213d5..12bf062c5fe9961232d978198741e9e776e21e74 100644 (file)
--- a/src/DDS/DDS.h
+++ b/src/DDS/DDS.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 DDS_H
 #define DDS_H
 

diff --git a/src/DDS/DDS.pro b/src/DDS/DDS.pro
index 6a5c8d1f4277d9a11b88f9fc4d05fc5ce53650d0..097c5b6df44e09b4c3fc195bce0e1bc9962d62ec 100644 (file)
--- a/src/DDS/DDS.pro
+++ b/src/DDS/DDS.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = DDS
 DESTDIR = ../../lib

diff --git a/src/DDS/DDS_DicGroup.cxx b/src/DDS/DDS_DicGroup.cxx
index 1d7d736f1cea860a4eccb07f1dbc16c606e8a85f..82de5fc5bfd7ed08ef82cd08c848c96066ea9562 100644 (file)
--- a/src/DDS/DDS_DicGroup.cxx
+++ b/src/DDS/DDS_DicGroup.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 "DDS_DicGroup.h"
 
 #include "DDS_Dictionary.h"

diff --git a/src/DDS/DDS_DicGroup.h b/src/DDS/DDS_DicGroup.h
index 1ef6afda7f7c979d9295122d4141dc7c4435ae04..9e4a5c3108757a3a75c27896a8df6a217495eb9d 100644 (file)
--- a/src/DDS/DDS_DicGroup.h
+++ b/src/DDS/DDS_DicGroup.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 DDS_DICGROUP_H
 #define DDS_DICGROUP_H
 

diff --git a/src/DDS/DDS_DicItem.cxx b/src/DDS/DDS_DicItem.cxx
index 87603cd5b7fda41b3e22340aa214b5c38ae722d4..ecb059a6d8b5804a9293636aa248c3edd8c80854 100644 (file)
--- a/src/DDS/DDS_DicItem.cxx
+++ b/src/DDS/DDS_DicItem.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 "DDS_DicItem.h"
 #include "DDS_Dictionary.h"
 

diff --git a/src/DDS/DDS_DicItem.h b/src/DDS/DDS_DicItem.h
index d81a5e744ca7575e1ce330701bd5ee1a7c945419..9f6ef4fff6054ab8cff6e79d0caf101ab4491e52 100644 (file)
--- a/src/DDS/DDS_DicItem.h
+++ b/src/DDS/DDS_DicItem.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 DDS_DICITEM_H
 #define DDS_DICITEM_H
 

diff --git a/src/DDS/DDS_Dictionary.cxx b/src/DDS/DDS_Dictionary.cxx
index ff4c516f34c1467ae7f123947cbbf0b00d558f72..2b93ea1ba3ca5ffe0972fe31ed9b9f3c4bbb60ab 100644 (file)
--- a/src/DDS/DDS_Dictionary.cxx
+++ b/src/DDS/DDS_Dictionary.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 "DDS_Dictionary.h"
 
 #include "DDS_KeyWords.h"

diff --git a/src/DDS/DDS_Dictionary.h b/src/DDS/DDS_Dictionary.h
index 5ecf488da89092988ca20eec52c8b901892199db..8dfeb796b36cc3636d17f3a29437e73d115c849e 100644 (file)
--- a/src/DDS/DDS_Dictionary.h
+++ b/src/DDS/DDS_Dictionary.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 DDS_DICTIONARY_H
 #define DDS_DICTIONARY_H
 

diff --git a/src/DDS/DDS_KeyWords.cxx b/src/DDS/DDS_KeyWords.cxx
index 6eb6215640caa331c6086ae272b497de15330cab..e559fe325de965df458e1ed9debcc2c3ed7fb2ac 100644 (file)
--- a/src/DDS/DDS_KeyWords.cxx
+++ b/src/DDS/DDS_KeyWords.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 "DDS_KeyWords.h"
 
 IMPLEMENT_STANDARD_HANDLE(DDS_KeyWords, MMgt_TShared)

diff --git a/src/DDS/DDS_KeyWords.h b/src/DDS/DDS_KeyWords.h
index 4d249b5f3dd7df8ecb9fbdca8a96474858b2c5da..38887509f71370162f7200934fc3243b62d14996 100644 (file)
--- a/src/DDS/DDS_KeyWords.h
+++ b/src/DDS/DDS_KeyWords.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 DDS_KEYWORDS_H
 #define DDS_KEYWORDS_H
 

diff --git a/src/DDS/Makefile.am b/src/DDS/Makefile.am
index dd8553b1488203f5c1611b27a32c1bb3928b2ccb..ad494ade77ceee6bca4da414a5133e19e1d851c7 100755 (executable)
--- a/src/DDS/Makefile.am
+++ b/src/DDS/Makefile.am
@@ -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   : Makefile.in
 #  Author : Alexander SOLOVYOV (OCN)
 #  Module : DDS

diff --git a/src/Event/Event.h b/src/Event/Event.h
index f790a90c0dc9ef449310f20bb6dc1dc770cc553e..42a862cb8a4ffc7fb74efbfd811e1981bbb57b15 100755 (executable)
--- a/src/Event/Event.h
+++ b/src/Event/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
 //
+
 #if !defined ( EVENT_H )
 #define EVENT_H
 

diff --git a/src/Event/Event.pro b/src/Event/Event.pro
index 3b3457b457a47350660efed9189ab98cf1cc5ea0..6d749fe99e97f002babb0772345601842f6ce924 100644 (file)
--- a/src/Event/Event.pro
+++ b/src/Event/Event.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = Event
 DESTDIR = ../../lib

diff --git a/src/Event/Makefile.am b/src/Event/Makefile.am
index 49ecd27fae4f88c083f53c5039cb06aca8d9cdea..8c5cfaf2bb7b27205605077b3cbec8a146db7fc2 100755 (executable)
--- a/src/Event/Makefile.am
+++ b/src/Event/Makefile.am
@@ -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 Utils : general SALOME's definitions and tools
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)

diff --git a/src/Event/SALOME_Event.cxx b/src/Event/SALOME_Event.cxx
index 43b11026c458c310171f30ffa1495ff8c0a45d0a..909d52554eebee387b0b7fbc059bdf6afdaf0cae 100755 (executable)
--- a/src/Event/SALOME_Event.cxx
+++ b/src/Event/SALOME_Event.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
 //
+
 //  KERNEL SALOME_Event : Define event posting mechanism
 //  File   : SALOME_Event.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/Event/SALOME_Event.h b/src/Event/SALOME_Event.h
index 0c6fb56cfdca30e23651aa58280df3662352a210..56ca2153301c2b0ce8f88745e21499e9106afba9 100644 (file)
--- a/src/Event/SALOME_Event.h
+++ b/src/Event/SALOME_Event.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
 //
+
 //  KERNEL SALOME_Event : Define event posting mechanism
 //  File   : SALOME_Event.h
 //  Author : Sergey ANIKIN

diff --git a/src/Event/SALOME_EventFilter.cxx b/src/Event/SALOME_EventFilter.cxx
index 074213c9ad41fe8448905ddc8cd9689eb0f9281c..362160c8fb82414f91d5bed09dfd273b25fd5477 100755 (executable)
--- a/src/Event/SALOME_EventFilter.cxx
+++ b/src/Event/SALOME_EventFilter.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 "SALOME_EventFilter.h"
 #include "SALOME_Event.h"
 

diff --git a/src/Event/SALOME_EventFilter.h b/src/Event/SALOME_EventFilter.h
index 3881d6ac1148837d97a881af35394ea2f2182b62..6fbfd6b0dde85520d8865af3061cca7700b3b2fb 100755 (executable)
--- a/src/Event/SALOME_EventFilter.h
+++ b/src/Event/SALOME_EventFilter.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 SALOME_EVENTFILTER_H
 #define SALOME_EVENTFILTER_H
 

diff --git a/src/GLViewer/GLViewer.h b/src/GLViewer/GLViewer.h
index bb4f1775016e6c9e6a226b35d51e54b5e9775156..08bb24bcedfda65b8976ac6a1634f2bc247ade19 100644 (file)
--- a/src/GLViewer/GLViewer.h
+++ b/src/GLViewer/GLViewer.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer.pro b/src/GLViewer/GLViewer.pro
index e342254e55a9d60d6c91f5583d0f8b57a89c781e..3e965b35ef696cd6d8927cbd7023f415997d3f0a 100644 (file)
--- a/src/GLViewer/GLViewer.pro
+++ b/src/GLViewer/GLViewer.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = GLViewer
 DESTDIR = ../../lib

diff --git a/src/GLViewer/GLViewer_AspectLine.cxx b/src/GLViewer/GLViewer_AspectLine.cxx
index a3db1329dbdaea283077f2a8a804fc1897512968..d349016f0e658324c5c8f61e9c9c13bd7a05c54f 100644 (file)
--- a/src/GLViewer/GLViewer_AspectLine.cxx
+++ b/src/GLViewer/GLViewer_AspectLine.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_AspectLine.cxx
 // Created:   26/05/2005 3:17:00 PM

diff --git a/src/GLViewer/GLViewer_AspectLine.h b/src/GLViewer/GLViewer_AspectLine.h
index 25e25412b81cdbeb75ede7c0fc2358d86425ccdc..aa875aefc566f5c517174881240f706d95be7732 100644 (file)
--- a/src/GLViewer/GLViewer_AspectLine.h
+++ b/src/GLViewer/GLViewer_AspectLine.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_AspectLine.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_BaseDrawers.cxx b/src/GLViewer/GLViewer_BaseDrawers.cxx
index b861c68e18bd9f133a855b92e7866e5a0407321b..0459ec54922d4121eba84dfde0aa7de8bec8279b 100644 (file)
--- a/src/GLViewer/GLViewer_BaseDrawers.cxx
+++ b/src/GLViewer/GLViewer_BaseDrawers.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_BaseDrawers.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_BaseDrawers.h b/src/GLViewer/GLViewer_BaseDrawers.h
index 8c451efbac51641561693a8561fca44e97737ff6..38ca7071614dde8c9b6442ae86d873b5c97b98de 100644 (file)
--- a/src/GLViewer/GLViewer_BaseDrawers.h
+++ b/src/GLViewer/GLViewer_BaseDrawers.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_BaseDrawers.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_BaseObjects.cxx b/src/GLViewer/GLViewer_BaseObjects.cxx
index 29bff9d44fdd3df32dee8b889ad43e6753685752..d0d117c21fef434e5cbc7233745dfe9d73907811 100644 (file)
--- a/src/GLViewer/GLViewer_BaseObjects.cxx
+++ b/src/GLViewer/GLViewer_BaseObjects.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
 //
+
 //  Author : OPEN CASCADE
 //#include <GLViewerAfx.h>
 //

diff --git a/src/GLViewer/GLViewer_BaseObjects.h b/src/GLViewer/GLViewer_BaseObjects.h
index 5c5ee929bed419acd8cbef2be2b6a40a047bb2b8..1d0689e9d1f10f9ade73263a70380abefa4cad90 100644 (file)
--- a/src/GLViewer/GLViewer_BaseObjects.h
+++ b/src/GLViewer/GLViewer_BaseObjects.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_BaseObjects.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Compass.cxx b/src/GLViewer/GLViewer_Compass.cxx
index 47e0fcddc1967ee3f48837e617b4b3dd66c79703..c49b487fd7854ff8b064c916ad90b9f52967804e 100644 (file)
--- a/src/GLViewer/GLViewer_Compass.cxx
+++ b/src/GLViewer/GLViewer_Compass.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Compass.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Compass.h b/src/GLViewer/GLViewer_Compass.h
index 0ace9ae752630f023988406adaed38b4aad717e8..845abf96aa699cdab95d02d275c5b2e24e113f21 100644 (file)
--- a/src/GLViewer/GLViewer_Compass.h
+++ b/src/GLViewer/GLViewer_Compass.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Compass.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Context.cxx b/src/GLViewer/GLViewer_Context.cxx
index 403e694cd7bca8c257d1d0261053cc4725539a84..a97a1707b6e94fc1af4c07ead7adffe5912ca3f7 100644 (file)
--- a/src/GLViewer/GLViewer_Context.cxx
+++ b/src/GLViewer/GLViewer_Context.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Context.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Context.h b/src/GLViewer/GLViewer_Context.h
index 0090a107a039054d3a478d5941ad5f96bf05478b..5daa8cdfbbc9f11659d8c1e2292c964373f0be11 100644 (file)
--- a/src/GLViewer/GLViewer_Context.h
+++ b/src/GLViewer/GLViewer_Context.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Context.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_CoordSystem.cxx b/src/GLViewer/GLViewer_CoordSystem.cxx
index cc5d11820d35fdef7aef89c52d101aad24db66a8..bfea22a16d171a2248cc061ad1bea6fd76d0e582 100644 (file)
--- a/src/GLViewer/GLViewer_CoordSystem.cxx
+++ b/src/GLViewer/GLViewer_CoordSystem.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Context.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_CoordSystem.h b/src/GLViewer/GLViewer_CoordSystem.h
index 105b64c90adf46ee4c53c0b120103d0834065bdb..edd607452cf0d47fa828c7e974b6d8dafc213be3 100644 (file)
--- a/src/GLViewer/GLViewer_CoordSystem.h
+++ b/src/GLViewer/GLViewer_CoordSystem.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_CoordSystem.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Defs.h b/src/GLViewer/GLViewer_Defs.h
index cace175439b982e0545c72eda2dac594411e2dd1..23565376cbb5c82f08bc3c2840292602f894d97d 100644 (file)
--- a/src/GLViewer/GLViewer_Defs.h
+++ b/src/GLViewer/GLViewer_Defs.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Defs.h
 // Created:   March, 2005

diff --git a/src/GLViewer/GLViewer_Drawer.cxx b/src/GLViewer/GLViewer_Drawer.cxx
index 43d4c2c13c2f73c1e5b6205a9f0f33fee9e75b71..da19c3aae4ab310fef86abc2f0b401e1f7fbcff7 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.cxx
+++ b/src/GLViewer/GLViewer_Drawer.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Drawer.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Drawer.h b/src/GLViewer/GLViewer_Drawer.h
index 03c1ec8d5440402ffc1ded2d6442e7fd2b9691b0..37cd11209491b2f4d3ca708b54ce66ecac4a3549 100644 (file)
--- a/src/GLViewer/GLViewer_Drawer.h
+++ b/src/GLViewer/GLViewer_Drawer.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Drawer.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Geom.cxx b/src/GLViewer/GLViewer_Geom.cxx
index 8ad608cfea59f28a23d50f4ecd3bc6723fcbbc49..529f46e55bdf6dd38c741e1d91b0bf4740c5ee16 100644 (file)
--- a/src/GLViewer/GLViewer_Geom.cxx
+++ b/src/GLViewer/GLViewer_Geom.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
 //
+
 //  Author : OPEN CASCADE
 //#include <GLViewerAfx.h>
 //

diff --git a/src/GLViewer/GLViewer_Geom.h b/src/GLViewer/GLViewer_Geom.h
index 4b75d3e782b3767db196c8be114f421b5ce4fb44..1a5e66108ad586ff51d731609a7775a74ca95442 100644 (file)
--- a/src/GLViewer/GLViewer_Geom.h
+++ b/src/GLViewer/GLViewer_Geom.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Geom.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Grid.cxx b/src/GLViewer/GLViewer_Grid.cxx
index 27b4d7dacef8691e2dd7d55d241e87d3b7759845..ffb7ea4a2efee39224f749dabbb7b1fde4d4f046 100644 (file)
--- a/src/GLViewer/GLViewer_Grid.cxx
+++ b/src/GLViewer/GLViewer_Grid.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Grid.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Grid.h b/src/GLViewer/GLViewer_Grid.h
index e2dba9f47d5d8a2eb9738251f360c3ff9769efbe..b92bea0b572775716343be0aa07783e74dcba9c7 100644 (file)
--- a/src/GLViewer/GLViewer_Grid.h
+++ b/src/GLViewer/GLViewer_Grid.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Grid.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Group.cxx b/src/GLViewer/GLViewer_Group.cxx
index f04bc8ce884e95d7ce6a448aa1ae40f050b113a4..1a17a948a0a1ffac1cf64c9d13c6205929d3455b 100644 (file)
--- a/src/GLViewer/GLViewer_Group.cxx
+++ b/src/GLViewer/GLViewer_Group.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Group.xx
 // Created:   March, 2005

diff --git a/src/GLViewer/GLViewer_Group.h b/src/GLViewer/GLViewer_Group.h
index 92c05288847833561e5bcd7a176ccbf7f6c5b449..bdd3b4403cd010117e502a793ac91860b328dbe2 100644 (file)
--- a/src/GLViewer/GLViewer_Group.h
+++ b/src/GLViewer/GLViewer_Group.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Group.h
 // Created:   March, 2005

diff --git a/src/GLViewer/GLViewer_MimeData.cxx b/src/GLViewer/GLViewer_MimeData.cxx
index 345d686ac944637be40d68dd9062433bf6f02781..77d5f1aa256f4017f1266ece2179af3c16cf2d9f 100644 (file)
--- a/src/GLViewer/GLViewer_MimeData.cxx
+++ b/src/GLViewer/GLViewer_MimeData.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
 //
+
 //  Author : OPEN CASCADE
 //#include <GLViewerAfx.h>
 //

diff --git a/src/GLViewer/GLViewer_MimeData.h b/src/GLViewer/GLViewer_MimeData.h
index 9dd6df85485d4edcde1c1cbe4c90fcefe3cc272a..856e285d8cd5cf7ef25b40f87b0c8686e4a760ab 100644 (file)
--- a/src/GLViewer/GLViewer_MimeData.h
+++ b/src/GLViewer/GLViewer_MimeData.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_MimeData.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Object.cxx b/src/GLViewer/GLViewer_Object.cxx
index f998aefa7d00c9298973428f8ea384bf2f90ffb0..11c44e2635016d1dd8c2c6026bdf9a995523367c 100644 (file)
--- a/src/GLViewer/GLViewer_Object.cxx
+++ b/src/GLViewer/GLViewer_Object.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
 //
+
 //  Author : OPEN CASCADE
 //#include <GLViewerAfx.h>
 //

diff --git a/src/GLViewer/GLViewer_Object.h b/src/GLViewer/GLViewer_Object.h
index b4499d38ee65f7e4a40ae111343fd7725e955505..778360832fb15a518b2ae201b982e32613a012b6 100644 (file)
--- a/src/GLViewer/GLViewer_Object.h
+++ b/src/GLViewer/GLViewer_Object.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Object.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Selector.cxx b/src/GLViewer/GLViewer_Selector.cxx
index 7700e5c4092916c7c23c2c6b10a552c89864cb94..2ecb9a0a8251fc59b1e3e3248f87b10645841167 100644 (file)
--- a/src/GLViewer/GLViewer_Selector.cxx
+++ b/src/GLViewer/GLViewer_Selector.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Selector.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Selector.h b/src/GLViewer/GLViewer_Selector.h
index f5d4c94c229a48344b73fae13d791b115e424edd..57905828cd735639f386616e232bf4bd7693a57b 100644 (file)
--- a/src/GLViewer/GLViewer_Selector.h
+++ b/src/GLViewer/GLViewer_Selector.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Selector.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Selector2d.cxx b/src/GLViewer/GLViewer_Selector2d.cxx
index 3d925dfff5bc48c76d9bd3967a30bb816b6dc82a..34784b2fd7037296c68b3da3b6f1dc3df7486130 100644 (file)
--- a/src/GLViewer/GLViewer_Selector2d.cxx
+++ b/src/GLViewer/GLViewer_Selector2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Selector2d.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Selector2d.h b/src/GLViewer/GLViewer_Selector2d.h
index e5cd153106795e755f989e636dcb98e8bca66322..c2d0d0600f9833d43c26dfc84b73584a6133f501 100644 (file)
--- a/src/GLViewer/GLViewer_Selector2d.h
+++ b/src/GLViewer/GLViewer_Selector2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Selector2d.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Text.cxx b/src/GLViewer/GLViewer_Text.cxx
index 26e03eb7dc4dbf4322d1851b12ff9626effe8079..35bd892f2bc6a0014e693079a9e750dbaddf6329 100644 (file)
--- a/src/GLViewer/GLViewer_Text.cxx
+++ b/src/GLViewer/GLViewer_Text.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
 //
+
 //  Author : OPEN CASCADE
 //#include <GLViewerAfx.h>
 //

diff --git a/src/GLViewer/GLViewer_Text.h b/src/GLViewer/GLViewer_Text.h
index 9dc2869f63aae2653f1a2739c85dc69626254fb8..43df698d393862c52edd868087842989d8724e43 100644 (file)
--- a/src/GLViewer/GLViewer_Text.h
+++ b/src/GLViewer/GLViewer_Text.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Text.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ToolTip.cxx b/src/GLViewer/GLViewer_ToolTip.cxx
index c75d9acb461d30111a0ee8696649c565a42a3fb2..23ac8ac76f7926685b35b0865a5076eb2a72585e 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.cxx
+++ b/src/GLViewer/GLViewer_ToolTip.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ToolTip.xx
 // Created:   March, 2005

diff --git a/src/GLViewer/GLViewer_ToolTip.h b/src/GLViewer/GLViewer_ToolTip.h
index fc81dfe27a3504dc36f15408a826e669d2e35737..217cee6bc32a12c95b19d1884d3880f0b4aca807 100644 (file)
--- a/src/GLViewer/GLViewer_ToolTip.h
+++ b/src/GLViewer/GLViewer_ToolTip.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ToolTip.h
 // Created:   March, 2005

diff --git a/src/GLViewer/GLViewer_Tools.cxx b/src/GLViewer/GLViewer_Tools.cxx
index ffc2098e98dd20d17badd2422b8a9ab003ac0c79..c4c498f1cfd4b9bbde6f2d851c690fce3f8ac425 100644 (file)
--- a/src/GLViewer/GLViewer_Tools.cxx
+++ b/src/GLViewer/GLViewer_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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Tools.cxx
 // Created:   April, 2005

diff --git a/src/GLViewer/GLViewer_Tools.h b/src/GLViewer/GLViewer_Tools.h
index 26e9835f518298e980b38f0efb95d9bf3d6b071e..3973519eaca0600c81a5146037b376b0ef5a6677 100644 (file)
--- a/src/GLViewer/GLViewer_Tools.h
+++ b/src/GLViewer/GLViewer_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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Tools.h
 // Created:   April, 2005

diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx
index 94f705082909d8e911da8b2ffa58ebc16542f4c7..f664abe48257842a17944a08ffb207c01815846e 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.cxx
+++ b/src/GLViewer/GLViewer_ViewFrame.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewFrame.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewFrame.h b/src/GLViewer/GLViewer_ViewFrame.h
index 86cb9ccf73c8384922ad82e7f32d25bbe1031246..c07f50516e303facd06fb3801a1f5e1b148c4c78 100644 (file)
--- a/src/GLViewer/GLViewer_ViewFrame.h
+++ b/src/GLViewer/GLViewer_ViewFrame.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewFrame.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewManager.cxx b/src/GLViewer/GLViewer_ViewManager.cxx
index 60ddf0df54743f28156d34d9e7544d383e572da6..2a7e50911e0ccb453ee0e782135948844cdfe854 100644 (file)
--- a/src/GLViewer/GLViewer_ViewManager.cxx
+++ b/src/GLViewer/GLViewer_ViewManager.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewManager.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewManager.h b/src/GLViewer/GLViewer_ViewManager.h
index 65652d49dadceea1cbb60a5e15097f69b5e555fc..325e1c57d6b485f9da4d1e360fb1ee531187ef0f 100644 (file)
--- a/src/GLViewer/GLViewer_ViewManager.h
+++ b/src/GLViewer/GLViewer_ViewManager.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewManager.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewPort.cxx b/src/GLViewer/GLViewer_ViewPort.cxx
index 699d245a6bd717e4ccacbc02ad2cf2a740e1d499..fb0e6e69cfd3eabd22ec593f7a8d14f69c1c9d7d 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.cxx
+++ b/src/GLViewer/GLViewer_ViewPort.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewPort.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewPort.h b/src/GLViewer/GLViewer_ViewPort.h
index 4ca9525ffb81709072fdda456122a8c47dd5a738..952bb90f004718fde52c2ebef82e368a7cbdbb5b 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort.h
+++ b/src/GLViewer/GLViewer_ViewPort.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewPort.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewPort2d.cxx b/src/GLViewer/GLViewer_ViewPort2d.cxx
index 4e4447b623fe392a6610bee62b85e130faf5cda3..4918b083071256da9d9fbbaaea4a8d0f800f12ca 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.cxx
+++ b/src/GLViewer/GLViewer_ViewPort2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewPort2d.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_ViewPort2d.h b/src/GLViewer/GLViewer_ViewPort2d.h
index e62616310345d0f1e404dc0f96aebf2ea547481a..877e826380a89bd3d6327980a0e74c1c2a10c285 100644 (file)
--- a/src/GLViewer/GLViewer_ViewPort2d.h
+++ b/src/GLViewer/GLViewer_ViewPort2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_ViewPort2d.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Viewer.cxx b/src/GLViewer/GLViewer_Viewer.cxx
index ca290be8e1c6b507aa03aa205ca913ef39d27461..1c5e84fb077a26c1731160e7ce0493d74a072827 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.cxx
+++ b/src/GLViewer/GLViewer_Viewer.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Viewer.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Viewer.h b/src/GLViewer/GLViewer_Viewer.h
index c6626f6228b99c3e9ac007c8208ce1febc94ec93..814891df03538d2065981de8681d296333348944 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer.h
+++ b/src/GLViewer/GLViewer_Viewer.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Viewer.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Viewer2d.cxx b/src/GLViewer/GLViewer_Viewer2d.cxx
index f5d4e20ba27be711b40335bbae07ed0f97948ebb..9086483d4a96f4abf8b1e1d7671d7de7ef855dd4 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer2d.cxx
+++ b/src/GLViewer/GLViewer_Viewer2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Viewer2d.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Viewer2d.h b/src/GLViewer/GLViewer_Viewer2d.h
index b06ef330e9ffa5219ba065597ca83b04e1938d5a..539b1a9fc04a10d7359f30f2bf8f4e7f976f9d93 100644 (file)
--- a/src/GLViewer/GLViewer_Viewer2d.h
+++ b/src/GLViewer/GLViewer_Viewer2d.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Viewer2d.h
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Widget.cxx b/src/GLViewer/GLViewer_Widget.cxx
index 2153cea3e1b550c5057c68d751a237f3a9d87713..692c02e88f2bcaa71e3d05a1201e6d73b7ec7a10 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.cxx
+++ b/src/GLViewer/GLViewer_Widget.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Widget.cxx
 // Created:   November, 2004

diff --git a/src/GLViewer/GLViewer_Widget.h b/src/GLViewer/GLViewer_Widget.h
index f073b7fd5d34d3affc52bc6c7f41fd7eb88657ab..00378ab4736a06954da154fbb765d386cc86599f 100644 (file)
--- a/src/GLViewer/GLViewer_Widget.h
+++ b/src/GLViewer/GLViewer_Widget.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
 //
+
 //  Author : OPEN CASCADE
 // File:      GLViewer_Widget.h
 // Created:   November, 2004

diff --git a/src/GLViewer/Makefile.am b/src/GLViewer/Makefile.am
index 4c4594a52e825e7bef90c1c3654ade249220f266..1eec79e89bb7aebff0b33b8e9d5e82a348523fc9 100644 (file)
--- a/src/GLViewer/Makefile.am
+++ b/src/GLViewer/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : caf

diff --git a/src/GLViewer/resources/GLViewer_images.ts b/src/GLViewer/resources/GLViewer_images.ts
index 5358816e4e0df198ef6fb07d3a75b04067528a37..c85d42adc2cb7306ae37e1b1b20910c337bdf63b 100644 (file)
--- a/src/GLViewer/resources/GLViewer_images.ts
+++ b/src/GLViewer/resources/GLViewer_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/GLViewer/resources/GLViewer_msg_en.ts b/src/GLViewer/resources/GLViewer_msg_en.ts
index 3099db15545da80775f38dd4d43503706f2088bd..667a0a688d0f85d0de516fb44c614827ecae09de 100644 (file)
--- a/src/GLViewer/resources/GLViewer_msg_en.ts
+++ b/src/GLViewer/resources/GLViewer_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/LightApp/LightApp.h b/src/LightApp/LightApp.h
index f85a5fe75460d774014806406f97146c4a6e0b5c..45873ec7c1ab6b600fc8b0f30ac1d91798a355d6 100644 (file)
--- a/src/LightApp/LightApp.h
+++ b/src/LightApp/LightApp.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   : LightApp.h
 // Author : OCC team
 //

diff --git a/src/LightApp/LightApp.pro b/src/LightApp/LightApp.pro
index ffe32e5f926802fe2c600da1a0811a934f41a69b..3bfba2f53585a89632bd55214a2b72988efc50d8 100644 (file)
--- a/src/LightApp/LightApp.pro
+++ b/src/LightApp/LightApp.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = LightApp
 DESTDIR = ../../lib

diff --git a/src/LightApp/LightApp_AboutDlg.cxx b/src/LightApp/LightApp_AboutDlg.cxx
index 0a48f79612045f511e6a99f3cecea0564e854f7b..d3e54f081eadf210012c4fd7f4f44683654389a4 100644 (file)
--- a/src/LightApp/LightApp_AboutDlg.cxx
+++ b/src/LightApp/LightApp_AboutDlg.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:      LightApp_AboutDlg.cxx
 // Created:   03.06.2005 13:52:45
 // Author:    Sergey TELKOV

diff --git a/src/LightApp/LightApp_AboutDlg.h b/src/LightApp/LightApp_AboutDlg.h
index 71216a37e5950f09a9f3d563ae7639d850c54532..c66f0520ca51a9af626903d13d91d0a0a65925a0 100644 (file)
--- a/src/LightApp/LightApp_AboutDlg.h
+++ b/src/LightApp/LightApp_AboutDlg.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:      LightApp_AboutDlg.h
 // Created:   03.06.2005 13:49:25
 // Author:    Sergey TELKOV

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index a9fbd8ee07a6fc2eef7402dd0824899d224d5d06..b1b027d9292aa5191717bf432738cf63c00b5146 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.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:      LightApp_Application.cxx
 // Created:   6/20/2005 18:39:45 PM
 // Author:    Natalia Donis
@@ -27,8 +28,10 @@
 // E.A. : On windows with python 2.6, there is a conflict
 // E.A. : between pymath.h and Standard_math.h which define
 // E.A. : some same symbols : acosh, asinh, ...
-#include <Standard_math.hxx>
-#include <pymath.h>
+  #include <Standard_math.hxx>
+  #ifndef DISABLE_PYCONSOLE
+    #include <pymath.h>
+  #endif
 #endif
 
 #ifndef DISABLE_PYCONSOLE
@@ -95,6 +98,8 @@
 #ifndef DISABLE_PLOT2DVIEWER
   #include <Plot2d_ViewManager.h>
   #include <Plot2d_ViewModel.h>
+  #include <Plot2d_ViewWindow.h>
+  #include <Plot2d_ViewFrame.h>
   #include "LightApp_Plot2dSelector.h"
 #ifndef DISABLE_SALOMEOBJECT
   #include <SPlot2d_ViewModel.h>
@@ -1013,6 +1018,12 @@ void LightApp_Application::onHelpContextModule( const QString& theComponentName,
 */
 void LightApp_Application::onSelectionChanged()
 {
+  LightApp_Module* m = dynamic_cast<LightApp_Module*>( activeModule() );
+  bool canCopy  = m ? m->canCopy() : false;
+  bool canPaste = m ? m->canPaste() : false;
+
+  action( EditCopyId )->setEnabled(canCopy);
+  action( EditPasteId )->setEnabled(canPaste);
 }
 
 /*!
@@ -3248,3 +3259,23 @@ void LightApp_Application::clearKnownViewManagers()
       removeViewManager(aMgr);
   }
 }
+
+/*!
+  Copy of current selection 
+ */
+void LightApp_Application::onCopy()
+{
+  LightApp_Module* m = dynamic_cast<LightApp_Module*>( activeModule() );
+  if( m )
+    m->copy();
+}
+
+/*!
+  Paste of current data in clipboard
+ */
+void LightApp_Application::onPaste()
+{
+  LightApp_Module* m = dynamic_cast<LightApp_Module*>( activeModule() );
+  if( m )
+    m->paste();
+}

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 27d0852afb498397de19554f759a6e3907330a40..f905b03f274e3762e83b1c0a6c1a775e3548499f 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.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:      LightApp_Application.h
 // Created:   6/20/2005 18:39:25 PM
 // Author:    OCC team
@@ -167,6 +168,9 @@ public slots:
   virtual void                        onOpenDoc();
   virtual void                        onHelpAbout();
   virtual bool                        onOpenDoc( const QString& );
+  virtual void                        onCopy();
+  virtual void                        onPaste();
+  virtual void                        onSelectionChanged();
 
 protected:
   virtual void                        createActions();
@@ -181,7 +185,6 @@ protected:
 
   virtual void                        setActiveStudy( SUIT_Study* );
   virtual void                        updateCommandsStatus();
-  virtual void                        onSelectionChanged();
 
   virtual void                        beforeCloseDoc( SUIT_Study* );
   virtual void                        afterCloseDoc();

diff --git a/src/LightApp/LightApp_DataModel.cxx b/src/LightApp/LightApp_DataModel.cxx
index f843e4a4a7ce76fd79c6e380418dc943f50b3740..93af7991b82a22815748ecef65baf043a7c95e3d 100644 (file)
--- a/src/LightApp/LightApp_DataModel.cxx
+++ b/src/LightApp/LightApp_DataModel.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:      LightApp_DataModel.cxx
 // Created:   10/25/2004 10:36:06 AM
 // Author:    Sergey LITONIN

diff --git a/src/LightApp/LightApp_DataModel.h b/src/LightApp/LightApp_DataModel.h
index e7c0f40a641af4954948bb55db41c34b91e235e6..367b3e0c9c801461ba43a00e0ded9d92ac0379d4 100644 (file)
--- a/src/LightApp/LightApp_DataModel.h
+++ b/src/LightApp/LightApp_DataModel.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:      LightApp_DataModel.h
 // Created:   10/25/2004 10:32:33 AM
 // Author:    Sergey LITONIN

diff --git a/src/LightApp/LightApp_DataObject.cxx b/src/LightApp/LightApp_DataObject.cxx
index 1ea74a77a33cf46ca081614b96e5398a6bdf58aa..804bbc214e3ccaab95615a6247a499d5009ce63a 100644 (file)
--- a/src/LightApp/LightApp_DataObject.cxx
+++ b/src/LightApp/LightApp_DataObject.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   : LightApp_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/LightApp/LightApp_DataObject.h b/src/LightApp/LightApp_DataObject.h
index 94b4b838bbe7e9a77be92b974c87fa82773203f9..3b8bb9cc12e72cb4b7110c0648afd42715b2944d 100644 (file)
--- a/src/LightApp/LightApp_DataObject.h
+++ b/src/LightApp/LightApp_DataObject.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   : LightApp_DataObject.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/LightApp/LightApp_DataOwner.cxx b/src/LightApp/LightApp_DataOwner.cxx
index be594b0557473553fb348e3c8337726fdefee8c9..026d30a4a73ccdf04421e54d51c758900b50efa2 100644 (file)
--- a/src/LightApp/LightApp_DataOwner.cxx
+++ b/src/LightApp/LightApp_DataOwner.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 "LightApp_DataOwner.h"
 
 /*!Constructor. Initialize by \a theEntry.*/

diff --git a/src/LightApp/LightApp_DataOwner.h b/src/LightApp/LightApp_DataOwner.h
index c04f1823017cc333f599415a8847ce2dca2618f0..bf832b87b09b0bd1351223baf840aa686a88173d 100644 (file)
--- a/src/LightApp/LightApp_DataOwner.h
+++ b/src/LightApp/LightApp_DataOwner.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 LIGHTAPP_DATAOWNER_H
 #define LIGHTAPP_DATAOWNER_H
 

diff --git a/src/LightApp/LightApp_DataSubOwner.cxx b/src/LightApp/LightApp_DataSubOwner.cxx
index 8f8a71bf74c7e58c604454f948d9684b2b4fddfa..525ea3a36aaf3f5dcceec45cc5d16e50f9858be5 100644 (file)
--- a/src/LightApp/LightApp_DataSubOwner.cxx
+++ b/src/LightApp/LightApp_DataSubOwner.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 "LightApp_DataSubOwner.h"
 
 /*!Constructor.Initialize by \a entry and \a index*/

diff --git a/src/LightApp/LightApp_DataSubOwner.h b/src/LightApp/LightApp_DataSubOwner.h
index 6753d8c0f608dd58b6b414c3c9fac9543c5e7cc0..2c75a6a58b1cb8989a23cb74d7b4ddbcaee2cc9d 100644 (file)
--- a/src/LightApp/LightApp_DataSubOwner.h
+++ b/src/LightApp/LightApp_DataSubOwner.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 LIGHTAPP_DATASUBOWNER_H
 #define LIGHTAPP_DATASUBOWNER_H
 

diff --git a/src/LightApp/LightApp_Dialog.cxx b/src/LightApp/LightApp_Dialog.cxx
index 3b2067dfec90da0046139a094ce83ff17a5cddad..4c2a16a10e57b2d2d70e5ccb72aa214c8386f2ae 100644 (file)
--- a/src/LightApp/LightApp_Dialog.cxx
+++ b/src/LightApp/LightApp_Dialog.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:      LightApp_Dialog.cxx
 // Author:    Alexander SOLOVYOV
 //

diff --git a/src/LightApp/LightApp_Dialog.h b/src/LightApp/LightApp_Dialog.h
index e7bd0db0d08fb90db21c9ec7d7f86f3d57f11b93..aecf79dd9bbe00c1f7e9b2ac7fd1cefbe2b9da24 100644 (file)
--- a/src/LightApp/LightApp_Dialog.h
+++ b/src/LightApp/LightApp_Dialog.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:      LightApp_Dialog.h
 // Author:    Alexander SOLOVYOV
 //

diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index f0f40c5a446430e81f3613ed451179793e1b7bbe..afa34797535d15aee404256e4ce563031f91ffa8 100644 (file)
--- a/src/LightApp/LightApp_Displayer.cxx
+++ b/src/LightApp/LightApp_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
 //
+
 #include "LightApp_Displayer.h"
 #include "LightApp_Application.h"
 #include "LightApp_Module.h"

diff --git a/src/LightApp/LightApp_Displayer.h b/src/LightApp/LightApp_Displayer.h
index 4e3544f2a6fceb1bb042946d02115ec170c2659b..272cd7f6ea5358cb7d404bb29b554839c2650287 100644 (file)
--- a/src/LightApp/LightApp_Displayer.h
+++ b/src/LightApp/LightApp_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
 //
+
 #ifndef LIGHTAPP_DISPLAYER_HEADER
 #define LIGHTAPP_DISPLAYER_HEADER
 

diff --git a/src/LightApp/LightApp_Driver.cxx b/src/LightApp/LightApp_Driver.cxx
index e856607781ed9e41fdb6c171af2700379650cb6d..48b0eb11f8c9e4a4646674ea396d240702855908 100644 (file)
--- a/src/LightApp/LightApp_Driver.cxx
+++ b/src/LightApp/LightApp_Driver.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 "LightApp_Driver.h"
 
 #include <TCollection_AsciiString.hxx> 

diff --git a/src/LightApp/LightApp_Driver.h b/src/LightApp/LightApp_Driver.h
index 5148426c5cc4d55dd65ed24f570def3711832672..f80bca6d03c56e9ba7e3aeaf1cecfb2bebcaed0f 100644 (file)
--- a/src/LightApp/LightApp_Driver.h
+++ b/src/LightApp/LightApp_Driver.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 LIGHTAPP_DRIVER_H
 #define LIGHTAPP_DRIVER_H
 

diff --git a/src/LightApp/LightApp_EventFilter.cxx b/src/LightApp/LightApp_EventFilter.cxx
index dbeb54835ea17347fc22f5d0b809d295da031922..dccbf478ad44c5fc7ed2d557f0c4dc9b0465adfd 100644 (file)
--- a/src/LightApp/LightApp_EventFilter.cxx
+++ b/src/LightApp/LightApp_EventFilter.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 "LightApp_EventFilter.h"
 
 #include <SUIT_Desktop.h>

diff --git a/src/LightApp/LightApp_EventFilter.h b/src/LightApp/LightApp_EventFilter.h
index de59af6c25348bac69cdd3366074e0f33e2dc5e3..21e218c44dd0c0df64589e5dfba4ea29d0902b66 100644 (file)
--- a/src/LightApp/LightApp_EventFilter.h
+++ b/src/LightApp/LightApp_EventFilter.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 LIGHTAPP_EVENTFILTER_H
 #define LIGHTAPP_EVENTFILTER_H
 

diff --git a/src/LightApp/LightApp_GLSelector.cxx b/src/LightApp/LightApp_GLSelector.cxx
index 15a2dab9042cad5b9f307c0d381da6f8bf980347..139584bd907f787fa6fa803fd2bf4dbe8a33406f 100644 (file)
--- a/src/LightApp/LightApp_GLSelector.cxx
+++ b/src/LightApp/LightApp_GLSelector.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 "LightApp_GLSelector.h"
 
 #include "LightApp_DataOwner.h"

diff --git a/src/LightApp/LightApp_GLSelector.h b/src/LightApp/LightApp_GLSelector.h
index 45260e314de6fc4b8cb886f77c23e9c0d95b0e48..cd66dd082e982dc9a05efe639e34c02c690267f3 100644 (file)
--- a/src/LightApp/LightApp_GLSelector.h
+++ b/src/LightApp/LightApp_GLSelector.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 LIGHTAPP_GLSELECTOR_H
 #define LIGHTAPP_GLSELECTOR_H
 

diff --git a/src/LightApp/LightApp_HDFDriver.cxx b/src/LightApp/LightApp_HDFDriver.cxx
index 168f18013bbd19a20549aa1a6fe0b0117309f5a9..e891f7590dd62da4d9160ed337a8aa4c4aeb3a23 100644 (file)
--- a/src/LightApp/LightApp_HDFDriver.cxx
+++ b/src/LightApp/LightApp_HDFDriver.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 "LightApp_HDFDriver.h"
 
 #include "HDFOI.hxx"

diff --git a/src/LightApp/LightApp_HDFDriver.h b/src/LightApp/LightApp_HDFDriver.h
index 2a7fd3c9c423fbe914745251bc087a01c5875d90..a803ca326ec4150bc52ee53300319b4926ad0fc9 100644 (file)
--- a/src/LightApp/LightApp_HDFDriver.h
+++ b/src/LightApp/LightApp_HDFDriver.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 LIGHTAPP_HDFDRIVER_H
 #define LIGHTAPP_HDFDRIVER_H
 

diff --git a/src/LightApp/LightApp_Module.cxx b/src/LightApp/LightApp_Module.cxx
index 22823451343b98bb13f4184e075f96c5c384f49a..118fc9db43df3875fce81cf13260d2595c3604d1 100644 (file)
--- a/src/LightApp/LightApp_Module.cxx
+++ b/src/LightApp/LightApp_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
 //
+
 // File:      LightApp_Module.cxx
 // Created:   6/20/2005 16:30:56 AM
 // Author:    OCC team
@@ -649,3 +650,63 @@ bool LightApp_Module::reusableOperation( const int id )
 {
  return true;
 } 
+
+/*!
+  virtual method
+  \return true if module can copy the current selection
+*/
+bool LightApp_Module::canCopy() const
+{
+  return false;
+}
+
+/*!
+  virtual method
+  \return true if module can paste previously copied data
+*/
+bool LightApp_Module::canPaste() const
+{
+  return false;
+}
+
+/*!
+  virtual method
+  \brief Copies the current selection into clipboard
+*/
+void LightApp_Module::copy()
+{
+}
+
+/*!
+  virtual method
+  \brief Pastes the current data in the clipboard
+*/
+void LightApp_Module::paste()
+{
+}
+
+
+int LightApp_Module::createMenu( const QString& subMenu, const int menu, const int id, const int group, const int idx )
+{
+  return CAM_Module::createMenu( subMenu, menu, id, group, idx );
+}
+int LightApp_Module::createMenu( const QString& subMenu, const QString& menu, const int id, const int group, const int idx )
+{
+  return CAM_Module::createMenu( subMenu, menu, id, group, idx );
+}
+int LightApp_Module::createMenu( const int id, const int menu, const int group, const int idx )
+{
+  return CAM_Module::createMenu( id, menu, group, idx );
+}
+int LightApp_Module::createMenu( const int id, const QString& menu, const int group, const int idx )
+{
+  return CAM_Module::createMenu( id, menu, group, idx );
+}
+int LightApp_Module::createMenu( QAction* a, const int menu, const int id, const int group, const int idx )
+{
+  return CAM_Module::createMenu( a, menu, id, group, idx );
+}
+int LightApp_Module::createMenu( QAction* a, const QString& menu, const int id, const int group, const int idx )
+{
+  return CAM_Module::createMenu( a, menu, id, group, idx );
+}

diff --git a/src/LightApp/LightApp_Module.h b/src/LightApp/LightApp_Module.h
index c608497e52197b151afc0b15a2b386256a865fc9..e86ce87a2710fd8d8ab805ab313422bab509bb1f 100644 (file)
--- a/src/LightApp/LightApp_Module.h
+++ b/src/LightApp/LightApp_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
 //
+
 // File:      LightApp_Module.h
 // Created:   6/20/2005 16:25:06 AM
 // Author:    OCC team
@@ -92,6 +93,18 @@ public:
   virtual LightApp_Displayer*         displayer();
   virtual LightApp_Selection*         createSelection() const;
 
+  virtual bool                        canCopy() const;
+  virtual bool                        canPaste() const;
+  virtual void                        copy();
+  virtual void                        paste();
+
+  int                    createMenu( const QString&, const int, const int = -1, const int = -1, const int = -1 );
+  int                    createMenu( const QString&, const QString&, const int = -1, const int = -1, const int = -1 );
+  int                    createMenu( const int, const int, const int = -1, const int = -1 );
+  int                    createMenu( const int, const QString&, const int = -1, const int = -1 );
+  int                    createMenu( QAction*, const int, const int = -1, const int = -1, const int = -1 );
+  int                    createMenu( QAction*, const QString&, const int = -1, const int = -1, const int = -1 );
+
 public slots:
   virtual bool                        activateModule( SUIT_Study* );
   virtual bool                        deactivateModule( SUIT_Study* );

diff --git a/src/LightApp/LightApp_ModuleAction.cxx b/src/LightApp/LightApp_ModuleAction.cxx
index 36c6fa77bb5d7352fb3463871a3daf16b410e045..584496a58dfe0ab8667f2ed0ec8a4c8992884b5d 100755 (executable)
--- a/src/LightApp/LightApp_ModuleAction.cxx
+++ b/src/LightApp/LightApp_ModuleAction.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   : LightApp_ModuleAction.cxx
 // Author : Sergey TELKOV, Vadim SANDLER
 //
@@ -462,6 +460,7 @@ void LightApp_ModuleAction::update( QtxComboBox* cb )
   if ( !cb )
     return;
 
+  bool blocked = cb->blockSignals( true );
   int curId = mySet->moduleId( active() );
   QList<QAction*> alist = mySet->actions();
   cb->clear();
@@ -478,6 +477,7 @@ void LightApp_ModuleAction::update( QtxComboBox* cb )
   }
 
   cb->setCurrentId( curId );
+  cb->blockSignals( blocked );
 }
 
 /*!

diff --git a/src/LightApp/LightApp_ModuleAction.h b/src/LightApp/LightApp_ModuleAction.h
index 4be268decea3c76a6eacf5e047bf9b03bd1986d6..47c4a85ae0406da90e9b046be5354f33c3d81416 100755 (executable)
--- a/src/LightApp/LightApp_ModuleAction.h
+++ b/src/LightApp/LightApp_ModuleAction.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   : LightApp_ModuleAction.h
 // Author : Sergey TELKOV, Vadim SANDLER
 //

diff --git a/src/LightApp/LightApp_ModuleDlg.cxx b/src/LightApp/LightApp_ModuleDlg.cxx
index fe086470337756492de79993727f05a562dbe3e1..0166dabeaf7d0d5594c420a99a12ac84a44772d7 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.cxx
+++ b/src/LightApp/LightApp_ModuleDlg.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   : LightApp_ModuleDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -178,6 +179,8 @@ LightApp_ModuleDlg::LightApp_ModuleDlg( QWidget*       parent,
 
   // <Cancel>
   QPushButton* cancelBtn = new QPushButton( tr( "CANCEL" ), this );
+  cancelBtn->setAutoDefault( true );
+
   myButtonLayout->addSpacing( 70 );
   myButtonLayout->addStretch();
   myButtonLayout->addWidget( cancelBtn );
@@ -223,8 +226,12 @@ int LightApp_ModuleDlg::addButton( const QString& button, const int id )
   }
 
   QPushButton* newButton = new QPushButton( button, this );
+  newButton->setAutoDefault( true );
 
-  if ( myButtons.empty() ) newButton->setDefault( true );
+  if ( myButtons.empty() ) {
+       newButton->setDefault( true );
+       newButton->setFocus();
+  }
 
   myButtons.insert( newButton, bid );
   myButtonLayout->insertWidget( myButtonLayout->count()-3, newButton );

diff --git a/src/LightApp/LightApp_ModuleDlg.h b/src/LightApp/LightApp_ModuleDlg.h
index 90211f5313972dfd83f1ecaa6e82b78b15985305..88765916be4800979c03377564185407365ffd55 100644 (file)
--- a/src/LightApp/LightApp_ModuleDlg.h
+++ b/src/LightApp/LightApp_ModuleDlg.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   : LightApp_ModuleDlg.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/LightApp/LightApp_NameDlg.cxx b/src/LightApp/LightApp_NameDlg.cxx
index b6ead7cdc7e3a4ae26925520b0bbda85b6ed9611..3745a6719f22f0ccae7753fc31582c31b187c210 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.cxx
+++ b/src/LightApp/LightApp_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   : LightApp_NameDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/LightApp/LightApp_NameDlg.h b/src/LightApp/LightApp_NameDlg.h
index 7a6262d574229413110e0fa63381752ae3bbcf16..064156d87dc46bbeb230547effb41e9909de5a31 100644 (file)
--- a/src/LightApp/LightApp_NameDlg.h
+++ b/src/LightApp/LightApp_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   : LightApp_NameDlg.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/LightApp/LightApp_OBFilter.cxx b/src/LightApp/LightApp_OBFilter.cxx
index 20c347ecde2c181213e720f6d20acf63970867b9..d278d4ab532b3c719ee54d9e65410d8a5b8da294 100644 (file)
--- a/src/LightApp/LightApp_OBFilter.cxx
+++ b/src/LightApp/LightApp_OBFilter.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 "LightApp_OBFilter.h"
 
 #include "LightApp_SelectionMgr.h" 

diff --git a/src/LightApp/LightApp_OBFilter.h b/src/LightApp/LightApp_OBFilter.h
index 8788919f5745fa86d1cfe567a6b6f7cfb99f4d97..5e7cbcec9a5e74e3a7e25fe489a3baa3a60d13a8 100644 (file)
--- a/src/LightApp/LightApp_OBFilter.h
+++ b/src/LightApp/LightApp_OBFilter.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 LIGHTAPP_OBFILTER_H
 #define LIGHTAPP_OBFILTER_H
 

diff --git a/src/LightApp/LightApp_OBSelector.cxx b/src/LightApp/LightApp_OBSelector.cxx
index d6b98efcf6045761cf9a4f36de6bc0540d952b26..0e48995e2da162912cf6c7814dfbcdbde9eeea0b 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.cxx
+++ b/src/LightApp/LightApp_OBSelector.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   : LightApp_OBSelector.cxx
 // Author :
 //

diff --git a/src/LightApp/LightApp_OBSelector.h b/src/LightApp/LightApp_OBSelector.h
index 7426335656d0da67e8fb396641ebfa93193010e0..4a7bb6239d52f93c2a2688cc7a52679d9034f646 100644 (file)
--- a/src/LightApp/LightApp_OBSelector.h
+++ b/src/LightApp/LightApp_OBSelector.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   : LightApp_OBSelector.h
 // Author :
 //

diff --git a/src/LightApp/LightApp_OCCSelector.cxx b/src/LightApp/LightApp_OCCSelector.cxx
index 1ccbeecbc8af7822497891e7f87a691e3811f2ea..54eed9c907e1842059b568765de250d3d1ad25c3 100644 (file)
--- a/src/LightApp/LightApp_OCCSelector.cxx
+++ b/src/LightApp/LightApp_OCCSelector.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 "LightApp_DataOwner.h"
 #include "LightApp_OCCSelector.h"
 

diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h
index d266c7f5045443dfe3ccd320b41359babfac2ada..1f4bd46a55a4b080e6a17799095656870de6e7ad 100644 (file)
--- a/src/LightApp/LightApp_OCCSelector.h
+++ b/src/LightApp/LightApp_OCCSelector.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 LIGHTAPP_OCCSELECTOR_H
 #define LIGHTAPP_OCCSELECTOR_H
 
@@ -66,7 +67,7 @@ protected:
   virtual void      setSelection( const SUIT_DataOwnerPtrList& );
 
 #ifndef DISABLE_OCCVIEWER
-  QString           entry( const Handle_AIS_InteractiveObject& ) const;
+  virtual QString   entry( const Handle_AIS_InteractiveObject& ) const;
 #endif
 
   SUIT_DataOwnerPtrList mySelectedExternals;

diff --git a/src/LightApp/LightApp_Operation.cxx b/src/LightApp/LightApp_Operation.cxx
index a80d54bf736a3e3887b2cd7b25a3d3207fbfb7ba..490115d9899541693f18a572c1e78ae798e4de15 100755 (executable)
--- a/src/LightApp/LightApp_Operation.cxx
+++ b/src/LightApp/LightApp_Operation.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   : LightApp_Operation.h
 //  Author : Sergey LITONIN
 //  Module : LightApp

diff --git a/src/LightApp/LightApp_Operation.h b/src/LightApp/LightApp_Operation.h
index c48787502dfe65e8bf51242d03ad6f19ad0725e9..a4b4757716307ff5531974dabc7e03b47553afa8 100755 (executable)
--- a/src/LightApp/LightApp_Operation.h
+++ b/src/LightApp/LightApp_Operation.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   : LightApp_Operation.h
 //  Author : Sergey LITONIN
 //  Module : LIGHT

diff --git a/src/LightApp/LightApp_Plot2dSelector.cxx b/src/LightApp/LightApp_Plot2dSelector.cxx
index 9efc836b0d9e76d7c69f9bdb671aa44550184465..55109044a3b45f765e6ed311e0676bbb16fb54e3 100755 (executable)
--- a/src/LightApp/LightApp_Plot2dSelector.cxx
+++ b/src/LightApp/LightApp_Plot2dSelector.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 "LightApp_Plot2dSelector.h"
 
 #include "LightApp_DataOwner.h"
@@ -28,7 +26,7 @@
 /*!
   Constructor
 */
-LightApp_Plot2dSelector::LightApp_Plot2dSelector( SPlot2d_Viewer* v, SUIT_SelectionMgr* mgr )
+LightApp_Plot2dSelector::LightApp_Plot2dSelector( Plot2d_Viewer* v, SUIT_SelectionMgr* mgr )
 : SUIT_Selector( mgr, v )
 {
   if ( v )

diff --git a/src/LightApp/LightApp_Plot2dSelector.h b/src/LightApp/LightApp_Plot2dSelector.h
index b9ba299a3d260b950f0ec603baf6b151d5698e0e..fba3e8aa429de2c57e0b6135e1e84ab44fff0cd3 100755 (executable)
--- a/src/LightApp/LightApp_Plot2dSelector.h
+++ b/src/LightApp/LightApp_Plot2dSelector.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 LIGHTAPP_PLOT2DSELECTOR_H
 #define LIGHTAPP_PLOT2DSELECTOR_H
 
@@ -26,7 +24,7 @@
 
 #include <SUIT_Selector.h>
 #include <SUIT_DataOwner.h>
-#include <SPlot2d_ViewModel.h>
+#include <Plot2d_ViewModel.h>
 
 class LightApp_DataObject;
 
@@ -39,7 +37,7 @@ class LIGHTAPP_EXPORT LightApp_Plot2dSelector : public QObject, public SUIT_Sele
   Q_OBJECT
 
 public:
-  LightApp_Plot2dSelector( SPlot2d_Viewer*, SUIT_SelectionMgr* );
+  LightApp_Plot2dSelector( Plot2d_Viewer*, SUIT_SelectionMgr* );
   virtual ~LightApp_Plot2dSelector();
 
   /*!Return "ObjectBrowser"*/

diff --git a/src/LightApp/LightApp_Preferences.cxx b/src/LightApp/LightApp_Preferences.cxx
index ecdb2579b46027e04cb697a047aff818c0025905..b856b6929bef9bcc56334a5ef0f01af37162dda8 100644 (file)
--- a/src/LightApp/LightApp_Preferences.cxx
+++ b/src/LightApp/LightApp_Preferences.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:      LightApp_Preferences.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/LightApp/LightApp_Preferences.h b/src/LightApp/LightApp_Preferences.h
index 8ab8fbd82a0c58c9dd5274e4d961329d316abe25..4de1f52a7d9e696adf3c27f3b8c00b95afc0903d 100644 (file)
--- a/src/LightApp/LightApp_Preferences.h
+++ b/src/LightApp/LightApp_Preferences.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:      LightApp_Preferences.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/LightApp/LightApp_PreferencesDlg.cxx b/src/LightApp/LightApp_PreferencesDlg.cxx
index b66fa3648cf36fc51c3131c6eb8d2dd963009f7f..9ca65e63fe17920168dd55ac464108b19a68ac2c 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.cxx
+++ b/src/LightApp/LightApp_PreferencesDlg.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:      LightApp_PreferencesDlg.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/LightApp/LightApp_PreferencesDlg.h b/src/LightApp/LightApp_PreferencesDlg.h
index 64299c97210927ed1ea2bee21ae784a4a941308e..7648866b886ff711af6b75c20bad66e5ca3bd5c4 100644 (file)
--- a/src/LightApp/LightApp_PreferencesDlg.h
+++ b/src/LightApp/LightApp_PreferencesDlg.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:      LightApp_PreferencesDlg.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/LightApp/LightApp_PyInterp.cxx b/src/LightApp/LightApp_PyInterp.cxx
index de65eba2b857880a542f8db4d23f07656c1ad950..5172d582f566b08c33171324be36f619e981b504 100644 (file)
--- a/src/LightApp/LightApp_PyInterp.cxx
+++ b/src/LightApp/LightApp_PyInterp.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,9 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
+//
 #include "LightApp_PyInterp.h"
 
 #include <SUITApp_init_python.hxx>

diff --git a/src/LightApp/LightApp_PyInterp.h b/src/LightApp/LightApp_PyInterp.h
index cbbff1325dd7e9090ddc4fc5349d24cd766dd7f9..fd4cc3fc77c9a292d948665118863355ddad5a42 100644 (file)
--- a/src/LightApp/LightApp_PyInterp.h
+++ b/src/LightApp/LightApp_PyInterp.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,9 +16,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
+//
 #ifndef _LIGHTAPP_PYINTERP_H_
 #define _LIGHTAPP_PYINTERP_H_
 

diff --git a/src/LightApp/LightApp_Selection.cxx b/src/LightApp/LightApp_Selection.cxx
index 6931c9585759c62d8f4c276c7cbba4f18cc4d73e..b8e90e67cc5461d569610a785a0ba8dfea28dd2d 100644 (file)
--- a/src/LightApp/LightApp_Selection.cxx
+++ b/src/LightApp/LightApp_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
 //
+
 #include "LightApp_Selection.h"
 #include "LightApp_SelectionMgr.h"
 #include "LightApp_DataOwner.h"

diff --git a/src/LightApp/LightApp_Selection.h b/src/LightApp/LightApp_Selection.h
index 5e2e17a19c84166ffb4dd342558d8ee2841711f7..aafefbb6d635ab190a8edf57a97cdaaa97dd6769 100644 (file)
--- a/src/LightApp/LightApp_Selection.h
+++ b/src/LightApp/LightApp_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
 //
+
 //  LightApp_Selection
 //  File   : LightApp_Selection.h
 //  Author : Alexander SOLOVYOV

diff --git a/src/LightApp/LightApp_SelectionMgr.cxx b/src/LightApp/LightApp_SelectionMgr.cxx
index 9a40604d9c635a093f15708e737c30fb91bf9310..397cfaebc624c1a9911b3a3ae6083e3f1c28517c 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.cxx
+++ b/src/LightApp/LightApp_SelectionMgr.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 "LightApp_SelectionMgr.h"
 
 #include "LightApp_Study.h"

diff --git a/src/LightApp/LightApp_SelectionMgr.h b/src/LightApp/LightApp_SelectionMgr.h
index 9a6b11804baab82c119518fcb3050002ea1936b8..7c248d08bd1580ab0b066ad540f778d71bd1f7de 100644 (file)
--- a/src/LightApp/LightApp_SelectionMgr.h
+++ b/src/LightApp/LightApp_SelectionMgr.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 LIGHTAPP_SELECTIONMGR_H
 #define LIGHTAPP_SELECTIONMGR_H
 

diff --git a/src/LightApp/LightApp_ShowHideOp.cxx b/src/LightApp/LightApp_ShowHideOp.cxx
index a48129436d5d28d8062fb35c68e317f876de5c42..d2d3608d92ab5a952f5c17cc04812684f0560a53 100644 (file)
--- a/src/LightApp/LightApp_ShowHideOp.cxx
+++ b/src/LightApp/LightApp_ShowHideOp.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 "LightApp_ShowHideOp.h"
 #include "LightApp_Application.h"
 #include "LightApp_Module.h"

diff --git a/src/LightApp/LightApp_ShowHideOp.h b/src/LightApp/LightApp_ShowHideOp.h
index 3e4958115628216232a0cee0997ac43e050cc80b..7e9db0ed9a9ef885d6f946474851f3fb6d9db2a9 100644 (file)
--- a/src/LightApp/LightApp_ShowHideOp.h
+++ b/src/LightApp/LightApp_ShowHideOp.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 LIGHTAPP_SHOW_HIDE_OPERATION_HEADER
 #define LIGHTAPP_SHOW_HIDE_OPERATION_HEADER
 

diff --git a/src/LightApp/LightApp_Study.cxx b/src/LightApp/LightApp_Study.cxx
index e0356bcf83becda5914da2d56ad362c1ce6b092d..7f2ee5e950d5435fcd0a6f0fcdac9426329fbbff 100644 (file)
--- a/src/LightApp/LightApp_Study.cxx
+++ b/src/LightApp/LightApp_Study.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 "LightApp_Study.h"
 
 #include "CAM_DataModel.h"

diff --git a/src/LightApp/LightApp_Study.h b/src/LightApp/LightApp_Study.h
index d47e7c0549a93db1274ce95b5ee0a529b2dda1b7..314b877463fcb1f13fe02804bd1343a41f94831d 100644 (file)
--- a/src/LightApp/LightApp_Study.h
+++ b/src/LightApp/LightApp_Study.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 LIGHTAPP_STUDY_H
 #define LIGHTAPP_STUDY_H
 

diff --git a/src/LightApp/LightApp_SwitchOp.cxx b/src/LightApp/LightApp_SwitchOp.cxx
index 3034bb80caae1da1d611cbb712609f1b520053bc..517dea7179a7a2e00be3ac4de244d04a73cafda1 100755 (executable)
--- a/src/LightApp/LightApp_SwitchOp.cxx
+++ b/src/LightApp/LightApp_SwitchOp.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 "LightApp_SwitchOp.h"
 #include "LightApp_Module.h"
 #include "LightApp_Operation.h"

diff --git a/src/LightApp/LightApp_SwitchOp.h b/src/LightApp/LightApp_SwitchOp.h
index 004831d597f5ce14eef9af52d2d8f86b74278882..6a58dd5bd561e7db4e7462a77e18d147c28ea612 100755 (executable)
--- a/src/LightApp/LightApp_SwitchOp.h
+++ b/src/LightApp/LightApp_SwitchOp.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 LightApp_SwitchOp_H
 #define LightApp_SwitchOp_H
 

diff --git a/src/LightApp/LightApp_UpdateFlags.h b/src/LightApp/LightApp_UpdateFlags.h
index d42e103811933bae4bcd9871cf4439873565ee87..a57029e1170eedf2bd2d75c000658117757c2764 100755 (executable)
--- a/src/LightApp/LightApp_UpdateFlags.h
+++ b/src/LightApp/LightApp_UpdateFlags.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   : LightApp_UpdateFlags.h
 //  Author : Sergey LITONIN
 //  Module : LIGHT

diff --git a/src/LightApp/LightApp_VTKSelector.cxx b/src/LightApp/LightApp_VTKSelector.cxx
index 625c6b70a07a85e732d90d2ef95137241c3b7e0c..05c4ece4865d0c6f0dc3ded02cfad92c53bc1670 100644 (file)
--- a/src/LightApp/LightApp_VTKSelector.cxx
+++ b/src/LightApp/LightApp_VTKSelector.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 "LightApp_VTKSelector.h"
 #include "LightApp_DataOwner.h"
 

diff --git a/src/LightApp/LightApp_VTKSelector.h b/src/LightApp/LightApp_VTKSelector.h
index a9cc2b47591371218faef4fe2a17e4893be9fe54..8b2012487ccade6e2000b57d1301a49e11af2a17 100644 (file)
--- a/src/LightApp/LightApp_VTKSelector.h
+++ b/src/LightApp/LightApp_VTKSelector.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 LIGHTAPP_VTKSELECTOR_H
 #define LIGHTAPP_VTKSELECTOR_H
 

diff --git a/src/LightApp/Makefile.am b/src/LightApp/Makefile.am
index 66d8cc8840686bae09782d537ef080840c8770a1..7f682eec1dda2a739dd244146a500f1be4b34e74 100755 (executable)
--- a/src/LightApp/Makefile.am
+++ b/src/LightApp/Makefile.am
@@ -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   : Makefile.in
 #  Author : OCC team (OCN)
 #  Module : LightApp

diff --git a/src/LightApp/resources/LightApp.xml b/src/LightApp/resources/LightApp.xml
index fbecde47505349ce0e15012609a89dedd5934d3d..2ae4f774c5eb8aa91d2f49acbec086db74b7aaa1 100644 (file)
--- a/src/LightApp/resources/LightApp.xml
+++ b/src/LightApp/resources/LightApp.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

diff --git a/src/LightApp/resources/LightApp_images.ts b/src/LightApp/resources/LightApp_images.ts
index ef5664006ad7e14155284542e90d2fba87a1a1aa..2a03347e9ca653dfbf65ff05e8b4ba3380785b83 100644 (file)
--- a/src/LightApp/resources/LightApp_images.ts
+++ b/src/LightApp/resources/LightApp_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/LightApp/resources/LightApp_msg_en.ts b/src/LightApp/resources/LightApp_msg_en.ts
index e1ddc72f0e6bec3aca729e27bb8d89737c187d78..2c9178de5908dfb2535e3039a84b9b27abc746db 100644 (file)
--- a/src/LightApp/resources/LightApp_msg_en.ts
+++ b/src/LightApp/resources/LightApp_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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
@@ -30,7 +30,7 @@
     </message>
     <message>
         <source>ABOUT_COPYRIGHT</source>
-        <translation>Copyright (C) 2007-2009 CEA/DEN, EDF R&amp;D, OPEN CASCADE
+        <translation>Copyright (C) 2007-2010 CEA/DEN, EDF R&amp;D, OPEN CASCADE
 
 Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6,
 CEA/DEN, CEDRAT, EDF R&amp;D, LEG, PRINCIPIA R&amp;D, BUREAU VERITAS</translation>

diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx
index 4a15cdaba3f49693ec8e9ce2ca4a3b18c0fddaae..92cc012aeeb5bff705d9e843828e5b436cdfe692 100755 (executable)
--- a/src/LogWindow/LogWindow.cxx
+++ b/src/LogWindow/LogWindow.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
 //
+
 //  KERNEL SALOME_Event : Define event posting mechanism
 // File   : LogWindow.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)

diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h
index f552a42292ff55fe9f79cfbb382821b899ffd7b1..bf853e8e5f61421b9c17b65c2b301820cb100774 100755 (executable)
--- a/src/LogWindow/LogWindow.h
+++ b/src/LogWindow/LogWindow.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
 //
+
 //  KERNEL SALOME_Event : Define event posting mechanism
 // File   : LogWindow.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)

diff --git a/src/LogWindow/LogWindow.pro b/src/LogWindow/LogWindow.pro
index 69eacdb67eafb2be68b3b07ded2a090f758f2279..47e343e1ea5bdd4296064631871b8d4f66777fa1 100644 (file)
--- a/src/LogWindow/LogWindow.pro
+++ b/src/LogWindow/LogWindow.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = LogWindow
 DESTDIR = ../../lib

diff --git a/src/LogWindow/Makefile.am b/src/LogWindow/Makefile.am
index 391b5cd1153ac9f0b9f9f18753d4e6faaa6ee964..492ebb8ffe80b8c25f2375cfcfae4af77ffa98c9 100755 (executable)
--- a/src/LogWindow/Makefile.am
+++ b/src/LogWindow/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : LogWindow

diff --git a/src/LogWindow/resources/LogWindow_msg_en.ts b/src/LogWindow/resources/LogWindow_msg_en.ts
index 1154409e55a5ba42f2b7444de67d7ba438e83b1a..91681176b591865b9e4853859f65173a9f655b25 100644 (file)
--- a/src/LogWindow/resources/LogWindow_msg_en.ts
+++ b/src/LogWindow/resources/LogWindow_msg_en.ts
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.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

diff --git a/src/Makefile.am b/src/Makefile.am
index 7ebc87fed0bc9288ccec9ee49d02503bde776eb4..8b684ec2e7983a747b0fde954d9b6157b4e974a8 100755 (executable)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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,9 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#  File   : Makefile.in
+
+#  File   : Makefile.am
 #  Author : Patrick GOLDBRONN (CEA)
-#  Module : SALOME
-# $Header$
-#
 
 ##
 # Common packages

diff --git a/src/OBJECT/Handle_SALOME_AISObject.hxx b/src/OBJECT/Handle_SALOME_AISObject.hxx
index 916806879f1b6333dc517382553c2bf660123c68..5299bb81add769f52a7ae5c1b2d41e2064645703 100755 (executable)
--- a/src/OBJECT/Handle_SALOME_AISObject.hxx
+++ b/src/OBJECT/Handle_SALOME_AISObject.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : Handle_SALOME_AISObject.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_AISShape.hxx b/src/OBJECT/Handle_SALOME_AISShape.hxx
index a7e434013454dd270e25e17ec7aabfc1f79188e2..8b1445b733e342093d5c8409bc87f19e4919406f 100755 (executable)
--- a/src/OBJECT/Handle_SALOME_AISShape.hxx
+++ b/src/OBJECT/Handle_SALOME_AISShape.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : Handle_SALOME_AISShape.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
index 30b5d05979e2a70fcea1744039264484e9200c18..ab2c7a7e228992a09386ff691794b45faefc3f81 100644 (file)
--- a/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
+++ b/src/OBJECT/Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : Handle_SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_Filter.hxx b/src/OBJECT/Handle_SALOME_Filter.hxx
index bb2345d08d2a19f959c0b475539c8e4cbb41419d..a30899eeeb1e11fb5b68c9b620b9c4c64d31be1e 100644 (file)
--- a/src/OBJECT/Handle_SALOME_Filter.hxx
+++ b/src/OBJECT/Handle_SALOME_Filter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : Handle_SALOME_Filter.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_InteractiveObject.hxx b/src/OBJECT/Handle_SALOME_InteractiveObject.hxx
index 07423d80adf18ee2fad48ab5f2f70a9ff03180c8..384558bc81d4b23ef6cfb398143e5fb8cfd2a37d 100755 (executable)
--- a/src/OBJECT/Handle_SALOME_InteractiveObject.hxx
+++ b/src/OBJECT/Handle_SALOME_InteractiveObject.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : Handle_SALOME_InteractiveObject.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx b/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx
index 5d1533399a5d72c76ca48f4b12db9fd53425851b..1ae3310c59158be08bdce0d0abaabe820d34218a 100644 (file)
--- a/src/OBJECT/Handle_SALOME_ListNodeOfListIO.hxx
+++ b/src/OBJECT/Handle_SALOME_ListNodeOfListIO.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : Handle_SALOME_ListNodeOfListIO.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Handle_SALOME_TypeFilter.hxx b/src/OBJECT/Handle_SALOME_TypeFilter.hxx
index 464e4c51d5a7d922745a32aee7b9997f44874a4e..5e657db0756509cd5e68aa43b2f02796cebf3ab8 100644 (file)
--- a/src/OBJECT/Handle_SALOME_TypeFilter.hxx
+++ b/src/OBJECT/Handle_SALOME_TypeFilter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : Handle_SALOME_TypeFilter.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am
index b553128dd2db24236967a735063a2f523a1a56c7..0fa0623f4a005bd08825026777132e28f8558c7c 100755 (executable)
--- a/src/OBJECT/Makefile.am
+++ b/src/OBJECT/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libSalomeObject.la

diff --git a/src/OBJECT/OBJECT.pro b/src/OBJECT/OBJECT.pro
index 4f3f219468422d8a98abe153156b023b7f2cdafc..7a4727c26af6924de906be051ee255577825b125 100644 (file)
--- a/src/OBJECT/OBJECT.pro
+++ b/src/OBJECT/OBJECT.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SalomeObject
 DESTDIR = ../../lib

diff --git a/src/OBJECT/SALOME_AISObject.cxx b/src/OBJECT/SALOME_AISObject.cxx
index d7a0d9b04088b4f0b6839c2900c29ea004eb0db9..b29b970a0489adfad0a0b69fdaa35efc2d0b52ca 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.cxx
+++ b/src/OBJECT/SALOME_AISObject.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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISObject.hxx
 //  Author : Nicolas REJNERI

diff --git a/src/OBJECT/SALOME_AISObject.hxx b/src/OBJECT/SALOME_AISObject.hxx
index b94df74c82ed8412c89041418cf718c4e686d15e..bd3d063a065f5f4f7a82871f51803630d268c706 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.hxx
+++ b/src/OBJECT/SALOME_AISObject.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISObject.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_AISObject.ixx b/src/OBJECT/SALOME_AISObject.ixx
index dbf37bdbfcc6dc56cd9028c307434971eb9c8c8c..8d02a3b6ebe3ffd5769cd94fcc71256d7429b2b7 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.ixx
+++ b/src/OBJECT/SALOME_AISObject.ixx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISObject.ixx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_AISObject.jxx b/src/OBJECT/SALOME_AISObject.jxx
index 2284b4acd3a40f38b292a606cff52cef22c93e35..a7606e2aae4856a6c536d417a689f31e8a86081e 100755 (executable)
--- a/src/OBJECT/SALOME_AISObject.jxx
+++ b/src/OBJECT/SALOME_AISObject.jxx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISObject.jxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_AISShape.cxx b/src/OBJECT/SALOME_AISShape.cxx
index 3fa0c47b5c43f69479442a271b59bdc279c51f9e..eddf2fbae7358ecf2c0a99097b82870bbd59910a 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.cxx
+++ b/src/OBJECT/SALOME_AISShape.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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISShape.hxx
 //  Author : Nicolas REJNERI

diff --git a/src/OBJECT/SALOME_AISShape.hxx b/src/OBJECT/SALOME_AISShape.hxx
index 9d5cc5a24a4050ed6d773596cbe0171f408ce03c..5ac1e9554f95aecfdfe0d7a3ed378a6547fc500e 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.hxx
+++ b/src/OBJECT/SALOME_AISShape.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISShape.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_AISShape.ixx b/src/OBJECT/SALOME_AISShape.ixx
index 1b68f13e4ad3571c7f5d0346abe8e170e7438325..303742b075b4937b029ed09825eca521551a0258 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.ixx
+++ b/src/OBJECT/SALOME_AISShape.ixx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISShape.ixx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_AISShape.jxx b/src/OBJECT/SALOME_AISShape.jxx
index 546cc63778f04beda038107c6b270782654389a7..2a42f71c711311ce56818cb81f123e9c4a396015 100755 (executable)
--- a/src/OBJECT/SALOME_AISShape.jxx
+++ b/src/OBJECT/SALOME_AISShape.jxx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_AISShape.jxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx
index 85441bfa3a0cdda834aa5d8c26baff46617a3fd0..74078cb345c443545b1dcb910b7873088570b366 100644 (file)
--- a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx
+++ b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
index 57f6c3c6827c5ee61592a27a0097ceea99135ee0..86096c07976de89977e08984e4ec646ad78c28dc 100644 (file)
--- a/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
+++ b/src/OBJECT/SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapIteratorOfDataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
index 5bb115dc403fa58322af75fabf31f8a16bd0701b..ca4d786ed4e2e8f6d06e8c719f192eb690694908 100644 (file)
--- a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
+++ b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
index cf7b68692a1fdd9efde2f9dea0b6043bd22020e7..14b9dea97d5d2aa0ea5921ecc0a4ede0d9023511 100644 (file)
--- a/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
+++ b/src/OBJECT/SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapNodeOfDataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx
index 74e65e737d9900fc8356f72e65dc5a26780e92ef..d167dc0d5c0db8db81e779c74a3fcb93f46fc2d2 100644 (file)
--- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.hxx
+++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapOfIOMapOfInteger.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx
index e07f3c2ae1ac4e501ff9fea47c4180e072157ee0..a3f5a1225d88398d686848ab187c0ecd4df1d221 100644 (file)
--- a/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.cxx
+++ b/src/OBJECT/SALOME_DataMapOfIOMapOfInteger_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_DataMapOfIOMapOfInteger_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_Filter.cxx b/src/OBJECT/SALOME_Filter.cxx
index 78626c23ae09d7dd2aedcac807c26f5a5f21f036..b5657597b6525365c537197f7ac28cd1f5438142 100644 (file)
--- a/src/OBJECT/SALOME_Filter.cxx
+++ b/src/OBJECT/SALOME_Filter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Filter.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/OBJECT/SALOME_Filter.hxx b/src/OBJECT/SALOME_Filter.hxx
index 808b0563b2854385b2929bcc639a7014900c639b..7f926208a3e1457616f9b98e16cb4e7389f75a6f 100644 (file)
--- a/src/OBJECT/SALOME_Filter.hxx
+++ b/src/OBJECT/SALOME_Filter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Filter.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_Filter.ixx b/src/OBJECT/SALOME_Filter.ixx
index 59d5ba2a045db23c00fa2d0824b52f91f789213b..2680142bf45fbf77e24af4f21d1f9fa5ab27da1b 100644 (file)
--- a/src/OBJECT/SALOME_Filter.ixx
+++ b/src/OBJECT/SALOME_Filter.ixx
@@ -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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Filter.ixx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_Filter.jxx b/src/OBJECT/SALOME_Filter.jxx
index 21f56047da0e1db44cc586b73679df7c93d9eca7..8e23fec8f95beb1bb4b786bb7535e32f3d024951 100644 (file)
--- a/src/OBJECT/SALOME_Filter.jxx
+++ b/src/OBJECT/SALOME_Filter.jxx
@@ -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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Filter.jxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_InteractiveObject.cxx b/src/OBJECT/SALOME_InteractiveObject.cxx
index 3e61ed5f6278767f5c3b691d44bffd4e11fc61fa..bd2bc387edde8c9a2b53b672fb6c8cd8de8c39ff 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.cxx
+++ b/src/OBJECT/SALOME_InteractiveObject.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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_InteractiveObject.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/OBJECT/SALOME_InteractiveObject.hxx b/src/OBJECT/SALOME_InteractiveObject.hxx
index ed938b85300e39cab0a96163d05fd01870974b5e..43a789431d039a50e7e6aa2d6e3654189843c3de 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.hxx
+++ b/src/OBJECT/SALOME_InteractiveObject.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 OBJECT : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_InteractiveObject.hxx
 //  Module : SALOME
@@ -35,6 +36,9 @@
 #ifdef VERSION
 #undef VERSION
 #endif
+#ifdef HAVE_FINITE
+#undef HAVE_FINITE
+#endif
 #include <Standard.hxx>
 #endif
 #ifndef _Handle_SALOME_InteractiveObject_HeaderFile

diff --git a/src/OBJECT/SALOME_InteractiveObject.ixx b/src/OBJECT/SALOME_InteractiveObject.ixx
index b7f7e93e7ed97b03ba59b4d0d3908c05bafe078e..6f38edd0810474c544ab0f3f69d82da56d278d15 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.ixx
+++ b/src/OBJECT/SALOME_InteractiveObject.ixx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_InteractiveObject.ixx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_InteractiveObject.jxx b/src/OBJECT/SALOME_InteractiveObject.jxx
index 215d3d2f48c4f9618579f7743d2b4ea9a2a0ecbc..878daf7c04c651c109e36ed7b7bafe378c469ee3 100755 (executable)
--- a/src/OBJECT/SALOME_InteractiveObject.jxx
+++ b/src/OBJECT/SALOME_InteractiveObject.jxx
@@ -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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   : SALOME_InteractiveObject.jxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListIO.hxx b/src/OBJECT/SALOME_ListIO.hxx
index 4b2e81255d7f4ab5ffa6916b78ed38f66a38749d..1b104ac16e8a426c2ddadd662eecfcc228d8db89 100644 (file)
--- a/src/OBJECT/SALOME_ListIO.hxx
+++ b/src/OBJECT/SALOME_ListIO.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListIO.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListIO_0.cxx b/src/OBJECT/SALOME_ListIO_0.cxx
index 97af181b5430869105ab157c577a5c807db1c57c..9250867d4cc3afc1600eb8f294a9682b21a48fd6 100644 (file)
--- a/src/OBJECT/SALOME_ListIO_0.cxx
+++ b/src/OBJECT/SALOME_ListIO_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListIO_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListIteratorOfListIO.hxx b/src/OBJECT/SALOME_ListIteratorOfListIO.hxx
index eb355c7f99e411bdc27e000a0b88721583c96466..7d79231d7d3f1e571fd066eee21885221b190efc 100644 (file)
--- a/src/OBJECT/SALOME_ListIteratorOfListIO.hxx
+++ b/src/OBJECT/SALOME_ListIteratorOfListIO.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListIteratorOfListIO.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx b/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx
index 54dc233bd7f626bac714743cfc6ff0703adf5f3b..8c3409170558b11a6d2fe45ba58ccfd62b6719d0 100644 (file)
--- a/src/OBJECT/SALOME_ListIteratorOfListIO_0.cxx
+++ b/src/OBJECT/SALOME_ListIteratorOfListIO_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListIteratorOfListIO_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListNodeOfListIO.hxx b/src/OBJECT/SALOME_ListNodeOfListIO.hxx
index 7c1fb354291f176776089190b3d8eb9d33b1900c..e7a2797dbf37a36ed3e24306ce9b17e15be014e1 100644 (file)
--- a/src/OBJECT/SALOME_ListNodeOfListIO.hxx
+++ b/src/OBJECT/SALOME_ListNodeOfListIO.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListNodeOfListIO.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx b/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx
index fa60f0edc95f1ae74b9d72f2b1df303eafdf88fa..8fe1e61db910ff950ffc9766d10cb6bd75ec770b 100644 (file)
--- a/src/OBJECT/SALOME_ListNodeOfListIO_0.cxx
+++ b/src/OBJECT/SALOME_ListNodeOfListIO_0.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_ListNodeOfListIO_0.cxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_Selection.h b/src/OBJECT/SALOME_Selection.h
index 0e5fb270596b6d242cfc7218a3d218a8c9f94826..5f09d476b9e40333ae2c234126bf1e101497753f 100644 (file)
--- a/src/OBJECT/SALOME_Selection.h
+++ b/src/OBJECT/SALOME_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
 //
+
 //  SALOME Selection : description of enumeration Selection_Mode
 //  File   : SALOME_Selection.h
 //  Author :

diff --git a/src/OBJECT/SALOME_TypeFilter.cxx b/src/OBJECT/SALOME_TypeFilter.cxx
index 62db81b46c67ed16a80dde05e04d9f567fe27328..661592dbe6a24a712971788ea67ab1b95de561ce 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.cxx
+++ b/src/OBJECT/SALOME_TypeFilter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_TypeFilter.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/OBJECT/SALOME_TypeFilter.hxx b/src/OBJECT/SALOME_TypeFilter.hxx
index b4304ce892dd800be934c5c6d2324c6bb4895d9d..5fd1093813010923e525571d4904a5e6ca07fa7e 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.hxx
+++ b/src/OBJECT/SALOME_TypeFilter.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_TypeFilter.hxx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_TypeFilter.ixx b/src/OBJECT/SALOME_TypeFilter.ixx
index 8cc87c16b16d740727d76375d183b2d74f6e853f..d2a77a322f2af029aa53583d48149c880f6e9d7b 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.ixx
+++ b/src/OBJECT/SALOME_TypeFilter.ixx
@@ -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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_TypeFilter.ixx
 //  Module : SALOME

diff --git a/src/OBJECT/SALOME_TypeFilter.jxx b/src/OBJECT/SALOME_TypeFilter.jxx
index 58d9312fcca86c7b5de6f384b8c07b4fd4fb82d3..eba5e90ea651e078526aa4ab3c094a10a761ccad 100644 (file)
--- a/src/OBJECT/SALOME_TypeFilter.jxx
+++ b/src/OBJECT/SALOME_TypeFilter.jxx
@@ -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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_TypeFilter.jxx
 //  Module : SALOME

diff --git a/src/OCCViewer/Makefile.am b/src/OCCViewer/Makefile.am
index c2041a5d83f2cb3ef0015cc80b0561d11d03a222..65d59fc7ecef6c884896fbe143aa07b131fedeec 100755 (executable)
--- a/src/OCCViewer/Makefile.am
+++ b/src/OCCViewer/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : OCCViewer
@@ -42,7 +43,8 @@ salomeinclude_HEADERS =                               \
        OCCViewer_ClippingDlg.h                 \
        OCCViewer_AxialScaleDlg.h               \
        OCCViewer_SetRotationPointDlg.h         \
-       OCCViewer_Trihedron.h
+       OCCViewer_Trihedron.h                   \
+       OCCViewer_ToolTip.h
 
 dist_libOCCViewer_la_SOURCES =                 \
        OCCViewer_AISSelector.cxx               \

diff --git a/src/OCCViewer/OCCViewer.h b/src/OCCViewer/OCCViewer.h
index f11fa462a100940a3af4a48f9fdabf34b184294a..d2b139672010ea3dbc5aac423ca16ffc3b85f0e1 100755 (executable)
--- a/src/OCCViewer/OCCViewer.h
+++ b/src/OCCViewer/OCCViewer.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
 //
+
 #ifdef WIN32
 #if defined OCCVIEWER_EXPORTS || defined OCCViewer_EXPORTS
 #define OCCVIEWER_EXPORT __declspec(dllexport)

diff --git a/src/OCCViewer/OCCViewer.pro b/src/OCCViewer/OCCViewer.pro
index b5560bb7ce041e288be4aef884283d6d29c317c3..e4137e1bece10aa083db7f55eb86ca4bcb61f4a4 100644 (file)
--- a/src/OCCViewer/OCCViewer.pro
+++ b/src/OCCViewer/OCCViewer.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = OCCViewer
 DESTDIR = ../../lib

diff --git a/src/OCCViewer/OCCViewer_AISSelector.cxx b/src/OCCViewer/OCCViewer_AISSelector.cxx
index 44b55e471281af7c3102f216b12c5a3e0094b1f6..666c3e7afeb66ad6fa583b85adc27e1c84848290 100755 (executable)
--- a/src/OCCViewer/OCCViewer_AISSelector.cxx
+++ b/src/OCCViewer/OCCViewer_AISSelector.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 "OCCViewer_AISSelector.h"
 
 /*!

diff --git a/src/OCCViewer/OCCViewer_AISSelector.h b/src/OCCViewer/OCCViewer_AISSelector.h
index a311b47d41605ce5e84ff1b52760005b39e7627c..17fce9b0bdead3137b35b560ae19e658d2fcab69 100755 (executable)
--- a/src/OCCViewer/OCCViewer_AISSelector.h
+++ b/src/OCCViewer/OCCViewer_AISSelector.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
 //
+
 #if !defined( OCCVIEWER_AISSELECTOR_H )
 #define OCCVIEWER_AISSELECTOR_H
 

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx b/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
index d670db0fe3c54d358c57ad1759942e92740ac451..df14c95620512ba580e8a8ab9efc2d1327cdd0f2 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.cxx
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.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 "OCCViewer_AxialScaleDlg.h"
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewPort3d.h"

diff --git a/src/OCCViewer/OCCViewer_AxialScaleDlg.h b/src/OCCViewer/OCCViewer_AxialScaleDlg.h
index 5bb70804c0bacdc278c4af81689cdb4b05cc4682..17f55f4003164e21c258eec1047a47f324dc37a6 100644 (file)
--- a/src/OCCViewer/OCCViewer_AxialScaleDlg.h
+++ b/src/OCCViewer/OCCViewer_AxialScaleDlg.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 OCCVIEWER_AXIALSCALEDLG_H
 #define OCCVIEWER_AXIALSCALEDLG_H
 

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.cxx b/src/OCCViewer/OCCViewer_ClippingDlg.cxx
index 0a7e75f9790b3fc67768761f4b080366bd6aaf2e..4fb3b48b0108377375bcc0c8a739e5cce6d5b18e 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.cxx
+++ b/src/OCCViewer/OCCViewer_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,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "OCCViewer_ClippingDlg.h"
 
 #include <QtxDoubleSpinBox.h>

diff --git a/src/OCCViewer/OCCViewer_ClippingDlg.h b/src/OCCViewer/OCCViewer_ClippingDlg.h
index 760115595f0dec99efb7ac1f117ca0b090c288ea..8639661b7e93427f39dbdf4deea8d94b774b68c8 100644 (file)
--- a/src/OCCViewer/OCCViewer_ClippingDlg.h
+++ b/src/OCCViewer/OCCViewer_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 OCCVIEWER_CLIPPINGDLG_H
 #define OCCVIEWER_CLIPPINGDLG_H
 

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
index 718e9a61c6ffd96c0cc5438a84829c4b7ec7f8db..574e7de739c54280bad193e7d170a855b800a9d0 100755 (executable)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.cxx
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.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 "OCCViewer_CreateRestoreViewDlg.h"
 #include "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewPort3d.h"

diff --git a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
index bc67b546861b8da5f2fec58ef8155ec51bae4a52..a0688f2db4185371ba86667e96d771c88589f188 100755 (executable)
--- a/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.h
+++ b/src/OCCViewer/OCCViewer_CreateRestoreViewDlg.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 OCCVIEWER_CREATERESTOREVIEWDLG_H
 #define OCCVIEWER_CREATERESTOREVIEWDLG_H
 

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx b/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
index 4e4f95d97acbb8b39abba3c270939f12f67e6f96..d5d1310143c75026c3b7bc0c5f59a982e2615b99 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.cxx
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.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 "OCCViewer_SetRotationPointDlg.h"
 
 #include <QtxAction.h>

diff --git a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h b/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
index cc3a907aee455be4fda88cef022ab1d1e9c8a01c..83cccad42043291622e7ddc17abddeab5f0f9cf6 100644 (file)
--- a/src/OCCViewer/OCCViewer_SetRotationPointDlg.h
+++ b/src/OCCViewer/OCCViewer_SetRotationPointDlg.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 OCCVIEWER_SETROTATIONPOINTDLG_H
 #define OCCVIEWER_SETROTATIONPOINTDLG_H
 

diff --git a/src/OCCViewer/OCCViewer_ToolTip.cxx b/src/OCCViewer/OCCViewer_ToolTip.cxx
index 03ff55fff12a7b3d12b86d2cd618cf3aa62a5acd..ddb963111fa8439da68467aad0524422970215e7 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.cxx
+++ b/src/OCCViewer/OCCViewer_ToolTip.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:      OCCViewer_ToolTip.cxx
 // Author:    Alexandre SOLOVYOV
 //

diff --git a/src/OCCViewer/OCCViewer_ToolTip.h b/src/OCCViewer/OCCViewer_ToolTip.h
index 5ff60c81ce693ed0611dbd2ae8d9b30b392c8b0b..6cb288c00cc47ec48e089dc31abc1c2d05f30f05 100644 (file)
--- a/src/OCCViewer/OCCViewer_ToolTip.h
+++ b/src/OCCViewer/OCCViewer_ToolTip.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 OCCVIEWER_TOOLTIP_H
 #define OCCVIEWER_TOOLTIP_H
 

diff --git a/src/OCCViewer/OCCViewer_Trihedron.cxx b/src/OCCViewer/OCCViewer_Trihedron.cxx
index 3637ca04ed3fc951814ca61b7cf5934a49d2c009..99bfe107a611928317a199ede8cc244126edde9f 100755 (executable)
--- a/src/OCCViewer/OCCViewer_Trihedron.cxx
+++ b/src/OCCViewer/OCCViewer_Trihedron.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
 //
+
 #ifdef WIN32
 #include <windows.h>
 #endif

diff --git a/src/OCCViewer/OCCViewer_Trihedron.h b/src/OCCViewer/OCCViewer_Trihedron.h
index 87ea6645f0a647ccecc74d2d6a5b729295b2665f..aa1fd806d1a3be573e7f70d879da6dfae1606155 100644 (file)
--- a/src/OCCViewer/OCCViewer_Trihedron.h
+++ b/src/OCCViewer/OCCViewer_Trihedron.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 OCCVIEWER_TRIHEDRON_H
 #define OCCVIEWER_TRIHEDRON_H
 

diff --git a/src/OCCViewer/OCCViewer_VService.cxx b/src/OCCViewer/OCCViewer_VService.cxx
index af826923d8de934dafb1944495e8d07b2fb31bd5..a06cf9e7df94dce4bebc19e6bafeb45729c8749f 100755 (executable)
--- a/src/OCCViewer/OCCViewer_VService.cxx
+++ b/src/OCCViewer/OCCViewer_VService.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 "OCCViewer_VService.h"
 #include <V3d_Viewer.hxx>
 #include <V3d_View.hxx>

diff --git a/src/OCCViewer/OCCViewer_VService.h b/src/OCCViewer/OCCViewer_VService.h
index aa2889a13129cc4e5af861f7dc89e55c475e75c7..f8f05e8672a106a9d62567be3dc0fbffc4dfa587 100755 (executable)
--- a/src/OCCViewer/OCCViewer_VService.h
+++ b/src/OCCViewer/OCCViewer_VService.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 OCCVIEWER_VSERVICE_H
 #define OCCVIEWER_VSERVICE_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewManager.cxx b/src/OCCViewer/OCCViewer_ViewManager.cxx
index 52a8813f08a1a8a4e505e2c7a102a9deef874aec..b952c22b3cbc2db56662bab6f17e1fef8284dd24 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewManager.cxx
+++ b/src/OCCViewer/OCCViewer_ViewManager.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 "OCCViewer_ViewManager.h"
 #include "OCCViewer_ViewWindow.h"
 #include "SUIT_Desktop.h"

diff --git a/src/OCCViewer/OCCViewer_ViewManager.h b/src/OCCViewer/OCCViewer_ViewManager.h
index ba44d017e87a9d30bb7a1ed836871bd75fb9821b..bff02bc61e62b6d2cdd73682f43daad556d5ffc6 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewManager.h
+++ b/src/OCCViewer/OCCViewer_ViewManager.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 OCCVIEWER_VIEWMANAGER_H
 #define OCCVIEWER_VIEWMANAGER_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewModel.cxx b/src/OCCViewer/OCCViewer_ViewModel.cxx
index f931e0cdfe2df361c9e7b577b2afbf1e62e89482..caea7732622cc0079fde91928e4af40e6dde6e0a 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewModel.cxx
+++ b/src/OCCViewer/OCCViewer_ViewModel.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 "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_VService.h"

diff --git a/src/OCCViewer/OCCViewer_ViewModel.h b/src/OCCViewer/OCCViewer_ViewModel.h
index 40c4e495fa16d02b9fe5680fd1a00d776f50dbc8..925b2dc05d7aa1e4e481eaaa0c4d56f8f162979a 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewModel.h
+++ b/src/OCCViewer/OCCViewer_ViewModel.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 OCCVIEWER_VIEWMODEL_H
 #define OCCVIEWER_VIEWMODEL_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx
index f7b7f77a6e58d322cc13af068346468301c64c24..9c4858edc2287dd21620ea29786fa03d4e46e953 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort.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
 //
+
 #if !defined WNT
 #define QT_CLEAN_NAMESPACE         /* avoid definition of INT32 and INT8 */
 #endif
@@ -118,7 +119,7 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi )
   if ( vi->visualid == XVisualIDFromVisual( (Visual*)QX11Info::appVisual() ) )
   {
 #ifdef DEBUG
-    cout << "Using x11AppColormap" << endl;
+//    cout << "Using x11AppColormap" << endl;
 #endif
     return QX11Info::appColormap();
   }

diff --git a/src/OCCViewer/OCCViewer_ViewPort.h b/src/OCCViewer/OCCViewer_ViewPort.h
index 5f038cd1128c0ead3cee47b9d1c57ab2a6527018..355944b6f68da188208a2accb72a5f7d9cf7ad71 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort.h
+++ b/src/OCCViewer/OCCViewer_ViewPort.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 OCCVIEWER_VIEWPORT_H
 #define OCCVIEWER_VIEWPORT_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx
index 40876920c9151258946d609680303fa1e9a53651..f590759895ff4aaed69f33c10d4676292c1843d2 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.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 "OCCViewer_ViewPort3d.h"
 
 #include "OCCViewer_VService.h"
@@ -383,6 +384,7 @@ void OCCViewer_ViewPort3d::startRotation( int x, int y,
     default:
       break;
     }
+    activeView()->DepthFitAll();
   }
 }
 

diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.h b/src/OCCViewer/OCCViewer_ViewPort3d.h
index 4092b4c1f6f0b25e491c023f2d8dd206388ea70b..469ce17cb1777cd981bbe318d705bd29d98b9e92 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewPort3d.h
+++ b/src/OCCViewer/OCCViewer_ViewPort3d.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 OCCVIEWER_VIEWPORT3D_H
 #define OCCVIEWER_VIEWPORT3D_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.cxx b/src/OCCViewer/OCCViewer_ViewSketcher.cxx
index 17ca4d8a7b515cd565aaf4f7bf1199b5d1652d94..3b22ef62f5aefee3b006a28921b1335c56c427ab 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.cxx
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.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 "OCCViewer_ViewSketcher.h"
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewPort3d.h"

diff --git a/src/OCCViewer/OCCViewer_ViewSketcher.h b/src/OCCViewer/OCCViewer_ViewSketcher.h
index b33b0690d10afc457f590471dd4d6dfc401dca9f..15b73e32f0b76c6bdb92f501c46a8c24575995af 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewSketcher.h
+++ b/src/OCCViewer/OCCViewer_ViewSketcher.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 OCCVIEWER_VIEWSKETCHER_H
 #define OCCVIEWER_VIEWSKETCHER_H
 

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx
index 65f1bc061d77534ac20fdf1eaa9296fe75620a94..ee2ba5cb823795d487d40e4c94c7db276cbc5cd0 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.cxx
+++ b/src/OCCViewer/OCCViewer_ViewWindow.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,9 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File   : OCCViewer_ViewWindow.cxx
 // Author :
-
+//
 #include "OCCViewer_ViewWindow.h"
 #include "OCCViewer_ViewModel.h"
 #include "OCCViewer_ViewPort3d.h"
@@ -468,8 +469,8 @@ void OCCViewer_ViewWindow::activateZoom()
   if ( myOperation != ZOOMVIEW ) {
     QPixmap zoomPixmap (imageZoomCursor);
     QCursor zoomCursor (zoomPixmap);
-    setTransformRequested ( ZOOMVIEW );
-    myViewPort->setCursor( zoomCursor );
+    if( setTransformRequested ( ZOOMVIEW ) )
+      myViewPort->setCursor( zoomCursor );
   }
 }
 
@@ -486,8 +487,8 @@ void OCCViewer_ViewWindow::activatePanning()
 
   if ( myOperation != PANVIEW ) {
     QCursor panCursor (Qt::SizeAllCursor);
-    setTransformRequested ( PANVIEW );
-    myViewPort->setCursor( panCursor );
+    if( setTransformRequested ( PANVIEW ) )
+      myViewPort->setCursor( panCursor );
   }
 }
 
@@ -504,8 +505,8 @@ void OCCViewer_ViewWindow::activateRotation()
   if ( myOperation != ROTATE ) {
     QPixmap rotatePixmap (imageRotateCursor);
     QCursor rotCursor (rotatePixmap);
-    setTransformRequested ( ROTATE );
-    myViewPort->setCursor( rotCursor );
+    if( setTransformRequested ( ROTATE ) )
+      myViewPort->setCursor( rotCursor );
   }
 }
 
@@ -693,8 +694,8 @@ void OCCViewer_ViewWindow::activateGlobalPanning()
     aView3d->FitAll(0.01, false);
     myCursor = cursor();                // save old cursor
     myViewPort->fitAll(); // fits view before selecting a new scene center
-    setTransformRequested( PANGLOBAL );
-    myViewPort->setCursor( glPanCursor );
+    if( setTransformRequested( PANGLOBAL ) )
+      myViewPort->setCursor( glPanCursor );
   }
 }
 
@@ -710,22 +711,25 @@ void OCCViewer_ViewWindow::activateWindowFit()
 
   if ( myOperation != WINDOWFIT ) {
     QCursor handCursor (Qt::PointingHandCursor);
-    setTransformRequested ( WINDOWFIT );
-    myViewPort->setCursor ( handCursor );
-    myCursorIsHand = true;
+    if( setTransformRequested ( WINDOWFIT ) )
+    {
+      myViewPort->setCursor ( handCursor );
+      myCursorIsHand = true;
+    }
   }
 }
 
 /*!
   \brief Start delayed viewer operation.
 */
-void OCCViewer_ViewWindow::setTransformRequested( OperationType op )
+bool OCCViewer_ViewWindow::setTransformRequested( OperationType op )
 {
-  myOperation = op;
-  myViewPort->setMouseTracking( myOperation == NOTHING );
+  bool ok = transformEnabled( op );
+  myOperation = ok ? op : NOTHING;
+  myViewPort->setMouseTracking( myOperation == NOTHING );  
+  return ok;
 }
 
-
 /*!
   \brief Handle mouse move event.
   \param theEvent mouse event
@@ -1907,3 +1911,19 @@ void OCCViewer_ViewWindow::setTransformInProcess( bool bOn )
 {
   myEventStarted = bOn;
 }
+
+/*!
+  Set enabled state of transformation (rotate, zoom, etc)
+*/
+void OCCViewer_ViewWindow::setTransformEnabled( const OperationType id, const bool on )
+{
+  if ( id != NOTHING ) myStatus.insert( id, on );
+}
+
+/*!
+  \return enabled state of transformation (rotate, zoom, etc)
+*/
+bool OCCViewer_ViewWindow::transformEnabled( const OperationType id ) const
+{
+  return myStatus.contains( id ) ? myStatus[ id ] : true;
+}

diff --git a/src/OCCViewer/OCCViewer_ViewWindow.h b/src/OCCViewer/OCCViewer_ViewWindow.h
index 15fd3b61a8d6528f11f64289b3584f3b6f16969f..56558b5b7e64939dbc90910403eee34fcba0b77d 100755 (executable)
--- a/src/OCCViewer/OCCViewer_ViewWindow.h
+++ b/src/OCCViewer/OCCViewer_ViewWindow.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 OCCVIEWER_VIEWWINDOW_H
 #define OCCVIEWER_VIEWWINDOW_H
 
@@ -88,6 +89,9 @@ public:
   int                     interactionStyle() const;
   void                    setInteractionStyle( const int );
  
+  void setTransformEnabled( const OperationType, const bool );
+  bool transformEnabled( const OperationType ) const;
+
 public slots:
   void onFrontView();
   void onViewFitAll();
@@ -138,7 +142,7 @@ protected:
 
   /* Transformation selected but not started yet */
   bool transformRequested() const;
-  void setTransformRequested ( OperationType );
+  bool setTransformRequested ( OperationType );
 
   /* Transformation is selected and already started */
   bool          transformInProcess() const;
@@ -209,6 +213,9 @@ private:
   QtxRectRubberBand* myRectBand; //!< selection rectangle rubber band
 
   int myInteractionStyle;
+
+  typedef QMap<OperationType, bool> MapOfTransformStatus;
+  MapOfTransformStatus myStatus;
 };
 
 #ifdef WIN32

diff --git a/src/OCCViewer/resources/OCCViewer_images.ts b/src/OCCViewer/resources/OCCViewer_images.ts
index 843e896848c7526ea8a48fe5fdc0afad57b75aa2..bdd523e49e659f0458877d0cef1922a09ce17fa7 100644 (file)
--- a/src/OCCViewer/resources/OCCViewer_images.ts
+++ b/src/OCCViewer/resources/OCCViewer_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/OCCViewer/resources/OCCViewer_msg_en.ts b/src/OCCViewer/resources/OCCViewer_msg_en.ts
index 6e88f1909ac98654ed986c57b9a0754c3d156613..5fcc11b74551cd9be5f3eca3be098da8c570193d 100644 (file)
--- a/src/OCCViewer/resources/OCCViewer_msg_en.ts
+++ b/src/OCCViewer/resources/OCCViewer_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/ObjBrowser/Makefile.am b/src/ObjBrowser/Makefile.am
index de6ed12b08de21e9964f21f572c372dbf9a7d0eb..aa46ccd3785c7fbef76ff6a039f95f87397a7215 100755 (executable)
--- a/src/ObjBrowser/Makefile.am
+++ b/src/ObjBrowser/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : ObjectBrowser

diff --git a/src/ObjBrowser/OB.h b/src/ObjBrowser/OB.h
index 47045a2ef9ac0c7121be7e36984bececaa0e683b..24f59e53dfcc5696f70462a103a6693ac9feab82 100755 (executable)
--- a/src/ObjBrowser/OB.h
+++ b/src/ObjBrowser/OB.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 OB_H
 #define OB_H
 

diff --git a/src/ObjBrowser/OB_Browser.cxx b/src/ObjBrowser/OB_Browser.cxx
index 0e8f33a6331ff018fc327f472b3d9ac3ace8cb89..e0e649a4d2b14c2262405d8dd1fbbb17088dc201 100755 (executable)
--- a/src/ObjBrowser/OB_Browser.cxx
+++ b/src/ObjBrowser/OB_Browser.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   : OB_Browser.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/ObjBrowser/OB_Browser.h b/src/ObjBrowser/OB_Browser.h
index 378900ce8cb1c2f7ded6bf58e9935300da4d674b..f9d63d62cac82d4146648cdd0bf7f57fabbbc705 100755 (executable)
--- a/src/ObjBrowser/OB_Browser.h
+++ b/src/ObjBrowser/OB_Browser.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   : OB_Browser.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/ObjBrowser/OB_Filter.cxx b/src/ObjBrowser/OB_Filter.cxx
index edc1816af93e25d38d39741aee26615966497d39..ab0ef0ff31372760f7595508eb437519cc1cb307 100644 (file)
--- a/src/ObjBrowser/OB_Filter.cxx
+++ b/src/ObjBrowser/OB_Filter.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 "OB_Filter.h"
 
 /*!

diff --git a/src/ObjBrowser/OB_Filter.h b/src/ObjBrowser/OB_Filter.h
index ee10e8fdb73ebc941ea656af8702945971ce483b..7895aaceef9b01a732992caf119e21bd8ef7704f 100644 (file)
--- a/src/ObjBrowser/OB_Filter.h
+++ b/src/ObjBrowser/OB_Filter.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 OB_FILTER_H
 #define OB_FILTER_H
 

diff --git a/src/ObjBrowser/resources/OB_msg_en.ts b/src/ObjBrowser/resources/OB_msg_en.ts
index 560c0b9470c3f8ca9e6f88dd1732586617fb052d..cddaea49a99feb6a9897d9990b79433e4bc84dcf 100644 (file)
--- a/src/ObjBrowser/resources/OB_msg_en.ts
+++ b/src/ObjBrowser/resources/OB_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/OpenGLUtils/Makefile.am b/src/OpenGLUtils/Makefile.am
index 1440fb8d2a12c2091c91ca2d1a0cad828e72c3d2..2c7e350bc2b3df98f7b1d8fba191c0401ef3db05 100755 (executable)
--- a/src/OpenGLUtils/Makefile.am
+++ b/src/OpenGLUtils/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 : Oleg UVAROV
 #  Module : SALOME
@@ -36,4 +34,6 @@ dist_libOpenGLUtils_la_SOURCES = \
        OpenGLUtils_FrameBuffer.cxx
 
 libOpenGLUtils_la_CPPFLAGS = $(OGL_INCLUDES)
-libOpenGLUtils_la_LDFLAGS  = $(OGL_LIBS)
+libOpenGLUtils_la_LDFLAGS  = $(KERNEL_LDFLAGS)
+
+libOpenGLUtils_la_LIBADD = $(OGL_LIBS) -lSALOMELocalTrace
\ No newline at end of file

diff --git a/src/OpenGLUtils/OpenGLUtils.h b/src/OpenGLUtils/OpenGLUtils.h
index 4a4cb8b49fc8a3718b6d196fee10a030741f750d..00e557f214f13fd1257edc461c42cdaf311fb23c 100755 (executable)
--- a/src/OpenGLUtils/OpenGLUtils.h
+++ b/src/OpenGLUtils/OpenGLUtils.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
 //
+
 #if !defined ( OPENGLUTILS_H )
 #define OPENGLUTILS_H
 

diff --git a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx
index 87357ec47a36cc88d89949efbaee36390271fbb5..a5e81e8132aea234d7ee55c0836e3b1973c556ec 100755 (executable)
--- a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.cxx
+++ b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.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,16 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : OpenGLUtils_FrameBuffer.cxx
 //  Module : SALOME
 //
 #include "OpenGLUtils_FrameBuffer.h"
 
+#include <utilities.h>
+
+#include <cstring>
+
 #ifndef WNT
 # ifndef GLX_GLXEXT_LEGACY
 #  define GLX_GLXEXT_LEGACY
@@ -126,8 +128,13 @@ OpenGLUtils_FrameBuffer::~OpenGLUtils_FrameBuffer()
 
 bool OpenGLUtils_FrameBuffer::init( const GLsizei& xSize, const GLsizei& ySize )
 {
-  if( !IsEXTInitialized )
+  char* ext = (char*)glGetString( GL_EXTENSIONS );
+  if( !IsEXTInitialized ||
+      strstr( ext, "GL_EXT_framebuffer_object" ) == NULL )
+  {
+    INFOS( "Initializing OpenGL FrameBuffer extension failed" );
     return false;
+  }
 
   // create a texture object
   glEnable( GL_TEXTURE_2D );
@@ -165,6 +172,9 @@ bool OpenGLUtils_FrameBuffer::init( const GLsizei& xSize, const GLsizei& ySize )
 
 void OpenGLUtils_FrameBuffer::release()
 {
+  if( !IsEXTInitialized )
+    return;
+
   glDeleteTextures( 1, &textureId );
   textureId = 0;
 
@@ -177,10 +187,16 @@ void OpenGLUtils_FrameBuffer::release()
 
 void OpenGLUtils_FrameBuffer::bind()
 {
+  if( !IsEXTInitialized )
+    return;
+
   vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, fboId );
 }
 
 void OpenGLUtils_FrameBuffer::unbind()
 {
+  if( !IsEXTInitialized )
+    return;
+
   vglBindFramebufferEXT( GL_FRAMEBUFFER_EXT, 0 );
 }

diff --git a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.h b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.h
index 3f0d2688fd9d0cdf1ee35a64104bb6e9ee2d6add..ab4d00932e86e2a549eb14d3126a1577cf7a57ca 100755 (executable)
--- a/src/OpenGLUtils/OpenGLUtils_FrameBuffer.h
+++ b/src/OpenGLUtils/OpenGLUtils_FrameBuffer.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   : OpenGLUtils_FrameBuffer.h
 //  Module : SALOME
 //

diff --git a/src/Plot2d/Makefile.am b/src/Plot2d/Makefile.am
index c68c582b461f41dde53ab8b59aabde179811cc90..dac45b6e104d4b1f86e39fda0b2a8d95fd038e51 100755 (executable)
--- a/src/Plot2d/Makefile.am
+++ b/src/Plot2d/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : Plot2d

diff --git a/src/Plot2d/Plot2d.cxx b/src/Plot2d/Plot2d.cxx
index 769a419db8b7e06e3c7845f0c828d9ecba4b04b1..18e29df437b47795c38fc8c1ce48787db69016a1 100755 (executable)
--- a/src/Plot2d/Plot2d.cxx
+++ b/src/Plot2d/Plot2d.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   : Plot2d.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d.h b/src/Plot2d/Plot2d.h
index 1800ee2eb273c3c4fe5df9924ed58467aebac624..da1bcbb0d87f4fb615de744c5cdeee46f889527b 100755 (executable)
--- a/src/Plot2d/Plot2d.h
+++ b/src/Plot2d/Plot2d.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   : Plot2d.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d.pro b/src/Plot2d/Plot2d.pro
index 684083bfb4338a4b37de52aac76e97456b73639f..b139a12ba8c14cefbbc257843a8f48a20d057679 100644 (file)
--- a/src/Plot2d/Plot2d.pro
+++ b/src/Plot2d/Plot2d.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = Plot2d
 DESTDIR = ../../lib

diff --git a/src/Plot2d/Plot2d_Curve.cxx b/src/Plot2d/Plot2d_Curve.cxx
index 434d62703bdb571238187a80b59269069e32e868..aed76a81e0730456290093dd87cccf53b7e4b478 100755 (executable)
--- a/src/Plot2d/Plot2d_Curve.cxx
+++ b/src/Plot2d/Plot2d_Curve.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   : Plot2d_Curve.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_Curve.h b/src/Plot2d/Plot2d_Curve.h
index c8a4015021a3e821552c9cf354761b1fa0cd2145..eccea214ab4fea5c1e45575fe602313c39bef854 100755 (executable)
--- a/src/Plot2d/Plot2d_Curve.h
+++ b/src/Plot2d/Plot2d_Curve.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   : Plot2d_Curve.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx
index 500c4c658ff23a08d4cdeb03737c989f74d2594e..2cbcdf9d108c8fc23786cb44f3811ac9158ff70b 100755 (executable)
--- a/src/Plot2d/Plot2d_FitDataDlg.cxx
+++ b/src/Plot2d/Plot2d_FitDataDlg.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   : Plot2d_FitDataDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_FitDataDlg.h b/src/Plot2d/Plot2d_FitDataDlg.h
index 177a504ba57b796546b5f26cf76e5e7c66e877a6..a3641b360a54fea63113b1bcf74503bd7bfe5272 100755 (executable)
--- a/src/Plot2d/Plot2d_FitDataDlg.h
+++ b/src/Plot2d/Plot2d_FitDataDlg.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 PLOT2D_FITDATADLG_H
 #define PLOT2D_FITDATADLG_H
 

diff --git a/src/Plot2d/Plot2d_Prs.cxx b/src/Plot2d/Plot2d_Prs.cxx
index db316b5a2c229fbf5fb2daf7707a8eaeb88e9e8e..b582f3dab6a9fd57e442424ab87ffab2f8ba63ff 100755 (executable)
--- a/src/Plot2d/Plot2d_Prs.cxx
+++ b/src/Plot2d/Plot2d_Prs.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 OCCViewer : build OCC Viewer into Salome desktop
 //  File   : Plot2d_Prs.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/Plot2d/Plot2d_Prs.h b/src/Plot2d/Plot2d_Prs.h
index 70e6d5fbb2c1d37d8ee5f19098766b10a881ed3d..760b3eb2d2dfa9f064d6985e33a4f22cc0faba60 100755 (executable)
--- a/src/Plot2d/Plot2d_Prs.h
+++ b/src/Plot2d/Plot2d_Prs.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 PLOT2D_PRS_H
 #define PLOT2D_PRS_H
 

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx
index 384f5c259da0e5e99f7a393eeb4436cd86c52d2b..5e6bf08bd13b65d5d6ac11817a647f66dded2c6e 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.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   : Plot2d_SetupCurveDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.h b/src/Plot2d/Plot2d_SetupCurveDlg.h
index 1c178a4a7c592a3aa30712ecf19d79079679925a..458f0ba02209a340b4a5f6d2d1fb973aa5fe91ad 100644 (file)
--- a/src/Plot2d/Plot2d_SetupCurveDlg.h
+++ b/src/Plot2d/Plot2d_SetupCurveDlg.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   : Plot2d_SetupCurveDlg.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx
index 7551bd56173ce44d57f485cc4522e44b5dccbd28..f00ff8691f7b26c34bbb90c503bbe4ff0dac927f 100755 (executable)
--- a/src/Plot2d/Plot2d_SetupViewDlg.cxx
+++ b/src/Plot2d/Plot2d_SetupViewDlg.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   : Plot2d_SetupViewDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_SetupViewDlg.h b/src/Plot2d/Plot2d_SetupViewDlg.h
index 6de74752b3eb6eeef7e416d46f9bf86735d13a85..ac59ee77e34584044e60f0c87e439dca859f23b9 100755 (executable)
--- a/src/Plot2d/Plot2d_SetupViewDlg.h
+++ b/src/Plot2d/Plot2d_SetupViewDlg.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   : Plot2d_SetupViewDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_ToolTip.cxx b/src/Plot2d/Plot2d_ToolTip.cxx
index 99b52c73ced070cd2d05e2cf72e6df6aa8a688e7..7b7c8f94423763a9ec89d9b6c064745f3d96df6f 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.cxx
+++ b/src/Plot2d/Plot2d_ToolTip.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:      Plot2d_ToolTip.cxx
 // Author:    Alexandre SOLOVYOV
 //

diff --git a/src/Plot2d/Plot2d_ToolTip.h b/src/Plot2d/Plot2d_ToolTip.h
index 95afdf43226c38522f4241296114ec0cb9c05784..9c4b09e6814096265e280e2c5afc2f57a0ae1788 100644 (file)
--- a/src/Plot2d/Plot2d_ToolTip.h
+++ b/src/Plot2d/Plot2d_ToolTip.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:      Plot2d_ToolTip.h
 // Author:    Alexandre SOLOVYOV
 //

diff --git a/src/Plot2d/Plot2d_ViewFrame.cxx b/src/Plot2d/Plot2d_ViewFrame.cxx
index d5958c31e39606bc0d6f83d4c28c3316f2657736..b2fc5e26e5f661ba80b16dd3adaf8549435c0bba 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.cxx
+++ b/src/Plot2d/Plot2d_ViewFrame.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 "Plot2d_ViewFrame.h"
 
 #include "Plot2d_Prs.h"
@@ -148,6 +149,40 @@ const char* imageCrossCursor[] = {
   "................................",
   "................................"};
   
+const char* yAxisLeft[] = {
+  "12 12 2 1",
+  "  c None",
+  ". c #000000",
+  "            ",
+  "   .        ",
+  "  ...       ",
+  " . . .      ",
+  "   .        ",
+  "   .        ",
+  "   .    .   ",
+  "   .     .  ",
+  "   ........ ",
+  "         .  ",
+  "        .   ",
+  "            "};
+
+const char* yAxisRight[] = {
+  "12 12 2 1",
+  "  c None",
+  ". c #000000",
+  "            ",
+  "        .   ",
+  "       ...  ",
+  "      . . . ",
+  "        .   ",
+  "        .   ",
+  "   .    .   ",
+  "  .     .   ",
+  " ........   ",
+  "  .         ",
+  "   .        ",
+  "            "};
+
 
 /*!
   Constructor
@@ -272,14 +307,7 @@ void Plot2d_ViewFrame::Display( const Plot2d_Prs* prs )
   if ( !prs || prs->IsNull() )
     return;
 
-  if (prs->isSecondY()) {
-    myPlot->enableAxis(QwtPlot::yRight, true);
-    mySecondY = true;
-  }
-  else {
-    myPlot->enableAxis(QwtPlot::yRight, false);
-    mySecondY = false;
-  }
+  mySecondY = prs->isSecondY();
 
   // display all curves from presentation
   curveList aCurves = prs->getCurves();
@@ -548,6 +576,9 @@ void Plot2d_ViewFrame::displayCurve( Plot2d_Curve* curve, bool update )
   if ( !curve )
     return;
 
+  if ( curve->getYAxis() == QwtPlot::yRight )
+    mySecondY = true;
+
   // san -- Protection against QwtCurve bug in Qwt 0.4.x: 
   // it crashes if switched to X/Y logarithmic mode, when one or more points have
   // non-positive X/Y coordinate
@@ -560,9 +591,9 @@ void Plot2d_ViewFrame::displayCurve( Plot2d_Curve* curve, bool update )
     updateCurve( curve, update );
   }
   else {
-    QwtPlotCurve* aPCurve = new QwtPlotCurve( curve->getVerTitle() );
+    Plot2d_QwtPlotCurve* aPCurve = new Plot2d_QwtPlotCurve( curve->getVerTitle(), curve->getYAxis() );
     aPCurve->attach( myPlot );
-    //myPlot->setCurveYAxis(curveKey, curve->getYAxis());
+    aPCurve->setYAxis( curve->getYAxis() );
 
     myPlot->getCurves().insert( aPCurve, curve );
     if ( curve->isAutoAssign() ) {
@@ -593,6 +624,7 @@ void Plot2d_ViewFrame::displayCurve( Plot2d_Curve* curve, bool update )
     aPCurve->setData( curve->horData(), curve->verData(), curve->nbPoints() );
   }
   updateTitles();
+  myPlot->updateYAxisIdentifiers();
   if ( update )
     myPlot->replot();
 }
@@ -629,6 +661,7 @@ void Plot2d_ViewFrame::eraseCurve( Plot2d_Curve* curve, bool update )
     aPCurve->detach();
     myPlot->getCurves().remove( aPCurve );
     updateTitles();
+    myPlot->updateYAxisIdentifiers();
     if ( update )
       myPlot->replot();
   }
@@ -750,7 +783,6 @@ void Plot2d_ViewFrame::fitAll()
   if (mySecondY) {
     myPlot->setAxisAutoScale( QwtPlot::yRight );
     myPlot->replot();
-    QwtScaleMap yMap2 = myPlot->canvasMap( QwtPlot::yRight );
     myPlot->setAxisScale( QwtPlot::yRight, y2min, y2max );
   }
   myPlot->replot();
@@ -829,38 +861,67 @@ void Plot2d_ViewFrame::getFitRanges(double& xMin,double& xMax,
 /*!
   Gets current fit ranges by Curves
 */
-void Plot2d_ViewFrame::getFitRangeByCurves(double& xMin,double& xMax,
-                                           double& yMin, double& yMax,
+void Plot2d_ViewFrame::getFitRangeByCurves(double& xMin,  double& xMax,
+                                           double& yMin,  double& yMax,
                                            double& y2Min, double& y2Max)
 {
   CurveDict cdict = getCurves();
+  bool emptyV1 = true, emptyV2 = true;
   if ( !cdict.isEmpty() ) {
     CurveDict::const_iterator it = myPlot->getCurves().begin();
-    xMin = yMin = y2Min = 1e150;
-    xMax = yMax = y2Max = -1e150;
     for ( ; it != myPlot->getCurves().end(); it++ ) {
-      if ( xMin > it.value()->getMinX() ) xMin = it.value()->getMinX();
-      if ( xMax < it.value()->getMaxX() ) xMax = it.value()->getMaxX();
-      if ( yMin > it.value()->getMinY() ) yMin = it.value()->getMinY();
-      if ( yMax < it.value()->getMaxY() ) yMax = it.value()->getMaxY();
+      bool isV2 = it.value()->getYAxis() == QwtPlot::yRight;
+      if ( !it.value()->isEmpty() ) {
+       if ( emptyV1 && emptyV2 ) {
+         xMin = 1e150;
+         xMax = -1e150;
+       }
+       if ( emptyV1 ) {
+         yMin = 1e150;
+         yMax = -1e150;
+       }
+       if ( emptyV2 ) {
+         y2Min = 1e150;
+         y2Max = -1e150;
+       }
+       isV2 ? emptyV2 = false : emptyV1 = false;
+       xMin = qMin( xMin, it.value()->getMinX() );
+       xMax = qMax( xMax, it.value()->getMaxX() );
+        if ( isV2 ) {
+          y2Min = qMin( y2Min, it.value()->getMinY() );
+          y2Max = qMax( y2Max, it.value()->getMaxY() );
+        }
+        else {
+          yMin = qMin( yMin, it.value()->getMinY() );
+          yMax = qMax( yMax, it.value()->getMaxY() );
+        }
+      }
     }
     if ( xMin == xMax ) {
-      xMin -= xMin/10.;
-      xMax += xMax/10.;
+      xMin = xMin == 0. ? -1. : xMin - xMin/10.;
+      xMax = xMax == 0. ?  1. : xMax + xMax/10.;
     }
     if ( yMin == yMax ) {
-      yMin -= yMin/10.;
-      yMax += yMax/10.;
+      yMin = yMin == 0. ? -1. : yMin - yMin/10.;
+      yMax = yMax == 0. ?  1  : yMax + yMax/10.;
+    }
+    if ( y2Min == y2Max ) {
+      y2Min = y2Min == 0. ? -1. : y2Min - y2Min/10.;
+      y2Max = y2Max == 0. ?  1  : y2Max + y2Max/10.;
     }
-    y2Min = yMin;
-    y2Max = yMax;
   }
-  else {
-    // default values
+  // default values
+  if ( emptyV1 && emptyV2 ) {
     xMin = isModeHorLinear() ? 0.    : 1.;
     xMax = isModeHorLinear() ? 1000. : 1e5;
-    yMin = y2Min = isModeVerLinear() ? 0.   : 1.;
-    yMax = y2Max = isModeVerLinear() ? 1000 : 1e5;
+  }
+  if ( emptyV1  ) {
+    yMin = isModeVerLinear() ? 0.    : 1.;
+    yMax = isModeVerLinear() ? 1000. : 1e5;
+  }
+  if ( emptyV2  ) {
+    y2Min = isModeVerLinear() ? 0.    : 1.;
+    y2Max = isModeVerLinear() ? 1000. : 1e5;
   }
 }
 
@@ -1692,6 +1753,25 @@ void Plot2d_Plot2d::setLogScale( int axisId, bool log10 )
 */
 void Plot2d_Plot2d::replot()
 {
+  // the following code is intended to enable only axes
+  // that are really used by displayed curves
+  bool enableXBottom = false, enableXTop = false;
+  bool enableYLeft = false, enableYRight = false;
+  CurveDict::iterator it = myCurves.begin();
+  for( ; it != myCurves.end(); it++ ) {
+    QwtPlotCurve* aCurve = it.key();
+    if( aCurve ) {
+      enableXBottom |= aCurve->xAxis() == QwtPlot::xBottom;
+      enableXTop    |= aCurve->xAxis() == QwtPlot::xTop;
+      enableYLeft   |= aCurve->yAxis() == QwtPlot::yLeft;
+      enableYRight  |= aCurve->yAxis() == QwtPlot::yRight;
+    }
+  }
+  enableAxis( QwtPlot::xBottom, enableXBottom );
+  enableAxis( QwtPlot::xTop,    enableXTop );
+  enableAxis( QwtPlot::yLeft,   enableYLeft );
+  enableAxis( QwtPlot::yRight,  enableYRight );
+
   updateLayout();  // to fix bug(?) of Qwt - view is not updated when title is changed
   QwtPlot::replot(); 
 }
@@ -1915,6 +1995,36 @@ void Plot2d_Plot2d::onScaleDivChanged()
   }
 }
 
+/*!
+  Updates identifiers of Y axis type in the legend.
+*/
+void Plot2d_Plot2d::updateYAxisIdentifiers()
+{
+  bool enableYLeft = false, enableYRight = false;
+  CurveDict::iterator it = myCurves.begin();
+  for( ; it != myCurves.end(); it++ ) {
+    QwtPlotCurve* aCurve = it.key();
+    if( aCurve ) {
+      enableYLeft  |= aCurve->yAxis() == QwtPlot::yLeft;
+      enableYRight |= aCurve->yAxis() == QwtPlot::yRight;
+    }
+  }
+
+  // if several curves are attached to different axes
+  // display corresponding identifiers in the legend,
+  // otherwise hide them
+  for( it = myCurves.begin(); it != myCurves.end(); it++ )
+    if( Plot2d_QwtPlotCurve* aPCurve = dynamic_cast<Plot2d_QwtPlotCurve*>( it.key() ) )
+      aPCurve->setYAxisIdentifierEnabled( enableYLeft && enableYRight );
+
+  const QwtPlotItemList& anItemList = itemList();
+  for( QwtPlotItemIterator anItemIter = anItemList.begin(); anItemIter != anItemList.end(); ++anItemIter ) {
+    QwtPlotItem* anItem = *anItemIter;
+    if( anItem && anItem->isVisible() )
+      anItem->updateLegend( legend() );
+  }
+}
+
 /*!
   Sets the flag saying that QwtPlot geometry has been fully defined.
 */
@@ -1983,8 +2093,10 @@ void Plot2d_ViewFrame::updateTitles()
   //QIntDictIterator<Plot2d_Curve> it( myCurves );
   QStringList aXTitles;
   QStringList aYTitles;
+  QStringList aY2Titles;
   QStringList aXUnits;
   QStringList aYUnits;
+  QStringList aY2Units;
   QStringList aTables;
   int i = 0;
 
@@ -1996,14 +2108,22 @@ void Plot2d_ViewFrame::updateTitles()
     QString yTitle = aCurve->getVerTitle().trimmed();
     QString xUnits = aCurve->getHorUnits().trimmed();
     QString yUnits = aCurve->getVerUnits().trimmed();
+    bool isY2 = aCurve->getYAxis() == QwtPlot::yRight;
     
-    aYTitles.append( yTitle );
     if ( !aXTitles.contains( xTitle ) )
       aXTitles.append( xTitle );
     if ( !aXUnits.contains( xUnits ) )
       aXUnits.append( xUnits );
-    if ( !aYUnits.contains( yUnits ) )
-      aYUnits.append( yUnits );
+    if ( isY2 ) {
+      aY2Titles.append( yTitle );
+      if ( !aY2Units.contains( yUnits ) )
+        aY2Units.append( yUnits );
+    }
+    else {
+      aYTitles.append( yTitle );
+      if ( !aYUnits.contains( yUnits ) )
+        aYUnits.append( yUnits );
+    }
 
     QString aName = aCurve->getTableTitle();
     if( !aName.isEmpty() && !aTables.contains( aName ) )
@@ -2011,24 +2131,32 @@ void Plot2d_ViewFrame::updateTitles()
     ++i;
   }
   // ... and update plot 2d view
-  QString xUnits, yUnits;
+  QString xUnits, yUnits, y2Units;
   if ( aXUnits.count() == 1 && !aXUnits[0].isEmpty() )
     xUnits = BRACKETIZE( aXUnits[0] );
   if ( aYUnits.count() == 1 && !aYUnits[0].isEmpty())
     yUnits = BRACKETIZE( aYUnits[0] );
-  QString xTitle, yTitle;
+  if ( aY2Units.count() == 1 && !aY2Units[0].isEmpty())
+    y2Units = BRACKETIZE( aY2Units[0] );
+  QString xTitle, yTitle, y2Title;
   if ( aXTitles.count() == 1 && aXUnits.count() == 1 )
     xTitle = aXTitles[0];
   if ( aYTitles.count() == 1 )
     yTitle = aYTitles[0];
+  if ( aY2Titles.count() == 1 )
+    y2Title = aY2Titles[0];
 
   if ( !xTitle.isEmpty() && !xUnits.isEmpty() )
     xTitle += " ";
   if ( !yTitle.isEmpty() && !yUnits.isEmpty() )
     yTitle += " ";
+  if ( !y2Title.isEmpty() && !y2Units.isEmpty() )
+    y2Title += " ";
 
   setTitle( myXTitleEnabled, xTitle + xUnits, XTitle, true );
   setTitle( myYTitleEnabled, yTitle + yUnits, YTitle, true );
+  if ( mySecondY )
+    setTitle( myY2TitleEnabled, y2Title + y2Units, Y2Title, true );
   setTitle( true, aTables.join("; "), MainTitle, true );
 }
 
@@ -2249,3 +2377,101 @@ QwtText Plot2d_ScaleDraw::label( double value ) const
 
   return QwtScaleDraw::label( value );
 }
+
+/*!
+  Constructor of Plot2d_QwtLegendItem
+*/
+Plot2d_QwtLegendItem::Plot2d_QwtLegendItem( QWidget* parent ) :
+  QwtLegendItem( parent ),
+  myYAxisIdentifierMode( IM_None )
+{
+  myYAxisLeftIcon = yAxisLeft;
+  myYAxisRightIcon = yAxisRight;
+  int anIconWidth = qMax( myYAxisLeftIcon.width(), myYAxisRightIcon.width() );
+
+  mySpacingCollapsed = spacing();
+  mySpacingExpanded = anIconWidth - mySpacingCollapsed;
+}
+
+/*!
+  Destructor of Plot2d_QwtLegendItem
+*/
+Plot2d_QwtLegendItem::~Plot2d_QwtLegendItem()
+{
+}
+
+/*!
+  Set Y axis identifier displaying mode
+*/
+void Plot2d_QwtLegendItem::setYAxisIdentifierMode( const int theMode )
+{
+  myYAxisIdentifierMode = theMode;
+  setSpacing( theMode == IM_None ? mySpacingCollapsed : mySpacingExpanded );
+}
+
+/*!
+  Redefined method of drawing identifier of legend item
+*/
+void Plot2d_QwtLegendItem::drawIdentifier( QPainter* painter, const QRect& rect ) const
+{
+  QwtLegendItem::drawIdentifier( painter, rect );
+
+  if( myYAxisIdentifierMode != IM_None ) {
+    QPixmap aPixmap( myYAxisIdentifierMode == IM_Left ? yAxisLeft : yAxisRight );
+    painter->save();
+    painter->drawPixmap( rect.topRight() + QPoint( mySpacingExpanded/2, mySpacingExpanded/2 ), aPixmap );
+    painter->restore();
+  }
+}
+
+/*!
+  Constructor of Plot2d_QwtPlotCurve
+*/
+Plot2d_QwtPlotCurve::Plot2d_QwtPlotCurve( const QString& title,
+                                          QwtPlot::Axis yAxis /*const int index*/ ) :
+  QwtPlotCurve( title ),
+  myYAxis( yAxis ),
+  myYAxisIdentifierEnabled( false )
+{
+}
+
+/*!
+  Destructor of Plot2d_QwtPlotCurve
+*/
+Plot2d_QwtPlotCurve::~Plot2d_QwtPlotCurve()
+{
+}
+
+/*!
+  Enable / disable Y axis identifier
+*/
+void Plot2d_QwtPlotCurve::setYAxisIdentifierEnabled( const bool on )
+{
+  myYAxisIdentifierEnabled = on;
+}
+
+/*!
+  Redefined method, which updates legend of the curve
+*/
+void Plot2d_QwtPlotCurve::updateLegend( QwtLegend* legend ) const
+{
+  QwtPlotCurve::updateLegend( legend );
+
+  QWidget* widget = legend->find( this );
+  if( Plot2d_QwtLegendItem* anItem = dynamic_cast<Plot2d_QwtLegendItem*>( widget ) ) {
+    int aMode = Plot2d_QwtLegendItem::IM_None;
+    if( myYAxisIdentifierEnabled )
+      aMode = myYAxis == QwtPlot::yRight ?
+        Plot2d_QwtLegendItem::IM_Right :
+        Plot2d_QwtLegendItem::IM_Left;
+    anItem->setYAxisIdentifierMode( aMode );
+  }
+}
+
+/*!
+  Redefined method, which creates and returns legend item of the curve
+*/
+QWidget* Plot2d_QwtPlotCurve::legendItem() const
+{
+  return new Plot2d_QwtLegendItem;
+}

diff --git a/src/Plot2d/Plot2d_ViewFrame.h b/src/Plot2d/Plot2d_ViewFrame.h
index 16aca311a0442d25d98ce319273d1b4305442445..bb25204f4f1287260fd25901865e29396e59a3b5 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewFrame.h
+++ b/src/Plot2d/Plot2d_ViewFrame.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 PLOT2D_VIEWFRAME_H
 #define PLOT2D_VIEWFRAME_H
 
@@ -26,6 +27,8 @@
 #include <QWidget>
 #include <QMultiHash>
 #include <QList>
+#include <qwt_legend_item.h>
+#include <qwt_plot_curve.h>
 #include <qwt_symbol.h>
 #include <qwt_scale_draw.h>
 
@@ -227,6 +230,8 @@ public:
   CurveDict& getCurves() { return myCurves; }
   Plot2d_Curve*       getClosestCurve( QPoint p, double& distance, int& index );
 
+  virtual void        updateYAxisIdentifiers();
+
 public slots:
   virtual void polish();
 
@@ -259,4 +264,45 @@ private:
   int  myPrecision;
 };
 
+class Plot2d_QwtLegendItem : public QwtLegendItem
+{
+public:
+  enum YAxisIdentifierMode { IM_None = 0, IM_Left, IM_Right };
+
+public:
+  Plot2d_QwtLegendItem( QWidget* = 0 );
+  virtual ~Plot2d_QwtLegendItem();
+
+public:
+  void             setYAxisIdentifierMode( const int );
+
+protected:
+  virtual void     drawIdentifier( QPainter*, const QRect& ) const;
+
+private:
+  int              myYAxisIdentifierMode;
+  QPixmap          myYAxisLeftIcon;
+  QPixmap          myYAxisRightIcon;
+  int              mySpacingCollapsed;
+  int              mySpacingExpanded;
+};
+
+class Plot2d_QwtPlotCurve : public QwtPlotCurve
+{
+public:
+  Plot2d_QwtPlotCurve( const QString&, QwtPlot::Axis = QwtPlot::yLeft );
+  virtual ~Plot2d_QwtPlotCurve();
+
+public:
+  virtual void     setYAxisIdentifierEnabled( const bool );
+
+protected:
+  virtual void     updateLegend( QwtLegend* ) const;
+  virtual QWidget* legendItem() const;
+
+private:
+  QwtPlot::Axis    myYAxis;
+  bool             myYAxisIdentifierEnabled;
+};
+
 #endif

diff --git a/src/Plot2d/Plot2d_ViewManager.cxx b/src/Plot2d/Plot2d_ViewManager.cxx
index 374b777d607d60a5efb1637370fc3879da8d7799..db4560d5e5444a6c329ee7bafeefb834b55b64a5 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewManager.cxx
+++ b/src/Plot2d/Plot2d_ViewManager.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 "Plot2d_ViewManager.h"
 #include "Plot2d_ViewModel.h"
 #include "Plot2d_ViewWindow.h"

diff --git a/src/Plot2d/Plot2d_ViewManager.h b/src/Plot2d/Plot2d_ViewManager.h
index da494a26c8f062f3c657a036499dcd232cbb265c..6bb39b5cc7da1e2b5f2b02eee6af978eac7a94c2 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewManager.h
+++ b/src/Plot2d/Plot2d_ViewManager.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 PLOT2D_VIEWMANAGER_H
 #define PLOT2D_VIEWMANAGER_H
 

diff --git a/src/Plot2d/Plot2d_ViewModel.cxx b/src/Plot2d/Plot2d_ViewModel.cxx
index ccbf57cd5e1049fa3a34a31524d5e7c6771085f7..2e912da1ae822ebb913141deadc952b812cdbf28 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewModel.cxx
+++ b/src/Plot2d/Plot2d_ViewModel.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
 //
+
 // Plot2d_ViewModel.cxx: implementation of the Plot2d_ViewModel class.
 //
 #include "Plot2d_ViewModel.h"

diff --git a/src/Plot2d/Plot2d_ViewModel.h b/src/Plot2d/Plot2d_ViewModel.h
index ddb8ad35371ad4b26adc06a1aa5dd1902942c245..1a9fa1551a3268f73746b1b5117092cf357abd00 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewModel.h
+++ b/src/Plot2d/Plot2d_ViewModel.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
 //
+
 #if !defined(_PLOT2D_VIEWMODEL_H)
 #define _PLOT2D_VIEWMODEL_H
 

diff --git a/src/Plot2d/Plot2d_ViewWindow.cxx b/src/Plot2d/Plot2d_ViewWindow.cxx
index 33cc3fa4651cc2d6adf8966178299216871c6855..0160b605eced05098d4fae59b0c63ffae455fea5 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewWindow.cxx
+++ b/src/Plot2d/Plot2d_ViewWindow.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   : Plot2d_ViewWindow.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/Plot2d_ViewWindow.h b/src/Plot2d/Plot2d_ViewWindow.h
index bd3c15dcb2e48a1e255e369422a6707d9539aa08..9c081305671c7713397dfe2aed511c40071512cd 100755 (executable)
--- a/src/Plot2d/Plot2d_ViewWindow.h
+++ b/src/Plot2d/Plot2d_ViewWindow.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   : Plot2d_ViewWindow.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Plot2d/resources/Plot2d_images.ts b/src/Plot2d/resources/Plot2d_images.ts
index 41d9904456d31a7ee6a3b8711611b0691b1ed507..ce8f0a3d8572e8befaf9324b2cc4c9e5ab96f76b 100644 (file)
--- a/src/Plot2d/resources/Plot2d_images.ts
+++ b/src/Plot2d/resources/Plot2d_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/Plot2d/resources/Plot2d_msg_en.ts b/src/Plot2d/resources/Plot2d_msg_en.ts
index c1a7aad83bb83d45b1f605177af69c58a2e63a0e..3a084267ff79a4f1de0439c6ddfb4d0721b438c0 100644 (file)
--- a/src/Plot2d/resources/Plot2d_msg_en.ts
+++ b/src/Plot2d/resources/Plot2d_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/Prs/Makefile.am b/src/Prs/Makefile.am
index 06a0502045463569443a8039fdf982f455cfb8b3..53edfc5abcdcd8cb59143cdf6adf05da7a0f15f9 100755 (executable)
--- a/src/Prs/Makefile.am
+++ b/src/Prs/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libSalomePrs.la

diff --git a/src/Prs/Prs.pro b/src/Prs/Prs.pro
index a22aad15e08f81138b360532236c692e319faa65..06ddc0bdeed102814183054aea8fb85a81d723d9 100644 (file)
--- a/src/Prs/Prs.pro
+++ b/src/Prs/Prs.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SalomePrs
 DESTDIR = ../../lib

diff --git a/src/Prs/SALOME_Prs.cxx b/src/Prs/SALOME_Prs.cxx
index 4b28dbe6b2b0365c42324cade385bd66c0592d18..c0fc28e9d3c04dd3dffd52061d86f04c03020d33 100755 (executable)
--- a/src/Prs/SALOME_Prs.cxx
+++ b/src/Prs/SALOME_Prs.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:        SALOME_Prs.cxx
 // Created:     Wed Apr 28 15:03:43 2004
 // Author:      Sergey ANIKIN

diff --git a/src/Prs/SALOME_Prs.h b/src/Prs/SALOME_Prs.h
index a7bb2f802a75d0ea38dbce886399909b0a0bef49..3ce235a4ca2fbe7e347dc888937688afd7170452 100755 (executable)
--- a/src/Prs/SALOME_Prs.h
+++ b/src/Prs/SALOME_Prs.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_PRS_H
 #define SALOME_PRS_H
 

diff --git a/src/PyConsole/Makefile.am b/src/PyConsole/Makefile.am
index d6a0fc497efd33f3610b5f9d656b8179290af480..fe0b4a1f6dd744ef04daac271c77d85364cb44f2 100755 (executable)
--- a/src/PyConsole/Makefile.am
+++ b/src/PyConsole/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 : Vladimir Klyachin (OCN)
 #  Module : PyConsole

diff --git a/src/PyConsole/PyConsole.h b/src/PyConsole/PyConsole.h
index 1787033375fcf358d613fadb67ea54d0cd3f2ca4..5888451ad750b29b3e24fcbbab79ca83c94b269b 100644 (file)
--- a/src/PyConsole/PyConsole.h
+++ b/src/PyConsole/PyConsole.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   : PyConsole.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/PyConsole/PyConsole.pro b/src/PyConsole/PyConsole.pro
index aee086ec5c31a8b5b05c382ac4672b72de3795c3..3f7c3ea1d1553ef0600ba9e86204807bf6f47eef 100644 (file)
--- a/src/PyConsole/PyConsole.pro
+++ b/src/PyConsole/PyConsole.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = PyConsole
 DESTDIR = ../../lib

diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx
index ccb7b835b4452d93eed820f24f7b66cfcfa03917..bae6451573514130de4b4b8add0a7ac53d2a905c 100644 (file)
--- a/src/PyConsole/PyConsole_Console.cxx
+++ b/src/PyConsole/PyConsole_Console.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   : PyConsole_Console.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -185,6 +186,8 @@ void PyConsole_Console::contextMenuPopup( QMenu* menu )
   menu->addAction( myActions[ClearId] );
   menu->addSeparator();
   menu->addAction( myActions[SelectAllId] );
+  menu->addSeparator();
+  menu->addAction( myActions[DumpCommandsId] );
 
   Qtx::simplifySeparators( menu );
 
@@ -205,6 +208,7 @@ void PyConsole_Console::setMenuActions( const int flags )
   myActions[PasteId]->setVisible( flags & PasteId );
   myActions[ClearId]->setVisible( flags & ClearId );
   myActions[SelectAllId]->setVisible( flags & SelectAllId );
+  myActions[DumpCommandsId]->setVisible( flags & DumpCommandsId );
 }
 
 /*!
@@ -219,6 +223,7 @@ int PyConsole_Console::menuActions() const
   ret = ret | ( myActions[PasteId]->isVisible() ? PasteId : 0 );
   ret = ret | ( myActions[ClearId]->isVisible() ? ClearId : 0 );
   ret = ret | ( myActions[SelectAllId]->isVisible() ? SelectAllId : 0 );
+  ret = ret | ( myActions[DumpCommandsId]->isVisible() ? DumpCommandsId : 0 );
   return ret;
 }
 
@@ -248,6 +253,11 @@ void PyConsole_Console::createActions()
   a->setStatusTip( tr( "EDIT_SELECTALL_CMD" ) );
   connect( a, SIGNAL( triggered( bool ) ), myEditor, SLOT( selectAll() ) );
   myActions.insert( SelectAllId, a );
+  
+  a = new QAction( tr( "EDIT_DUMPCOMMANDS_CMD" ), this );
+  a->setStatusTip( tr( "EDIT_DUMPCOMMANDS_CMD" ) );
+  connect( a, SIGNAL( triggered( bool ) ), myEditor, SLOT( dump() ) );
+  myActions.insert( DumpCommandsId, a );
 }
 
 /*!

diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h
index 790450c61b6e1e12e6aa7e44dfa7978c2d73887f..0666396fc0b0e219c39c027a7955c0742ee3a5b3 100644 (file)
--- a/src/PyConsole/PyConsole_Console.h
+++ b/src/PyConsole/PyConsole_Console.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   : PyConsole_Console.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -42,11 +43,12 @@ public:
   //! Context popup menu actions flags
   enum
   {
-    CopyId      = 0x01,                            //!< "Copy" menu action
-    PasteId     = 0x02,                            //!< "Paste" menu action
-    ClearId     = 0x04,                            //!< "Clear" menu action
-    SelectAllId = 0x08,                            //!< "Select All" menu action
-    All = CopyId | PasteId | ClearId | SelectAllId //!< all menu actions
+    CopyId         = 0x01,                                           //!< "Copy" menu action
+    PasteId        = 0x02,                                           //!< "Paste" menu action
+    ClearId        = 0x04,                                           //!< "Clear" menu action
+    SelectAllId    = 0x08,                                           //!< "Select All" menu action
+    DumpCommandsId = 0x16,                                           //!< "DumpCommands" menu action
+    All = CopyId | PasteId | ClearId | SelectAllId | DumpCommandsId  //!< all menu actions
   };
 
 public:

diff --git a/src/PyConsole/PyConsole_Editor.cxx b/src/PyConsole/PyConsole_Editor.cxx
index c437262dac154b0e7597e1055365a6029046632b..c622c66a833e77a9b5339c12ba3d7d755187eb97 100644 (file)
--- a/src/PyConsole/PyConsole_Editor.cxx
+++ b/src/PyConsole/PyConsole_Editor.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 SALOMEGUI : implementation of desktop and GUI kernel
 // File   : PyConsole_Editor.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
@@ -97,6 +98,9 @@
 #include <PyInterp_Dispatcher.h>
 
 #include <SUIT_Tools.h>
+#include <SUIT_FileDlg.h>
+#include <SUIT_MessageBox.h>
+#include <SUIT_FileValidator.h>
 
 #include <QApplication>
 #include <QClipboard>
@@ -108,6 +112,7 @@
 #include <QTextBlock>
 #include <QTextCursor>
 #include <QTextDocument>
+#include <QTextStream>
 
 static QString READY_PROMPT = ">>> ";
 static QString DOTS_PROMPT  = "... ";
@@ -115,6 +120,27 @@ static QString DOTS_PROMPT  = "... ";
 
 #define PRINT_EVENT 65432
 
+
+class DumpCommandsFileValidator : public SUIT_FileValidator
+{
+ public:
+  DumpCommandsFileValidator( QWidget* parent = 0 ) : SUIT_FileValidator ( parent ) {};
+  virtual ~DumpCommandsFileValidator() {};
+  virtual bool canSave( const QString& file, bool permissions );
+};
+
+bool DumpCommandsFileValidator::canSave(const QString& file, bool permissions)
+{
+  QFileInfo fi( file );
+  if ( !QRegExp( "[A-Za-z_][A-Za-z0-9_]*" ).exactMatch( fi.completeBaseName() ) ) {
+    SUIT_MessageBox::critical( parent(),
+                               QObject::tr("WRN_WARNING"),
+                               QObject::tr("WRN_FILE_NAME_BAD") );
+    return false;
+  }
+  return SUIT_FileValidator::canSave( file, permissions);
+}
+
 /*!
   \class ExecCommand
   \brief Python command execution request.
@@ -1075,3 +1101,28 @@ void PyConsole_Editor::clear()
   myPrompt = READY_PROMPT;
   addText( myPrompt );
 }
+
+/*!
+  \brief "Dump commands" operation.
+ */
+void PyConsole_Editor::dump()
+{
+  QStringList aFilters;
+  aFilters.append( tr( "PYTHON_FILES_FILTER" ) );
+  
+  QString fileName = SUIT_FileDlg::getFileName( this, QString(),
+                                    aFilters, tr( "TOT_DUMP_PYCOMMANDS" ),
+                                    false, true, new DumpCommandsFileValidator( this ) );
+  if ( fileName != "" ) {
+    QFile file( fileName ); 
+    if ( !file.open( QFile::WriteOnly ) )
+      return;
+
+    QTextStream out (&file);
+  
+    for( int i=0; i<myHistory.count(); i++ ) {
+         out<<myHistory[i]<<endl;
+    }
+    file.close();
+  }
+}

diff --git a/src/PyConsole/PyConsole_Editor.h b/src/PyConsole/PyConsole_Editor.h
index 2f21fab6aac1e90774a22e6c775e75429fa75162..ae381467cd62b4413b2beae111fadd3ae06fcf19 100644 (file)
--- a/src/PyConsole/PyConsole_Editor.h
+++ b/src/PyConsole/PyConsole_Editor.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 SALOMEGUI : implementation of desktop and GUI kernel
 // File   : PyConsole_Editor.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
@@ -65,11 +66,12 @@ public slots:
   void           clear();
   void           handleReturn();
   void           onPyInterpChanged( PyConsole_Interp* );
+  void           dump();
   
 private:
   PyConsole_Interp* myInterp;           //!< python interpreter
 
-  QString           myCommandBuffer;    //!< python comman buffer
+  QString           myCommandBuffer;    //!< python command buffer
   QString           myCurrentCommand;   //!< currently being printed command
   QString           myPrompt;           //!< current command line prompt
   int               myCmdInHistory;     //!< current history command index

diff --git a/src/PyConsole/PyConsole_Interp.cxx b/src/PyConsole/PyConsole_Interp.cxx
index b66f34d743786968e93fe43bce2964893b8344ca..a60be00e368fc3bdfd704cebfde8a4847a376dc5 100644 (file)
--- a/src/PyConsole/PyConsole_Interp.cxx
+++ b/src/PyConsole/PyConsole_Interp.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : PyConsole_Interp.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/PyConsole/PyConsole_Interp.h b/src/PyConsole/PyConsole_Interp.h
index ec07b64b9e8e33239307d7d0092dccb2816dfe9c..c77a027142390779522927cf2ab49e2e6a944c7e 100644 (file)
--- a/src/PyConsole/PyConsole_Interp.h
+++ b/src/PyConsole/PyConsole_Interp.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : PyConsole_Interp.h
 //  Author : Nicolas REJNERI

diff --git a/src/PyConsole/resources/PyConsole_msg_en.ts b/src/PyConsole/resources/PyConsole_msg_en.ts
index 3082168faedd27bd69d20789a46d5b0981875b63..986b476b1a8ccdcc16e1661a604ef69855fa9730 100644 (file)
--- a/src/PyConsole/resources/PyConsole_msg_en.ts
+++ b/src/PyConsole/resources/PyConsole_msg_en.ts
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS><TS version="1.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
@@ -45,5 +45,21 @@
         <source>EDIT_SELECTALL_CMD</source>
         <translation>Select &amp;All</translation>
     </message>
+    <message>
+        <source>EDIT_DUMPCOMMANDS_CMD</source>
+        <translation>D&amp;ump commands</translation>
+    </message>
+</context>
+
+<context>
+    <name>PyConsole_Editor</name>
+    <message>
+        <source>TOT_DUMP_PYCOMMANDS</source>
+        <translation>Dump commands</translation>
+    </message>
+    <message>
+       <source>PYTHON_FILES_FILTER</source>
+       <translation>PYTHON Files (*.py)</translation>
+    </message>
 </context>
 </TS>

diff --git a/src/PyInterp/Makefile.am b/src/PyInterp/Makefile.am
index 0adfaf36488ec1c6842a218a6e6f0d7356f03747..a5f94f91a00023f7ab618806df107f1a98a6fcb1 100755 (executable)
--- a/src/PyInterp/Makefile.am
+++ b/src/PyInterp/Makefile.am
@@ -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 PyInterp : implementation of base thread-safe Python services
 #  File   : Makefile.in
 #  Module : SALOME

diff --git a/src/PyInterp/PyInterp.h b/src/PyInterp/PyInterp.h
index dd75ef6748c0c9a17847ae048d43e251527c419c..6207135a5d12b6d0a728bdec169bcf5539b259d2 100755 (executable)
--- a/src/PyInterp/PyInterp.h
+++ b/src/PyInterp/PyInterp.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   : PyInterp.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/PyInterp/PyInterp.pro b/src/PyInterp/PyInterp.pro
index eb36ba2ff5fa80f82ee36b026390871281103e80..34b025a6f6ea23bc9908372c7aec6d1074254b4b 100644 (file)
--- a/src/PyInterp/PyInterp.pro
+++ b/src/PyInterp/PyInterp.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = PyInterp
 DESTDIR = ../../lib

diff --git a/src/PyInterp/PyInterp_Dispatcher.cxx b/src/PyInterp/PyInterp_Dispatcher.cxx
index ff7881ee18f62c2a5dc9d0b170c778367ec31e18..7c9bcaeffbadf76fabf833cb73cb2912792f4f2b 100755 (executable)
--- a/src/PyInterp/PyInterp_Dispatcher.cxx
+++ b/src/PyInterp/PyInterp_Dispatcher.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   : PyInterp_Dispatcher.cxx
 //  Author : Sergey ANIKIN, OCC
 //  Module : GUI

diff --git a/src/PyInterp/PyInterp_Dispatcher.h b/src/PyInterp/PyInterp_Dispatcher.h
index cd970dd0fc025c9ddcd5f458c4e2eff5b4bf7ba0..b9f980e14661b0efec01df29a302bc6bc86b349d 100755 (executable)
--- a/src/PyInterp/PyInterp_Dispatcher.h
+++ b/src/PyInterp/PyInterp_Dispatcher.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   : PyInterp_Dispatcher.h
 //  Author : Sergey Anikin, OCC
 //  Module : SALOME

diff --git a/src/PyInterp/PyInterp_Interp.cxx b/src/PyInterp/PyInterp_Interp.cxx
index fecaeb387245d6e9608ff9f778bb1856e136e9dc..d6dccbcab263197b525d1af9325167dd25a792b8 100644 (file)
--- a/src/PyInterp/PyInterp_Interp.cxx
+++ b/src/PyInterp/PyInterp_Interp.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   : PyInterp_Interp.cxx
 //  Author : Christian CAREMOLI, Paul RASCLE, EDF
 //  Module : SALOME

diff --git a/src/PyInterp/PyInterp_Interp.h b/src/PyInterp/PyInterp_Interp.h
index 32fadb60f3b12e2c8a46c9f64f044597b1963f49..a2f27270233e38acd37a30d592190996c14c0f3d 100644 (file)
--- a/src/PyInterp/PyInterp_Interp.h
+++ b/src/PyInterp/PyInterp_Interp.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   : PyInterp_Interp.h
 //  Author : Christian CAREMOLI, Paul RASCLE, EDF
 //  Module : SALOME

diff --git a/src/PyInterp/PyInterp_Watcher.h b/src/PyInterp/PyInterp_Watcher.h
index 242dc41005ec3ae7e5c3aaa8c7ed88c333fc4a80..562d3069bf4fe9fdc9e09bd4e18391ba021b5ec5 100755 (executable)
--- a/src/PyInterp/PyInterp_Watcher.h
+++ b/src/PyInterp/PyInterp_Watcher.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   : PyInterp_Watcher.h
 //  Author : Sergey Anikin, OCC
 //  Module : SALOME

diff --git a/src/QDS/Makefile.am b/src/QDS/Makefile.am
index c16f89d75989500ce52257dd54a1fca9c147fc2a..cd641de0d98336bfe03acef711d27a5c4b828507 100755 (executable)
--- a/src/QDS/Makefile.am
+++ b/src/QDS/Makefile.am
@@ -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   : Makefile.in
 #  Author : Alexander SOLOVYOV (OCN)
 #  Module : QDS

diff --git a/src/QDS/QDS.cxx b/src/QDS/QDS.cxx
index 052e4a287f8e891883801428b2b09d4ee84fabef..f55225e060cb90d2f51851ebb5439c48da231ae5 100644 (file)
--- a/src/QDS/QDS.cxx
+++ b/src/QDS/QDS.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 "QDS.h"
 
 #include "QDS_Datum.h"

diff --git a/src/QDS/QDS.h b/src/QDS/QDS.h
index f7c742c0da130b1ca4b84c5d5f40591ca8228909..7a96d6538fa99cbf8917468375aacb9491c2cad9 100644 (file)
--- a/src/QDS/QDS.h
+++ b/src/QDS/QDS.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 QDS_H
 #define QDS_H
 

diff --git a/src/QDS/QDS.pro b/src/QDS/QDS.pro
index fa9b02c5e6664aafe454afaaa00c63458b55771f..19464259babf074ce80b7eda60e1662674750068 100644 (file)
--- a/src/QDS/QDS.pro
+++ b/src/QDS/QDS.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = QDS
 DESTDIR = ../../lib

diff --git a/src/QDS/QDS_CheckBox.cxx b/src/QDS/QDS_CheckBox.cxx
index 862e7876ae38c3715e6ab90b06030af29b82fb4b..ffbb90babe0dc461b9c92fa3a52eed720e0d858c 100644 (file)
--- a/src/QDS/QDS_CheckBox.cxx
+++ b/src/QDS/QDS_CheckBox.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 "QDS_CheckBox.h"
 
 #include <QCheckBox>

diff --git a/src/QDS/QDS_CheckBox.h b/src/QDS/QDS_CheckBox.h
index d5bd69543e18d8fa7aeac3f488df3275451a886f..9f6a73861bbc0c37cfa23028b38a00337ec57a99 100644 (file)
--- a/src/QDS/QDS_CheckBox.h
+++ b/src/QDS/QDS_CheckBox.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 QDS_CHECKBOX_H
 #define QDS_CHECKBOX_H
 

diff --git a/src/QDS/QDS_ComboBox.cxx b/src/QDS/QDS_ComboBox.cxx
index a2a26f27956e50f42df9147946607d005fe43496..89ba7746121d9002fc95729f26638b1ddf43b638 100644 (file)
--- a/src/QDS/QDS_ComboBox.cxx
+++ b/src/QDS/QDS_ComboBox.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 "QDS_ComboBox.h"
 
 #include <QtxComboBox.h>
@@ -302,7 +303,7 @@ void QDS_ComboBox::setValues( const QList<int>& ids, const QStringList& names )
   myUserIds = ids;
   myUserNames = names;
 
-  unitSystemChanged( "" );
+  //unitSystemChanged( "" );
 }
 
 /*!
@@ -552,7 +553,11 @@ void QDS_ComboBox::onTextChanged( const QString& /*txt*/ )
 void QDS_ComboBox::onActivated( int idx )
 {
   if ( comboBox() )
-    comboBox()->setCurrentIndex( comboBox()->currentIndex() );
+  {
+    int ind = comboBox()->currentIndex();
+    comboBox()->setCurrentIndex( -1 );
+    comboBox()->setCurrentIndex( ind );
+  }
 
   int id = getId( idx );
   if ( id != -1 )

diff --git a/src/QDS/QDS_ComboBox.h b/src/QDS/QDS_ComboBox.h
index 8bc0f1c58a69225d7a82b1560551f4fa7f981e26..097b78c9ecfe1cdcc93c4f7d8b4524711468872e 100644 (file)
--- a/src/QDS/QDS_ComboBox.h
+++ b/src/QDS/QDS_ComboBox.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 QDS_COMBOBOX_H
 #define QDS_COMBOBOX_H
 

diff --git a/src/QDS/QDS_Datum.cxx b/src/QDS/QDS_Datum.cxx
index 4394119f5e8f0cf4d9062a00da2d0e4d758810a3..2a0ab0b1324cdd10904b4c3762e89d903127095b 100644 (file)
--- a/src/QDS/QDS_Datum.cxx
+++ b/src/QDS/QDS_Datum.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 "QDS_Datum.h"
 
 #include <QLayout>
@@ -342,7 +343,7 @@ QString QDS_Datum::label() const
     if( labStr.isNull() )
       labStr = toQString( myDicItem->GetId() );
   }
-  if( myTr )
+  if( myTr && labStr.length()>0 )
   {
     QString dest = QApplication::translate( "QDS", labStr.toLatin1().constData() );
     if( labStr != dest )

diff --git a/src/QDS/QDS_Datum.h b/src/QDS/QDS_Datum.h
index e438a4e17f2ebc9c3f49cd29d11588c8db0f9314..58725622cc81d675211a4fc205540a4d91f94a46 100644 (file)
--- a/src/QDS/QDS_Datum.h
+++ b/src/QDS/QDS_Datum.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 QDS_DATUM_H
 #define QDS_DATUM_H
 

diff --git a/src/QDS/QDS_LineEdit.cxx b/src/QDS/QDS_LineEdit.cxx
index aa00d7352ba70dba2b20cc1d6094e12d2eb074e3..41bd9cee10c4139a99d300a98dc4f0042ca81010 100644 (file)
--- a/src/QDS/QDS_LineEdit.cxx
+++ b/src/QDS/QDS_LineEdit.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 "QDS_LineEdit.h"
 
 #include <QLineEdit>

diff --git a/src/QDS/QDS_LineEdit.h b/src/QDS/QDS_LineEdit.h
index 332a2b948e1c1383204bad5e0a5fb4faaff2b3ca..26878eeca78bff42b8e8d9f8d5ee3c96ae812da7 100644 (file)
--- a/src/QDS/QDS_LineEdit.h
+++ b/src/QDS/QDS_LineEdit.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 QDS_LINEEDIT_H
 #define QDS_LINEEDIT_H
 

diff --git a/src/QDS/QDS_RadioBox.cxx b/src/QDS/QDS_RadioBox.cxx
index c2ae107ce6206115f1b3e45782053f206a410661..a0278f6c5a436d1873f2b9213f229789dd1c68c1 100644 (file)
--- a/src/QDS/QDS_RadioBox.cxx
+++ b/src/QDS/QDS_RadioBox.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 "QDS_RadioBox.h"
 
 #include <TColStd_HArray1OfInteger.hxx>

diff --git a/src/QDS/QDS_RadioBox.h b/src/QDS/QDS_RadioBox.h
index 0d667d45c0f2ba7b4538a728c744b4a3923ff402..ceda4aead8a364c61e7dc55782e4d42659898b09 100644 (file)
--- a/src/QDS/QDS_RadioBox.h
+++ b/src/QDS/QDS_RadioBox.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 QDS_RADIOBOX_H
 #define QDS_RADIOBOX_H
 

diff --git a/src/QDS/QDS_SpinBox.cxx b/src/QDS/QDS_SpinBox.cxx
index 407cbe14e75cfc6f4058def30a94cba1ba6da6a5..fde906c0ac3dd4d784f7694fb1cbc8329fe9cc73 100644 (file)
--- a/src/QDS/QDS_SpinBox.cxx
+++ b/src/QDS/QDS_SpinBox.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 "QDS_SpinBox.h"
 
 #include <QtxIntSpinBox.h>

diff --git a/src/QDS/QDS_SpinBox.h b/src/QDS/QDS_SpinBox.h
index c313be8e01de6a2e15e6f89e08cacc4ea0bc7f80..71c472fabbc7894c630952df94fa44a393e25cf5 100644 (file)
--- a/src/QDS/QDS_SpinBox.h
+++ b/src/QDS/QDS_SpinBox.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 QDS_SPINBOX_H
 #define QDS_SPINBOX_H
 

diff --git a/src/QDS/QDS_SpinBoxDbl.cxx b/src/QDS/QDS_SpinBoxDbl.cxx
index bc8def56a995dbfcd21045ef1289da285869acbc..f6f948923bbdade89ba92b7a6633c73fce076162 100644 (file)
--- a/src/QDS/QDS_SpinBoxDbl.cxx
+++ b/src/QDS/QDS_SpinBoxDbl.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 "QDS_SpinBoxDbl.h"
 
 #include <QtxDoubleSpinBox.h>

diff --git a/src/QDS/QDS_SpinBoxDbl.h b/src/QDS/QDS_SpinBoxDbl.h
index 0d7d2b1187b792b1c90411e77a9dd6d0e9255b65..e6cf96de9bb3907aab820515e892294635c3d100 100644 (file)
--- a/src/QDS/QDS_SpinBoxDbl.h
+++ b/src/QDS/QDS_SpinBoxDbl.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 QDS_PINBOXDBL_H
 #define QDS_PINBOXDBL_H
 

diff --git a/src/QDS/QDS_Table.cxx b/src/QDS/QDS_Table.cxx
index e17cca801db7b5fd8fa82cfaf5d577684a4e05d6..9c173f1e55596b4249c5200bfaa712c1b2eae054 100644 (file)
--- a/src/QDS/QDS_Table.cxx
+++ b/src/QDS/QDS_Table.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 "QDS_Table.h"
 
 class QDS_Table::DeleteFilter : public QObject

diff --git a/src/QDS/QDS_Table.h b/src/QDS/QDS_Table.h
index 9384371aa1a6080ac8a76f457bf727131ae9a242..89a8759fe372b470786bc260d62f6e4609fa0ce3 100644 (file)
--- a/src/QDS/QDS_Table.h
+++ b/src/QDS/QDS_Table.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 QDS_TABLE_H
 #define QDS_TABLE_H
 

diff --git a/src/QDS/QDS_TextEdit.cxx b/src/QDS/QDS_TextEdit.cxx
index 61ff1044deb6f937730b0d409f0e607b8d3398b3..4545f3249a595ab67000b7f4fd541c98c46969da 100644 (file)
--- a/src/QDS/QDS_TextEdit.cxx
+++ b/src/QDS/QDS_TextEdit.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 "QDS_TextEdit.h"
 
 #include <QTextEdit>

diff --git a/src/QDS/QDS_TextEdit.h b/src/QDS/QDS_TextEdit.h
index 19fec6269b3dbcc54d9c0b068dd4930e1d04d622..b9e687b22a0e87bf728d1333525acb719bfb5a8b 100644 (file)
--- a/src/QDS/QDS_TextEdit.h
+++ b/src/QDS/QDS_TextEdit.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 QDS_TEXTEEDIT_H
 #define QDS_TEXTEEDIT_H
 

diff --git a/src/QDS/QDS_Validator.cxx b/src/QDS/QDS_Validator.cxx
index 16df1ba3a7d79c2ce86a0bf2d4db895facef5da1..7d65451d105b59f7c3935f0ff7164d832a24f115 100644 (file)
--- a/src/QDS/QDS_Validator.cxx
+++ b/src/QDS/QDS_Validator.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 "QDS_Validator.h"
 
 /*!

diff --git a/src/QDS/QDS_Validator.h b/src/QDS/QDS_Validator.h
index a8c70a7db4a6a24cd05aaccf82312712de97b1d6..19f4ff3627315bef1fbb429847c5135efe625805 100644 (file)
--- a/src/QDS/QDS_Validator.h
+++ b/src/QDS/QDS_Validator.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 QDS_VALIDATOR_H
 #define QDS_VALIDATOR_H
 

diff --git a/src/QDS/resources/QDS_msg_en.ts b/src/QDS/resources/QDS_msg_en.ts
index 10470e95620eeacbcaf87d61662ecf0c34359216..0caa8c1f22833fcc0c184f28699358aec9c607a3 100644 (file)
--- a/src/QDS/resources/QDS_msg_en.ts
+++ b/src/QDS/resources/QDS_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am
index 9da7c3a3dac05a2a268d746fa390480aa99eb378..633d33df9da4031bc18695938bb4c87d0bab4943 100755 (executable)
--- a/src/Qtx/Makefile.am
+++ b/src/Qtx/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : suit

diff --git a/src/Qtx/Qtx.cxx b/src/Qtx/Qtx.cxx
index a9163e978487c2eab55445f5ada2be4839ac5580..ded4dd5016407c5b07cceb4d950014ecac1cb9d8 100755 (executable)
--- a/src/Qtx/Qtx.cxx
+++ b/src/Qtx/Qtx.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:      Qtx.cxx
 // Author:    Sergey TELKOV
 //
@@ -39,6 +40,7 @@
 #include <QLinearGradient>
 #include <QRadialGradient>
 #include <QConicalGradient>
+#include <QtDebug>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -1381,3 +1383,70 @@ bool Qtx::stringToConicalGradient( const QString& str, QConicalGradient& gradien
   }
   return success;
 }
+
+#ifndef WIN32
+
+#include <X11/Xlib.h>
+#include <GL/glx.h>
+
+/*!
+  \brief Open the default X display and returns pointer to it.
+         This method is available on Linux only.
+  \return Pointer to X display.
+  \sa getVisual()
+*/
+void* Qtx::getDisplay()
+{
+  static Display* pDisplay = NULL;
+  if ( !pDisplay )
+    pDisplay = XOpenDisplay( NULL );
+  return pDisplay;
+}
+
+/*!
+  \brief Returns pointer to X visual suitable for 3D rendering.
+         This method is available on Linux only.
+  \return Pointer to X visual.
+  \sa getDisplay()
+*/
+Qt::HANDLE Qtx::getVisual()
+{
+  Qt::HANDLE res = NULL;
+
+  Display* pDisplay = (Display*)getDisplay();
+  if ( !pDisplay )
+    return res;
+
+  int errorBase;
+  int eventBase;
+
+  // Make sure OpenGL's GLX extension supported
+  if( !glXQueryExtension( pDisplay, &errorBase, &eventBase ) ){
+    qCritical( "Could not find glx extension" );
+    return res;
+  }
+
+  // Find an appropriate visual
+
+  int doubleBufferVisual[]  = {
+    GLX_RGBA,           // Needs to support OpenGL
+    GLX_DEPTH_SIZE, 16, // Needs to support a 16 bit depth buffer
+    GLX_DOUBLEBUFFER,   // Needs to support double-buffering
+    None                // end of list
+  };
+
+  // Try for the double-bufferd visual first
+  XVisualInfo *visualInfo = NULL;
+  visualInfo = glXChooseVisual( pDisplay, DefaultScreen(pDisplay), doubleBufferVisual );
+
+  if( visualInfo == NULL ){
+    qCritical( "Could not find matching glx visual" );
+    return res;
+  }
+
+  qDebug() << "Picked visual 0x" << hex << XVisualIDFromVisual( visualInfo->visual );
+  res = (Qt::HANDLE)( visualInfo->visual );
+ 
+  return res;
+}
+#endif // WIN32

diff --git a/src/Qtx/Qtx.h b/src/Qtx/Qtx.h
index b5dd9f2efe77e0b5ffad1588cb3e469256be45dd..c5bc82b2d11c3b3813341f447dbf9127958ba3c3 100755 (executable)
--- a/src/Qtx/Qtx.h
+++ b/src/Qtx/Qtx.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:      Qtx.h
 // Author:    Sergey TELKOV
 //
@@ -167,6 +168,11 @@ public:
   static bool        stringToLinearGradient( const QString&, QLinearGradient& );
   static bool        stringToRadialGradient( const QString&, QRadialGradient& );
   static bool        stringToConicalGradient( const QString&, QConicalGradient& );
+
+#ifndef WIN32
+  static void*       getDisplay();
+  static Qt::HANDLE  getVisual();
+#endif
 };
 
 #endif

diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro
index a5b7c33fb8a2bcc4c832b978adfff3e5e847f85e..ed6b4b5265d84f65d91c11acd7ea4ad94de4b2e3 100644 (file)
--- a/src/Qtx/Qtx.pro
+++ b/src/Qtx/Qtx.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = qtx
 DESTDIR = ../../lib

diff --git a/src/Qtx/QtxAction.cxx b/src/Qtx/QtxAction.cxx
index 49102514222393f3ab651da2144ce6458db2e29b..0bc9508aa50f0978238c1ca07dbbfcb1ebe16ead 100755 (executable)
--- a/src/Qtx/QtxAction.cxx
+++ b/src/Qtx/QtxAction.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:      QtxAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxAction.h b/src/Qtx/QtxAction.h
index 4e5448002f129e6352f96cb21f23aa3a00aa77ea..c7a87293fcb127d17b765fcaedd24f93471b0f96 100755 (executable)
--- a/src/Qtx/QtxAction.h
+++ b/src/Qtx/QtxAction.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:      QtxAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionGroup.cxx b/src/Qtx/QtxActionGroup.cxx
index eb651239d35a479fb6b1bd8cd70619dd152522f7..0148665c2842ea9eb4193b90cdb51f00798b852d 100644 (file)
--- a/src/Qtx/QtxActionGroup.cxx
+++ b/src/Qtx/QtxActionGroup.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:      QtxActionGroup.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionGroup.h b/src/Qtx/QtxActionGroup.h
index 45a8067e0861a2a8764c1711da6de76f9100c0a0..10b9a41f85f473101ecfb664bf382487d542b6b7 100644 (file)
--- a/src/Qtx/QtxActionGroup.h
+++ b/src/Qtx/QtxActionGroup.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:      QtxActionGroup.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionMenuMgr.cxx b/src/Qtx/QtxActionMenuMgr.cxx
index 90acf3ff7953ff395c221167298998a7c30a5b48..ea20d0d206ab81493220bae8a0d00ab5165322bb 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.cxx
+++ b/src/Qtx/QtxActionMenuMgr.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:      QtxActionMenuMgr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //
@@ -491,8 +492,19 @@ void QtxActionMenuMgr::remove( const int id, const int pId, const int group )
       delNodes.append( *it );
   }
 
+  QWidget* mW = menuWidget( pNode );
   for ( NodeList::iterator itr = delNodes.begin(); itr != delNodes.end(); ++itr )
+  {
+    int id = (*itr)->id;
+    if( mW && menuAction( id ) )
+    {
+      mW->removeAction( menuAction( id ) );
+      myMenus.remove( id );
+    }
+    else if( mW && itemAction( id ) )
+      mW->removeAction( itemAction( id ) );
     pNode->children.removeAll( *itr );
+  }
 
   triggerUpdate( pNode->id, false );
 }
@@ -984,8 +996,10 @@ bool QtxActionMenuMgr::ownAction( QAction* a, MenuNode* node ) const
   for ( NodeList::const_iterator iter = node->children.begin(); iter != node->children.end(); ++iter )
   {
     QAction* mya = itemAction( (*iter)->id );
-    if ( !mya ) mya = menuAction( (*iter)->id );
-    if ( mya && mya == a ) return true;
+    if ( !mya )
+      mya = menuAction( (*iter)->id );
+    if ( mya && mya == a )
+      return true;
   }
   return false;
 }

diff --git a/src/Qtx/QtxActionMenuMgr.h b/src/Qtx/QtxActionMenuMgr.h
index 071c34adb65ca8eacd615ddc27c8936bf307f27b..346d6c5b7980c4cfafaa044015f559ce00d5cefe 100644 (file)
--- a/src/Qtx/QtxActionMenuMgr.h
+++ b/src/Qtx/QtxActionMenuMgr.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:      QtxActionMenuMgr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionMgr.cxx b/src/Qtx/QtxActionMgr.cxx
index 3241ee76d426eae1bafd001738fc7510155bac83..b96f9fe3ce873e70b7aaf36e3adda26c222241f7 100644 (file)
--- a/src/Qtx/QtxActionMgr.cxx
+++ b/src/Qtx/QtxActionMgr.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:      QtxActionMgr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionMgr.h b/src/Qtx/QtxActionMgr.h
index b4b2fa68ffcae14bf7b9be03f76dd45226d5ea39..c1178f9cd51f01b4276db106b6d389ad1d21d614 100644 (file)
--- a/src/Qtx/QtxActionMgr.h
+++ b/src/Qtx/QtxActionMgr.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:      QtxActionMgr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionSet.cxx b/src/Qtx/QtxActionSet.cxx
index e43e700309bbacc89be5b779d1b17160235a7b60..26a1d942a3c74b8cb902d8b873241f784ca40b68 100644 (file)
--- a/src/Qtx/QtxActionSet.cxx
+++ b/src/Qtx/QtxActionSet.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:      QtxActionSet.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionSet.h b/src/Qtx/QtxActionSet.h
index 952a849da9c75741744b88a498b5a9be22182de7..25b7f96883826c3070fabfb8d4d922022989f887 100644 (file)
--- a/src/Qtx/QtxActionSet.h
+++ b/src/Qtx/QtxActionSet.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:      QtxActionSet.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionToolMgr.cxx b/src/Qtx/QtxActionToolMgr.cxx
index 8b209ecff98b42ee3a94bd457151e076914e0605..6cdf72121220af885d24533e1bad5cbab0cdf523 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.cxx
+++ b/src/Qtx/QtxActionToolMgr.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:      QtxActionToolMgr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxActionToolMgr.h b/src/Qtx/QtxActionToolMgr.h
index e38aae58b57768dcecca3937e0a60677d4a454b3..a9c71739f06ede47251362f94fb88f68daf155aa 100644 (file)
--- a/src/Qtx/QtxActionToolMgr.h
+++ b/src/Qtx/QtxActionToolMgr.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:      QtxActionToolMgr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index d792cf506761398dee87eae80d483d6568cb32ab..af9a76673ec65f28a719ba871cd9c1ae4f3eb92b 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.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:      QtxColorButton.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index 0b73d3a48f9c5013e245754740c95fea1197f547..953e66afa7b42dceb78d722cb2648a815f6eaedc 100644 (file)
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.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:      QtxColorButton.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxColorScale.cxx b/src/Qtx/QtxColorScale.cxx
index 3b1cbef9389fd28440cdb230070e8840a4728b87..597effaf755348595c47d3296588724a3585c417 100755 (executable)
--- a/src/Qtx/QtxColorScale.cxx
+++ b/src/Qtx/QtxColorScale.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:      QtxColorScale.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h
index 91bdd458aae3df2e0e9a92a2db1b66cfa4de7cac..32dea244fd9ac3bf9530a37aafada5b7c6fdee95 100755 (executable)
--- a/src/Qtx/QtxColorScale.h
+++ b/src/Qtx/QtxColorScale.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:      QtxColorScale.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxComboBox.cxx b/src/Qtx/QtxComboBox.cxx
index 74425a78848b0d77fbbf7e4a6e243bd2d9448514..d7b649db780360a3aebfb45d1fe9af5cc64e10c3 100755 (executable)
--- a/src/Qtx/QtxComboBox.cxx
+++ b/src/Qtx/QtxComboBox.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:      QtxComboBox.cxx
 // Author:    Sergey TELKOV
 //
@@ -133,7 +134,6 @@ QtxComboBox::QtxComboBox( QWidget* parent )
 : QComboBox( parent ),
   myCleared( false )
 {
-  connect( this, SIGNAL( activated( int ) ),            this, SLOT( onActivated( int ) ) );
   connect( this, SIGNAL( currentIndexChanged( int ) ),  this, SLOT( onCurrentChanged( int ) ) );
   setModel( new Model( this ) );
 }
@@ -235,16 +235,6 @@ void QtxComboBox::customEvent( QEvent* e )
     lineEdit()->setText( "" );
 }
 
-/*!
-  \brief Called when any item is activated by the user.
-  \param idx activated item index
-*/
-void QtxComboBox::onActivated( int idx )
-{
-  resetClear();
-  emit activatedId( id( idx ) );
-}
-
 /*!
   \brief Called when current item is chaned (by the user or programmatically).
   \param idx item being set current
@@ -252,7 +242,10 @@ void QtxComboBox::onActivated( int idx )
 void QtxComboBox::onCurrentChanged( int idx )
 {
   if ( idx != -1 )
+  {
     resetClear();
+    emit activatedId( id( idx ) );
+  }
 }
 
 /*!

diff --git a/src/Qtx/QtxComboBox.h b/src/Qtx/QtxComboBox.h
index 345881b325350650496d3f2556808cd5568aa3be..8cb4434b6b14006b383255f4f20abf8f2b10253c 100755 (executable)
--- a/src/Qtx/QtxComboBox.h
+++ b/src/Qtx/QtxComboBox.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:      QtxComboBox.h
 // Author:    Sergey TELKOV
 //
@@ -61,7 +62,6 @@ signals:
   void         activatedId( int );
 
 private slots:
-  void         onActivated( int );
   void         onCurrentChanged( int );
 
 protected:

diff --git a/src/Qtx/QtxDialog.cxx b/src/Qtx/QtxDialog.cxx
index f20e41353012eb7be8b5d96e8c2797b01f950599..c43cf64e760b02b5fd1b8f61229f73eedad18b97 100755 (executable)
--- a/src/Qtx/QtxDialog.cxx
+++ b/src/Qtx/QtxDialog.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:      QtxDialog.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDialog.h b/src/Qtx/QtxDialog.h
index e35487f38d70eff882acf4edafea43d540a17ea2..10466e07a6bc3c9121231c0455765ff8568b988c 100755 (executable)
--- a/src/Qtx/QtxDialog.h
+++ b/src/Qtx/QtxDialog.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:      QtxDialog.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDockAction.cxx b/src/Qtx/QtxDockAction.cxx
index 0b6d6e2d58c7a1e766406aaae0c9e2bfc1195dc4..5a1f3fa581aa4bb86d6fd2f346b4e58aae7ee1f6 100755 (executable)
--- a/src/Qtx/QtxDockAction.cxx
+++ b/src/Qtx/QtxDockAction.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:      QtxDockAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDockAction.h b/src/Qtx/QtxDockAction.h
index 756cbd314ceaf268b9c4e1edd1e00e38d6a8c74d..64b2c4ea19c3776adbfe9b4f41796dfe1d56073e 100755 (executable)
--- a/src/Qtx/QtxDockAction.h
+++ b/src/Qtx/QtxDockAction.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:      QtxDockAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDockWidget.cxx b/src/Qtx/QtxDockWidget.cxx
index 1adcca765a208edbd0d13038041cc66c97549d35..31611dd9bccee7db5de74d586d69a3c942d7623c 100644 (file)
--- a/src/Qtx/QtxDockWidget.cxx
+++ b/src/Qtx/QtxDockWidget.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:      QtxDockWidget.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDockWidget.h b/src/Qtx/QtxDockWidget.h
index ca55bfba57f61c75c46e78dfc127fd8fb1bb4629..bd686898f42b3245af25c78c445c6a5d882e579f 100644 (file)
--- a/src/Qtx/QtxDockWidget.h
+++ b/src/Qtx/QtxDockWidget.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:      QtxDockWidget.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxDoubleSpinBox.cxx b/src/Qtx/QtxDoubleSpinBox.cxx
index dad449f6caae8e58439e932c56d5d7cdeadc3df2..f0560db9be6487ce590f55d97e2ea68600adf2f4 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.cxx
+++ b/src/Qtx/QtxDoubleSpinBox.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:      QtxDoubleSpinBox.cxx
 // Author:    Sergey TELKOV
 //
@@ -26,6 +24,9 @@
 
 #include <QLineEdit>
 #include <QDoubleValidator>
+#include <QVariant>
+
+#include <limits>
 
 /*!
   \class QtxDoubleSpinBox
@@ -48,6 +49,15 @@
     ... // process entered value
   }
   \endcode
+
+  Another useful feature is possibility to use scientific notation (e.g. 1.234e+18) 
+  for the widegt text. To enable this, negative precision should be specified either
+  through a constructor or using setPrecision() method.
+
+  Note that "decimals" property of QDoubleSpinBox is almost completely substituted
+  by "myPrecision" field of QtxDoubleSpinBox class. "decimals" is still used 
+  for proper size hint calculation and for rounding minimum and maximum bounds of
+  the spin box range.
 */
 
 /*!
@@ -61,9 +71,11 @@
 */
 QtxDoubleSpinBox::QtxDoubleSpinBox( QWidget* parent )
 : QDoubleSpinBox( parent ),
-  myCleared( false ),
-  myPrecision(0)
+  myCleared( false )
 {
+  // Use precision equal to default Qt decimals
+  myPrecision = decimals();
+  
   connect( lineEdit(), SIGNAL( textChanged( const QString& ) ), 
            this, SLOT( onTextChanged( const QString& ) ) );
 }
@@ -82,9 +94,11 @@ QtxDoubleSpinBox::QtxDoubleSpinBox( QWidget* parent )
 */
 QtxDoubleSpinBox::QtxDoubleSpinBox( double min, double max, double step, QWidget* parent )
 : QDoubleSpinBox( parent ),
-  myCleared( false ),
-  myPrecision( 0 )
+  myCleared( false )
 {
+  // Use precision equal to default Qt decimals
+  myPrecision = decimals();
+  
   setMinimum( min );
   setMaximum( max );
   setSingleStep( step );
@@ -97,12 +111,15 @@ QtxDoubleSpinBox::QtxDoubleSpinBox( double min, double max, double step, QWidget
   \brief Constructor.
 
   Constructs a spin box with specified minimum, maximum and step value.
-  The precision is set to 2 decimal places. 
+  The precision is set to <prec> decimal places. 
   The value is initially set to the minimum value.
 
   \param min spin box minimum possible value
   \param max spin box maximum possible value
   \param step spin box increment/decrement value
+  \param prec non-negative values means the number of digits after the decimal point, 
+              negative value means the maximum number of significant digits for the scientific notation
+  \param dec number of digits after the decimal point passed to base Qt class (used for correct control sizing only!)
   \param parent parent object
 */
 QtxDoubleSpinBox::QtxDoubleSpinBox( double min, double max, double step, int prec, int dec, QWidget* parent )
@@ -202,7 +219,7 @@ double QtxDoubleSpinBox::valueFromText( const QString& text ) const
 */
 QString QtxDoubleSpinBox::textFromValue( double val ) const
 {
-  QString s = QLocale().toString( val, myPrecision >= 0 ? 'f' : 'g', myPrecision == 0 ? 6 : qAbs( myPrecision ) );
+  QString s = QLocale().toString( val, myPrecision >= 0 ? 'f' : 'g', qAbs( myPrecision ) );
   return removeTrailingZeroes( s );
 }
 
@@ -256,19 +273,23 @@ void QtxDoubleSpinBox::stepBy( int steps )
 */
 QValidator::State QtxDoubleSpinBox::validate( QString& str, int& pos ) const
 {
-  if (myPrecision >= 0)
-    return QDoubleSpinBox::validate(str, pos);
-
   QString pref = this->prefix();
   QString suff = this->suffix();
   uint overhead = pref.length() + suff.length();
   QValidator::State state = QValidator::Invalid;
-
+  
   QDoubleValidator v (NULL);
-  v.setDecimals( decimals() );
+  
+  // If 'g' format is used (myPrecision < 0), then
+  // myPrecision - 1 digits are allowed after the decimal point.
+  // Otherwise, expect myPrecision digits after the decimal point.
+  int decs = myPrecision < 0 ? qAbs( myPrecision ) - 1 : myPrecision;
+ 
+  v.setDecimals( decs );
   v.setBottom( minimum() );
   v.setTop( maximum() );
-  v.setNotation( QDoubleValidator::ScientificNotation );
+  v.setNotation( myPrecision >= 0 ? QDoubleValidator::StandardNotation : 
+                                    QDoubleValidator::ScientificNotation );
 
   if ( overhead == 0 )
     state = v.validate( str, pos );
@@ -300,6 +321,34 @@ QValidator::State QtxDoubleSpinBox::validate( QString& str, int& pos ) const
             }
         }
     }
+
+  // Treat values ouside (min; max) range as Invalid
+  // This check is enabled by assigning "strict_validity_check" dynamic property
+  // with value "true" to the spin box instance.
+  if ( state == QValidator::Intermediate ){
+    bool isOk;
+    double val = str.toDouble( &isOk );
+    if ( isOk ){
+      QVariant propVal = property( "strict_validity_check" );
+      if ( propVal.isValid() && propVal.canConvert( QVariant::Bool ) && propVal.toBool() ){
+        if ( val < minimum() || val > maximum() )
+          state = QValidator::Invalid;
+      }
+    }
+    else if ( myPrecision < 0 ){
+      // Consider too large negative exponent as Invalid
+      QChar e( QLocale().exponential() );
+      int epos = str.indexOf( e, 0, Qt::CaseInsensitive );
+      if ( epos != -1 ){
+        epos++; // Skip exponential symbol itself
+        QString exponent = str.right( str.length() - epos );
+        int expValue = exponent.toInt( &isOk );
+        if ( isOk && expValue < std::numeric_limits<double>::min_exponent10 )
+          state = QValidator::Invalid;
+      }
+    }
+  }
+
   return state;
 }
 

diff --git a/src/Qtx/QtxDoubleSpinBox.h b/src/Qtx/QtxDoubleSpinBox.h
index 5c094e82ef09e3347ee47bb21e9b9e29e0155d80..6e3da8ade2c0fe77f32374858bcfc19f5cf0be09 100644 (file)
--- a/src/Qtx/QtxDoubleSpinBox.h
+++ b/src/Qtx/QtxDoubleSpinBox.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:      QtxDoubleSpinBox.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxEvalExpr.cxx b/src/Qtx/QtxEvalExpr.cxx
index 140a3173a4113088baeaf183f81b5dbb97fb3e50..a7632e2d4e500d9dea54c7a4e44dbc0a6c771e66 100644 (file)
--- a/src/Qtx/QtxEvalExpr.cxx
+++ b/src/Qtx/QtxEvalExpr.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:      QtxEvalExpr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxEvalExpr.h b/src/Qtx/QtxEvalExpr.h
index d2fce8b1da975df03e451a8ed67b90d218c4f6e3..151520f8903de702f54d99af7fd9838fe88cf5a6 100644 (file)
--- a/src/Qtx/QtxEvalExpr.h
+++ b/src/Qtx/QtxEvalExpr.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:      QtxEvalExpr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxFontEdit.cxx b/src/Qtx/QtxFontEdit.cxx
index 467ce456dd7abbfd0907403a950b260e7bac6b21..4f2523b8bd752a503ee04b7fbf0bfad48cec0a58 100644 (file)
--- a/src/Qtx/QtxFontEdit.cxx
+++ b/src/Qtx/QtxFontEdit.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:      QtxFontEdit.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxFontEdit.h b/src/Qtx/QtxFontEdit.h
index 8934f9cddf64161c50c505f2592ff535827486cd..42c3d5daccb4eaf60d35624f3104f47bc23556be 100644 (file)
--- a/src/Qtx/QtxFontEdit.h
+++ b/src/Qtx/QtxFontEdit.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:      QtxFontEdit.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxGridBox.cxx b/src/Qtx/QtxGridBox.cxx
index c2f04236a8716078b59646c2f834e7a1c68a868c..d974628f90cb5a69f367a2f7cac0ee1662712f73 100644 (file)
--- a/src/Qtx/QtxGridBox.cxx
+++ b/src/Qtx/QtxGridBox.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:      QtxGridBox.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxGridBox.h b/src/Qtx/QtxGridBox.h
index 7ddf76bb7062988bf82a0fe675a79d55f3127b88..aecb5d82c5e00c6dff7eb7edaa498ec064b87d5f 100644 (file)
--- a/src/Qtx/QtxGridBox.h
+++ b/src/Qtx/QtxGridBox.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:      QtxGridBox.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxGroupBox.cxx b/src/Qtx/QtxGroupBox.cxx
index c6cccf4b363186e703808a4d7301ce7087ad8a5c..247805669eb47a67fddda7bef72e520cd4f62dec 100644 (file)
--- a/src/Qtx/QtxGroupBox.cxx
+++ b/src/Qtx/QtxGroupBox.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:      QtxGroupBox.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxGroupBox.h b/src/Qtx/QtxGroupBox.h
index f37b8dd2248be7325e3fbe4fc8b7e0d98c5676fd..9bf0376f0ad810f3c5048810215d0f1bae955ae9 100644 (file)
--- a/src/Qtx/QtxGroupBox.h
+++ b/src/Qtx/QtxGroupBox.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:      QtxGroupBox.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxIntSpinBox.cxx b/src/Qtx/QtxIntSpinBox.cxx
index 02a92596e4f627827a4793d303bd1de83159c4ac..cb3dd5bff9de685a932bc8ef38d8529088d8386a 100755 (executable)
--- a/src/Qtx/QtxIntSpinBox.cxx
+++ b/src/Qtx/QtxIntSpinBox.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:      QtxIntSpinBox.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxIntSpinBox.h b/src/Qtx/QtxIntSpinBox.h
index 39230639ca36ae5f6e6dc3816c6d365a782cb065..9288115e6947c6fe6630f8d2578f42712fe0b185 100755 (executable)
--- a/src/Qtx/QtxIntSpinBox.h
+++ b/src/Qtx/QtxIntSpinBox.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:      QtxIntSpinBox.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxListAction.cxx b/src/Qtx/QtxListAction.cxx
index 6162a28fe9a170197c58617eb81a5bac09b20ec5..2cdb2f35018c51f48bc9727469c295e7c4a533d9 100755 (executable)
--- a/src/Qtx/QtxListAction.cxx
+++ b/src/Qtx/QtxListAction.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:      QtxListAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxListAction.h b/src/Qtx/QtxListAction.h
index bcbf744944e81499bd44a20630dc150394f2b0b3..75fce924ccba59a4f8f51da63718f13eb36b953f 100755 (executable)
--- a/src/Qtx/QtxListAction.h
+++ b/src/Qtx/QtxListAction.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:      QtxListAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxListBox.cxx b/src/Qtx/QtxListBox.cxx
index 21a286c11f2bab8a796c751036bfa01689f35ca7..0226114a98b6dbed904988b78e8c1e5b5b8d6d92 100755 (executable)
--- a/src/Qtx/QtxListBox.cxx
+++ b/src/Qtx/QtxListBox.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:      QtxListBox.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxListBox.h b/src/Qtx/QtxListBox.h
index 74b4887289cbe8633701caa37c386d26f374afcd..3fe9c61926542c09b8a079f987b8c582ddc16b76 100755 (executable)
--- a/src/Qtx/QtxListBox.h
+++ b/src/Qtx/QtxListBox.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:      QtxListBox.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxLogoMgr.cxx b/src/Qtx/QtxLogoMgr.cxx
index 52e29f908ce0901d528635f6d85e07f0e73280ec..abaccfb1a6865b8d64195f8064e35d86ff0902a8 100644 (file)
--- a/src/Qtx/QtxLogoMgr.cxx
+++ b/src/Qtx/QtxLogoMgr.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:      QtxLogoMgr.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxLogoMgr.h b/src/Qtx/QtxLogoMgr.h
index 2aa6941e251be3512dcec962d0348debc3068b57..590272a879bf1950ee231b803143da7ec1d25d81 100644 (file)
--- a/src/Qtx/QtxLogoMgr.h
+++ b/src/Qtx/QtxLogoMgr.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:      QtxLogoMgr.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMRUAction.cxx b/src/Qtx/QtxMRUAction.cxx
index b3f5c89a77540a2da700a8dca4ea7ea53fe1b53a..b5d1976b46b2cb62ab53e683c2cfd35281b8ed93 100755 (executable)
--- a/src/Qtx/QtxMRUAction.cxx
+++ b/src/Qtx/QtxMRUAction.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:      QtxMRUAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMRUAction.h b/src/Qtx/QtxMRUAction.h
index 93a5a231c5f139f94eb44a5ed4c041e7e5911cc9..8945f85e11f74d3d20533dc719c92180402970fc 100755 (executable)
--- a/src/Qtx/QtxMRUAction.h
+++ b/src/Qtx/QtxMRUAction.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:      QtxMRUAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMainWindow.cxx b/src/Qtx/QtxMainWindow.cxx
index 5802f6b1af88194b5dd5c4544c9b59e0c9b85ef4..75abd996ffb0d589067f7b701ca34943fbd7743f 100644 (file)
--- a/src/Qtx/QtxMainWindow.cxx
+++ b/src/Qtx/QtxMainWindow.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:      QtxMainWindow.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMainWindow.h b/src/Qtx/QtxMainWindow.h
index a77e9959a0e96d5851793587b4a45649bb2fa8b9..305e519c4f4197795212e17e4de3cf615f4ee5d9 100644 (file)
--- a/src/Qtx/QtxMainWindow.h
+++ b/src/Qtx/QtxMainWindow.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:      QtxMainWindow.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMap.h b/src/Qtx/QtxMap.h
index 6545f5f3cefd89b5c307aacdd9b4c74242caa9b5..25019fe5a2f72d89cacbf7529312a41458777103 100644 (file)
--- a/src/Qtx/QtxMap.h
+++ b/src/Qtx/QtxMap.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   : QtxMap.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Qtx/QtxMenu.cxx b/src/Qtx/QtxMenu.cxx
index 6e146ef238a1bba86aa6768d111ef31f68c432a7..afd07f80f1e2b00fd0247d0db86087ce817a4ef9 100644 (file)
--- a/src/Qtx/QtxMenu.cxx
+++ b/src/Qtx/QtxMenu.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:      QtxMenu.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMenu.h b/src/Qtx/QtxMenu.h
index a719802c1e713bbcb43a26164f66296c1bafb30c..5af34bd2dded49d3d449b4ff09febf46dcf32b9a 100644 (file)
--- a/src/Qtx/QtxMenu.h
+++ b/src/Qtx/QtxMenu.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:      QtxMenu.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMultiAction.cxx b/src/Qtx/QtxMultiAction.cxx
index 21f85f53bf462212ea2099caef50c3b76514743f..d476201388835d81937faa971f4c80d8746a2762 100644 (file)
--- a/src/Qtx/QtxMultiAction.cxx
+++ b/src/Qtx/QtxMultiAction.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:      QtxMultiAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxMultiAction.h b/src/Qtx/QtxMultiAction.h
index 52583819c799070e2db0b0f916d33ab2e6ae97dd..53fc7290856f1794349deaf372119cf544c7d8b8 100644 (file)
--- a/src/Qtx/QtxMultiAction.h
+++ b/src/Qtx/QtxMultiAction.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:      QtxMultiAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx
index df939b8bd09efd33c03f1668c91054fa3174f556..d59c3f89fc2770115e2a949183b2e9677ec25a82 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.cxx
+++ b/src/Qtx/QtxPagePrefMgr.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:      QtxPagePrefMgr.cxx
 // Author:    Sergey TELKOV
 //
@@ -44,6 +42,7 @@
 #include <QApplication>
 #include <QDateTimeEdit>
 #include <QStackedWidget>
+#include <QSlider>
 
 #include <stdio.h>
 
@@ -2210,6 +2209,288 @@ void QtxPagePrefEditItem::updateEditor()
   myEditor->setValidator( val );
 }
 
+/*!
+  \class QtxPagePrefSliderItem
+*/
+
+/*!
+  \brief Constructor.
+
+  Creates preference item with slider widget
+
+  \param title preference item title
+  \param parent parent preference item
+  \param sect resource file section associated with the preference item
+  \param param resource file parameter associated with the preference item
+*/
+QtxPagePrefSliderItem::QtxPagePrefSliderItem( const QString& title, QtxPreferenceItem* parent,
+                                              const QString& sect, const QString& param )
+: QtxPageNamedPrefItem( title, parent, sect, param )
+{
+  setControl( mySlider = new QSlider( Qt::Horizontal ) );
+  widget()->layout()->addWidget( myLabel = new QLabel( ) );
+    
+  setMinimum( 0 );
+  setMaximum( 0 );
+  setSingleStep( 1 );
+  setPageStep( 1 );
+  
+  mySlider->setTickPosition( QSlider::TicksBothSides );
+  
+  connect (mySlider, SIGNAL(valueChanged(int)), this, SLOT(setIcon(int)));
+  updateSlider();
+}
+
+/*!
+  \brief Destructor.
+*/
+QtxPagePrefSliderItem::~QtxPagePrefSliderItem()
+{
+}
+
+/*!
+  \brief Get slider preference item step value.
+  \return slider single step value
+  \sa setSingleStep()
+*/
+int QtxPagePrefSliderItem::singleStep() const
+{
+  return mySlider->singleStep();
+}
+
+/*!
+  \brief Get slider preference item step value.
+  \return slider page step value
+  \sa setPageStep()
+*/
+int QtxPagePrefSliderItem::pageStep() const
+{
+  return mySlider->pageStep();
+}
+
+/*!
+  \brief Get slider preference item minimum value.
+  \return slider minimum value
+  \sa setMinimum()
+*/
+int QtxPagePrefSliderItem::minimum() const
+{
+    return mySlider->minimum();
+}
+
+/*!
+  \brief Get slider preference item maximum value.
+  \return slider maximum value
+  \sa setMaximum()
+*/
+int QtxPagePrefSliderItem::maximum() const
+{
+    return mySlider->maximum();
+}
+
+/*!
+  \brief Get the list of the icons associated with the selection widget items
+  \return list of icons
+  \sa setIcons()
+*/
+QList<QIcon> QtxPagePrefSliderItem::icons() const
+{
+  return myIcons;
+}
+
+/*!
+  \brief Set slider preference item step value.
+  \param step new slider single step value
+  \sa step()
+*/
+void QtxPagePrefSliderItem::setSingleStep( const int& step )
+{
+  mySlider->setSingleStep( step );
+}
+
+/*!
+  \brief Set slider preference item step value.
+  \param step new slider single step value
+  \sa step()
+*/
+void QtxPagePrefSliderItem::setPageStep( const int& step )
+{
+  mySlider->setPageStep( step );
+}
+
+/*!
+  \brief Set slider preference item minimum value.
+  \param min new slider minimum value
+  \sa minimum()
+*/
+void QtxPagePrefSliderItem::setMinimum( const int& min )
+{
+  mySlider->setMinimum( min );
+  setIcon( mySlider->value() );
+}
+
+/*!
+  \brief Set slider preference item maximum value.
+  \param max new slider maximum value
+  \sa maximum()
+*/
+void QtxPagePrefSliderItem::setMaximum( const int& max )
+{
+  mySlider->setMaximum( max );
+  setIcon( mySlider->value() );
+}
+
+/*!
+  \brief Set the list of the icons to the selection widget items
+  \param icns new list of icons
+  \sa icons()
+*/
+void QtxPagePrefSliderItem::setIcons( const QList<QIcon>& icns )
+{
+  if ( icns.isEmpty() ) 
+    return;
+  myIcons = icns;
+  
+  QSize maxsize(0, 0); 
+  for ( QList<QIcon>::const_iterator it = myIcons.begin(); it != myIcons.end(); ++it ) {
+    if ( (*it).isNull() ) continue;
+    maxsize = maxsize.expandedTo( (*it).availableSizes().first() );
+  }
+  myLabel->setFixedSize( maxsize );
+  
+  updateSlider();
+}
+
+/*!
+  \brief Store preference item to the resource manager.
+  \sa retrieve()
+*/
+void QtxPagePrefSliderItem::store()
+{
+  setInteger( mySlider->value() );
+}
+
+/*!
+  \brief Retrieve preference item from the resource manager.
+  \sa store()
+*/
+void QtxPagePrefSliderItem::retrieve()
+{
+  mySlider->setValue( getInteger( mySlider->value() ) );
+}
+
+/*!
+  \brief Get preference item option value.
+  \param name option name
+  \return property value or null integer if option is not set
+  \sa setOptionValue()
+*/
+QVariant QtxPagePrefSliderItem::optionValue( const QString& name ) const
+{
+  if ( name == "minimum" || name == "min" )
+    return minimum();
+  else if ( name == "maximum" || name == "max" )
+    return maximum();
+  else if ( name == "single_step" )
+    return singleStep();
+  else if ( name == "page_step" )
+    return pageStep();
+  else if ( name == "icons" || name == "pixmaps" )
+  {
+    QList<QVariant> lst;
+    QList<QIcon> ics = icons();
+    for ( QList<QIcon>::const_iterator it = ics.begin(); it != ics.end(); ++it )
+      lst.append( *it );
+    return lst;
+  }
+  else
+    return QtxPageNamedPrefItem::optionValue( name );
+}
+
+/*!
+  \brief Set preference item option value.
+  \param name option name
+  \param val new property value
+  \sa optionValue()
+*/
+void QtxPagePrefSliderItem::setOptionValue( const QString& name, const QVariant& val )
+{
+  if ( val.canConvert( QVariant::Int ) )
+  {
+    if ( name == "minimum" || name == "min" )
+      setMinimum( val.toInt() );
+    else if ( name == "maximum" || name == "max" )
+      setMaximum( val.toInt() );
+    else if ( name == "single_step" )
+      setSingleStep( val.toInt() );
+    else if ( name == "page_step" )
+      setPageStep( val.toInt() );
+    else
+      QtxPageNamedPrefItem::setOptionValue( name, val );
+  }
+  else if ( name == "icons" || name == "pixmaps" )
+    setIcons( val );
+  else
+    QtxPageNamedPrefItem::setOptionValue( name, val );
+}
+
+void QtxPagePrefSliderItem::setIcon( int pos )
+{
+  int index = pos - mySlider->minimum();
+  if ( !myIcons.isEmpty() && index >= 0 && index < myIcons.size() && !myIcons[index].isNull() )
+    myLabel->setPixmap( myIcons[index].pixmap( myIcons[index].availableSizes().first() ) );
+  else
+    myLabel->clear();
+}
+
+/*!
+  \brief Update slider widget.
+*/
+void QtxPagePrefSliderItem::updateSlider()
+{
+  int val = mySlider->value();
+  int stp = singleStep();
+  int ptp = pageStep();
+  int min = minimum();
+  int max = maximum();
+
+  control()->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
+  mySlider->setFocusPolicy(Qt::StrongFocus);
+  
+  mySlider->setValue( val );
+  setSingleStep( stp );
+  setPageStep( ptp );
+  setMinimum( min );
+  setMaximum( max );
+  
+  myLabel->setVisible( !myIcons.empty() );
+  widget()->layout()->setSpacing( !myIcons.empty() ? 6 : 0 );
+}
+
+/*!
+  \brief Set the list of the icons from the resource manager.
+  \param var new icons list
+  \internal
+*/
+void  QtxPagePrefSliderItem::setIcons( const QVariant& var )
+{
+  if ( var.type() != QVariant::List )
+    return;
+
+  QList<QIcon> lst;
+  QList<QVariant> varList = var.toList();
+  for ( QList<QVariant>::const_iterator it = varList.begin(); it != varList.end(); ++it )
+  {
+    if ( (*it).canConvert<QIcon>() )
+      lst.append( (*it).value<QIcon>() );
+    else if ( (*it).canConvert<QPixmap>() )
+      lst.append( (*it).value<QPixmap>() );
+    else
+      lst.append( QIcon() );
+  }
+  setIcons( lst );
+}
+
 /*!
   \class QtxPagePrefSelectItem
   \brief GUI implementation of the resources selector item

diff --git a/src/Qtx/QtxPagePrefMgr.h b/src/Qtx/QtxPagePrefMgr.h
index f0c532458d69a06d0ca48bc63571b37d9b1343f6..62f1c88bdfa4e1a0c21c677a6c5208d1a9d4c6ac 100644 (file)
--- a/src/Qtx/QtxPagePrefMgr.h
+++ b/src/Qtx/QtxPagePrefMgr.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:      QtxPagePrefMgr.h
 // Author:    Sergey TELKOV
 //
@@ -51,6 +49,7 @@ class QListWidget;
 class QFileDialog;
 class QDateTimeEdit;
 class QStackedWidget;
+class QSlider;
 
 class QTX_EXPORT QtxPagePrefMgr : public QFrame, public QtxPreferenceMgr
 {
@@ -418,6 +417,47 @@ private:
   QLineEdit*       myEditor;
 };
 
+class QTX_EXPORT QtxPagePrefSliderItem : public QObject,public QtxPageNamedPrefItem
+{
+  Q_OBJECT
+
+public:
+  QtxPagePrefSliderItem( const QString&, QtxPreferenceItem* = 0,
+                         const QString& = QString(), const QString& = QString() );
+  virtual ~QtxPagePrefSliderItem();
+
+  int              singleStep() const;
+  int              pageStep() const;
+  int              minimum() const;
+  int              maximum() const;
+  QList<QIcon>     icons() const; 
+
+  void             setSingleStep( const int& );
+  void             setPageStep( const int& );
+  void             setMinimum( const int& );
+  void             setMaximum( const int& );
+  void             setIcons( const QList<QIcon>& );
+
+  virtual void     store();
+  virtual void     retrieve();
+
+protected:
+  virtual QVariant optionValue( const QString& ) const;
+  virtual void     setOptionValue( const QString&, const QVariant& );
+
+private slots:
+ void             setIcon( int );
+
+private:
+  void             updateSlider();
+  void             setIcons( const QVariant& );
+
+private:
+  QSlider*         mySlider;
+  QLabel*          myLabel;
+  QList<QIcon>     myIcons;
+};
+
 class QTX_EXPORT QtxPagePrefSelectItem : public QtxPageNamedPrefItem
 {
 public:

diff --git a/src/Qtx/QtxPathDialog.cxx b/src/Qtx/QtxPathDialog.cxx
index e344862bd8df88742295b03f1e3e4d42f348bb84..03ff2e654474e44aedbd1ce56b055e64307daf39 100755 (executable)
--- a/src/Qtx/QtxPathDialog.cxx
+++ b/src/Qtx/QtxPathDialog.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:      QtxPathDialog.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPathDialog.h b/src/Qtx/QtxPathDialog.h
index faf9335aebd435fa810fbbf686d5e49ee9b66d16..b2a76ed356d2f21141711453bd246fcc23486a98 100755 (executable)
--- a/src/Qtx/QtxPathDialog.h
+++ b/src/Qtx/QtxPathDialog.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:      QtxPathDialog.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPathEdit.cxx b/src/Qtx/QtxPathEdit.cxx
index 6075340fc30e07be1008b4235f3d3ef847bc53c0..f4f146213d79c2dace6c293e53f415f6e765ed4d 100644 (file)
--- a/src/Qtx/QtxPathEdit.cxx
+++ b/src/Qtx/QtxPathEdit.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:      QtxPathEdit.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPathEdit.h b/src/Qtx/QtxPathEdit.h
index eea26b66541575ac1b271bbdd834775f3c69be0a..f8422eec5106ed93950d9dd781590f88ebe91ff3 100644 (file)
--- a/src/Qtx/QtxPathEdit.h
+++ b/src/Qtx/QtxPathEdit.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:      QtxPathEdit.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPathListEdit.cxx b/src/Qtx/QtxPathListEdit.cxx
index 8ba42c2645b5aeb77eb828f2f3e2d5e2c766c87a..28e3b7e0914697383497f811fa8a9f64c576675f 100644 (file)
--- a/src/Qtx/QtxPathListEdit.cxx
+++ b/src/Qtx/QtxPathListEdit.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:      QtxPathListEdit.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPathListEdit.h b/src/Qtx/QtxPathListEdit.h
index 012a5adb85746a2bcf2220ade7eacd7ab6a7f3e1..3b37b95569e2b4d7ea51da8db6ed50f58679dc74 100644 (file)
--- a/src/Qtx/QtxPathListEdit.h
+++ b/src/Qtx/QtxPathListEdit.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:      QtxPathListEdit.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPopupMgr.cxx b/src/Qtx/QtxPopupMgr.cxx
index bccd7f399ec3c9fecc2e7855a563b0ad7e1956ad..ea60aac8731682a2970e29f099b3fe6ca8b98e4d 100644 (file)
--- a/src/Qtx/QtxPopupMgr.cxx
+++ b/src/Qtx/QtxPopupMgr.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:      QtxPopupMgr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPopupMgr.h b/src/Qtx/QtxPopupMgr.h
index 488c854411ac5d92bfc4ddd75a2e62034618dcd1..bdcb1357d9ebd9f7a1f378e8fb28629c034e7ac5 100644 (file)
--- a/src/Qtx/QtxPopupMgr.h
+++ b/src/Qtx/QtxPopupMgr.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:      QtxPopupMgr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPreferenceMgr.cxx b/src/Qtx/QtxPreferenceMgr.cxx
index 6758276d78b4424eae5dbf3cf020fce6493a9cdb..804808303fe87252cfbc49732508d623be27217e 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.cxx
+++ b/src/Qtx/QtxPreferenceMgr.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:      QtxPreferenceMgr.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxPreferenceMgr.h b/src/Qtx/QtxPreferenceMgr.h
index 8699d0bac77bd62c6d52f97baf985b409b916bca..2a4e1761892c178313b5b90fe91a1a755903cbb5 100644 (file)
--- a/src/Qtx/QtxPreferenceMgr.h
+++ b/src/Qtx/QtxPreferenceMgr.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:      QtxPreferenceMgr.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxResourceMgr.cxx b/src/Qtx/QtxResourceMgr.cxx
index addc1dce1267a86dff5915d624e86646724db846..f68c292bc11daa6e2751f0da3c98445ee8e8d04d 100644 (file)
--- a/src/Qtx/QtxResourceMgr.cxx
+++ b/src/Qtx/QtxResourceMgr.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:      QtxResourceMgr.cxx
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxResourceMgr.h b/src/Qtx/QtxResourceMgr.h
index 626abe1f10c8da07901c8525f5a97f950433b981..5c997077743c559a116fe5f2d122f5f502f517d5 100644 (file)
--- a/src/Qtx/QtxResourceMgr.h
+++ b/src/Qtx/QtxResourceMgr.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:      QtxResourceMgr.h
 // Author:    Alexander SOLOVYOV, Sergey TELKOV
 //

diff --git a/src/Qtx/QtxRubberBand.cxx b/src/Qtx/QtxRubberBand.cxx
index e93c644add2d05bd173b8d99a04db44a360afaef..cfaeed5925b3aedcebc24b8828eb2cfabb83a04b 100755 (executable)
--- a/src/Qtx/QtxRubberBand.cxx
+++ b/src/Qtx/QtxRubberBand.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:      QtxRubberBand.cxx
 // Author:    Alexander A. BORODIN
 //

diff --git a/src/Qtx/QtxRubberBand.h b/src/Qtx/QtxRubberBand.h
index 9c90581bee0084da23bf26ca0d81bf786978a7a9..07d328cbc4e69473b8974c8482762d9d6eeccf48 100755 (executable)
--- a/src/Qtx/QtxRubberBand.h
+++ b/src/Qtx/QtxRubberBand.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:      QtxRubberBand.h
 // Author:    Alexander A. BORODIN
 //

diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index c63c902d58c3054820cdae211a9fd862eddfb621..743407527c613c9a1745d0c6f0e83d8fb9f0ab92 100644 (file)
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.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   : QtxSearchTool.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Qtx/QtxSearchTool.h b/src/Qtx/QtxSearchTool.h
index 26afe3830f88b7cf95e99be2e3c263e828c6080b..c6a284728c450b0605dcc36c92b14b30ab6d561b 100644 (file)
--- a/src/Qtx/QtxSearchTool.h
+++ b/src/Qtx/QtxSearchTool.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   : QtxSearchTool.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx
index 465a42bae44f7e6df36ac4b65e083c4907c1976c..93747c265cea77820e6ddf97ac65b6ed0d535092 100644 (file)
--- a/src/Qtx/QtxSplash.cxx
+++ b/src/Qtx/QtxSplash.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   : QtxSplash.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h
index 66431803e92d8f8d19ccf25edbefff4fee35d69f..b7eeffeef4c97a4bb9e25de2386c5897e87fa3c9 100644 (file)
--- a/src/Qtx/QtxSplash.h
+++ b/src/Qtx/QtxSplash.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   : QtxSplash.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Qtx/QtxTable.cxx b/src/Qtx/QtxTable.cxx
index 63ab2b30afee88dbd62666f557324d447bc8c8a1..6b7d0ab80f4957c63be7a381e31236299507c902 100644 (file)
--- a/src/Qtx/QtxTable.cxx
+++ b/src/Qtx/QtxTable.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:      QtxTable.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxTable.h b/src/Qtx/QtxTable.h
index 398b0305a11f209fd0b2268b6ba8b4e4f678f581..2a58d12c9588bc07392852a714779ae88e008467 100644 (file)
--- a/src/Qtx/QtxTable.h
+++ b/src/Qtx/QtxTable.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:      QtxTable.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxToolBar.cxx b/src/Qtx/QtxToolBar.cxx
index 23c1ca52b02d8aca343d377e020deda8c66b5f52..821b514da6ef146e49e130281000efba5362b93a 100644 (file)
--- a/src/Qtx/QtxToolBar.cxx
+++ b/src/Qtx/QtxToolBar.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:      QtxToolBar.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxToolBar.h b/src/Qtx/QtxToolBar.h
index 8b3044272618f942fc5804213f0d1d6419bd05d7..1ad762df333aae660f00caf8f14a92f73660a79d 100644 (file)
--- a/src/Qtx/QtxToolBar.h
+++ b/src/Qtx/QtxToolBar.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:      QtxToolBar.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxToolTip.cxx b/src/Qtx/QtxToolTip.cxx
index c05ad144954f23b99bf001d0a6d0df48550731b6..b582387aa889206394e3e5181c1a2f76f087f231 100755 (executable)
--- a/src/Qtx/QtxToolTip.cxx
+++ b/src/Qtx/QtxToolTip.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:      QtxToolTip.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxToolTip.h b/src/Qtx/QtxToolTip.h
index b8586b6f696329dcacb8138458520416c8d8eb21..09c69256ff9f9c5d513770649dea410784a52b5e 100755 (executable)
--- a/src/Qtx/QtxToolTip.h
+++ b/src/Qtx/QtxToolTip.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:      QtxToolTip.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxTranslator.cxx b/src/Qtx/QtxTranslator.cxx
index 624dfba327a0391d45bf822c1110a27416b53ad6..d8413a137cd40f2905851c7af3d0bb1adae9c265 100644 (file)
--- a/src/Qtx/QtxTranslator.cxx
+++ b/src/Qtx/QtxTranslator.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:      QtxTranslator.cxx
 // Author:    Alexander SOLOVYOV
 //

diff --git a/src/Qtx/QtxTranslator.h b/src/Qtx/QtxTranslator.h
index 99d1d78bacaf4cb499b8e2b8aed0b9a5d08f89c2..b7acab7d180e25b7ef9374a5f731bff6a98fa932 100644 (file)
--- a/src/Qtx/QtxTranslator.h
+++ b/src/Qtx/QtxTranslator.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:      QtxTranslator.h
 // Author:    Alexander SOLOVYOV
 //

diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx
index f0ff8d0b8e1d7e93d101e9e57a40e9468498451d..ef551abc427917db6a2c74653f53f06a11776aa1 100644 (file)
--- a/src/Qtx/QtxTreeView.cxx
+++ b/src/Qtx/QtxTreeView.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:      QtxTreeView.cxx
 // Author:    Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -321,18 +319,6 @@ void QtxTreeView::selectionChanged( const QItemSelection& selected,
   emit( selectionChanged() );
 }
 
-/*!
-  \brief Called when rows are about to be removed.
-  \param parent model index
-  \param start first row to remove
-  \param end last row to remove
-*/
-void QtxTreeView::rowsAboutToBeRemoved( const QModelIndex& parent, int start, int end )
-{
-  setCurrentIndex( QModelIndex() );
-  QTreeView::rowsAboutToBeRemoved( parent, start, end );
-}
-
 /*!
   \brief Expand/collapse the specified item (recursively).
   \param index model index

diff --git a/src/Qtx/QtxTreeView.h b/src/Qtx/QtxTreeView.h
index 2a65382b2d8e65bd60d5d219e69d0035f5ce7e0e..af16b8284bf50df31c801e30b99083089f54a00b 100644 (file)
--- a/src/Qtx/QtxTreeView.h
+++ b/src/Qtx/QtxTreeView.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:      QtxTreeView.h
 // Author:    Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -59,7 +57,6 @@ public:
 
 protected slots:
   void     onHeaderClicked( int );
-  void     rowsAboutToBeRemoved( const QModelIndex&, int, int );
   void     selectionChanged( const QItemSelection&, const QItemSelection& );
   void     onAppropriate( Qt::Orientation, int, int );
   

diff --git a/src/Qtx/QtxValidator.cxx b/src/Qtx/QtxValidator.cxx
index e4fec68e3b909e4e6ef72535f3ac478e7a59e350..a720f59efb2bc952a2b6a4140b4d2fe0f39a63a5 100644 (file)
--- a/src/Qtx/QtxValidator.cxx
+++ b/src/Qtx/QtxValidator.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:      QtxValidator.cxx
 // Author:    Alexandre SOLOVYOV
 //

diff --git a/src/Qtx/QtxValidator.h b/src/Qtx/QtxValidator.h
index 4f02deb6753230cd7a80f1c7ed435d36a365e78a..e91c64c7e1a4153cef2bbd70ce6e4d583944d9e6 100644 (file)
--- a/src/Qtx/QtxValidator.h
+++ b/src/Qtx/QtxValidator.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:      QtxValidator.h
 // Author:    Alexandre SOLOVYOV
 //

diff --git a/src/Qtx/QtxWorkspace.cxx b/src/Qtx/QtxWorkspace.cxx
index 90bef875b2d661216013c049289461e352577bf3..bd6d0212faada39144551a828c021620d1d9008a 100644 (file)
--- a/src/Qtx/QtxWorkspace.cxx
+++ b/src/Qtx/QtxWorkspace.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:      QtxWorkspace.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkspace.h b/src/Qtx/QtxWorkspace.h
index 85bab25c08da6518b884a23e4793f193219c92ee..27765655dc9caf7372695aab52208d3838e43f88 100644 (file)
--- a/src/Qtx/QtxWorkspace.h
+++ b/src/Qtx/QtxWorkspace.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:      QtxWorkspace.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkspaceAction.cxx b/src/Qtx/QtxWorkspaceAction.cxx
index be6db8a1bc1804cc483f9a15aaf020569612ef18..12512e74fd28875fc91403fc313f8610cb8d6290 100644 (file)
--- a/src/Qtx/QtxWorkspaceAction.cxx
+++ b/src/Qtx/QtxWorkspaceAction.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:      QtxWorkspaceAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkspaceAction.h b/src/Qtx/QtxWorkspaceAction.h
index 0f5d89360530a1c692c2a9636c1dbe58cc80a823..0e6c92001eb194b75a6ecd87ce341494bcf87d0e 100644 (file)
--- a/src/Qtx/QtxWorkspaceAction.h
+++ b/src/Qtx/QtxWorkspaceAction.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:      QtxWorkspaceAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkstack.cxx b/src/Qtx/QtxWorkstack.cxx
index b1da1a5a8c32217c296dfbeb8189fe91b9a774be..ae651bf48c39cd5858a5718ae096384fe743ecd9 100644 (file)
--- a/src/Qtx/QtxWorkstack.cxx
+++ b/src/Qtx/QtxWorkstack.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:      QtxWorkstack.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkstack.h b/src/Qtx/QtxWorkstack.h
index 7571e18a8a19032a55477912ca7e5985b952407f..2f365318795b76512fd9cb6c50a921056a381697 100644 (file)
--- a/src/Qtx/QtxWorkstack.h
+++ b/src/Qtx/QtxWorkstack.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:      QtxWorkstack.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkstackAction.cxx b/src/Qtx/QtxWorkstackAction.cxx
index cd47695934a205bf89c774fd76f34b41b65e1966..dc9d5961ded873b72a76005c9a537cc86e6ec945 100644 (file)
--- a/src/Qtx/QtxWorkstackAction.cxx
+++ b/src/Qtx/QtxWorkstackAction.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:      QtxWorkstackAction.cxx
 // Author:    Sergey TELKOV
 //

diff --git a/src/Qtx/QtxWorkstackAction.h b/src/Qtx/QtxWorkstackAction.h
index aaa61b7863f9554e93faa927fc5444939ca80112..9258308899a060bbeb4297a93015b8e66f8e63c2 100644 (file)
--- a/src/Qtx/QtxWorkstackAction.h
+++ b/src/Qtx/QtxWorkstackAction.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:      QtxWorkstackAction.h
 // Author:    Sergey TELKOV
 //

diff --git a/src/QxGraph/Makefile.am b/src/QxGraph/Makefile.am
index 9e9874a0f7f75dc4aabe7b0a3f1ab6c630dfe703..a3ee2853c8d8567fd07a3d98bed08e3ec0b4f69b 100755 (executable)
--- a/src/QxGraph/Makefile.am
+++ b/src/QxGraph/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
@@ -23,7 +20,7 @@
 ##############################################################
 # VSR: WARNING! THIS PACKAGE IS OBSOLETE
 ##############################################################
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libQxGraph.la

diff --git a/src/QxGraph/QxGraph.h b/src/QxGraph/QxGraph.h
index 0a87b0c3fe9f308e139cb47deaef9e94c1be31cb..cbbb7361a9bdfd5e9fbfcda14360da4511fd158b 100644 (file)
--- a/src/QxGraph/QxGraph.h
+++ b/src/QxGraph/QxGraph.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 QxGraph : build Supervisor viewer into desktop
 //
 #ifdef WNT

diff --git a/src/QxGraph/QxGraph.pro b/src/QxGraph/QxGraph.pro
index deff370849d0b2d9266d978c939282011363b832..ac76e1c5d813b45ab74464408815b7aef73dc836 100644 (file)
--- a/src/QxGraph/QxGraph.pro
+++ b/src/QxGraph/QxGraph.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = QxGraph
 DESTDIR = ../../lib

diff --git a/src/QxGraph/QxGraph_ActiveItem.h b/src/QxGraph/QxGraph_ActiveItem.h
index aecf9294c1a0482e56ac3100ad1b8dc4b72c6d29..c41a75fee8e87aaeb28760d34f3cef0377316343 100644 (file)
--- a/src/QxGraph/QxGraph_ActiveItem.h
+++ b/src/QxGraph/QxGraph_ActiveItem.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 QXGRAPH_ACTIVEITEM_H
 #define QXGRAPH_ACTIVEITEM_H
 

diff --git a/src/QxGraph/QxGraph_Canvas.cxx b/src/QxGraph/QxGraph_Canvas.cxx
index 634f4d27d76a5ba6117766ef601e59bfbda5b165..ecdd66f73bad9926530e610d2604d76901e5333e 100644 (file)
--- a/src/QxGraph/QxGraph_Canvas.cxx
+++ b/src/QxGraph/QxGraph_Canvas.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 QxGraph : build Supervisor viewer into desktop
 //
 #include "QxGraph_Canvas.h"

diff --git a/src/QxGraph/QxGraph_Canvas.h b/src/QxGraph/QxGraph_Canvas.h
index 7425b46de6c7ea45f8725018a745a82df5767791..9eb752c492808f622be9dd0104a8fbd6658097b0 100644 (file)
--- a/src/QxGraph/QxGraph_Canvas.h
+++ b/src/QxGraph/QxGraph_Canvas.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 QxGraph : build Supervisor viewer into desktop
 //
 #ifndef QXGRAPH_CANVAS_H

diff --git a/src/QxGraph/QxGraph_CanvasView.cxx b/src/QxGraph/QxGraph_CanvasView.cxx
index 558186175e5783ff088cbbe7fbe47018d1aadb39..dda282fcf382f89974c87e26488e36aef9877133 100644 (file)
--- a/src/QxGraph/QxGraph_CanvasView.cxx
+++ b/src/QxGraph/QxGraph_CanvasView.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 QxGraph : build Supervisor viewer into desktop
 //
 #include "QxGraph_CanvasView.h"

diff --git a/src/QxGraph/QxGraph_CanvasView.h b/src/QxGraph/QxGraph_CanvasView.h
index 20f355ee77c99844b8fcbb06df6730d903331ba2..d6c643dd1e930ed6c3409545b88d96398cbeb271 100644 (file)
--- a/src/QxGraph/QxGraph_CanvasView.h
+++ b/src/QxGraph/QxGraph_CanvasView.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 QxGraph : build Supervisor viewer into desktop
 //
 #ifndef QXGRAPH_CANVASVIEW_H

diff --git a/src/QxGraph/QxGraph_Def.h b/src/QxGraph/QxGraph_Def.h
index 948fd964708d1c5d8e1b415634a67ffc343b9502..aa56af6b981fbc73706aacb52de64251fcaf5621 100644 (file)
--- a/src/QxGraph/QxGraph_Def.h
+++ b/src/QxGraph/QxGraph_Def.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 QxGraph : build Supervisor viewer into desktop
 //
 #ifndef QXGRAPH_DEF_H

diff --git a/src/QxGraph/QxGraph_Prs.cxx b/src/QxGraph/QxGraph_Prs.cxx
index 5b8fcd0cbb9387c16410a1e1223f006bab006b9c..d0a2be5096577bdfdc4d52cfd247a8f17a53a952 100644 (file)
--- a/src/QxGraph/QxGraph_Prs.cxx
+++ b/src/QxGraph/QxGraph_Prs.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 QxGraph : build Supervisor viewer into desktop
 //
 #include "QxGraph_Prs.h"

diff --git a/src/QxGraph/QxGraph_Prs.h b/src/QxGraph/QxGraph_Prs.h
index 83e49559f408b9b7bca6425eed8ffcc1ee1db018..24f0bb7ed7b8aa0e2cccdedf4f4475abed5e4b0f 100644 (file)
--- a/src/QxGraph/QxGraph_Prs.h
+++ b/src/QxGraph/QxGraph_Prs.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 QXGRAPH_PRS_H
 #define QXGRAPH_PRS_H
 

diff --git a/src/QxGraph/QxGraph_ViewManager.cxx b/src/QxGraph/QxGraph_ViewManager.cxx
index a003c04cfdbe5182f934364c0e68edc5796e479d..4fac426e23301d46008ecef3f95f97ad28814f77 100644 (file)
--- a/src/QxGraph/QxGraph_ViewManager.cxx
+++ b/src/QxGraph/QxGraph_ViewManager.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 "QxGraph_ViewManager.h"
 
 /*!

diff --git a/src/QxGraph/QxGraph_ViewManager.h b/src/QxGraph/QxGraph_ViewManager.h
index 4da3ef4fdb759d1b85e7a619e704cc60e8e2dbd3..97fdb7a4584f990706205a0177b7fa28b71f1666 100644 (file)
--- a/src/QxGraph/QxGraph_ViewManager.h
+++ b/src/QxGraph/QxGraph_ViewManager.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 QXGRAPH_VIEWMANAGER_H
 #define QXGRAPH_VIEWMANAGER_H
 

diff --git a/src/QxGraph/QxGraph_ViewModel.cxx b/src/QxGraph/QxGraph_ViewModel.cxx
index acaed5f410fdaefdcd1f21bfa29e65940d529ea8..4c34f82cea3ddee1b3024c202d318bcd3664ee20 100644 (file)
--- a/src/QxGraph/QxGraph_ViewModel.cxx
+++ b/src/QxGraph/QxGraph_ViewModel.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 "QxGraph_ViewModel.h"
 #include "QxGraph_ViewWindow.h"
 #include "QxGraph_Canvas.h"

diff --git a/src/QxGraph/QxGraph_ViewModel.h b/src/QxGraph/QxGraph_ViewModel.h
index 91e0fdf835aab4346d15ed48fcbf5d6aec9994b0..719881ad6502439e6aedd67654758647e12e87f7 100644 (file)
--- a/src/QxGraph/QxGraph_ViewModel.h
+++ b/src/QxGraph/QxGraph_ViewModel.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 QXGRAPH_VIEWMODEL_H
 #define QXGRAPH_VIEWMODEL_H
 

diff --git a/src/QxGraph/QxGraph_ViewWindow.cxx b/src/QxGraph/QxGraph_ViewWindow.cxx
index 2cc7ca6891c5e3c92eef140389d0ee4bcaa52700..1f1a1a85732bc0c88c6abe6ef8d3853b3fcec2a0 100644 (file)
--- a/src/QxGraph/QxGraph_ViewWindow.cxx
+++ b/src/QxGraph/QxGraph_ViewWindow.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 QxGraph : build Supervisor viewer into desktop
 //
 #include "QxGraph_ViewWindow.h"

diff --git a/src/QxGraph/QxGraph_ViewWindow.h b/src/QxGraph/QxGraph_ViewWindow.h
index 2de18419a8b9cb7202eb9e109e003c4e2e01486f..f86caa60bbfbacec638b4d77548f6664c55e1027 100644 (file)
--- a/src/QxGraph/QxGraph_ViewWindow.h
+++ b/src/QxGraph/QxGraph_ViewWindow.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 QxGraph : build Supervisor viewer into desktop
 //
 #ifndef QXGRAPH_VIEWWINDOW_H

diff --git a/src/QxGraph/resources/QxGraph_images.ts b/src/QxGraph/resources/QxGraph_images.ts
index 0d2e33a44e57f8d87139446bc4a09223ebee63a4..8171832e62df3994644789004accb1e5c3274271 100644 (file)
--- a/src/QxGraph/resources/QxGraph_images.ts
+++ b/src/QxGraph/resources/QxGraph_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/QxGraph/resources/QxGraph_msg_en.ts b/src/QxGraph/resources/QxGraph_msg_en.ts
index ba4779838153bcaa6874a6fe5a2ca047e71e56a0..ddd193551c0b9ef92f7be4d23e9327488a30c64d 100644 (file)
--- a/src/QxGraph/resources/QxGraph_msg_en.ts
+++ b/src/QxGraph/resources/QxGraph_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/QxScene/DebTrace.hxx b/src/QxScene/DebTrace.hxx
index 6350ae559d5cb7b6399bef2521410d6d39bfee2b..adde3cf1fc388ab8b9abf1d32d30a046b9cbab2b 100644 (file)
--- a/src/QxScene/DebTrace.hxx
+++ b/src/QxScene/DebTrace.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 __DEBTRACE_HXX__
 #define __DEBTRACE_HXX__
 

diff --git a/src/QxScene/Makefile.am b/src/QxScene/Makefile.am
index 86d9c2cafe364d27d10759ae2ed5cabb737e8fa8..d877bf81e3fb78a81f0e41d5cbb7212993ae3c8b 100755 (executable)
--- a/src/QxScene/Makefile.am
+++ b/src/QxScene/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
 
 lib_LTLIBRARIES = libQxScene.la

diff --git a/src/QxScene/QxScene.h b/src/QxScene/QxScene.h
index da83380cab5d58270feb9bf4edbeae9495c980ec..5498fc5c7393e861ea86d157107c6c0e5ce3a7d3 100644 (file)
--- a/src/QxScene/QxScene.h
+++ b/src/QxScene/QxScene.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
 //
+
 //  SALOME QxScene : build Supervisor viewer into desktop
 //
 #ifdef WNT

diff --git a/src/QxScene/QxScene_Def.h b/src/QxScene/QxScene_Def.h
index 369554a81df4c2b824a7327094742b1466872b47..b1255ee2ad6010a5b1890e4ebf946fe1c5a80216 100644 (file)
--- a/src/QxScene/QxScene_Def.h
+++ b/src/QxScene/QxScene_Def.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
 //
+
 //  SALOME QxScene : build Supervisor viewer into desktop
 //
 #ifndef QXSCENE_DEF_H

diff --git a/src/QxScene/QxScene_ViewManager.cxx b/src/QxScene/QxScene_ViewManager.cxx
index 38439ca344e1d6a6227c6ddd4a177e3648484063..4d3c1a8366a27bbfa2a0c6188fd76d3ee07383b0 100644 (file)
--- a/src/QxScene/QxScene_ViewManager.cxx
+++ b/src/QxScene/QxScene_ViewManager.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 "QxScene_ViewManager.h"
 #include "QxScene_ViewWindow.h"
 

diff --git a/src/QxScene/QxScene_ViewManager.h b/src/QxScene/QxScene_ViewManager.h
index 924084c74a1069396ea203c43143e8a27a0035a7..62330407274633ff702d68beba3d868579489c9e 100644 (file)
--- a/src/QxScene/QxScene_ViewManager.h
+++ b/src/QxScene/QxScene_ViewManager.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 QXSCENE_VIEWMANAGER_H
 #define QXSCENE_VIEWMANAGER_H
 

diff --git a/src/QxScene/QxScene_ViewModel.cxx b/src/QxScene/QxScene_ViewModel.cxx
index 5d2e6755d22fc45e494c5052e2802fe5b7d2ee51..4f3f292b671847a07faae12b79754a22e76b9265 100644 (file)
--- a/src/QxScene/QxScene_ViewModel.cxx
+++ b/src/QxScene/QxScene_ViewModel.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 "QxScene_ViewModel.h"
 #include "QxScene_ViewWindow.h"
 #include "QxScene_ViewManager.h"

diff --git a/src/QxScene/QxScene_ViewModel.h b/src/QxScene/QxScene_ViewModel.h
index 565532c2b6e86e2ed0b4c60fbac535d98e36be7b..a61e7993d52e3194c99095754ac6fe12f34b8cb2 100644 (file)
--- a/src/QxScene/QxScene_ViewModel.h
+++ b/src/QxScene/QxScene_ViewModel.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 QXSCENE_VIEWMODEL_H
 #define QXSCENE_VIEWMODEL_H
 

diff --git a/src/QxScene/QxScene_ViewWindow.cxx b/src/QxScene/QxScene_ViewWindow.cxx
index 3c15b1dc7343f37a6453e42a51bcee610341b313..76b9537e0bdb0ef831e1d386a832b6c185f64ead 100644 (file)
--- a/src/QxScene/QxScene_ViewWindow.cxx
+++ b/src/QxScene/QxScene_ViewWindow.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 QxScene : build Supervisor viewer into desktop
 //
 #include "QxScene_ViewWindow.h"

diff --git a/src/QxScene/QxScene_ViewWindow.h b/src/QxScene/QxScene_ViewWindow.h
index dd1f8aa4eadf81a9abb495d0cccb5d932f0342df..19299e1d7e5430568cf9c985a2b39bebde04b90c 100644 (file)
--- a/src/QxScene/QxScene_ViewWindow.h
+++ b/src/QxScene/QxScene_ViewWindow.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
 //
+
 //  SALOME QxScene : build Supervisor viewer into desktop
 //
 #ifndef QXSCENE_VIEWWINDOW_H

diff --git a/src/QxScene/resources/QxSceneViewer_images.ts b/src/QxScene/resources/QxSceneViewer_images.ts
index 755bb16b0b30093cc367aa1b578638f3b1919ef9..69bb07b0dec347f4340bb7654ea3f2f87f55b8af 100644 (file)
--- a/src/QxScene/resources/QxSceneViewer_images.ts
+++ b/src/QxScene/resources/QxSceneViewer_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/QxScene/resources/QxSceneViewer_msg_en.ts b/src/QxScene/resources/QxSceneViewer_msg_en.ts
index e8188cd71158e1762e5bead8361599b174673d45..4ad001ec8020b8302272fbc50c8a57ee71945725 100644 (file)
--- a/src/QxScene/resources/QxSceneViewer_msg_en.ts
+++ b/src/QxScene/resources/QxSceneViewer_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/ResExporter/Makefile.am b/src/ResExporter/Makefile.am
index e2f33242633e88267028fed5d0f42e3bb84ae098..039da37ad286d94f497bf43de312fbafc3146452 100755 (executable)
--- a/src/ResExporter/Makefile.am
+++ b/src/ResExporter/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 bin_PROGRAMS = ResourceExporter

diff --git a/src/ResExporter/ResExporter.pro b/src/ResExporter/ResExporter.pro
index 8d5157cb43ed1615e9725c7d93f2c105f64a5c47..3fb3ecb2032ef5bad94e9d0b05ccd47b684bf089 100644 (file)
--- a/src/ResExporter/ResExporter.pro
+++ b/src/ResExporter/ResExporter.pro
@@ -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
 #
+
 TEMPLATE = 
 TARGET = ResourceExporter
 DESTDIR = ../../bin

diff --git a/src/ResExporter/ResourceExporter.cxx b/src/ResExporter/ResourceExporter.cxx
index 9a4ebba2c94d6d4ffbd40da3f206166e085b3586..19d55fda8c1eedbadb0866e73b30daffb4fd6da2 100644 (file)
--- a/src/ResExporter/ResourceExporter.cxx
+++ b/src/ResExporter/ResourceExporter.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    : ResourceExporter.cxx
 // Author  : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SALOME_PY/Makefile.am b/src/SALOME_PY/Makefile.am
index f91fcc7be32fd36ad0268fe84ba84c124e71ab54..6dad1e3c41c2a181b39dc95aa51f1c1a34a975f6 100755 (executable)
--- a/src/SALOME_PY/Makefile.am
+++ b/src/SALOME_PY/Makefile.am
@@ -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 SALOME_PY : binding of VTK graphics and Python
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF

diff --git a/src/SALOME_PY/SalomePy.cxx b/src/SALOME_PY/SalomePy.cxx
index 9e7db3d17a9c8654bf5de31e5129cb112b923723..5fbdab8b2e5df14ea9bb6ab7f4c63ec4c52392fc 100755 (executable)
--- a/src/SALOME_PY/SalomePy.cxx
+++ b/src/SALOME_PY/SalomePy.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 SALOME_PY : binding of VTK graphics and Python
 //  File   : SalomePy.cxx
 //  Author : Paul RASCLE, EDF

diff --git a/src/SALOME_PYQT/Makefile.am b/src/SALOME_PYQT/Makefile.am
index 58b39484691b0f90c9f63785c94fbf8f3226f296..842aa1a5ae6650d18dfea5c0caffb74075308d52 100755 (executable)
--- a/src/SALOME_PYQT/Makefile.am
+++ b/src/SALOME_PYQT/Makefile.am
@@ -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   : Makefile.in
 #  Author : Patrick GOLDBRONN (CEA)
 #  Module : SALOME

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
index 99dacc936758d3bb87469b0111e9af734e228c27..f4ad800fb64e1f31551d7d39c49e112c06d256b2 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.am
@@ -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   : Makefile.in
 #  Author : Nicolas REJNERI
 #  Module : SALOME
@@ -48,7 +49,7 @@ nodist_libSalomePyQtGUI_la_SOURCES = $(MOC_FILES)
 libSalomePyQtGUI_la_CPPFLAGS = $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES)       \
        $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS)               \
        -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -DCALL_OLD_METHODS                            \
-       -I@builddir@ -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp             \
+       -I. -I$(srcdir)/../../PyInterp -I$(srcdir)/../../SalomeApp              \
        -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp         \
        -I$(srcdir)/../SALOME_PYQT_GUILight                                             \
        -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer                            \

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h
index 61cc769dcd1c99d64654adc7d2e44e9ddc182498..a9645d2a53a8ea7190430ea3c4a568e651f573a5 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_GUI.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   : SALOME_PYQT_GUI.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
index 10d777ce25873add7cc7721a289a8569c663055f..14bcf08bd1f45e187d10887ed6850266efc5793d 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_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,10 +19,10 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File   : SALOME_PYQT_Module.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #include <PyInterp_Dispatcher.h>
 
 #include "SALOME_PYQT_Module.h"

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
index 74b190935e317d44fd51828144de80b4476b0318..950f723ed01091bbbc5a6235780b1c6a5d25e219 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_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
 //
+
 // File   : SALOME_PYQT_Module.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am b/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
index 47defba2aa14a5f2e01e31b561d08473f0b6c94d..1b0fb478b734c38c78fdded3a038df7dfe37a960 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/Makefile.am
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/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,10 +16,10 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.am
 #  Author : Roman NIKOLAEV Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
-
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Library target
@@ -70,7 +67,7 @@ nodist_libSalomePyQtGUILight_la_SOURCES = $(MOC_FILES) $(SIP_SRC)
 libSalomePyQtGUILight_la_CPPFLAGS =  $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) \
        $(CAS_CPPFLAGS) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS)               \
        -DHAVE_CONFIG_H @KERNEL_CXXFLAGS@ -DCALL_OLD_METHODS                            \
-       -I@builddir@ -I$(srcdir)/../../PyInterp -I$(srcdir)/../../PyConsole             \
+       -I. -I$(srcdir)/../../PyInterp -I$(srcdir)/../../PyConsole              \
        -I$(srcdir)/../../SUIT -I$(srcdir)/../../Qtx -I$(srcdir)/../../LightApp         \
        -I$(srcdir)/../../Plot2d -I$(srcdir)/../../OCCViewer                            \
        -I$(srcdir)/../../CAM -I$(srcdir)/../../STD                                     \

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
index 614dfba64070560ffaf38238f8406e33887d0200..a1067426f973865f98384f070ff099c5407ecad3 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.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
@@ -18,10 +15,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
+//
 #include "PyInterp_Interp.h" // // !!! WARNING !!! THIS INCLUDE MUST BE THE VERY FIRST !!!
 
 #include "SALOME_PYQT_DataModelLight.h" 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
index 275c084d4f16b0e5084543017a371f53de78dc7e..6942445522a795f243d52421904305755eddc0d3 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataModelLight.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
@@ -18,10 +15,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
+//
 #ifndef SALOME_PYQT_DATAMODELLIGHT_H
 #define SALOME_PYQT_DATAMODELLIGHT_H
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
index 9e0ef56d621cdb3431aca02f7d7456ce7dc5f062..7b9df644c43341e0870b2ccb74914d80c68e69d0 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.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
@@ -18,11 +15,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
-
+//
 #include "SALOME_PYQT_DataObjectLight.h"
 #include <LightApp_Application.h>
 #include <SUIT_Session.h>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
index a99e0212ab9945fde9c4f527d9ce78d379c3650b..e2bca6dcc95051d4fa3ccb102e45104e5e8c1ce8 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_DataObjectLight.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
@@ -18,11 +15,11 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
-
+//
 #ifndef SALOME_PYQT_DATAOBJECTLIGHT_H
 #define SALOME_PYQT_DATAOBJECTLIGHT_H
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
index 12ab128a48745b0c626f306e5e2beae40ca4bec9..14469be306416ef7847a03c94a4f6a3ee3635c76 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.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   : SALOME_PYQT_GUI.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #if !defined ( SALOME_PYQT_GUILIGHT_H )
 #define SALOME_PYQT_GUIILIGHT_H
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
index df8efca88c067b279114b4595560a5cfc9c25b7d..f4c0dafc092940e02fafa763430d759feb351911 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_GUILight.sip
@@ -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

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
index b9e9bed8d94c2d766770b5d3a15e83052129f0a5..50861058ac3a4b190904f563c328decf56d32655 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.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   : SALOME_PYQT_Module.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #include "SALOME_PYQT_PyInterp.h"
 #include <SUITApp_init_python.hxx>
 #include <PyInterp_Interp.h>

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
index 6326e1df8568d25f986593e922b65ac8a325778b..90fce396956d1d17c45ea190280b62724923e330 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_ModuleLight.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   : SALOME_PYQT_Module.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
-
 #ifndef SALOME_PYQT_MODULELIGHT_H
 #define SALOME_PYQT_MODULELIGHT_H
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
index eac78e7eac3e79883cd5c2b88aca20be23278fe5..a37cd4ae48eb6a73ea9076a0e4517610d7797ce9 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.cxx
@@ -1,3 +1,21 @@
+//  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
+//
 
 #include "SALOME_PYQT_PyInterp.h" // this include must be first !!
 

diff --git a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h
index dc99adcdac112e0a02c1ffbd3cf08b3ff5704297..4629a016f07ffe30214fbc35116b81f2a8fdd347 100644 (file)
--- a/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.h
+++ b/src/SALOME_PYQT/SALOME_PYQT_GUILight/SALOME_PYQT_PyInterp.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,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  File   : SALOME_PYQT_Module.h
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 13/04/2009
-
-
+//
 #ifndef SALOME_PYQT_PYINTERP_H
 #define SALOME_PYQT_PYINTERP_H
 

diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am
index 6e82b8f098f6cdb5c26f3f74bb3f3f86ccca2081..223858437a1a970e2b689c06023d2d4c7fa143f8 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/Makefile.am
+++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am
@@ -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   : Makefile.in
 #  Author : Nicolas REJNERI
 #  Module : SALOME

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
index b7efe52de8035fcac1f93623c579cea4068b83c7..bfda59f2dd1e6386088370fd2949cc52f9215d86 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.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   : SalomePyQt.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -1521,7 +1522,7 @@ public:
   CrMenu( QAction* action, const QString& menu, const int id, const int group, const int idx ) 
     : myCase( 5 ), myAction( action ), myMenuName( menu ), myId( id ), myGroup( group ), myIndex( idx ) {}
 
-  int execute( SALOME_PYQT_ModuleLight* module ) const
+  int execute( LightApp_Module* module ) const
   {
     if ( module ) {
       switch ( myCase ) {
@@ -1562,9 +1563,12 @@ public:
     : myResult( -1 ), myCrMenu( crMenu ) {}
   virtual void Execute()
   {
-    SALOME_PYQT_ModuleLight* module = getActiveModule();
-    if ( module )
-      myResult = myCrMenu.execute( module );
+    if ( LightApp_Application* anApp = getApplication() ) 
+      {
+        LightApp_Module* module = dynamic_cast<LightApp_Module*>( anApp->activeModule() );
+        if ( module )
+          myResult = myCrMenu.execute( module );
+      }
   }
 };
 

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
index 0818fe7cf5a2a95b0ded3af40b2f037c9e467094..0aaa9f395cb0772080c90bfa7e8cb4475cbf8dd0 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.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   : SalomePyQt.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
index 65d493cf81814ff0e3a6465dd9b9f3014ead039c..60bbb4f420ac7de3c64d4312399eea3548fea43f 100644 (file)
--- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
+++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip
@@ -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/src/SALOME_SWIG/Help.py b/src/SALOME_SWIG/Help.py
index ac63a5f58b80f9f5026f8c4119e79026529f0179..c8a73874de583b24ba870349eebf68684236459f 100755 (executable)
--- a/src/SALOME_SWIG/Help.py
+++ b/src/SALOME_SWIG/Help.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
 #
+
 #  File   : Help.py
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME

diff --git a/src/SALOME_SWIG/Makefile.am b/src/SALOME_SWIG/Makefile.am
index 039ba353723d412f6bc093b478b48d683321d7a2..91a7a133c1245493e53e02f2c3056049c206181f 100755 (executable)
--- a/src/SALOME_SWIG/Makefile.am
+++ b/src/SALOME_SWIG/Makefile.am
@@ -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   : Makefile.in
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME

diff --git a/src/SALOME_SWIG/PyInterp.py b/src/SALOME_SWIG/PyInterp.py
index daf3d2a657785a712b4582fa4bf59193e56ee30e..40f624cb1f6ad6f9fe193828ce8b807d91912e4f 100755 (executable)
--- a/src/SALOME_SWIG/PyInterp.py
+++ b/src/SALOME_SWIG/PyInterp.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
 #
+
 #  File   : PyInterp.py
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME

diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
index 4d212eeb336b63d535cbb473505fb4b88a7995cf..2a33e342f2f7291e59f78009cd3586a78dc980ca 100644 (file)
--- a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx
+++ b/src/SALOME_SWIG/SALOMEGUI_Swig.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 SALOMEGUI : implementation of desktop and GUI kernel
 // File   : SALOMEGUI_Swig.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)

diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.hxx b/src/SALOME_SWIG/SALOMEGUI_Swig.hxx
index 02eced3736086e4a62a7b5ad3f9a3bfe3c44a32a..0240dbf707d5a05f62555eced7b0b701454a4041 100644 (file)
--- a/src/SALOME_SWIG/SALOMEGUI_Swig.hxx
+++ b/src/SALOME_SWIG/SALOMEGUI_Swig.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 SALOMEGUI : implementation of desktop and GUI kernel
 // File   : SALOMEGUI_Swig.hxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)

diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.i b/src/SALOME_SWIG/SALOMEGUI_Swig.i
index b53eca5137143c9d6cd0af37b0ff3bf4e01973a3..e09db10bc6f5ab0364e11d61a9821dc2e6db7990 100644 (file)
--- a/src/SALOME_SWIG/SALOMEGUI_Swig.i
+++ b/src/SALOME_SWIG/SALOMEGUI_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
 //
+
 //  SALOME SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOMEGUI_Swig.i
 //  Author : Paul RASCLE, EDF

diff --git a/src/SALOME_SWIG/SALOMEGUI_shared_modules.py b/src/SALOME_SWIG/SALOMEGUI_shared_modules.py
index 8d720a62057d12123a86f89847049f0f737baaaa..a6cbe44cf695ecfe9b6f4ca72fa0fc740e2a9e2e 100755 (executable)
--- a/src/SALOME_SWIG/SALOMEGUI_shared_modules.py
+++ b/src/SALOME_SWIG/SALOMEGUI_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/SALOME_SWIG/examplevtk1.py b/src/SALOME_SWIG/examplevtk1.py
index d340da560ab59131d8492d56faca36e3cbb86e44..715bbe26ac64cec755166bdd5ddd7661500a795e 100755 (executable)
--- a/src/SALOME_SWIG/examplevtk1.py
+++ b/src/SALOME_SWIG/examplevtk1.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
 #
+
 #  File   : examplevtk1.py
 #  Module : SALOME
 #

diff --git a/src/SALOME_SWIG/libSALOME_Swig.i b/src/SALOME_SWIG/libSALOME_Swig.i
index 14e318090d21d17095b5a3b29f568fc0623059f9..576705fe297a3f4393f6ad2141f8573cc1ca5f0d 100755 (executable)
--- a/src/SALOME_SWIG/libSALOME_Swig.i
+++ b/src/SALOME_SWIG/libSALOME_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
 //
+
 //  File   : libSALOME_Swig.i
 //  Author : Paul RASCLE, EDF
 //  Module : SALOME

diff --git a/src/SALOME_SWIG/salome.py b/src/SALOME_SWIG/salome.py
index 29e969ec485839d424ba44217d4c6ce79d785644..57ea44ca67d31303c4f77d2e005fd956422e8e7b 100755 (executable)
--- a/src/SALOME_SWIG/salome.py
+++ b/src/SALOME_SWIG/salome.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
 #
+
 #  File   : salome.py
 #  Author : Paul RASCLE, EDF
 #  Module : SALOME

diff --git a/src/SALOME_SWIG/supervisionexample.py.in b/src/SALOME_SWIG/supervisionexample.py.in
index 36a97cc412d2227f365d8dc20ee11b2f5241947f..90906b2b3d5180fdbe288288c0913f0e6c76abb7 100755 (executable)
--- a/src/SALOME_SWIG/supervisionexample.py.in
+++ b/src/SALOME_SWIG/supervisionexample.py.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,13 +19,14 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #==============================================================================
 #  File      : supervisionexample.py
 #  Created   : 23 nov 2001
 #  Author    : Jean Rahuel
 #  Project   : SALOME
 #==============================================================================
-
+#
 from SuperV import *
 
 

diff --git a/src/SALOME_SWIG/supervisiongeomexample.py.in b/src/SALOME_SWIG/supervisiongeomexample.py.in
index 09a2bf40dc43774119f34ddaf42ccf1fbe665158..b339426ff4f000233fb1268420ca1a56a8b7c33d 100755 (executable)
--- a/src/SALOME_SWIG/supervisiongeomexample.py.in
+++ b/src/SALOME_SWIG/supervisiongeomexample.py.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
@@ -21,7 +21,7 @@
 #
 
 # Generated python file of Graph GraphGeom2Essai
-
+#
 from SuperV import *
 
 import salome

diff --git a/src/SALOME_SWIG/test_big_table.py b/src/SALOME_SWIG/test_big_table.py
index 5112181b66ddbe854b0ff068e4d00e7a7203bd89..060d6ec1c39c5e634284ce5089200822b5f13df8 100755 (executable)
--- a/src/SALOME_SWIG/test_big_table.py
+++ b/src/SALOME_SWIG/test_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
 #
+
 # File   : test_big_table.py
 # Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 #

diff --git a/src/SALOME_SWIG/test_many_objects.py b/src/SALOME_SWIG/test_many_objects.py
index 43751af4fb8247c75075c5541554418af5f36f34..68b10d9114df59e76dad5e3b360da66a43f56a20 100755 (executable)
--- a/src/SALOME_SWIG/test_many_objects.py
+++ b/src/SALOME_SWIG/test_many_objects.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
 #
+
 # File   : visu_many_objects.py
 # Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 #

diff --git a/src/SALOME_SWIG/test_remove_ref.py b/src/SALOME_SWIG/test_remove_ref.py
index 5205a586347a277d9b0556632dd5ce59927247f2..4b8be4f35947be29bfb9fcc718cef4446013052b 100755 (executable)
--- a/src/SALOME_SWIG/test_remove_ref.py
+++ b/src/SALOME_SWIG/test_remove_ref.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
 #
+
 #  File   : test_remove_ref.py
 #  Module : SALOMEDS     
 #

diff --git a/src/SALOME_SWIG/test_table.py b/src/SALOME_SWIG/test_table.py
index dab3d7f0665fd11880b2381deae0472d4c6a2a9a..a1b2a94d90cbffbc122903b4d9e52abc9e2d4c3f 100755 (executable)
--- a/src/SALOME_SWIG/test_table.py
+++ b/src/SALOME_SWIG/test_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
 #
+
 # File   : test_table.py
 # Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 #

diff --git a/src/SOCC/Makefile.am b/src/SOCC/Makefile.am
index 077604f77c15e220886b37af6951e362d2cd947d..9682c229cc07e9215bb1cad6c055e4fd6274cc9f 100755 (executable)
--- a/src/SOCC/Makefile.am
+++ b/src/SOCC/Makefile.am
@@ -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   : Makefile.in
 #  Author : Alexander Solovyov(OCN)
 #  Module : SOCC

diff --git a/src/SOCC/SOCC.h b/src/SOCC/SOCC.h
index 329f60208c762fd38e16005c7f928d35b1cd17f0..82c43ad85a9f32ed22c13abd4c643ca85cd2d302 100755 (executable)
--- a/src/SOCC/SOCC.h
+++ b/src/SOCC/SOCC.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
 //
+
 #ifdef WIN32
 #if defined SOCC_EXPORTS
 #define SOCC_EXPORT __declspec(dllexport)

diff --git a/src/SOCC/SOCC.pro b/src/SOCC/SOCC.pro
index 1caf6c28de2da87c5c9e21d2285050e5c91614ea..592522e90fc27ee1e967c944b59c0eb56df78a74 100644 (file)
--- a/src/SOCC/SOCC.pro
+++ b/src/SOCC/SOCC.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SOCC
 DESTDIR = ../../lib

diff --git a/src/SOCC/SOCC_Prs.cxx b/src/SOCC/SOCC_Prs.cxx
index 1f4c379d5d006aa3069e402c89de4f2bc7ea427e..5cee85e1c1b9c70ab22c1913256a675901e0f5c9 100644 (file)
--- a/src/SOCC/SOCC_Prs.cxx
+++ b/src/SOCC/SOCC_Prs.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 OCCViewer : build OCC Viewer into Salome desktop
 //  File   : SOCC_Prs.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/SOCC/SOCC_Prs.h b/src/SOCC/SOCC_Prs.h
index 007a68f90ac7806063e62fc26b76f057f9a9ad0c..641f904f40dafef808970e32f3f0c62e57f44a44 100644 (file)
--- a/src/SOCC/SOCC_Prs.h
+++ b/src/SOCC/SOCC_Prs.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 OCCViewer : build OCC Viewer into Salome desktop
 //  File   : SOCC_Prs.h
 //  Author : Sergey ANIKIN

diff --git a/src/SOCC/SOCC_ViewModel.cxx b/src/SOCC/SOCC_ViewModel.cxx
index c7a19b522f62fe978db9494ff375d8396a38f100..260bed36e5692ef21b8d2a56c520b18d6fd0c7b7 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.cxx
+++ b/src/SOCC/SOCC_ViewModel.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 "SOCC_ViewModel.h"
 
 #include "SOCC_Prs.h"
@@ -58,6 +59,8 @@
 
 #include <AIS_TypeOfIso.hxx>
 
+#include <Precision.hxx>
+
 // in order NOT TO link with SalomeApp, here the code returns SALOMEDS_Study.
 // SalomeApp_Study::studyDS() does it as well, but -- here it is retrieved from 
 // SALOMEDS::StudyManager - no linkage with SalomeApp. 
@@ -673,6 +676,12 @@ bool SOCC_Viewer::getTrihedronSize( double& theNewSize, double& theSize )
   if ( aMaxSide < Ymax -Ymin ) aMaxSide = Ymax -Ymin;
   if ( aMaxSide < Zmax -Zmin ) aMaxSide = Zmax -Zmin;
 
+  // IPAL21687
+  // The boundary box of the view may be initialized but nullified
+  // (case of infinite objects)
+  if ( aMaxSide < Precision::Confusion() )
+    return false;
+
   float aSizeInPercents = SUIT_Session::session()->resourceMgr()->doubleValue("Viewer","TrihedronSize", 105.);
 
   static float EPS = 5.0E-3;

diff --git a/src/SOCC/SOCC_ViewModel.h b/src/SOCC/SOCC_ViewModel.h
index 9c20035f5bcd8116c3d9e1bc9885f7af716b3130..7a5b10ef436ae9ce458c2a39f524da459e0d1ba1 100755 (executable)
--- a/src/SOCC/SOCC_ViewModel.h
+++ b/src/SOCC/SOCC_ViewModel.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 SOCC_VIEWMODEL_H
 #define SOCC_VIEWMODEL_H
 

diff --git a/src/SOCC/SOCC_ViewWindow.cxx b/src/SOCC/SOCC_ViewWindow.cxx
index 71c2f2cef2134b41a9568176c136e53a863575ae..4019ad04734ca525e3537c226d260cf4ce527067 100644 (file)
--- a/src/SOCC/SOCC_ViewWindow.cxx
+++ b/src/SOCC/SOCC_ViewWindow.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 "SOCC_ViewWindow.h"
 
 #include "OCCViewer_ViewPort3d.h"

diff --git a/src/SOCC/SOCC_ViewWindow.h b/src/SOCC/SOCC_ViewWindow.h
index 656f2d3a5f6719eccfd588295634a5d8a0e25b2c..90338fbef304598ed7defb39489e6e635e6cafce 100644 (file)
--- a/src/SOCC/SOCC_ViewWindow.h
+++ b/src/SOCC/SOCC_ViewWindow.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 SOCC_VIEWWINDOW_H
 #define SOCC_VIEWWINDOW_H
 

diff --git a/src/SPlot2d/Makefile.am b/src/SPlot2d/Makefile.am
index 6b19753e21d4e12b26cc6ca50b775c01495fffe7..8f9c0ebc53c1c23aeec00b1aeff1a40a614a2817 100644 (file)
--- a/src/SPlot2d/Makefile.am
+++ b/src/SPlot2d/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libSPlot2d.la

diff --git a/src/SPlot2d/SPlot2d.h b/src/SPlot2d/SPlot2d.h
index fef91eb1052d5aa068ae1220e98a59f779a40503..448a1e56428af54bd4ac49b41849c3c77f7cdaec 100644 (file)
--- a/src/SPlot2d/SPlot2d.h
+++ b/src/SPlot2d/SPlot2d.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
 //
+
 #ifdef WIN32
 #if defined SPLOT2D_EXPORTS || defined SPlot2d_EXPORTS
 #define SPLOT2D_EXPORT __declspec(dllexport)

diff --git a/src/SPlot2d/SPlot2d.pro b/src/SPlot2d/SPlot2d.pro
index faf945c5803200d42909e7df4efa56087ca1507b..b37345c00561d9e95d5631a00501cfb22b7039f7 100644 (file)
--- a/src/SPlot2d/SPlot2d.pro
+++ b/src/SPlot2d/SPlot2d.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SPlot2d
 DESTDIR = ../../lib

diff --git a/src/SPlot2d/SPlot2d_Curve.cxx b/src/SPlot2d/SPlot2d_Curve.cxx
index 95c17a520e0c282df790f3468f8788900a336ec9..2dba5829f8d3b965d40f678b989cf0de4139a6a0 100644 (file)
--- a/src/SPlot2d/SPlot2d_Curve.cxx
+++ b/src/SPlot2d/SPlot2d_Curve.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   : SPlot2d_Curve.cxx
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_Curve.h b/src/SPlot2d/SPlot2d_Curve.h
index 444fddda71b2dbfb3685e3e79538ab07a02da1cb..6fbe16f1a131f6859602f941b823379526771983 100644 (file)
--- a/src/SPlot2d/SPlot2d_Curve.h
+++ b/src/SPlot2d/SPlot2d_Curve.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   : SPlot2d_Curve.h
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_Prs.cxx b/src/SPlot2d/SPlot2d_Prs.cxx
index e96b2cc2829968f85ae44524944dcfb366513376..c7ef2d7b51beb1955c5812b28ffe72a7f6e996ac 100644 (file)
--- a/src/SPlot2d/SPlot2d_Prs.cxx
+++ b/src/SPlot2d/SPlot2d_Prs.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   : SPlot2d_Prs.cxx
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_Prs.h b/src/SPlot2d/SPlot2d_Prs.h
index 67b79b0980d4071744d1b173271e9715980c903f..3bf047570676a716cff475dfd63b404843de6ff8 100644 (file)
--- a/src/SPlot2d/SPlot2d_Prs.h
+++ b/src/SPlot2d/SPlot2d_Prs.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   : SPlot2d_Prs.h
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_ViewModel.cxx b/src/SPlot2d/SPlot2d_ViewModel.cxx
index c102f6b542194c8913c95220ce2452a4e2dfb0eb..581027ee37cf080b07f4d5c8b3a54adde7f67bd8 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewModel.cxx
+++ b/src/SPlot2d/SPlot2d_ViewModel.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   : SPlot2d_Viewer.cxx
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_ViewModel.h b/src/SPlot2d/SPlot2d_ViewModel.h
index 861deddd785a0df5a071c8af1fff8a6a1ff5ee96..87e187474d37bffc0502132de28e169bd3badc63 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewModel.h
+++ b/src/SPlot2d/SPlot2d_ViewModel.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   : SPlot2d_ViewModel.h
 //  Author : Sergey RUIN
 //  Module : SUIT

diff --git a/src/SPlot2d/SPlot2d_ViewWindow.cxx b/src/SPlot2d/SPlot2d_ViewWindow.cxx
index 187af80be30baa7a7a1015f13a0ca5692265c716..9df64ec479fc65be93a1ccf4c4de762109d2a9ff 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewWindow.cxx
+++ b/src/SPlot2d/SPlot2d_ViewWindow.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 "SPlot2d_ViewWindow.h"
 
 #include "Plot2d_ViewFrame.h"

diff --git a/src/SPlot2d/SPlot2d_ViewWindow.h b/src/SPlot2d/SPlot2d_ViewWindow.h
index 1f9ba0b8014ade3e25c06e8a620bfad0a5cab3d5..e918eae372d55ede3e3d563baef742fb25832dd8 100644 (file)
--- a/src/SPlot2d/SPlot2d_ViewWindow.h
+++ b/src/SPlot2d/SPlot2d_ViewWindow.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 SPLOT2D_VIEWWINDOW_H
 #define SPLOT2D_VIEWWINDOW_H
 

diff --git a/src/STD/Makefile.am b/src/STD/Makefile.am
index fa5aa382a6dc6cbad81fccb790b6f57cddb97307..7c023b5772e78e7969d9d7ff5db147b8065c9c68 100755 (executable)
--- a/src/STD/Makefile.am
+++ b/src/STD/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : STD

diff --git a/src/STD/STD.h b/src/STD/STD.h
index bf761c3565875b9392b1dfcd97f0806e30dc0497..9d4eb7e60eb21529f2c559364ad7d066adef1d1e 100755 (executable)
--- a/src/STD/STD.h
+++ b/src/STD/STD.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 STD_H
 #define STD_H
 

diff --git a/src/STD/STD.pro b/src/STD/STD.pro
index 09171229bcdf47a156e21389e2e0f4b74cb7f5f8..4d518bb6f104dfcd0446619039ec34ce9fd945ff 100644 (file)
--- a/src/STD/STD.pro
+++ b/src/STD/STD.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = std
 DESTDIR = ../../lib

diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx
index b24f79bcd11cbe626605570cb67bd39a99863652..9006a49ff3648de8dd6d75b05606425115cf4700 100755 (executable)
--- a/src/STD/STD_Application.cxx
+++ b/src/STD/STD_Application.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 "STD_Application.h"
 
 #include "STD_MDIDesktop.h"

diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h
index 6f8fc68fb189eb0b24950d34055034dec9d0f971..a8e5dea3333da566399185121d5905e0d3c6e223 100755 (executable)
--- a/src/STD/STD_Application.h
+++ b/src/STD/STD_Application.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 STD_APPLICATION_H
 #define STD_APPLICATION_H
 

diff --git a/src/STD/STD_MDIDesktop.cxx b/src/STD/STD_MDIDesktop.cxx
index 1909349da1ccec41985bd3ff11bbf8943dca5c2a..e7a75229569897c466ef6529e202a70c2da0c1fa 100755 (executable)
--- a/src/STD/STD_MDIDesktop.cxx
+++ b/src/STD/STD_MDIDesktop.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 "STD_MDIDesktop.h"
 
 #include <SUIT_Session.h>

diff --git a/src/STD/STD_MDIDesktop.h b/src/STD/STD_MDIDesktop.h
index a229ab713d0c0f7fc7f3ef373e2491eb0c9643a9..65c9b8f897dfc867057db9428241c728cf11ccba 100755 (executable)
--- a/src/STD/STD_MDIDesktop.h
+++ b/src/STD/STD_MDIDesktop.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 STD_MDIDESKTOP_H
 #define STD_MDIDESKTOP_H
 

diff --git a/src/STD/STD_SDIDesktop.cxx b/src/STD/STD_SDIDesktop.cxx
index 87a65307a90cf7ea9cb93cc7c2a9f90ff06fdee0..1bfac660b89c3e8f0c0391e5629c3d832da1cd00 100755 (executable)
--- a/src/STD/STD_SDIDesktop.cxx
+++ b/src/STD/STD_SDIDesktop.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 "STD_SDIDesktop.h"
 
 #include <SUIT_ViewWindow.h>

diff --git a/src/STD/STD_SDIDesktop.h b/src/STD/STD_SDIDesktop.h
index d5e17e891968b506cbd213adc8aef326586162d5..dac055653ce27494d641a5212916ae06a3bdc514 100755 (executable)
--- a/src/STD/STD_SDIDesktop.h
+++ b/src/STD/STD_SDIDesktop.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 STD_SDIDESKTOP_H
 #define STD_SDIDESKTOP_H
 

diff --git a/src/STD/STD_TabDesktop.cxx b/src/STD/STD_TabDesktop.cxx
index 80a460bdb9c5e84ad3c46f4cfc266718d2aef177..9fc198c95b0827839fdad6f67cc588ebd2f4830f 100644 (file)
--- a/src/STD/STD_TabDesktop.cxx
+++ b/src/STD/STD_TabDesktop.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 "STD_TabDesktop.h"
 
 #include <SUIT_Session.h>

diff --git a/src/STD/STD_TabDesktop.h b/src/STD/STD_TabDesktop.h
index 57d5195ad8fa5a2cf61db0363156b0570864f60d..0eae722a099d6387e8da2d2ea971050af193a3ab 100644 (file)
--- a/src/STD/STD_TabDesktop.h
+++ b/src/STD/STD_TabDesktop.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 STD_TABDESKTOP_H
 #define STD_TABDESKTOP_H
 

diff --git a/src/STD/resources/STD_images.ts b/src/STD/resources/STD_images.ts
index 216ea3f4a69c8a05703199521d5c3b732f072f93..909158771a968116a15298463e6ec8d864926c62 100644 (file)
--- a/src/STD/resources/STD_images.ts
+++ b/src/STD/resources/STD_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/STD/resources/STD_msg_en.ts b/src/STD/resources/STD_msg_en.ts
index f1d397d530ee46e767daa46869ee3cf69117343d..b6c4b838dd4f5fe521838490c3e811e5653de430 100644 (file)
--- a/src/STD/resources/STD_msg_en.ts
+++ b/src/STD/resources/STD_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SUIT/Makefile.am b/src/SUIT/Makefile.am
index 2c2646522b9fe37a331d5b3d90f6baed4b49a391..1cf97028860a3e8fea1a60148fd69b30007aa5d9 100755 (executable)
--- a/src/SUIT/Makefile.am
+++ b/src/SUIT/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : suit

diff --git a/src/SUIT/SUIT.h b/src/SUIT/SUIT.h
index d4976821305ed6e573ea4980f4a12893ac4bc198..37ac864cd532f3041a9040cf137172617b1d942d 100755 (executable)
--- a/src/SUIT/SUIT.h
+++ b/src/SUIT/SUIT.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   : SUIT.h
 // Author : 
 //

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index 9161aedba2e6fe10a0bd62dfd436a6f1f50f8191..17bc963bc07f1e0654a5736cf5bf039c05327970 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = suit
 DESTDIR = ../../lib

diff --git a/src/SUIT/SUIT_Accel.cxx b/src/SUIT/SUIT_Accel.cxx
index d46df4a41e063f82fb5fac637e56a271528e0001..973189d0ada55ee13401aaa0e6c0b776aa845c78 100644 (file)
--- a/src/SUIT/SUIT_Accel.cxx
+++ b/src/SUIT/SUIT_Accel.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
 //
+
 // SUIT_Accel.cxx: implementation of the SUIT_Accel class.
 //
 #include "SUIT_Accel.h"

diff --git a/src/SUIT/SUIT_Accel.h b/src/SUIT/SUIT_Accel.h
index b3b0886f1d7e615520e911a025b317af6d50ccda..f577032c3ea88a7eafc2f00140907430c34fc55e 100644 (file)
--- a/src/SUIT/SUIT_Accel.h
+++ b/src/SUIT/SUIT_Accel.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
 //
+
 // SUIT_Accel.h: interface for the SUIT_Accel class.
 //
 #ifndef SUIT_ACELL_H

diff --git a/src/SUIT/SUIT_ActionOperation.cxx b/src/SUIT/SUIT_ActionOperation.cxx
index a0e7dba288cf9be3142df3c3204722f543e3bc5c..da5d575979d392a5c935bbcf58a8fbd6a164cb1d 100644 (file)
--- a/src/SUIT/SUIT_ActionOperation.cxx
+++ b/src/SUIT/SUIT_ActionOperation.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 "SUIT_ActionOperation.h"
 
 #include "SUIT_Application.h"

diff --git a/src/SUIT/SUIT_ActionOperation.h b/src/SUIT/SUIT_ActionOperation.h
index 1dd97fc5a4ae31efa84b1f43fe89189d4a641cea..692efa831a83ba16eb2feceab2fd62a89cd28e3a 100644 (file)
--- a/src/SUIT/SUIT_ActionOperation.h
+++ b/src/SUIT/SUIT_ActionOperation.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 SUIT_ACTIONOPERATION_H
 #define SUIT_ACTIONOPERATION_H
 

diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx
index e1393b9bb4baa849116a53940a262a775bff0a1c..7624b5c6a0c07e23f61d99b5c8929a4b79c0c7e5 100755 (executable)
--- a/src/SUIT/SUIT_Application.cxx
+++ b/src/SUIT/SUIT_Application.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 "SUIT_Application.h"
 
 #include "SUIT_Study.h"

diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h
index 37aa200b2fe9062a8f81993381217f234092f90c..e04cee4f587aa52f3d28b6f5fd4675321b1441ef 100755 (executable)
--- a/src/SUIT/SUIT_Application.h
+++ b/src/SUIT/SUIT_Application.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 SUIT_APPLICATION_H
 #define SUIT_APPLICATION_H
 

diff --git a/src/SUIT/SUIT_DataBrowser.cxx b/src/SUIT/SUIT_DataBrowser.cxx
index 6a5902937e37567ecd32be07b21182938c759cc2..d4ec696a8feec3acdcf1daf4f2e3d4bc6411ff11 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.cxx
+++ b/src/SUIT/SUIT_DataBrowser.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   : SUIT_DataBrowser.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_DataBrowser.h b/src/SUIT/SUIT_DataBrowser.h
index f619e4ff3b8445a6c4a606ad47adb21fa128fb13..1c8e8d9582750513b3870c88eff81a3912f2c549 100644 (file)
--- a/src/SUIT/SUIT_DataBrowser.h
+++ b/src/SUIT/SUIT_DataBrowser.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   : SUIT_DataBrowser.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_DataObject.cxx b/src/SUIT/SUIT_DataObject.cxx
index 9248bc3edd34d3d44a7b1a2faa49d11a5692f9aa..96f91e7d7ade73f71e8cb8ee7c5786b90c31976d 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.cxx
+++ b/src/SUIT/SUIT_DataObject.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   : SUIT_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_DataObject.h b/src/SUIT/SUIT_DataObject.h
index 8e06fad064460a5b95932f3567e427e9f0cda3cb..7966202486e6c90c067788bb6debc29a3e8e40be 100755 (executable)
--- a/src/SUIT/SUIT_DataObject.h
+++ b/src/SUIT/SUIT_DataObject.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   : SUIT_DataObject.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_DataObjectIterator.cxx b/src/SUIT/SUIT_DataObjectIterator.cxx
index 145c0bd71ab0a9bed9c373fb8f06fd56b258af9c..71c6b4d0c454a11d335095e19e074f0ead691744 100644 (file)
--- a/src/SUIT/SUIT_DataObjectIterator.cxx
+++ b/src/SUIT/SUIT_DataObjectIterator.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 "SUIT_DataObjectIterator.h"
 
 /*!

diff --git a/src/SUIT/SUIT_DataObjectIterator.h b/src/SUIT/SUIT_DataObjectIterator.h
index b17ba2e1b25b0f9be8696649f0f44bda4adab2da..cad24fc1f75a65d3b3312bdaf8ab74c7ed8583f1 100644 (file)
--- a/src/SUIT/SUIT_DataObjectIterator.h
+++ b/src/SUIT/SUIT_DataObjectIterator.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 SUIT_DATAOBJECT_ITERATOR_H
 #define SUIT_DATAOBJECT_ITERATOR_H
 

diff --git a/src/SUIT/SUIT_DataObjectKey.cxx b/src/SUIT/SUIT_DataObjectKey.cxx
index ac17c9152caf61c791bf6a0636ca924c9fbaea86..9c8451fde5d709d16ecb3da03cfd4ae9ccf6ef94 100755 (executable)
--- a/src/SUIT/SUIT_DataObjectKey.cxx
+++ b/src/SUIT/SUIT_DataObjectKey.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 "SUIT_DataObjectKey.h"
 
 #include <string.h>

diff --git a/src/SUIT/SUIT_DataObjectKey.h b/src/SUIT/SUIT_DataObjectKey.h
index 00ac5ffd2ee787b9918893c6778dba9288d4c239..f48ae28b196d44d11ef15dfaed221ed8876a33fb 100755 (executable)
--- a/src/SUIT/SUIT_DataObjectKey.h
+++ b/src/SUIT/SUIT_DataObjectKey.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 SUIT_DATAOBJECTKEY_H
 #define SUIT_DATAOBJECTKEY_H
 

diff --git a/src/SUIT/SUIT_DataOwner.cxx b/src/SUIT/SUIT_DataOwner.cxx
index 300a88e7c0295975a0e8b21a08c5fa57d3e25953..f0a46aa5f537c7f54fc316a5fb355692de8541c9 100755 (executable)
--- a/src/SUIT/SUIT_DataOwner.cxx
+++ b/src/SUIT/SUIT_DataOwner.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 "SUIT_DataOwner.h"
 
 #ifndef WIN32

diff --git a/src/SUIT/SUIT_DataOwner.h b/src/SUIT/SUIT_DataOwner.h
index 9136041f1d5ba791d34d32d023cb2522ced6f864..c21dca5b136d1be2a1c3d19fcafd097cf69fc0ae 100755 (executable)
--- a/src/SUIT/SUIT_DataOwner.h
+++ b/src/SUIT/SUIT_DataOwner.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 SUIT_DATAOWNER_H
 #define SUIT_DATAOWNER_H
 

diff --git a/src/SUIT/SUIT_Desktop.cxx b/src/SUIT/SUIT_Desktop.cxx
index e7019f4677e70ae6d6d7e7e57333a6ab0fd27427..ad4b310b53a703934a90db86fb332a23b7e49b66 100755 (executable)
--- a/src/SUIT/SUIT_Desktop.cxx
+++ b/src/SUIT/SUIT_Desktop.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 "SUIT_Desktop.h"
 
 #include "SUIT_ViewWindow.h"

diff --git a/src/SUIT/SUIT_Desktop.h b/src/SUIT/SUIT_Desktop.h
index ad49bd55e5462240f27173eb38f98ba86e813877..c557d6d740cc0c01a28baddd72b1f1961d69561b 100755 (executable)
--- a/src/SUIT/SUIT_Desktop.h
+++ b/src/SUIT/SUIT_Desktop.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 SUIT_DESKTOP_H
 #define SUIT_DESKTOP_H
 

diff --git a/src/SUIT/SUIT_ExceptionHandler.cxx b/src/SUIT/SUIT_ExceptionHandler.cxx
index 8793c96311c38adb359ac98f5d11c8b1eceee091..876ba77e9e29fa0f862cbad3625fe9987d704909 100755 (executable)
--- a/src/SUIT/SUIT_ExceptionHandler.cxx
+++ b/src/SUIT/SUIT_ExceptionHandler.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 "SUIT_ExceptionHandler.h"
 
 #include "SUIT_MessageBox.h"

diff --git a/src/SUIT/SUIT_ExceptionHandler.h b/src/SUIT/SUIT_ExceptionHandler.h
index ccc53e91d275087b2ec687f35570d146f2f02d8a..367ea7fa10a06c1b584f562c86b65dd57213e234 100755 (executable)
--- a/src/SUIT/SUIT_ExceptionHandler.h
+++ b/src/SUIT/SUIT_ExceptionHandler.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 SUIT_EXCEPTIONHANDLER_H
 #define SUIT_EXCEPTIONHANDLER_H
 

diff --git a/src/SUIT/SUIT_FileDlg.cxx b/src/SUIT/SUIT_FileDlg.cxx
index 6a2872cb4585c37887bf889ffe0745ccf4f87e69..ccfdd61f16ba27d5299fb1708d6e10a2800c3758 100755 (executable)
--- a/src/SUIT/SUIT_FileDlg.cxx
+++ b/src/SUIT/SUIT_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   : SUIT_FileDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_FileDlg.h b/src/SUIT/SUIT_FileDlg.h
index 72cfd756da1368d951bc7a2aa8f0fa6b339d3d2e..6be781d58397c7ccf8cb1cd7afe7f383b98b4118 100755 (executable)
--- a/src/SUIT/SUIT_FileDlg.h
+++ b/src/SUIT/SUIT_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   : SUIT_FileDlg.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_FileValidator.cxx b/src/SUIT/SUIT_FileValidator.cxx
index f56f2286d4a786e1f2d6544507cc7dfd0478f91f..070cc5431da23cc96fc5af55a03f39e6b228a558 100755 (executable)
--- a/src/SUIT/SUIT_FileValidator.cxx
+++ b/src/SUIT/SUIT_FileValidator.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   : SUIT_FileValidator.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_FileValidator.h b/src/SUIT/SUIT_FileValidator.h
index 2f1c06ae842fda8bcc0c224062b520becc00dd21..62c8630a46f78c3a15146a543ded1b9009883f0f 100755 (executable)
--- a/src/SUIT/SUIT_FileValidator.h
+++ b/src/SUIT/SUIT_FileValidator.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   : SUIT_FileValidator.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_LicenseDlg.cxx b/src/SUIT/SUIT_LicenseDlg.cxx
index 816e82ca8976f7238fedbc7a723fe024db9b11c7..21c6517b2e5f342ca8893de2141ad3d50f52c2d4 100755 (executable)
--- a/src/SUIT/SUIT_LicenseDlg.cxx
+++ b/src/SUIT/SUIT_LicenseDlg.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 "SUIT_LicenseDlg.h"
 
 #include <QApplication>

diff --git a/src/SUIT/SUIT_LicenseDlg.h b/src/SUIT/SUIT_LicenseDlg.h
index cc9e79fbb7c0de43eab7ea8a3a383e8675d7b910..2c3fc13f47e8b16e6da52361a6dc5f4958f1648c 100755 (executable)
--- a/src/SUIT/SUIT_LicenseDlg.h
+++ b/src/SUIT/SUIT_LicenseDlg.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 SUIT_LICENSEDLG_H
 #define SUIT_LICENSEDLG_H
 

diff --git a/src/SUIT/SUIT_MessageBox.cxx b/src/SUIT/SUIT_MessageBox.cxx
index cc4754efc3f54d458c47b9112d32d91aa9f1a0c1..6f69c250775c2ec2f92631b186837ee78bedef20 100755 (executable)
--- a/src/SUIT/SUIT_MessageBox.cxx
+++ b/src/SUIT/SUIT_MessageBox.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 "SUIT_MessageBox.h"
 
 #include "SUIT_OverrideCursor.h"

diff --git a/src/SUIT/SUIT_MessageBox.h b/src/SUIT/SUIT_MessageBox.h
index d1f8f65c035142d98187cc584c2c81a01c5da62b..e63f2dac86b28ed700957de349237044d60088b5 100755 (executable)
--- a/src/SUIT/SUIT_MessageBox.h
+++ b/src/SUIT/SUIT_MessageBox.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 SUIT_MESSAGEBOX_H
 #define SUIT_MESSAGEBOX_H
 

diff --git a/src/SUIT/SUIT_Operation.cxx b/src/SUIT/SUIT_Operation.cxx
index 3088a5c4f2cab1aa6c92073f37e618153e0d379f..d87fff6d35fcb563097c5000ca0171d35d461739 100755 (executable)
--- a/src/SUIT/SUIT_Operation.cxx
+++ b/src/SUIT/SUIT_Operation.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 "SUIT_Operation.h"
 
 #include "SUIT_Study.h"

diff --git a/src/SUIT/SUIT_Operation.h b/src/SUIT/SUIT_Operation.h
index 1137949c46bbc731c3598238509fcd13ddd9c796..b6e14ba1c8d178043c6f6d5f0e82952ba77bbec5 100755 (executable)
--- a/src/SUIT/SUIT_Operation.h
+++ b/src/SUIT/SUIT_Operation.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 SUIT_OPERATION_H
 #define SUIT_OPERATION_H
 

diff --git a/src/SUIT/SUIT_OverrideCursor.cxx b/src/SUIT/SUIT_OverrideCursor.cxx
index d5718b729a5a050fc86484e84e630c3d3c25e8aa..ef97140d401beb1c70e711f4a0ce97690234dd0a 100755 (executable)
--- a/src/SUIT/SUIT_OverrideCursor.cxx
+++ b/src/SUIT/SUIT_OverrideCursor.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 "SUIT_OverrideCursor.h"
 
 #include <QApplication>

diff --git a/src/SUIT/SUIT_OverrideCursor.h b/src/SUIT/SUIT_OverrideCursor.h
index 95e56c1afc98ebe136217865c7e97027ae0c1c96..94eac38de71ca71ab2ad4dafd6e730384e8cc379 100755 (executable)
--- a/src/SUIT/SUIT_OverrideCursor.h
+++ b/src/SUIT/SUIT_OverrideCursor.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 SUIT_OVERRIDECURSOR_H
 #define SUIT_OVERRIDECURSOR_H
 

diff --git a/src/SUIT/SUIT_PopupClient.cxx b/src/SUIT/SUIT_PopupClient.cxx
index 5f79a5352c5096dbcd358beee877bb1cfccf13ca..39787a4134899f94fcd0f1fca20711e9206ed669 100644 (file)
--- a/src/SUIT/SUIT_PopupClient.cxx
+++ b/src/SUIT/SUIT_PopupClient.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 "SUIT_PopupClient.h"
 
 /*! constructor. initialize mySignal.*/

diff --git a/src/SUIT/SUIT_PopupClient.h b/src/SUIT/SUIT_PopupClient.h
index eab6c722326650df16b3bc383f5c132f10cb91fb..e4d77abcac620374a429a2662730405904644e7e 100644 (file)
--- a/src/SUIT/SUIT_PopupClient.h
+++ b/src/SUIT/SUIT_PopupClient.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 SUIT_POPUPCLIENT_H
 #define SUIT_POPUPCLIENT_H
 

diff --git a/src/SUIT/SUIT_PreferenceMgr.cxx b/src/SUIT/SUIT_PreferenceMgr.cxx
index ac1c801b2d04aafc628a432022fdb6706eb44eaf..0263b413d7846c982d6fd2583bf946621b34faea 100644 (file)
--- a/src/SUIT/SUIT_PreferenceMgr.cxx
+++ b/src/SUIT/SUIT_PreferenceMgr.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:      SUIT_PreferenceMgr.cxx
 // Author:    Sergey TELKOV
 //
@@ -132,6 +130,9 @@ int SUIT_PreferenceMgr::addItem( const QString& title, const int pId,
   case Integer:
     item = new QtxPagePrefEditItem( QtxPagePrefEditItem::Integer, title, parent, sect, param );
     break;
+  case Slider:
+    item = new QtxPagePrefSliderItem( title, parent, sect, param );
+    break;
   case GroupBox:
     item = new QtxPagePrefGroupItem( title, parent, sect, param );
     break;

diff --git a/src/SUIT/SUIT_PreferenceMgr.h b/src/SUIT/SUIT_PreferenceMgr.h
index bf4c61fe1f7ef9c395b5a58c43b7e30618fc19a2..be99b1dc608b5835cafade85bcc6822574a5c685 100644 (file)
--- a/src/SUIT/SUIT_PreferenceMgr.h
+++ b/src/SUIT/SUIT_PreferenceMgr.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:      SUIT_PreferenceMgr.h
 // Author:    Sergey TELKOV
 //
@@ -39,7 +37,7 @@ class SUIT_EXPORT SUIT_PreferenceMgr : public QtxPagePrefMgr
 public:
   typedef enum { Auto, Space, Bool, Color, String, Selector,
                  DblSpin, IntSpin, Double, Integer,
-                 GroupBox, Tab, Frame, Font, DirList, File, 
+                 GroupBox, Tab, Frame, Font, DirList, File, Slider, 
                  UserDefined = 1000 } PrefItemType;
 
 public:

diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx
index f134e733279e4edfa421c3faa0cadf05885088b1..cb73db6c346b12b3fdca7c7aef429e29a8c54663 100755 (executable)
--- a/src/SUIT/SUIT_ResourceMgr.cxx
+++ b/src/SUIT/SUIT_ResourceMgr.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 "SUIT_ResourceMgr.h"
 
 #include <QDir>

diff --git a/src/SUIT/SUIT_ResourceMgr.h b/src/SUIT/SUIT_ResourceMgr.h
index e0ff7ce17bcfe57b5298870539b70f346bb550e0..c20eb1a1f6f6ab24db71af86482362b59053cd97 100755 (executable)
--- a/src/SUIT/SUIT_ResourceMgr.h
+++ b/src/SUIT/SUIT_ResourceMgr.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 SUIT_RESOURCEMGR_H
 #define SUIT_RESOURCEMGR_H
 

diff --git a/src/SUIT/SUIT_SelectionFilter.cxx b/src/SUIT/SUIT_SelectionFilter.cxx
index 85f8d7d99a05a994107b2fe19b226e47ae7764bd..f02f51a9f82b569dc800a5a5dc9704929e0315f4 100644 (file)
--- a/src/SUIT/SUIT_SelectionFilter.cxx
+++ b/src/SUIT/SUIT_SelectionFilter.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 "SUIT_SelectionFilter.h"
 
 /*! constructor. do nothing*/

diff --git a/src/SUIT/SUIT_SelectionFilter.h b/src/SUIT/SUIT_SelectionFilter.h
index 862a0d114e269ce7581cf356ce1c6f5b7790d30d..cad9dcd07dcdde6549d410b72ce523b1df79e990 100644 (file)
--- a/src/SUIT/SUIT_SelectionFilter.h
+++ b/src/SUIT/SUIT_SelectionFilter.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 SUIT_SELECTIONFILTER_H
 #define SUIT_SELECTIONFILTER_H
 

diff --git a/src/SUIT/SUIT_SelectionMgr.cxx b/src/SUIT/SUIT_SelectionMgr.cxx
index 0999c163891b0baa1fbf565ee5cfb2b3354621b6..042631603c8c3bb2e7041264afd8ab8ff147802e 100755 (executable)
--- a/src/SUIT/SUIT_SelectionMgr.cxx
+++ b/src/SUIT/SUIT_SelectionMgr.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 "SUIT_SelectionMgr.h"
 
 #include "SUIT_Selector.h"

diff --git a/src/SUIT/SUIT_SelectionMgr.h b/src/SUIT/SUIT_SelectionMgr.h
index 19b6bb60bcc5696c6982ef3ff9b653b38fdcc13a..3223010b9224beb73a6d068784a56a01c639e45d 100755 (executable)
--- a/src/SUIT/SUIT_SelectionMgr.h
+++ b/src/SUIT/SUIT_SelectionMgr.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 SUIT_SELECTIONMGR_H
 #define SUIT_SELECTIONMGR_H
 

diff --git a/src/SUIT/SUIT_Selector.cxx b/src/SUIT/SUIT_Selector.cxx
index 553d6ab62fdb449a3e0e706dea89a99897ffa371..d4956e7c0ce78d18f9198febcdfdc3bccd4c1813 100755 (executable)
--- a/src/SUIT/SUIT_Selector.cxx
+++ b/src/SUIT/SUIT_Selector.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 "SUIT_Selector.h"
 
 #include "SUIT_SelectionMgr.h"

diff --git a/src/SUIT/SUIT_Selector.h b/src/SUIT/SUIT_Selector.h
index 5be859d77349a1fdefe753d4d75ad5d104124d41..bdba634f2e548eb25bba35633b368790ce2b28f9 100755 (executable)
--- a/src/SUIT/SUIT_Selector.h
+++ b/src/SUIT/SUIT_Selector.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 SUIT_SELECTOR_H
 #define SUIT_SELECTOR_H
 

diff --git a/src/SUIT/SUIT_Session.cxx b/src/SUIT/SUIT_Session.cxx
index c2f26426725c9f256551a064ee305693dd8000db..517fa22d25ab34bdbb77cfd98bdd49516c0b385d 100755 (executable)
--- a/src/SUIT/SUIT_Session.cxx
+++ b/src/SUIT/SUIT_Session.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 "SUIT_Session.h"
 
 #include "SUIT_Study.h"

diff --git a/src/SUIT/SUIT_Session.h b/src/SUIT/SUIT_Session.h
index 479e5bd0e68abb11f777798cbb5d2ad4c7eac991..7c2d8ee26a0cb0266a838845e4ba018a3863cb00 100755 (executable)
--- a/src/SUIT/SUIT_Session.h
+++ b/src/SUIT/SUIT_Session.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 SUIT_SESSION_H
 #define SUIT_SESSION_H
 

diff --git a/src/SUIT/SUIT_SmartPtr.h b/src/SUIT/SUIT_SmartPtr.h
index dc3fb52b09bff2913cd1a5ecf5621699c509d6ac..b3375192f0f8c5637bbc3ad84f7987e7c2eb4594 100755 (executable)
--- a/src/SUIT/SUIT_SmartPtr.h
+++ b/src/SUIT/SUIT_SmartPtr.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
 //
+
 #if !defined(__SUIT_SMARTPTR_H)
 #define __SUIT_SMARTPTR_H
 

diff --git a/src/SUIT/SUIT_Study.cxx b/src/SUIT/SUIT_Study.cxx
index a9d8ad71e83a1ec575299b0bbb4adc6af26967b4..f88becf965511f212bee9541f50e93d2f31e32a9 100755 (executable)
--- a/src/SUIT/SUIT_Study.cxx
+++ b/src/SUIT/SUIT_Study.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 "SUIT_Study.h"
 
 #include "SUIT_Desktop.h"

diff --git a/src/SUIT/SUIT_Study.h b/src/SUIT/SUIT_Study.h
index c442ec1bfb8c38f6c9cdb4bea51f4ecb2837631e..d269c0be61a4c06443caa6cedd8a93d1be1e32f6 100755 (executable)
--- a/src/SUIT/SUIT_Study.h
+++ b/src/SUIT/SUIT_Study.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 SUIT_STUDY_H
 #define SUIT_STUDY_H
 

diff --git a/src/SUIT/SUIT_Tools.cxx b/src/SUIT/SUIT_Tools.cxx
index 1fcd3476623d824bf078892726153a1ee538a450..b8834b9a21612ca143f13de53f77c673a2083b77 100755 (executable)
--- a/src/SUIT/SUIT_Tools.cxx
+++ b/src/SUIT/SUIT_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
 //
+
 #include "SUIT_Tools.h"
 
 #include <QDir>

diff --git a/src/SUIT/SUIT_Tools.h b/src/SUIT/SUIT_Tools.h
index ec252782682906afeefadb4957e3d42fb90144fd..bdf743223969796c2e11a144b48e0886b252b001 100755 (executable)
--- a/src/SUIT/SUIT_Tools.h
+++ b/src/SUIT/SUIT_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
 //
+
 #ifndef SUIT_TOOLS_H
 #define SUIT_TOOLS_H
 

diff --git a/src/SUIT/SUIT_TreeModel.cxx b/src/SUIT/SUIT_TreeModel.cxx
index 3c32c174d1650b6e89fff1ed6b2075a2b2d7a148..71211f3ca17996b773fe0347be35019045665c07 100755 (executable)
--- a/src/SUIT/SUIT_TreeModel.cxx
+++ b/src/SUIT/SUIT_TreeModel.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:   SUIT_TreeModel.cxx
 // Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //
@@ -580,7 +578,7 @@ QPixmap SUIT_TreeModel::columnIcon( const QString& name ) const
 void SUIT_TreeModel::setAppropriate( const QString& name, const Qtx::Appropriate appr )
 {
   for( int i=0, n=myColumns.size(); i<n; i++ )
-    if( myColumns[i].myName==name || myColumns[i].myAppropriate != appr )
+    if( myColumns[i].myName==name && myColumns[i].myAppropriate != appr )
     {
       myColumns[i].myAppropriate = appr;
       emit headerDataChanged( Qt::Horizontal, i, i );

diff --git a/src/SUIT/SUIT_TreeModel.h b/src/SUIT/SUIT_TreeModel.h
index 59828481ef040c0542cb1c3a67ead2e112cbbd6c..adc728c2d091ca99bd0c9f02999886fc669311e9 100755 (executable)
--- a/src/SUIT/SUIT_TreeModel.h
+++ b/src/SUIT/SUIT_TreeModel.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:   SUIT_TreeModel.h
 // Author: Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SUIT/SUIT_TreeSync.h b/src/SUIT/SUIT_TreeSync.h
index d2916992b8f0ce116b8975f6c2ad3c9c309f60a1..4b6df3e6bbb4a90422d1e20745119bc219e45b3a 100644 (file)
--- a/src/SUIT/SUIT_TreeSync.h
+++ b/src/SUIT/SUIT_TreeSync.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   : SUIT_TreeSync.h
 // Author : Alexander SOLOVYOV
 //

diff --git a/src/SUIT/SUIT_ViewManager.cxx b/src/SUIT/SUIT_ViewManager.cxx
index c3ff10c41508c1d40f3e3eea98d1c2362680dd71..212702c5fabc301bd74c6e3dac37f7afcbf04ef8 100755 (executable)
--- a/src/SUIT/SUIT_ViewManager.cxx
+++ b/src/SUIT/SUIT_ViewManager.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 "SUIT_ViewManager.h"
 
 #include "SUIT_Desktop.h"

diff --git a/src/SUIT/SUIT_ViewManager.h b/src/SUIT/SUIT_ViewManager.h
index 9126290a63fb5ecda6f2dff52e6294e5c3821233..a011b11fb2a869fc4f2781e732a82ed61a69f268 100755 (executable)
--- a/src/SUIT/SUIT_ViewManager.h
+++ b/src/SUIT/SUIT_ViewManager.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 SUIT_VIEWMANAGER_H
 #define SUIT_VIEWMANAGER_H
 

diff --git a/src/SUIT/SUIT_ViewModel.cxx b/src/SUIT/SUIT_ViewModel.cxx
index e0bce381cd17e08c79cfd66b20f598979def806a..ec229414a7d82ae36abdff9e46018c7359ff664e 100755 (executable)
--- a/src/SUIT/SUIT_ViewModel.cxx
+++ b/src/SUIT/SUIT_ViewModel.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
 //
+
 // SUIT_ViewModel.cxx: implementation of the SUIT_ViewModel class.
 //
 #include "SUIT_ViewModel.h"

diff --git a/src/SUIT/SUIT_ViewModel.h b/src/SUIT/SUIT_ViewModel.h
index 9c19d906f0afb7491276b594b4b41893b59a891d..f793575c4f2dc24622bc10cf61f586351cce4a7a 100755 (executable)
--- a/src/SUIT/SUIT_ViewModel.h
+++ b/src/SUIT/SUIT_ViewModel.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 SUIT_VIEWMODEL_H
 #define SUIT_VIEWMODEL_H
 

diff --git a/src/SUIT/SUIT_ViewWindow.cxx b/src/SUIT/SUIT_ViewWindow.cxx
index e0d3df7934be275c94f845bccb831a32a7785019..ebf0055c94aa6a9d2e11861fa9271fefb0b50ecf 100755 (executable)
--- a/src/SUIT/SUIT_ViewWindow.cxx
+++ b/src/SUIT/SUIT_ViewWindow.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
 //
+
 // SUIT_ViewWindow.cxx: implementation of the SUIT_ViewWindow class.
 //
 #include "SUIT_ViewWindow.h"

diff --git a/src/SUIT/SUIT_ViewWindow.h b/src/SUIT/SUIT_ViewWindow.h
index 5c508cbe8c6b3dac3a2ed98183d77aa7584c078e..5b09273dab913c222b9fcf11b6e265b55e69a774 100755 (executable)
--- a/src/SUIT/SUIT_ViewWindow.h
+++ b/src/SUIT/SUIT_ViewWindow.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
 //
+
 // SUIT_ViewWindow.h: interface for the SUIT_ViewWindow class.
 //
 #ifndef SUIT_VIEWWINDOW_H

diff --git a/src/SUIT/resources/SUIT_msg_en.ts b/src/SUIT/resources/SUIT_msg_en.ts
index 62cfc102ace632a460da51ff7ba9f7d56a00aa11..d477c7f9cb2c6b27d22533f8723ac36764aa48b1 100644 (file)
--- a/src/SUIT/resources/SUIT_msg_en.ts
+++ b/src/SUIT/resources/SUIT_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SUITApp/Makefile.am b/src/SUITApp/Makefile.am
index 5c1f44e3635396636cd803b53693ab36124c66a9..30e2e8264431e956dd8eff304917610c02923b4c 100644 (file)
--- a/src/SUITApp/Makefile.am
+++ b/src/SUITApp/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : suitApp
@@ -29,13 +30,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libSUITApp.la
 
 salomeinclude_HEADERS =                \
-       SUITApp_Application.h   \
-       SUITApp_init_python.hxx
+       SUITApp_Application.h
 
 dist_libSUITApp_la_SOURCES =   \
        SUITApp.cxx             \
-       SUITApp_Application.cxx \
-       SUITApp_init_python.cxx 
+       SUITApp_Application.cxx
+
+if ENABLE_PYCONSOLE
+  salomeinclude_HEADERS += SUITApp_init_python.hxx
+  dist_libSUITApp_la_SOURCES += SUITApp_init_python.cxx 
+endif
 
 MOC_FILES =                            \
        SUITApp_Application_moc.cxx
@@ -61,8 +65,7 @@ endif
 libSUITApp_la_LIBADD   = ../Qtx/libqtx.la ../SUIT/libsuit.la ../Style/libSalomeStyle.la
 
 if ENABLE_PYCONSOLE
-libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic $(PYTHON_LIBS)
-AM_CPPFLAGS+=-DSUIT_ENABLE_PYTHON
+  libSUITApp_la_LDFLAGS += -Xlinker -export-dynamic $(PYTHON_LIBS)
 endif
 
 # Executable

diff --git a/src/SUITApp/SUITApp.cxx b/src/SUITApp/SUITApp.cxx
index 604eff9c55835ed7f13aa6f17d65d4bed7ace9e3..989542ba449359d09108b016735079bd946d53ff 100644 (file)
--- a/src/SUITApp/SUITApp.cxx
+++ b/src/SUITApp/SUITApp.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,28 +19,26 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
-#if defined WIN32
 
-#ifdef SUIT_ENABLE_PYTHON
-#undef SUIT_ENABLE_PYTHON
-#endif
-
-#else //#if defined WIN32
-
-#ifndef SUIT_ENABLE_PYTHON
+//#if defined WIN32
+//#ifdef SUIT_ENABLE_PYTHON
+//#undef SUIT_ENABLE_PYTHON
+//#endif
+//#else //#if defined WIN32
+//#ifndef SUIT_ENABLE_PYTHON
 // NOTE: DO NOT DELETE THIS DEFINITION ON LINUX
 // or make sure Python is initialized in main() in any case
 // Otherwise, application based on light SALOME and using Python 
 // are unlikely to work properly.
-#define SUIT_ENABLE_PYTHON
-#include <Python.h>
-#endif
-
+//#define SUIT_ENABLE_PYTHON
+//#include <Python.h>
+//#endif
+//
 #ifdef SUIT_ENABLE_PYTHON
 #include "SUITApp_init_python.hxx"
 #endif
 
-#endif //#if defined WIN32
+//#endif //#if defined WIN32
 
 #include "SUITApp_Application.h"
 
@@ -93,29 +91,29 @@ static QString salomeVersion()
   return ver;
 }
 
-static void MessageOutput( QtMsgType type, const char* msg )
-{
-  switch ( type )
-  {
-  case QtDebugMsg:
-#ifdef _DEBUG_
-    printf( "Debug: %s\n", msg );
-#endif
-    break;
-  case QtWarningMsg:
-#ifdef _DEBUG_
-    printf( "Warning: %s\n", msg );
-#endif
-    break;
-  case QtFatalMsg:
-#ifdef _DEBUG_
-    printf( "Fatal: %s\n", msg );
-#endif
-    break;
-  default:
-    break;
-  }
-}
+// static void MessageOutput( QtMsgType type, const char* msg )
+// {
+//   switch ( type )
+//   {
+//   case QtDebugMsg:
+// #ifdef _DEBUG_
+//     printf( "Debug: %s\n", msg );
+// #endif
+//     break;
+//   case QtWarningMsg:
+// #ifdef _DEBUG_
+//     printf( "Warning: %s\n", msg );
+// #endif
+//     break;
+//   case QtFatalMsg:
+// #ifdef _DEBUG_
+//     printf( "Fatal: %s\n", msg );
+// #endif
+//     break;
+//   default:
+//     break;
+//   }
+// }
 
 /* XPM */
 static const char* pixmap_not_found_xpm[] = {
@@ -287,7 +285,7 @@ int main( int argc, char* argv[] )
     PyEval_RestoreThread( SUIT_PYTHON::_gtstate );
     
     if ( !SUIT_PYTHON::salome_shared_modules_module ) // import only once
-      SUIT_PYTHON::salome_shared_modules_module = PyImport_ImportModule( "salome_shared_modules" );
+      SUIT_PYTHON::salome_shared_modules_module = PyImport_ImportModule( (char*)"salome_shared_modules" );
     if ( !SUIT_PYTHON::salome_shared_modules_module ) 
       PyErr_Print();
     

diff --git a/src/SUITApp/SUITApp.pro b/src/SUITApp/SUITApp.pro
index cd5f85fa25f65149e741e44ac423be805d1b187c..709bc1408352b15fc920ed35206eee80a6c1a7ab 100644 (file)
--- a/src/SUITApp/SUITApp.pro
+++ b/src/SUITApp/SUITApp.pro
@@ -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
 #
+
 TEMPLATE = app
 TARGET = SUITApp
 DESTDIR = ../../bin

diff --git a/src/SUITApp/SUITApp_Application.cxx b/src/SUITApp/SUITApp_Application.cxx
index 073fe0fc3327bebc0ad8ca7358eb50a0158866c9..7dfe948d92ed6b893ee75bb2f2f6fc6dfe9a19c7 100644 (file)
--- a/src/SUITApp/SUITApp_Application.cxx
+++ b/src/SUITApp/SUITApp_Application.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,14 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "SUITApp_Application.h"
 
 #include <SUIT_Tools.h>
 #include <SUIT_ExceptionHandler.h>
 
+#include <Qtx.h>
+
 #include <QDir>
 #include <QTranslator>
 
@@ -41,7 +44,13 @@ SUITApp_Application::SUITApp_Application( int& argc, char** argv, SUIT_Exception
 #ifdef ENABLE_TESTRECORDER
   : TestApplication( argc, argv ),
 #else
-  : QApplication( argc, argv ),
+#ifndef WIN32
+  // san: Opening an X display and choosing a visual most suitable for 3D visualization
+  // in order to make SALOME viewers work with non-native X servers
+  : QApplication( (Display*)Qtx::getDisplay(), argc, argv, Qtx::getVisual() ),
+#else
+  : QApplication( argc, argv ), 
+#endif
 #endif
 myExceptHandler( hand )
 {

diff --git a/src/SUITApp/SUITApp_Application.h b/src/SUITApp/SUITApp_Application.h
index 89e7e76ab1408be0a2fc19b3a0340051c250d5e8..138e713238bcb905087708dffb1b4e4e20206703 100644 (file)
--- a/src/SUITApp/SUITApp_Application.h
+++ b/src/SUITApp/SUITApp_Application.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 SUITAPP_APPLICATION_H
 #define SUITAPP_APPLICATION_H
 

diff --git a/src/SUITApp/SUITApp_init_python.cxx b/src/SUITApp/SUITApp_init_python.cxx
index 72c350f568fdfec090299451126fce8006a91aed..23163f032d77d902814b5c7fa4c73466c1fc08a0 100644 (file)
--- a/src/SUITApp/SUITApp_init_python.cxx
+++ b/src/SUITApp/SUITApp_init_python.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
 //
+
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
-
+//
 #include "SUITApp_init_python.hxx"
 
 

diff --git a/src/SUITApp/SUITApp_init_python.hxx b/src/SUITApp/SUITApp_init_python.hxx
index 3305a7f4edb93a8181ca67c5e8ab90b482e5f6cd..0e0b3cd7183fc561597a68c7bd14727557a21ab8 100644 (file)
--- a/src/SUITApp/SUITApp_init_python.hxx
+++ b/src/SUITApp/SUITApp_init_python.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
 //
+
 //  Author : Roman NIKOLAEV, Open CASCADE S.A.S. (roman.nikolaev@opencascade.com)
 //  Date   : 22/06/2007
-
-
+//
 #ifndef _SUITAPP_INIT_PYTHON_
 #define _SUITAPP_INIT_PYTHON_
 

diff --git a/src/SUITApp/resources/SUITApp_msg_en.ts b/src/SUITApp/resources/SUITApp_msg_en.ts
index c355758a68dd2ff11a103e1acb27adbbbddb3110..23ba569c8d0a17ee024afda48003d0aaad13144e 100644 (file)
--- a/src/SUITApp/resources/SUITApp_msg_en.ts
+++ b/src/SUITApp/resources/SUITApp_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SUPERVGraph/Makefile.am b/src/SUPERVGraph/Makefile.am
index 621001bb865bbb1f50d51ee9ac02d2b0e68e636d..f33bbbbcd19daa0d11baa0618d078c30700e4b3a 100755 (executable)
--- a/src/SUPERVGraph/Makefile.am
+++ b/src/SUPERVGraph/Makefile.am
@@ -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 $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libSUPERVGraph.la

diff --git a/src/SUPERVGraph/SUPERVGraph.cxx b/src/SUPERVGraph/SUPERVGraph.cxx
index 2a923e09e4db19bfc2ddcec450bad5f0908cf89c..5fc8e681bf572514c6f9643ec2952cd5867acc6c 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph.cxx
+++ b/src/SUPERVGraph/SUPERVGraph.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 SUPERVGraph : build Supervisor viewer into desktop
 //  File   : SUPERVGraph.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/SUPERVGraph/SUPERVGraph.h b/src/SUPERVGraph/SUPERVGraph.h
index c7c7d6a563ab1b2668239b7e9624d351f67f09bb..14cdcf98e750233b62c58c2ff15ec2665d64e7a3 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph.h
+++ b/src/SUPERVGraph/SUPERVGraph.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 SUPERVGraph : build Supervisor viewer into desktop
 //  File   : SUPERVGraph.h
 //  Author : Nicolas REJNERI

diff --git a/src/SUPERVGraph/SUPERVGraph.pro b/src/SUPERVGraph/SUPERVGraph.pro
index e0e188450d95fb2a03521a81c8f2fc13e0b69e43..64d895b593c95bea08bb96753e9ed00ef3f960b3 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph.pro
+++ b/src/SUPERVGraph/SUPERVGraph.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SUPERVGraph
 DESTDIR = ../../lib

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx b/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
index 9dd947fdcd92e42aa2765b2cbfcb73851f65948b..cb09b2447b363fcba602d006aa614f1b5e3b2a2c 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.cxx
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.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 SUPERVGraph : build Supervisor viewer into desktop
 //  File   : SUPERVGraph_ViewFrame.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h b/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
index 2bbf9d8d76b1e6d0e8f85c647059d4b842f294a5..c3b7d3b919b5f268d52e13b367c81161825906d0 100755 (executable)
--- a/src/SUPERVGraph/SUPERVGraph_ViewFrame.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewFrame.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 SUPERVGraph : build Supervisor viewer into desktop
 //  File   : SUPERVGraph_ViewFrame.h
 //  Author : Nicolas REJNERI

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewManager.cxx b/src/SUPERVGraph/SUPERVGraph_ViewManager.cxx
index 980eaa1379209e2ff046d0d861215ff8c18c1776..f33663a696db5ef221de1b3af7c0e67d410d9fd9 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph_ViewManager.cxx
+++ b/src/SUPERVGraph/SUPERVGraph_ViewManager.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 "SUPERVGraph_ViewManager.h"
 
 #include "SUIT_ViewWindow.h"

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewManager.h b/src/SUPERVGraph/SUPERVGraph_ViewManager.h
index 30998a8e7a624d23232a0073a0671436562c5f02..31d7af49d563f6083f340bbdc457809c4e085391 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph_ViewManager.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewManager.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 SUPERVGRAPH_VIEWMANAGER_H
 #define SUPERVGRAPH_VIEWMANAGER_H
 

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewModel.cxx b/src/SUPERVGraph/SUPERVGraph_ViewModel.cxx
index 59120a3fa443ed3f207c7c9e2863290d2c58ae64..ce7db729b4542ae6b211b5fc647f4ce4df4329b8 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph_ViewModel.cxx
+++ b/src/SUPERVGraph/SUPERVGraph_ViewModel.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 "SUPERVGraph_ViewModel.h"
 #include "SUPERVGraph_ViewFrame.h"
 #include "SUIT_Desktop.h"

diff --git a/src/SUPERVGraph/SUPERVGraph_ViewModel.h b/src/SUPERVGraph/SUPERVGraph_ViewModel.h
index 7b62c8cea39cc33772a3c14525fd4c5a92d63bd0..5260baf09cf23272994116fb5a0e00929f1e03f3 100644 (file)
--- a/src/SUPERVGraph/SUPERVGraph_ViewModel.h
+++ b/src/SUPERVGraph/SUPERVGraph_ViewModel.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 SUPERVGRAPH_VIEWMODEL_H
 #define SUPERVGRAPH_VIEWMODEL_H
 

diff --git a/src/SUPERVGraph/resources/SUPERVGraph_images.ts b/src/SUPERVGraph/resources/SUPERVGraph_images.ts
index 5d7cf3bbc2f5cdb04d87a56a2b671007b509cb2c..09554a27c620b917ab90d0625cbc7341a4f0c180 100644 (file)
--- a/src/SUPERVGraph/resources/SUPERVGraph_images.ts
+++ b/src/SUPERVGraph/resources/SUPERVGraph_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SUPERVGraph/resources/SUPERVGraph_msg_en.ts b/src/SUPERVGraph/resources/SUPERVGraph_msg_en.ts
index 145326d7497d5a1ff62f828fb6203eaa31816fe2..922fe3dcdf7be72a4860778ca04aeffa05a27138 100644 (file)
--- a/src/SUPERVGraph/resources/SUPERVGraph_msg_en.ts
+++ b/src/SUPERVGraph/resources/SUPERVGraph_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SVTK/Makefile.am b/src/SVTK/Makefile.am
index b418bc1237c968e047ca61c138cd739cde5012c4..1b078781e538fc0f3cf8281419ab29c194681d28 100755 (executable)
--- a/src/SVTK/Makefile.am
+++ b/src/SVTK/Makefile.am
@@ -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   : Makefile.in
 #  Author : Alexander Solovyov(OCN)
 #  Module : SVTK
@@ -150,12 +151,13 @@ libSVTK_la_CPPFLAGS =             \
 libSVTK_la_LDFLAGS =                   \
        $(VTK_LIBS) $(OGL_LIBS)         \
        $(QT_MT_LIBS)                   \
-       $(CAS_KERNEL) $(CAS_VIEWER)
+       $(CAS_KERNEL) $(CAS_VIEWER)     \
+       $(KERNEL_LDFLAGS)
 
 
 libSVTK_la_LIBADD = ../Qtx/libqtx.la ../SUIT/libsuit.la ../OBJECT/libSalomeObject.la \
                    ../Prs/libSalomePrs.la ../VTKViewer/libVTKViewer.la \
-                   ../OpenGLUtils/libOpenGLUtils.la
+                   ../OpenGLUtils/libOpenGLUtils.la -lSALOMELocalTrace
 
 # Executable
 bin_PROGRAMS = SVTK

diff --git a/src/SVTK/SALOME_Actor.cxx b/src/SVTK/SALOME_Actor.cxx
index b85f7c26f27be5214d88839eee425c7ce486b045..f7b54f6bce6f2a1b714316e0b9a089de54a9f428 100644 (file)
--- a/src/SVTK/SALOME_Actor.cxx
+++ b/src/SVTK/SALOME_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,6 +19,7 @@
 //
 //  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   : SALOME_Actor.cxx
 //  Author : Nicolas REJNERI
@@ -122,29 +123,27 @@ namespace
     };
     return false;
   }
+}
 
-  class TPickLimiter
+namespace SVTK
+{
+  /*!
+    Make picker work with this actor only
+  */
+  TPickLimiter::TPickLimiter(vtkAbstractPicker* picker, SALOME_Actor* actor):myPicker(picker)
   {
-    vtkAbstractPicker* myPicker;
-  public:
-    /*!
-      Make picker work with this actor only
-    */
-    TPickLimiter(vtkAbstractPicker* picker, SALOME_Actor* actor):myPicker(picker)
-    {
-      myPicker->InitializePickList();
-      myPicker->AddPickList( actor );
-      myPicker->SetPickFromList( true );
-    }
-    /*!
-      Unlimit picking
-    */
-    ~TPickLimiter()
-    {
-      myPicker->SetPickFromList( false );
-      myPicker->InitializePickList();
-    }
-  };
+    myPicker->InitializePickList();
+    myPicker->AddPickList( actor );
+    myPicker->SetPickFromList( true );
+  }
+  /*!
+    Unlimit picking
+  */
+  TPickLimiter::~TPickLimiter()
+  {
+    myPicker->SetPickFromList( false );
+    myPicker->InitializePickList();
+  }
 }
 
 
@@ -488,6 +487,8 @@ SALOME_Actor
   Selection_Mode aSelectionMode = theSelectionEvent->mySelectionMode;
   bool anIsChanged = (mySelectionMode != aSelectionMode);
 
+  myPreHighlightActor->SetMarkerEnabled( aSelectionMode == NodeSelection );
+
   vtkFloatingPointType x = theSelectionEvent->myX;
   vtkFloatingPointType y = theSelectionEvent->myY;
   vtkFloatingPointType z = 0.0;
@@ -506,7 +507,7 @@ SALOME_Actor
     switch(aSelectionMode) {
     case NodeSelection: 
     {
-      TPickLimiter( myPointPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myPointPicker, this );
       myPointPicker->Pick( x, y, z, aRenderer );
       
       int aVtkId = myPointPicker->GetPointId();
@@ -534,7 +535,7 @@ SALOME_Actor
     case FaceSelection:
     case VolumeSelection: 
     {
-      TPickLimiter( myCellPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myCellPicker, this );
       myCellPicker->Pick( x, y, z, aRenderer );
       
       int aVtkId = myCellPicker->GetCellId();
@@ -561,7 +562,7 @@ SALOME_Actor
     }
     case EdgeOfCellSelection:
     {
-      TPickLimiter( myCellPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myCellPicker, this );
       myCellPicker->Pick( x, y, z, aRenderer );
       
       int aVtkId = myCellPicker->GetCellId();
@@ -642,6 +643,8 @@ SALOME_Actor
   if ( !theIsHighlight )
     return true;
 
+  myHighlightActor->SetMarkerEnabled( aSelectionMode == NodeSelection );
+
   vtkFloatingPointType x = theSelectionEvent->myX;
   vtkFloatingPointType y = theSelectionEvent->myY;
   vtkFloatingPointType z = 0.0;
@@ -649,7 +652,7 @@ SALOME_Actor
   if( !theSelectionEvent->myIsRectangle ) {
     switch(aSelectionMode){
     case NodeSelection: {
-      TPickLimiter( myPointPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myPointPicker, this );
       myPointPicker->Pick( x, y, z, aRenderer );
 
       int aVtkId = myPointPicker->GetPointId();
@@ -667,7 +670,7 @@ SALOME_Actor
     case FaceSelection:
     case VolumeSelection: 
     {
-      TPickLimiter( myCellPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myCellPicker, this );
       myCellPicker->Pick( x, y, z, aRenderer );
     
       int aVtkId = myCellPicker->GetCellId();
@@ -684,7 +687,7 @@ SALOME_Actor
     }
     case EdgeOfCellSelection: 
     {
-      TPickLimiter( myCellPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myCellPicker, this );
       myCellPicker->Pick( x, y, z, aRenderer );
     
       int aVtkId = myCellPicker->GetCellId();
@@ -728,7 +731,7 @@ SALOME_Actor
     switch(aSelectionMode){
     case NodeSelection: {
 
-      TPickLimiter( myPointRectPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myPointRectPicker, this );
       myPointRectPicker->Pick( x1, y1, z1, x2, y2, z2, aRenderer );
 
       const SVTK_RectPicker::TVectorIdsMap& aVectorIdsMap = myPointRectPicker->GetPointIdsMap();
@@ -751,7 +754,7 @@ SALOME_Actor
         mySelector->AddIObject( this );
         anIndexes.Clear();
       }
-      else
+      else if ( !anIsShift )
         mySelector->RemoveIObject( this );
 
       break;
@@ -787,7 +790,7 @@ SALOME_Actor
     case FaceSelection:
     case VolumeSelection: 
     {
-      TPickLimiter( myCellRectPicker, this );
+      SVTK::TPickLimiter aPickLimiter( myCellRectPicker, this );
       myCellRectPicker->Pick( x1, y1, z1, x2, y2, z2, aRenderer );
 
       const SVTK_RectPicker::TVectorIdsMap& aVectorIdsMap = myCellRectPicker->GetCellIdsMap();
@@ -813,7 +816,7 @@ SALOME_Actor
         mySelector->AddIObject( this );
         anIndexes.Clear();
       }
-      else
+      else if ( !anIsShift )
         mySelector->RemoveIObject( this );
     }
     default:
@@ -981,3 +984,62 @@ SALOME_Actor
 {
   myHighlightActor->SetProperty(theProperty);
 }
+
+/*!
+  Set standard point marker
+  \param theMarkerType type of the marker
+  \param theMarkerScale scale of the marker
+*/
+void
+SALOME_Actor
+::SetMarkerStd( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  myPreHighlightActor->SetMarkerStd( theMarkerType, theMarkerScale );
+  myHighlightActor->SetMarkerStd( theMarkerType, theMarkerScale );
+}
+
+/*!
+  Set custom point marker
+  \param theMarkerId id of the marker texture
+  \param theMarkerTexture marker texture
+*/
+void
+SALOME_Actor
+::SetMarkerTexture( int theMarkerId, VTK::MarkerTexture theMarkerTexture )
+{
+  myPreHighlightActor->SetMarkerTexture( theMarkerId, theMarkerTexture );
+  myHighlightActor->SetMarkerTexture( theMarkerId, theMarkerTexture );
+}
+
+/*!
+  Get type of the point marker
+  \return type of the point marker
+*/
+VTK::MarkerType
+SALOME_Actor
+::GetMarkerType()
+{
+  return myPreHighlightActor->GetMarkerType();
+}
+
+/*!
+  Get scale of the point marker
+  \return scale of the point marker
+*/
+VTK::MarkerScale
+SALOME_Actor
+::GetMarkerScale()
+{
+  return myPreHighlightActor->GetMarkerScale();
+}
+
+/*!
+  Get texture identifier of the point marker
+  \return texture identifier of the point marker
+ */
+int
+SALOME_Actor
+::GetMarkerTexture()
+{
+  return myPreHighlightActor->GetMarkerTexture();
+}

diff --git a/src/SVTK/SALOME_Actor.h b/src/SVTK/SALOME_Actor.h
index a9081a208563f4a64bf6fc0716d00c5cbe7c040e..0aabd4df07b7091b21762897d5b8e37bf07f5895 100644 (file)
--- a/src/SVTK/SALOME_Actor.h
+++ b/src/SVTK/SALOME_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,6 +19,7 @@
 //
 //  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   : SALOME_Actor.h
 //  Author : Nicolas REJNERI
@@ -39,10 +40,12 @@ class Handle(SALOME_InteractiveObject);
 #undef min
 #undef max
 
-#include "VTKViewer_Actor.h"
+#include <VTKViewer_Actor.h>
+#include <VTKViewer_MarkerDef.h>
 
 #include <vtkSmartPointer.h>
 
+class vtkAbstractPicker;
 class vtkPointPicker;
 class vtkCellPicker;
 class vtkOutlineSource;
@@ -213,6 +216,32 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor
   void
   UpdateNameActors();
 
+  //----------------------------------------------------------------------------
+  //! Set standard point marker
+  virtual
+  void
+  SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
+
+  //! Set custom point marker
+  virtual
+  void
+  SetMarkerTexture( int, VTK::MarkerTexture );
+
+  //! Get type of the point marker
+  virtual
+  VTK::MarkerType
+  GetMarkerType();
+
+  //! Get scale of the point marker
+  virtual
+  VTK::MarkerScale
+  GetMarkerScale();
+
+  //! Get texture identifier of the point marker
+  virtual
+  int
+  GetMarkerTexture();
+
   //----------------------------------------------------------------------------
   //! To set up a picker for nodal selection (initialized by #SVTK_Renderer::AddActor)
   void
@@ -271,6 +300,17 @@ class SVTK_EXPORT SALOME_Actor : public VTKViewer_Actor
   vtkSmartPointer<VTKViewer_FramedTextActor> myNameActor;
 };
 
+namespace SVTK
+{
+  class SVTK_EXPORT TPickLimiter
+  {
+    vtkAbstractPicker* myPicker;
+  public:
+    TPickLimiter(vtkAbstractPicker*, SALOME_Actor*);
+    ~TPickLimiter();
+  };
+}
+
 #ifdef WIN32
 #pragma warning ( default:4251 )
 #endif

diff --git a/src/SVTK/SVTK.cxx b/src/SVTK/SVTK.cxx
index 1d9850573a02455a6b075f003f527ec7f2fe833c..dec2a16882ece42d7903d92193cce88ae037f86c 100644 (file)
--- a/src/SVTK/SVTK.cxx
+++ b/src/SVTK/SVTK.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/SVTK/SVTK.h b/src/SVTK/SVTK.h
index 6d67e6e712f2bd12be4b849dbbd4a43d302d12e3..f2a24b8c9db438fe2ad2ffd135f418eee4b15da0 100755 (executable)
--- a/src/SVTK/SVTK.h
+++ b/src/SVTK/SVTK.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 SVTK_H
 #define SVTK_H
 

diff --git a/src/SVTK/SVTK.pro b/src/SVTK/SVTK.pro
index 8567a0872afd04910b93e51abd89360655ba98b9..fa830888533e9d6c0b1fd8cdd068f2671ad3fd7f 100644 (file)
--- a/src/SVTK/SVTK.pro
+++ b/src/SVTK/SVTK.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SVTK
 DESTDIR = ../../lib

diff --git a/src/SVTK/SVTK_Actor.cxx b/src/SVTK/SVTK_Actor.cxx
index 81577cba92931db54fa0743b26029e3fece1369a..66d71c86673f86e4623903be73d9b2e31268bb9e 100644 (file)
--- a/src/SVTK/SVTK_Actor.cxx
+++ b/src/SVTK/SVTK_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,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #include "SVTK_Actor.h"
 #include "SALOME_Actor.h"
 

diff --git a/src/SVTK/SVTK_Actor.h b/src/SVTK/SVTK_Actor.h
index 164e10a2b0338ea42a89c429af487254f8daf6bb..1b8d2d739e6d8209200aa34b73135f6f16e84d2b 100644 (file)
--- a/src/SVTK/SVTK_Actor.h
+++ b/src/SVTK/SVTK_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,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef SVTK_ACTOR_H
 #define SVTK_ACTOR_H
 

diff --git a/src/SVTK/SVTK_ComboAction.cxx b/src/SVTK/SVTK_ComboAction.cxx
index bec4331438f90594061701dac213fd40060fa2fe..67e993cd2f6cbf26b076f6e929d4bd491a08b6b6 100644 (file)
--- a/src/SVTK/SVTK_ComboAction.cxx
+++ b/src/SVTK/SVTK_ComboAction.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/SVTK/SVTK_ComboAction.h b/src/SVTK/SVTK_ComboAction.h
index 245b132354f55468d64b83dc2b7e755377a1456f..d3b8278f14c7bfacaa52565a8147b205b0c7b5e7 100644 (file)
--- a/src/SVTK/SVTK_ComboAction.h
+++ b/src/SVTK/SVTK_ComboAction.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
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 

diff --git a/src/SVTK/SVTK_CubeAxesActor2D.cxx b/src/SVTK/SVTK_CubeAxesActor2D.cxx
index 2a02bdd9995caf11021794331cbec63bc6c75354..b31eaa0343a9b536afdd91321f1ace87499a9d7e 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesActor2D.cxx
+++ b/src/SVTK/SVTK_CubeAxesActor2D.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   : SVTK_CubeAxesActor2D.cxx
 //  Author : Eugeny Nikolaev

diff --git a/src/SVTK/SVTK_CubeAxesActor2D.h b/src/SVTK/SVTK_CubeAxesActor2D.h
index 75b084c8c9228ba81faa9206123b18beb24ba32e..a2f23f2697aaf6a54ac65080d13cbaed2c952a6a 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesActor2D.h
+++ b/src/SVTK/SVTK_CubeAxesActor2D.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 OBJECT : kernel of SALOME component
 //  File   : SVTK_CubeAxesActor2D.h
 //  Author : Eugeny Nikolaev

diff --git a/src/SVTK/SVTK_CubeAxesDlg.cxx b/src/SVTK/SVTK_CubeAxesDlg.cxx
index 03c821dc75a092d17920f4d821e78d53260dcdf8..942e9af6222a50c1ff00d66326ea568b38b6e5d7 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.cxx
+++ b/src/SVTK/SVTK_CubeAxesDlg.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 for SMESH component
 //  File   : SVTK_CubeAxesDlg.cxx
 //  Author : Sergey LITONIN

diff --git a/src/SVTK/SVTK_CubeAxesDlg.h b/src/SVTK/SVTK_CubeAxesDlg.h
index 9247771a6c69d008e5a66e97618c7b485ac2120f..6d615b8c6646c586b0ae54c98f1a5e5516832b33 100644 (file)
--- a/src/SVTK/SVTK_CubeAxesDlg.h
+++ b/src/SVTK/SVTK_CubeAxesDlg.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   : SVTK_CubeAxesDlg.h
 //  Author : Sergey LITONIN
 //  Module : VISU

diff --git a/src/SVTK/SVTK_DeviceActor.cxx b/src/SVTK/SVTK_DeviceActor.cxx
index a3ce7ecefb7943d8a22ac3919a23110d90268135..a8dbf72af636dc6a26e52637cc4f3fb1d02408d1 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.cxx
+++ b/src/SVTK/SVTK_DeviceActor.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
 //
+
 //  SVTK OBJECT : interactive object for SVTK visualization
 //  File   : SVTK_DeviceActor.cxx
 //  Author : 
@@ -39,8 +40,8 @@
 #include <vtkPolyData.h>
 #include <vtkUnstructuredGrid.h>
 
-#include <vtkPolyDataMapper.h>
-#include <vtkDataSetMapper.h>
+#include <VTKViewer_PolyDataMapper.h>
+#include <VTKViewer_DataSetMapper.h>
 
 #include <vtkPassThroughFilter.h>
 
@@ -68,7 +69,7 @@ SVTK_DeviceActor
   vtkMapper::GetResolveCoincidentTopologyPolygonOffsetParameters(myPolygonOffsetFactor,
                                                                  myPolygonOffsetUnits);
 
-  myMapper = vtkDataSetMapper::New();
+  myMapper = VTKViewer_DataSetMapper::New();
 
   myShrinkFilter = vtkShrinkFilter::New();
 
@@ -141,9 +142,9 @@ SVTK_DeviceActor
     myPassFilter[ anId + 1 ]->SetInput( myPassFilter[ anId ]->GetOutput() );
 
     anId++; // 5
-    if(vtkDataSetMapper* aMapper = dynamic_cast<vtkDataSetMapper*>(theMapper)){
+    if(VTKViewer_DataSetMapper* aMapper = dynamic_cast<VTKViewer_DataSetMapper*>(theMapper)){
       aMapper->SetInput(myPassFilter[anId]->GetOutput());
-    }else if(vtkPolyDataMapper* aMapper = dynamic_cast<vtkPolyDataMapper*>(theMapper)){
+    }else if(VTKViewer_PolyDataMapper* aMapper = dynamic_cast<VTKViewer_PolyDataMapper*>(theMapper)){
       aMapper->SetInput(myPassFilter[anId]->GetPolyDataOutput());
     }
   }
@@ -507,6 +508,8 @@ SVTK_DeviceActor
     break;
   }
 
+  SetMarkerEnabled( theMode == Points );
+
   myRepresentation = theMode;
 }
 
@@ -652,7 +655,7 @@ SVTK_DeviceActor
   units = myPolygonOffsetUnits;
 }
 
-vtkDataSetMapper* SVTK_DeviceActor::GetDataSetMapper()
+VTKViewer_DataSetMapper* SVTK_DeviceActor::GetDataSetMapper()
 {
   return myMapper;
 }
@@ -683,3 +686,59 @@ void SVTK_DeviceActor::SetQuadraticArcAngle(vtkFloatingPointType theMaxAngle){
 vtkFloatingPointType SVTK_DeviceActor::GetQuadraticArcAngle(){
   return myGeomFilter->GetQuadraticArcAngle();
 }
+
+/*!
+ * Set point marker enabled
+ * \param theMarkerEnabled flag to enable/disable point marker
+ */
+void SVTK_DeviceActor::SetMarkerEnabled( bool theMarkerEnabled )
+{
+  myMapper->SetMarkerEnabled( theMarkerEnabled );
+}
+
+/*!
+ * Set standard point marker
+ * \param theMarkerType type of the marker
+ * \param theMarkerScale scale of the marker
+ */
+void SVTK_DeviceActor::SetMarkerStd( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  myMapper->SetMarkerStd( theMarkerType, theMarkerScale );
+}
+
+/*!
+ * Set custom point marker
+ * \param theMarkerId id of the marker texture
+ * \param theMarkerTexture marker texture
+ */
+void SVTK_DeviceActor::SetMarkerTexture( int theMarkerId, VTK::MarkerTexture theMarkerTexture )
+{
+  myMapper->SetMarkerTexture( theMarkerId, theMarkerTexture );
+}
+
+/*!
+ * Get type of the point marker
+ * \return type of the point marker
+ */
+VTK::MarkerType SVTK_DeviceActor::GetMarkerType()
+{
+  return myMapper->GetMarkerType();
+}
+
+/*!
+  Get scale of the point marker
+  \return scale of the point marker
+*/
+VTK::MarkerScale SVTK_DeviceActor::GetMarkerScale()
+{
+  return myMapper->GetMarkerScale();
+}
+
+/*!
+ * Get texture identifier of the point marker
+ * \return texture identifier of the point marker
+ */
+int SVTK_DeviceActor::GetMarkerTexture()
+{
+  return myMapper->GetMarkerTexture();
+}

diff --git a/src/SVTK/SVTK_DeviceActor.h b/src/SVTK/SVTK_DeviceActor.h
index 4b7f106c71df45776defeee63602c6b6ed2994b2..6ae0169ebacf9c7f5362561e801c5e0483d08e58 100644 (file)
--- a/src/SVTK/SVTK_DeviceActor.h
+++ b/src/SVTK/SVTK_DeviceActor.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
 //
+
 //  SVTK OBJECT : interactive object for SVTK visualization
 //  File   : SVTK_DeviceActor.h
 //  Author : 
@@ -30,6 +31,7 @@
 
 #include "SVTK.h"
 #include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
 
 #include <vector>
 
@@ -44,7 +46,7 @@ class vtkCell;
 class vtkDataSet;
 class vtkShrinkFilter;
 class vtkFeatureEdges;
-class vtkDataSetMapper;
+class VTKViewer_DataSetMapper;
 class vtkPassThroughFilter;
 
 namespace SVTK
@@ -219,11 +221,31 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   SetShaded(bool theShaded);
   //@}
 
+  /** @name For marker management purpose */
+  void
+  SetMarkerEnabled( bool );
+
+  void
+  SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
+
+  void
+  SetMarkerTexture( int, VTK::MarkerTexture );
+
+  VTK::MarkerType
+  GetMarkerType();
+
+  VTK::MarkerScale
+  GetMarkerScale();
+
+  int
+  GetMarkerTexture();
+  //@}
+
   virtual
   void
   Render(vtkRenderer *, vtkMapper *);
 
-  vtkDataSetMapper* GetDataSetMapper();
+  VTKViewer_DataSetMapper* GetDataSetMapper();
 
   //----------------------------------------------------------------------------
   //! Setting for displaying quadratic elements
@@ -247,7 +269,7 @@ class SVTK_EXPORT SVTK_DeviceActor: public vtkLODActor
   std::vector<vtkPassThroughFilter*> myPassFilter;
   vtkShrinkFilter* myShrinkFilter;
   vtkFeatureEdges* myFeatureEdges;
-  vtkDataSetMapper* myMapper;
+  VTKViewer_DataSetMapper* myMapper;
 
   bool myIsShrinkable;
   bool myIsShrunk;

diff --git a/src/SVTK/SVTK_DialogBase.cxx b/src/SVTK/SVTK_DialogBase.cxx
index 33f0560d2a0290d0e27f471b5eb6809bae7edfcc..046d8ebefeb5670d2c5689f091b216e3e63ac805 100644 (file)
--- a/src/SVTK/SVTK_DialogBase.cxx
+++ b/src/SVTK/SVTK_DialogBase.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/SVTK/SVTK_DialogBase.h b/src/SVTK/SVTK_DialogBase.h
index aef47cd33446cd3a743b163688e6b5867665c2a8..699afc2649a1fea0cd3a0a10d2aee2ecacc2f6da 100644 (file)
--- a/src/SVTK/SVTK_DialogBase.h
+++ b/src/SVTK/SVTK_DialogBase.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/SVTK/SVTK_Event.h b/src/SVTK/SVTK_Event.h
index 751c8103e52f182e36b9b29226a84288b8213ce6..49778698ac4991399111b480c623041225bfbf47 100644 (file)
--- a/src/SVTK/SVTK_Event.h
+++ b/src/SVTK/SVTK_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 : Alexander SLADKOV

diff --git a/src/SVTK/SVTK_Extension.cxx b/src/SVTK/SVTK_Extension.cxx
index a3ac8255ba6fc9920cf2f8f45140e7c8c6d801b9..cb91478f06941c00dcc8754469990790b2a30517 100755 (executable)
--- a/src/SVTK/SVTK_Extension.cxx
+++ b/src/SVTK/SVTK_Extension.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   : SVTK_Extension.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/SVTK/SVTK_Extension.h b/src/SVTK/SVTK_Extension.h
index cafd2f04458f85a0b769f3b0eb818d56663d64df..63e5a7592b713c7a4f31e834522d837a59f58106 100755 (executable)
--- a/src/SVTK/SVTK_Extension.h
+++ b/src/SVTK/SVTK_Extension.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 SVTK_Extension_H
 #define SVTK_Extension_H
 

diff --git a/src/SVTK/SVTK_FontWidget.cxx b/src/SVTK/SVTK_FontWidget.cxx
index e29ab2b276ccb258419fc3997a439014ead76702..b8e3b28a8a5fe02e82ffa1d047bfffb944060829 100644 (file)
--- a/src/SVTK/SVTK_FontWidget.cxx
+++ b/src/SVTK/SVTK_FontWidget.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 for SMESH component
 //  File   : 
 //  Author : Sergey LITONIN

diff --git a/src/SVTK/SVTK_FontWidget.h b/src/SVTK/SVTK_FontWidget.h
index 653a4ee42b8e737b61defd8737425b1725918aff..6150dfe5ff82d94ba1f62ca8632d2acdbe31a165 100644 (file)
--- a/src/SVTK/SVTK_FontWidget.h
+++ b/src/SVTK/SVTK_FontWidget.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   : 
 //  Author : Sergey LITONIN
 //  Module : 

diff --git a/src/SVTK/SVTK_Functor.h b/src/SVTK/SVTK_Functor.h
index 2cf0f02ce325896d2cf43b40ebfd39229ba9715e..fdb5def833de16b06b6d779f436f4298497f81f1 100644 (file)
--- a/src/SVTK/SVTK_Functor.h
+++ b/src/SVTK/SVTK_Functor.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 SVTK_Functor_H
 #define SVTK_Functor_H
 

diff --git a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx b/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
index e00c8dabba627c0370dbb923df1d5bf53a6b9eae..45defb3efe0b8faa8a20fb58492bc4d9774cfb36 100644 (file)
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.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/SVTK/SVTK_GenericRenderWindowInteractor.h b/src/SVTK/SVTK_GenericRenderWindowInteractor.h
index f85df59ba5c019ca3e56e4a30a28c4bd59067cfa..86a9c97f129018e0d9a00ddbda5b8489138a138d 100644 (file)
--- a/src/SVTK/SVTK_GenericRenderWindowInteractor.h
+++ b/src/SVTK/SVTK_GenericRenderWindowInteractor.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/SVTK/SVTK_ImageWriter.cxx b/src/SVTK/SVTK_ImageWriter.cxx
index 2a3e1f052aa0badab464dc2b30735c8ddd98040b..6119ac42ae539d7591c92171968d32cc1d550388 100755 (executable)
--- a/src/SVTK/SVTK_ImageWriter.cxx
+++ b/src/SVTK/SVTK_ImageWriter.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 "SVTK_ImageWriter.h"
 
 #include <QSemaphore>

diff --git a/src/SVTK/SVTK_ImageWriter.h b/src/SVTK/SVTK_ImageWriter.h
index 5fb465368583b1bde97f7574d57604d70f9b2631..3c852713e64c56a1097885a5f72fc32b460a957a 100755 (executable)
--- a/src/SVTK/SVTK_ImageWriter.h
+++ b/src/SVTK/SVTK_ImageWriter.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 SVTK_IMAGEWRITER_H
 #define SVTK_IMAGEWRITER_H
 

diff --git a/src/SVTK/SVTK_ImageWriterMgr.cxx b/src/SVTK/SVTK_ImageWriterMgr.cxx
index ddea670b7530d59ea15b58f14f763b8e0dab80f0..475d2d6610d4eb295ff23605ce29a9a401edc7f5 100755 (executable)
--- a/src/SVTK/SVTK_ImageWriterMgr.cxx
+++ b/src/SVTK/SVTK_ImageWriterMgr.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 "SVTK_ImageWriterMgr.h"
 #include "SVTK_ImageWriter.h"
 

diff --git a/src/SVTK/SVTK_ImageWriterMgr.h b/src/SVTK/SVTK_ImageWriterMgr.h
index 601f709d285ae36d69697d911171503cd579ab47..725ca61141bcf0387931d126ff7737f0759bb871 100755 (executable)
--- a/src/SVTK/SVTK_ImageWriterMgr.h
+++ b/src/SVTK/SVTK_ImageWriterMgr.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 SVTK_IMAGEWRITERMGR_H
 #define SVTK_IMAGEWRITERMGR_H
 

diff --git a/src/SVTK/SVTK_InteractorStyle.cxx b/src/SVTK/SVTK_InteractorStyle.cxx
index 050386f959438474af3e288b17ec55366d1af728..b9cd1aec049192d1333e833e98d0e8a6dc6c7d9d 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.cxx
+++ b/src/SVTK/SVTK_InteractorStyle.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 : 
@@ -455,48 +456,48 @@ void SVTK_InteractorStyle::OnLeftButtonDown(int ctrl, int shift,
     {
       SVTK_SelectionEvent* aSelectionEvent = GetSelectionEventFlipY();
 
-      SALOME_Actor* anActor = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
+      bool isPicked = false;
+      vtkActorCollection* anActorCollection = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
       
-      if ( anActor )
+      if( anActorCollection )
       {
-        myPointPicker->Pick( aSelectionEvent->myX,
-                             aSelectionEvent->myY, 
-                             0.0, 
-                             GetCurrentRenderer() );
-        int aVtkId = myPointPicker->GetPointId();
-        if ( aVtkId >= 0 )
-        {
-          int anObjId = anActor->GetNodeObjId( aVtkId );
-          vtkFloatingPointType* aCoords = anActor->GetNodeCoord(anObjId);
-          
-          if (myCurrRotationPointType == SVTK::StartPointSelection) {
-            myCurrRotationPointType = SVTK::SetRotateSelected;
-          
-            // invoke event for update coordinates in SVTK_SetRotationPointDlg
-            InvokeEvent(SVTK::RotationPointChanged,(void*)aCoords);
-          }
-          else if (myCurrFocalPointType == SVTK::StartFocalPointSelection) {
-            myCurrFocalPointType = SVTK::SetFocalPointSelected;
-          
-            // invoke event for update coordinates in SVTK_ViewParameterDlg
-            InvokeEvent(SVTK::FocalPointChanged,(void*)aCoords);
-          }
-        }
-        else
+        anActorCollection->InitTraversal();
+        while( vtkActor* aVTKActor = anActorCollection->GetNextActor() )
         {
-          if (myCurrRotationPointType == SVTK::StartPointSelection) {
-            // invoke event with no data (for SVTK_SetRotationPointDlg)
-            InvokeEvent(SVTK::RotationPointChanged,0);
-            myCurrRotationPointType = myPrevRotationPointType;
-          }
-          else if (myCurrFocalPointType == SVTK::StartFocalPointSelection) {
-            // invoke event with no data (for SVTK_ViewParameterDlg)
-            InvokeEvent(SVTK::FocalPointChanged,0);
-            myCurrFocalPointType = myPrevFocalPointType;
+          if( SALOME_Actor* anActor = SALOME_Actor::SafeDownCast( aVTKActor ) )
+          {
+            SVTK::TPickLimiter aPickLimiter( myPointPicker, anActor );
+            myPointPicker->Pick( aSelectionEvent->myX,
+                                 aSelectionEvent->myY, 
+                                 0.0, 
+                                 GetCurrentRenderer() );
+            int aVtkId = myPointPicker->GetPointId();
+            if ( aVtkId >= 0 )
+            {
+              int anObjId = anActor->GetNodeObjId( aVtkId );
+              vtkFloatingPointType* aCoords = anActor->GetNodeCoord(anObjId);
+              
+              if (myCurrRotationPointType == SVTK::StartPointSelection) {
+                myCurrRotationPointType = SVTK::SetRotateSelected;
+                
+                // invoke event for update coordinates in SVTK_SetRotationPointDlg
+                InvokeEvent(SVTK::RotationPointChanged,(void*)aCoords);
+              }
+              else if (myCurrFocalPointType == SVTK::StartFocalPointSelection) {
+                myCurrFocalPointType = SVTK::SetFocalPointSelected;
+                
+                // invoke event for update coordinates in SVTK_ViewParameterDlg
+                InvokeEvent(SVTK::FocalPointChanged,(void*)aCoords);
+              }
+
+              isPicked = true;
+              break;
+            }
           }
         }
       }
-      else
+
+      if( !isPicked )
       {
         if (myCurrRotationPointType == SVTK::StartPointSelection) {
           // invoke event with no data (for SVTK_SetRotationPointDlg)
@@ -1035,23 +1036,36 @@ void SVTK_InteractorStyle::onFinishOperation()
             this->FindPokedRenderer(aSelectionEvent->myX, aSelectionEvent->myY);
             Interactor->StartPickCallback();
             
-            SALOME_Actor* anActor = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
+            SALOME_Actor* aHighlightedActor = NULL;
+            vtkActorCollection* anActorCollection = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
 
             aSelectionEvent->myIsRectangle = false;
 
             if(!myShiftState)
               GetSelector()->ClearIObjects();
 
-            if(anActor)
+            if( anActorCollection )
+            {
+              anActorCollection->InitTraversal();
+              while( vtkActor* aVTKActor = anActorCollection->GetNextActor() )
               {
-                anActor->Highlight( this, aSelectionEvent, true );
-              }
-            else
-              {
-                if(myLastHighlitedActor.GetPointer() && myLastHighlitedActor.GetPointer() != anActor)
-                  myLastHighlitedActor->Highlight( this, aSelectionEvent, false );
+                if( SALOME_Actor* anActor = SALOME_Actor::SafeDownCast( aVTKActor ) )
+                {
+                  if( anActor->Highlight( this, aSelectionEvent, true ) )
+                  {
+                    aHighlightedActor = anActor;
+                    break;
+                  }
+                }
               }
-            myLastHighlitedActor = anActor;
+            }
+
+            if( !aHighlightedActor )
+            {
+              if(myLastHighlitedActor.GetPointer() && myLastHighlitedActor.GetPointer() != aHighlightedActor)
+                myLastHighlitedActor->Highlight( this, aSelectionEvent, false );
+            }
+            myLastHighlitedActor = aHighlightedActor;
           } 
         else 
           {
@@ -1166,40 +1180,63 @@ void SVTK_InteractorStyle::onCursorMove(QPoint mousePos)
 
   bool anIsChanged = false;
 
-  SALOME_Actor *anActor = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
+  SALOME_Actor* aPreHighlightedActor = NULL;
+  vtkActorCollection* anActorCollection = GetSelector()->Pick(aSelectionEvent, GetCurrentRenderer());
 
   if ( myCurrRotationPointType == SVTK::StartPointSelection ||
        myCurrFocalPointType == SVTK::StartFocalPointSelection )
   {
     myHighlightSelectionPointActor->SetVisibility( false );
 
-    if ( anActor )
+    if( anActorCollection )
     {
-      myPointPicker->Pick( aSelectionEvent->myX, aSelectionEvent->myY, 0.0, GetCurrentRenderer() );
-      int aVtkId = myPointPicker->GetPointId();
-      if ( aVtkId >= 0 ) {
-        int anObjId = anActor->GetNodeObjId( aVtkId );
-
-        TColStd_IndexedMapOfInteger aMapIndex;
-        aMapIndex.Add( anObjId );
-        myHighlightSelectionPointActor->MapPoints( anActor, aMapIndex );
-
-        myHighlightSelectionPointActor->SetVisibility( true );
-        anIsChanged = true;
+      anActorCollection->InitTraversal();
+      while( vtkActor* aVTKActor = anActorCollection->GetNextActor() )
+      {
+        if( SALOME_Actor* anActor = SALOME_Actor::SafeDownCast( aVTKActor ) )
+        {
+          SVTK::TPickLimiter aPickLimiter( myPointPicker, anActor );
+          myPointPicker->Pick( aSelectionEvent->myX, aSelectionEvent->myY, 0.0, GetCurrentRenderer() );
+          int aVtkId = myPointPicker->GetPointId();
+          if ( aVtkId >= 0 ) {
+            int anObjId = anActor->GetNodeObjId( aVtkId );
+
+            TColStd_IndexedMapOfInteger aMapIndex;
+            aMapIndex.Add( anObjId );
+            myHighlightSelectionPointActor->MapPoints( anActor, aMapIndex );
+
+            myHighlightSelectionPointActor->SetVisibility( true );
+            anIsChanged = true;
+            break;
+          }
+        }
       }
     }
   }
   else {
-    if (anActor){
-      anIsChanged |= anActor->PreHighlight( this, aSelectionEvent, true );
+    if( anActorCollection )
+    {
+      anActorCollection->InitTraversal();
+      while( vtkActor* aVTKActor = anActorCollection->GetNextActor() )
+      {
+        if( SALOME_Actor* anActor = SALOME_Actor::SafeDownCast( aVTKActor ) )
+        {
+          anIsChanged = anActor->PreHighlight( this, aSelectionEvent, true );
+          if( anActor->isPreselected() )
+          {
+            aPreHighlightedActor = anActor;
+            break;
+          }
+        }
+      }
     }
 
-    if(myLastPreHighlitedActor.GetPointer() && myLastPreHighlitedActor.GetPointer() != anActor)
+    if(myLastPreHighlitedActor.GetPointer() && myLastPreHighlitedActor.GetPointer() != aPreHighlightedActor)
       anIsChanged |= myLastPreHighlitedActor->PreHighlight( this, aSelectionEvent, false );   
 
   }
   
-  myLastPreHighlitedActor = anActor;
+  myLastPreHighlitedActor = aPreHighlightedActor;
 
   if(anIsChanged)
     this->Render();

diff --git a/src/SVTK/SVTK_InteractorStyle.h b/src/SVTK/SVTK_InteractorStyle.h
index 50def5acf0eccc325e08b0b560c75f0042f254b6..51bb52657bb64af18e714aa6ce37f77ea4927c07 100644 (file)
--- a/src/SVTK/SVTK_InteractorStyle.h
+++ b/src/SVTK/SVTK_InteractorStyle.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   : SVTK_InteractorStyle.h
 //  Author : Christophe ATTANASIO

diff --git a/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx b/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx
index a3fd9bbf35175383d394bc063c1e2fa48c90477b..c32769c1610757d0abd172afb0e0d7351531e18e 100644 (file)
--- a/src/SVTK/SVTK_KeyFreeInteractorStyle.cxx
+++ b/src/SVTK/SVTK_KeyFreeInteractorStyle.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   : SVTK_KeyFreeInteractorStyle.cxx
 //  Author : Christophe ATTANASIO

diff --git a/src/SVTK/SVTK_KeyFreeInteractorStyle.h b/src/SVTK/SVTK_KeyFreeInteractorStyle.h
index 3b44baa84b8fc242fa795f87b4772c844821d0ab..f524932d3d83978b024874674f983382fb6f9e59 100644 (file)
--- a/src/SVTK/SVTK_KeyFreeInteractorStyle.h
+++ b/src/SVTK/SVTK_KeyFreeInteractorStyle.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
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : SVTK_KeyFreeInteractorStyle.h
 //  Author : Christophe ATTANASIO

diff --git a/src/SVTK/SVTK_NonIsometricDlg.cxx b/src/SVTK/SVTK_NonIsometricDlg.cxx
index 527fe110c87e5716807eba0e6b90eafe8af834d5..a1c5c6da081c194fd6c976567668c847a9a46673 100644 (file)
--- a/src/SVTK/SVTK_NonIsometricDlg.cxx
+++ b/src/SVTK/SVTK_NonIsometricDlg.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/SVTK/SVTK_NonIsometricDlg.h b/src/SVTK/SVTK_NonIsometricDlg.h
index 5effaed4904b8240515cd611b430ab349c226a70..1e2573d1d44b04a6f39976040af7fb81710c08bd 100644 (file)
--- a/src/SVTK/SVTK_NonIsometricDlg.h
+++ b/src/SVTK/SVTK_NonIsometricDlg.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/SVTK/SVTK_Prs.cxx b/src/SVTK/SVTK_Prs.cxx
index 34651fe477be8a513f3c6890d11e4eb95bb57c23..6c71a4ee981210066abf86990b286bddb0403398 100644 (file)
--- a/src/SVTK/SVTK_Prs.cxx
+++ b/src/SVTK/SVTK_Prs.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   : SVTK_Prs.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/SVTK/SVTK_Prs.h b/src/SVTK/SVTK_Prs.h
index e867f5c8b7948f35aa4f08b0b3c29c92178c4ae5..ce500014f944e90355a2db1ba3c14d6d45b20536 100644 (file)
--- a/src/SVTK/SVTK_Prs.h
+++ b/src/SVTK/SVTK_Prs.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   : SVTK_Prs.h
 //  Author : Sergey ANIKIN

diff --git a/src/SVTK/SVTK_Recorder.cxx b/src/SVTK/SVTK_Recorder.cxx
index a837c27b5d25118abe96cba62a9b9271e07b809b..84a3221eb8fa230b05045497321be6936f05cce9 100755 (executable)
--- a/src/SVTK/SVTK_Recorder.cxx
+++ b/src/SVTK/SVTK_Recorder.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 "SVTK_Recorder.h"
 
 #include "SVTK_ImageWriter.h"

diff --git a/src/SVTK/SVTK_Recorder.h b/src/SVTK/SVTK_Recorder.h
index f0e96b43e6c6980b9dbc05602b4b116e2d5e765b..faa07fa90567673f43547fd97d9d1db7662cc310 100755 (executable)
--- a/src/SVTK/SVTK_Recorder.h
+++ b/src/SVTK/SVTK_Recorder.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 SVTK_RECORDER_H
 #define SVTK_RECORDER_H
 

diff --git a/src/SVTK/SVTK_RecorderDlg.cxx b/src/SVTK/SVTK_RecorderDlg.cxx
index 8c59d15d5b4643e12de6d4dd45a9acad46fb2527..429ba9848aa6c1cf8d69e940ef960f5c8278f80d 100644 (file)
--- a/src/SVTK/SVTK_RecorderDlg.cxx
+++ b/src/SVTK/SVTK_RecorderDlg.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 "SVTK_RecorderDlg.h"
 #include "SVTK_Recorder.h"
 

diff --git a/src/SVTK/SVTK_RecorderDlg.h b/src/SVTK/SVTK_RecorderDlg.h
index 5f1468308720313dfbe3ba3559b7b9058b3009b8..522359a8a092a073fc20a1c57fe09b1e0a4c799d 100644 (file)
--- a/src/SVTK/SVTK_RecorderDlg.h
+++ b/src/SVTK/SVTK_RecorderDlg.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 SVTK_RECORDERDLG_H
 #define SVTK_RECORDERDLG_H
 

diff --git a/src/SVTK/SVTK_RectPicker.cxx b/src/SVTK/SVTK_RectPicker.cxx
index 43fc897e80d762d6233f5e8b68c3aad4bb1343ec..568c0cc12b16aee71f4bb62edb494187155e3ee6 100644 (file)
--- a/src/SVTK/SVTK_RectPicker.cxx
+++ b/src/SVTK/SVTK_RectPicker.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   : SVTK_RectPicker.cxx
 //  Author : 
@@ -424,7 +425,7 @@ SVTK_RectPicker
   if ( this->PickFromList ) 
     aProps = this->GetPickList();
   else 
-    aProps = theRenderer->GetProps();
+    aProps = theRenderer->GetViewProps();
 
   aProps->InitTraversal();
   while ( vtkProp* aProp = aProps->GetNextProp() ) {
@@ -433,7 +434,7 @@ SVTK_RectPicker
       vtkMapper *aMapper = NULL;
       bool anIsPickable = false;
       vtkActor* anActor = NULL;
-      vtkProp *aPropCandidate = aPath->GetLastNode()->GetProp();
+      vtkProp *aPropCandidate = aPath->GetLastNode()->GetViewProp();
       if ( aPropCandidate->GetPickable() && aPropCandidate->GetVisibility() ) {
         anIsPickable = true;
         anActor = vtkActor::SafeDownCast(aPropCandidate);

diff --git a/src/SVTK/SVTK_RectPicker.h b/src/SVTK/SVTK_RectPicker.h
index a7c2a3934721356f2a24ae80d7cdb226c334f368..801c7988ebb44f79888c32928145439ae028e6c0 100644 (file)
--- a/src/SVTK/SVTK_RectPicker.h
+++ b/src/SVTK/SVTK_RectPicker.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   : SVTK_RectPicker.h
 //  Author : 

diff --git a/src/SVTK/SVTK_RenderWindowInteractor.cxx b/src/SVTK/SVTK_RenderWindowInteractor.cxx
index aa77c4d1841e6c4de180e717ae6516b917b29ac4..eef4ade04e6daf74aa0fec284246eb5f546ad941 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.cxx
+++ b/src/SVTK/SVTK_RenderWindowInteractor.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/SVTK/SVTK_RenderWindowInteractor.h b/src/SVTK/SVTK_RenderWindowInteractor.h
index b4aabaedcc1cb5e250486dbed4df490c35b4d1a7..6619905ac4bb53f7f77b3a5c0d97afdbfe35cc17 100644 (file)
--- a/src/SVTK/SVTK_RenderWindowInteractor.h
+++ b/src/SVTK/SVTK_RenderWindowInteractor.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/SVTK/SVTK_Renderer.cxx b/src/SVTK/SVTK_Renderer.cxx
index c070dec6c677ef9123f40ec10fc7bdbb49fe51b2..9131259f8d81fab60e6831bfee72f10839cba4cc 100644 (file)
--- a/src/SVTK/SVTK_Renderer.cxx
+++ b/src/SVTK/SVTK_Renderer.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/SVTK/SVTK_Renderer.h b/src/SVTK/SVTK_Renderer.h
index b434996dfc48a894c2b5e6ba8ca611f8a80d165e..3762af06cdab409cbba097435b7f5e603db208be 100644 (file)
--- a/src/SVTK/SVTK_Renderer.h
+++ b/src/SVTK/SVTK_Renderer.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/SVTK/SVTK_Selection.h b/src/SVTK/SVTK_Selection.h
index 8e087f4caac56d5d5ac68cecd07eedfce959424e..2297012b6ee00b597745dc84199ecb1d2c25f645 100644 (file)
--- a/src/SVTK/SVTK_Selection.h
+++ b/src/SVTK/SVTK_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
 //
+
 //  SALOME SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Selection.h
 //  Author : Nicolas REJNERI

diff --git a/src/SVTK/SVTK_SelectionEvent.h b/src/SVTK/SVTK_SelectionEvent.h
index 22fc91e5e3d34e00883d524e67379be7f75c465e..9523ce1fa569aa2eaad50a95a673312f50f4ffbb 100644 (file)
--- a/src/SVTK/SVTK_SelectionEvent.h
+++ b/src/SVTK/SVTK_SelectionEvent.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SVTK_SelectionEvent.h
 //  Author : 

diff --git a/src/SVTK/SVTK_Selector.cxx b/src/SVTK/SVTK_Selector.cxx
index bbb58454083537a9da1dfb4c88af25e897591b45..0721bd38994b1bde8ca58cf2d213b3badc58d885 100644 (file)
--- a/src/SVTK/SVTK_Selector.cxx
+++ b/src/SVTK/SVTK_Selector.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Selection.cxx
 //  Author : Nicolas REJNERI
@@ -42,24 +43,6 @@
 #include <vtkCellPicker.h>
 
 
-/*!
-  Find first SALOME_Actor from the end of actors collection
-*/
-inline
-SALOME_Actor* 
-GetLastSALOMEActor(vtkActorCollection* theCollection)
-{
-  if (theCollection) {
-    for (int i = theCollection->GetNumberOfItems() - 1; i >= 0; i--) {
-      if (SALOME_Actor* anActor = dynamic_cast<SALOME_Actor*>(theCollection->GetItemAsObject(i)))
-        if (anActor->hasIO())
-          return anActor;
-    }
-  }
-  return NULL;
-}
-
-
 /*!
   \return new SVTK_Selector
 */
@@ -544,7 +527,7 @@ SVTK_SelectorDef
   return Handle(VTKViewer_Filter)();
 }
 
-SALOME_Actor*
+vtkActorCollection*
 SVTK_SelectorDef
 ::Pick(const SVTK_SelectionEvent* theEvent, vtkRenderer* theRenderer) const
 {
@@ -553,7 +536,6 @@ SVTK_SelectorDef
   if ( aResourceMgr )
     anAdvancedSelectionAlgorithm = aResourceMgr->booleanValue( "VTKViewer", "use_advanced_selection_algorithm", true );
 
-  SALOME_Actor* anActor = NULL;
   vtkActorCollection* aListActors = NULL;
   if ( anAdvancedSelectionAlgorithm ) {
     myCellPicker->Pick(theEvent->myX,
@@ -562,19 +544,17 @@ SVTK_SelectorDef
                        theRenderer);
   
     aListActors = myCellPicker->GetActors();
-    anActor = GetLastSALOMEActor(aListActors);
   }
 
-  if ( !anActor ) {
+  if ( !aListActors || !aListActors->GetNumberOfItems() ) {
     myPicker->Pick(theEvent->myX,
                    theEvent->myY, 
                    0.0,
                    theRenderer);
     aListActors = myPicker->GetActors();
-    anActor = GetLastSALOMEActor(aListActors);
   }
   
-  return anActor;
+  return aListActors;
 }
 
 void

diff --git a/src/SVTK/SVTK_Selector.h b/src/SVTK/SVTK_Selector.h
index 9ffd5ee7753509e1b74fd45c5460c3f9c7bd035c..40c40377e0199f7f748b1f092ce2c9eaba1d1651 100644 (file)
--- a/src/SVTK/SVTK_Selector.h
+++ b/src/SVTK/SVTK_Selector.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Selection.h
 //  Author : Nicolas REJNERI
@@ -41,6 +42,7 @@ class Handle(VTKViewer_Filter);
 
 class SALOME_Actor;
 class SVTK_SelectionEvent;
+class vtkActorCollection;
 class vtkRenderer;
 class Handle(SALOME_InteractiveObject);
 
@@ -210,7 +212,7 @@ public:
 
   //----------------------------------------------------------------------------
   virtual
-  SALOME_Actor*
+  vtkActorCollection*
   Pick(const SVTK_SelectionEvent* theEvent, vtkRenderer* theRenderer) const = 0;
 
   virtual

diff --git a/src/SVTK/SVTK_SelectorDef.h b/src/SVTK/SVTK_SelectorDef.h
index bed2189f0f36f2a1ca85db6c4c18d765ec0d8c1c..ab866dc063cb01dd8b7f830ed369cc8fb012665c 100644 (file)
--- a/src/SVTK/SVTK_SelectorDef.h
+++ b/src/SVTK/SVTK_SelectorDef.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOME_Selection.h
 //  Author : Nicolas REJNERI
@@ -170,7 +171,7 @@ public:
 
   //----------------------------------------------------------------------------
   virtual
-  SALOME_Actor*
+  vtkActorCollection*
   Pick(const SVTK_SelectionEvent* theEvent, vtkRenderer* theRenderer) const;
 
   virtual

diff --git a/src/SVTK/SVTK_SetRotationPointDlg.cxx b/src/SVTK/SVTK_SetRotationPointDlg.cxx
index d8048856af289546f256ee9fce423e7562af97d9..28ac37ec72fc945dd4c151fe1700843f3c60077e 100755 (executable)
--- a/src/SVTK/SVTK_SetRotationPointDlg.cxx
+++ b/src/SVTK/SVTK_SetRotationPointDlg.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/SVTK/SVTK_SetRotationPointDlg.h b/src/SVTK/SVTK_SetRotationPointDlg.h
index 85101344865895040fb2bbeaa7f0f408243543d0..e87335e3f09a5bff874422de7250a0ff4487345c 100755 (executable)
--- a/src/SVTK/SVTK_SetRotationPointDlg.h
+++ b/src/SVTK/SVTK_SetRotationPointDlg.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/SVTK/SVTK_SpaceMouse.cxx b/src/SVTK/SVTK_SpaceMouse.cxx
index 649e33989752cc9472a01ca9a17349a4ed7d2e95..3fae2fede652eda3be1afe1af9c9fa831768974f 100644 (file)
--- a/src/SVTK/SVTK_SpaceMouse.cxx
+++ b/src/SVTK/SVTK_SpaceMouse.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   : SVTK_SpaceMouse.cxx
 //  Author : Alexander SLADKOV

diff --git a/src/SVTK/SVTK_SpaceMouse.h b/src/SVTK/SVTK_SpaceMouse.h
index 2d8e289589a7c74113e21133ac8ad596935cc168..cd841855b1bed69fd0b9789f395a7c2d94ff5e4d 100644 (file)
--- a/src/SVTK/SVTK_SpaceMouse.h
+++ b/src/SVTK/SVTK_SpaceMouse.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   : SVTK_SpaceMouse.h
 //  Author : Alexander SLADKOV

diff --git a/src/SVTK/SVTK_Trihedron.cxx b/src/SVTK/SVTK_Trihedron.cxx
index f1a5ed8a9c1e03573c25c599c38994dca09f82d3..827800cd81771a321d35979ca00558b0ea04d26b 100644 (file)
--- a/src/SVTK/SVTK_Trihedron.cxx
+++ b/src/SVTK/SVTK_Trihedron.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 "SVTK_Trihedron.h"
 #include "SALOME_Actor.h"
 

diff --git a/src/SVTK/SVTK_Trihedron.h b/src/SVTK/SVTK_Trihedron.h
index 847301c72561c7d60d8f0864fa0be65cab8d1c8a..83a6ceb4f20376b1b893610554a3c6ad1785cb4d 100644 (file)
--- a/src/SVTK/SVTK_Trihedron.h
+++ b/src/SVTK/SVTK_Trihedron.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 SVTK_TRIHEDRON_H
 #define SVTK_TRIHEDRON_H
 

diff --git a/src/SVTK/SVTK_UpdateRateDlg.cxx b/src/SVTK/SVTK_UpdateRateDlg.cxx
index ae1329ca9450b1b14f73ba907ebd259555cf12c1..373471ffe17651c71521a671ecd78c2e7e2aa713 100644 (file)
--- a/src/SVTK/SVTK_UpdateRateDlg.cxx
+++ b/src/SVTK/SVTK_UpdateRateDlg.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/SVTK/SVTK_UpdateRateDlg.h b/src/SVTK/SVTK_UpdateRateDlg.h
index ff2beced5ba92e13af1da1ce60d132fc99c11a82..045c2d35aa56d7bfd9c2a336cacdcea6d80cea88 100644 (file)
--- a/src/SVTK/SVTK_UpdateRateDlg.h
+++ b/src/SVTK/SVTK_UpdateRateDlg.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/SVTK/SVTK_View.cxx b/src/SVTK/SVTK_View.cxx
index 55d9d2251d5fe7198035a6744dee9a4f27845ecb..1e70b3ab43b71cc9dc777c2c7c9fb08a68ffd791 100644 (file)
--- a/src/SVTK/SVTK_View.cxx
+++ b/src/SVTK/SVTK_View.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/SVTK/SVTK_View.h b/src/SVTK/SVTK_View.h
index 3535892b04e1c3a70607d6d8b05618be91db3ee1..1baab282342a9e8b35b65524c24a66e1ad5066c2 100644 (file)
--- a/src/SVTK/SVTK_View.h
+++ b/src/SVTK/SVTK_View.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 SVTK_VIEW_H
 #define SVTK_VIEW_H
 

diff --git a/src/SVTK/SVTK_ViewManager.cxx b/src/SVTK/SVTK_ViewManager.cxx
index 2b25de28ae54046dbb0259c22a84876d9bd6fa02..059d6b7e535aa214806d7094daebb04c5b84aae9 100644 (file)
--- a/src/SVTK/SVTK_ViewManager.cxx
+++ b/src/SVTK/SVTK_ViewManager.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 "SVTK_ViewManager.h"
 #include "SVTK_ViewModel.h"
 

diff --git a/src/SVTK/SVTK_ViewManager.h b/src/SVTK/SVTK_ViewManager.h
index 7ac3fd35644dd57bc2be862c97e0347a44326145..97a19012aaffe66ce892cf63152c06136c676d75 100644 (file)
--- a/src/SVTK/SVTK_ViewManager.h
+++ b/src/SVTK/SVTK_ViewManager.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 SVTK_VIEWMANAGER_H
 #define SVTK_VIEWMANAGER_H
 

diff --git a/src/SVTK/SVTK_ViewModel.cxx b/src/SVTK/SVTK_ViewModel.cxx
index 3a8f22654a1c194674953107b9d105d1dcaa97fc..c34ce6ac7a6261ea9f62a27533acf67da4ed3a12 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.cxx
+++ b/src/SVTK/SVTK_ViewModel.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 <QMenu>
 #include <QColorDialog>
 #include <QToolBar>

diff --git a/src/SVTK/SVTK_ViewModel.h b/src/SVTK/SVTK_ViewModel.h
index 1dda8f65a0cea301ce0702191f95690fa5b67356..f6a717a0aa2eda6a5462ac0e9ba729a5e90ec00c 100644 (file)
--- a/src/SVTK/SVTK_ViewModel.h
+++ b/src/SVTK/SVTK_ViewModel.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 SVTK_VIEWMODEL_H
 #define SVTK_VIEWMODEL_H
 

diff --git a/src/SVTK/SVTK_ViewModelBase.h b/src/SVTK/SVTK_ViewModelBase.h
index f1bfcceb71329b00b3fbc26fe31fb5b3c8cfcbbc..d3379a15795e487b9c0da90aaa55dc6d2c9877e8 100644 (file)
--- a/src/SVTK/SVTK_ViewModelBase.h
+++ b/src/SVTK/SVTK_ViewModelBase.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 SVTK_SELECTIONCHANGED_H
 #define SVTK_SELECTIONCHANGED_H
 

diff --git a/src/SVTK/SVTK_ViewParameterDlg.cxx b/src/SVTK/SVTK_ViewParameterDlg.cxx
index 8962fd29afb679d662e6c6977f80f4e07fc294b8..600250b4d16a2722651f04fe2feab9e0d04034a8 100755 (executable)
--- a/src/SVTK/SVTK_ViewParameterDlg.cxx
+++ b/src/SVTK/SVTK_ViewParameterDlg.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/SVTK/SVTK_ViewParameterDlg.h b/src/SVTK/SVTK_ViewParameterDlg.h
index 8fac8ce35d939f4fc996e1c462fdee393b7e0044..b987700639b5a820c29fb027656d44453fd7e97e 100755 (executable)
--- a/src/SVTK/SVTK_ViewParameterDlg.h
+++ b/src/SVTK/SVTK_ViewParameterDlg.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
 //
+
 //  SALOME VTKViewer : build VTK viewer into Salome desktop
 //  File   : 
 //  Author : 

diff --git a/src/SVTK/SVTK_ViewWindow.cxx b/src/SVTK/SVTK_ViewWindow.cxx
index ab162860355226c3dda0fd99b0da96170bc1b7f4..d88d66d8b55dccf6ba1d0f9392967d1018b8c529 100755 (executable)
--- a/src/SVTK/SVTK_ViewWindow.cxx
+++ b/src/SVTK/SVTK_ViewWindow.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 "SVTK_NonIsometricDlg.h"
 #include "SVTK_UpdateRateDlg.h"
 #include "SVTK_CubeAxesDlg.h"

diff --git a/src/SVTK/SVTK_ViewWindow.h b/src/SVTK/SVTK_ViewWindow.h
index c3c0b20b7dd9a6daae9867b5133bf1c40901b681..ac1a5f12249b7d5c736a6d888a74a1ed57b36296 100755 (executable)
--- a/src/SVTK/SVTK_ViewWindow.h
+++ b/src/SVTK/SVTK_ViewWindow.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 SVTK_VIEWWINDOW_H
 #define SVTK_VIEWWINDOW_H
 

diff --git a/src/SVTK/resources/SVTK_images.ts b/src/SVTK/resources/SVTK_images.ts
index 146bb8cf7f92763a33d289a8c1f2a7eef9b48827..2236a59bae8f5b8ae3def0ee936b0f91bcf786a1 100644 (file)
--- a/src/SVTK/resources/SVTK_images.ts
+++ b/src/SVTK/resources/SVTK_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SVTK/resources/SVTK_msg_en.ts b/src/SVTK/resources/SVTK_msg_en.ts
index ea331dcb4746113604164f8f16be2532eef2b4d9..9d7454fcfdcb4225116d6716256347bc96fdf96e 100644 (file)
--- a/src/SVTK/resources/SVTK_msg_en.ts
+++ b/src/SVTK/resources/SVTK_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am
index 614de706bcee1e6c48a0a80f881391f67e662a58..9c94a2680f9775591cca7d2d46ebe8d82f7caa24 100755 (executable)
--- a/src/SalomeApp/Makefile.am
+++ b/src/SalomeApp/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : SalomeApp
@@ -94,6 +95,9 @@ MOC_FILES =                                   \
 
 nodist_libSalomeApp_la_SOURCES = $(MOC_FILES)
 
+# python modules
+salomepython_PYTHON = salome_pluginsmanager.py
+
 dist_salomeres_DATA =          \
        resources/SalomeApp.ini \
        resources/SalomeApp.xml

diff --git a/src/SalomeApp/SalomeApp.h b/src/SalomeApp/SalomeApp.h
index c3d571696ede2a032ae49a50e25f45553b0bd769..a7ef614e7cc900671637c7b3deab0cd8a669f349 100644 (file)
--- a/src/SalomeApp/SalomeApp.h
+++ b/src/SalomeApp/SalomeApp.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:      SalomeApp.h
 // Created:   November, 2004
 // Author:    OCC team

diff --git a/src/SalomeApp/SalomeApp.pro b/src/SalomeApp/SalomeApp.pro
index a5d6eca4b813faa9177e550792bb7551a4e6439d..f7163fa72bb2ba98efde5a7268ddcc0ccfac45f4 100644 (file)
--- a/src/SalomeApp/SalomeApp.pro
+++ b/src/SalomeApp/SalomeApp.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = SalomeApp
 DESTDIR = ../../lib

diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx
index 41896b0b848bc6e54782420bc568b516b7027aa1..ed874a3f4d1170a03d21a6433df86a90dff8de11 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.cxx
+++ b/src/SalomeApp/SalomeApp_Application.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:      SalomeApp_Application.cxx
 // Created:   10/22/2004 3:23:45 PM
 // Author:    Sergey LITONIN
@@ -305,6 +306,17 @@ void SalomeApp_Application::createActions()
   createMenu( separator(), toolsMenu, -1, 15, -1 );
 
   createExtraActions();
+
+  // import Python module that manages SALOME plugins
+  PyGILState_STATE gstate = PyGILState_Ensure();
+  PyObject* pluginsmanager=PyImport_ImportModule((char*)"salome_pluginsmanager");
+  PyObject* res=PyObject_CallMethod( pluginsmanager, (char*)"initialize", (char*)"isss",0,"salome","Tools","Plugins");
+  if(res==NULL)
+    PyErr_Print();
+  Py_XDECREF(res);
+  PyGILState_Release(gstate);
+  // end of SALOME plugins loading
+
 }
 
 /*!
@@ -973,29 +985,32 @@ int SalomeApp_Application::openChoice( const QString& aName )
 {
   int choice = LightApp_Application::openChoice( aName );
 
-  if ( choice == OpenNew ) // The document isn't already open.
-  {
-    bool exist = false;
-    std::vector<std::string> lst = studyMgr()->GetOpenStudies();
-    for ( uint i = 0; i < lst.size() && !exist; i++ )
-    {
-      if ( aName == QString( lst[i].c_str() ) )
-        exist = true;
-    }
-
-    // The document already exists in the study manager.
-    // Do you want to reload it?
-    if ( exist )
-    {
-      int answer = SUIT_MessageBox::question( desktop(), tr( "WRN_WARNING" ), tr( "QUE_DOC_ALREADYEXIST" ).arg( aName ),
-                                              SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::No );
-      if ( answer == SUIT_MessageBox::Yes )
-        choice = OpenRefresh;
-      else
-        choice = OpenCancel;
+  if ( QFileInfo( aName ).exists() ) {
+    if ( choice == OpenNew ) { // The document isn't already open.
+      bool exist = false;
+      std::vector<std::string> lst = studyMgr()->GetOpenStudies();
+      for ( uint i = 0; i < lst.size() && !exist; i++ ) {
+        if ( aName == QString( lst[i].c_str() ) )
+          exist = true;
+      }
+      // The document already exists in the study manager.
+      // Do you want to reload it?
+      if ( exist ) {
+        int answer = SUIT_MessageBox::question( desktop(), tr( "WRN_WARNING" ), tr( "QUE_DOC_ALREADYEXIST" ).arg( aName ),
+                                                SUIT_MessageBox::Yes | SUIT_MessageBox::No, SUIT_MessageBox::No );
+        if ( answer == SUIT_MessageBox::Yes )
+          choice = OpenRefresh;
+        else
+          choice = OpenCancel;
+      }
     }
+  } else { // file is not exist on disk
+    SUIT_MessageBox::warning( desktop(),
+                              QObject::tr("WRN_WARNING"),
+                              QObject::tr("WRN_FILE_NOT_EXIST").arg(aName.toLatin1().data()));
+    return false;
   }
-
+  
   return choice;
 }
 

diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h
index 57c3f87f71ff4e5da4ae3b592ef01cb723bc1ab0..f4e82a0a9b305a02226f2c748a1926a54ac44bfb 100644 (file)
--- a/src/SalomeApp/SalomeApp_Application.h
+++ b/src/SalomeApp/SalomeApp_Application.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:      SalomeApp_Application.h
 // Created:   10/22/2004 3:37:25 PM
 // Author:    Sergey LITONIN

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx b/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
index f9016a68c7005d2dd3ca886e5ec6649e8d1831f8..d8e234261574c521c61fdab54c07d2cb864bed8a 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.cxx
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.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 "SalomeApp_CheckFileDlg.h"
 
 #include <QCheckBox>

diff --git a/src/SalomeApp/SalomeApp_CheckFileDlg.h b/src/SalomeApp/SalomeApp_CheckFileDlg.h
index 74e857b6b6ca4fc72f05740c3eeca84e1a1f1383..4eb3a3fdfa3e21c4742074f81877e43417466d5b 100644 (file)
--- a/src/SalomeApp/SalomeApp_CheckFileDlg.h
+++ b/src/SalomeApp/SalomeApp_CheckFileDlg.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 SALOMEAPP_CHECKFILEDIALOG_H
 #define SALOMEAPP_CHECKFILEDIALOG_H
 

diff --git a/src/SalomeApp/SalomeApp_DataModel.cxx b/src/SalomeApp/SalomeApp_DataModel.cxx
index 85bc1e1604c7782af31015496bcfb53e6b73809c..a1a8f02d9461475d17806994059dcd2ffc9a58b5 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.cxx
+++ b/src/SalomeApp/SalomeApp_DataModel.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:      SalomeApp_DataModel.cxx
 // Created:   10/25/2004 10:36:06 AM
 // Author:    Sergey LITONIN

diff --git a/src/SalomeApp/SalomeApp_DataModel.h b/src/SalomeApp/SalomeApp_DataModel.h
index 53b2f701c48bb76d8107f1207501c23a37e27c4e..bb4c8565022dbabaa7ca5820d444057213b61484 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataModel.h
+++ b/src/SalomeApp/SalomeApp_DataModel.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:      SalomeApp_DataModel.h
 // Created:   10/25/2004 10:32:33 AM
 // Author:    Sergey LITONIN

diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx
index dbc07fe6673095a61729b9baafa199015b7eb8ef..28ac15f0e419e8c46b31ad77f5e477d2d2746923 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.cxx
+++ b/src/SalomeApp/SalomeApp_DataObject.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   : SalomeApp_DataObject.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SalomeApp/SalomeApp_DataObject.h b/src/SalomeApp/SalomeApp_DataObject.h
index b8f4b39a19868b0593bef9eda2ba564329582f5b..7e2fa1cb219307eec3e58d3509547b92cd511896 100644 (file)
--- a/src/SalomeApp/SalomeApp_DataObject.h
+++ b/src/SalomeApp/SalomeApp_DataObject.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   : SalomeApp_DataObject.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
index f83897839832d876c939867e6b6f3c6b6c8e8ce6..984bb04b0371eb18b4b83c4d393186ef6658e3d7 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.cxx
@@ -1,24 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// 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.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  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.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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:      SalomeApp_DoubleSpinBox.cxx
 // Author:    Oleg UVAROV
-
+//
 #include <PyConsole_Interp.h> // this include must be first (see PyInterp_base.h)!
 #include <PyConsole_Console.h>
 
@@ -33,6 +34,8 @@
 
 #include <QKeyEvent>
 #include <QLineEdit>
+#include <QToolTip>
+#include <QRegExp>
 
 #include <string>
 
@@ -54,7 +57,9 @@ SalomeApp_DoubleSpinBox::SalomeApp_DoubleSpinBox( QWidget* parent )
   myDefaultValue( 0.0 ),
   myIsRangeSet( false ),
   myMinimum( 0.0 ),
-  myMaximum( 99.99 )
+  myMaximum( 99.99 ),
+  myAcceptNames( true ),
+  myShowTip( true )
 {
   connectSignalsAndSlots();
 }
@@ -76,7 +81,9 @@ SalomeApp_DoubleSpinBox::SalomeApp_DoubleSpinBox( double min, double max, double
   myDefaultValue( 0.0 ),
   myIsRangeSet( false ),
   myMinimum( min ),
-  myMaximum( max )
+  myMaximum( max ),
+  myAcceptNames( true ),
+  myShowTip( true )
 {
   connectSignalsAndSlots();
 }
@@ -92,13 +99,24 @@ SalomeApp_DoubleSpinBox::SalomeApp_DoubleSpinBox( double min, double max, double
   \param max spin box maximum possible value
   \param step spin box increment/decrement value
   \param parent parent object
+  \param acceptNames if true, enables variable names in the spin box
+  \param showTip if true, makes the widget show a tooltip when invalid text is entered by the user
 */
-SalomeApp_DoubleSpinBox::SalomeApp_DoubleSpinBox( double min, double max, double step, int prec, int dec, QWidget* parent )
+SalomeApp_DoubleSpinBox::SalomeApp_DoubleSpinBox( double min, 
+                                                  double max, 
+                                                  double step, 
+                                                  int prec, 
+                                                  int dec, 
+                                                  QWidget* parent,
+                                                  bool acceptNames,
+                                                  bool showTip )
 : QtxDoubleSpinBox( min, max, step, prec, dec, parent ),
   myDefaultValue( 0.0 ),
   myIsRangeSet( false ),
   myMinimum( min ),
-  myMaximum( max )
+  myMaximum( max ),
+  myAcceptNames( acceptNames ),
+  myShowTip( showTip )
 {
   connectSignalsAndSlots();
 }
@@ -110,6 +128,33 @@ SalomeApp_DoubleSpinBox::~SalomeApp_DoubleSpinBox()
 {
 }
 
+/*!
+  \brief Perform \a steps increment/decrement steps.
+  
+  Re-implemented to handle cases when Notebook variable
+  name is specified by the user as the widget text.  
+  Otherwise, simply calls the base implementation.
+
+  \param steps number of increment/decrement steps
+*/
+void SalomeApp_DoubleSpinBox::stepBy( int steps )
+{
+  QString str  = text();
+  QString pref = prefix();
+  QString suff = suffix();
+  
+  if ( pref.length() && str.startsWith( pref ) )
+    str = str.right( str.length() - pref.length() );
+  if ( suff.length() && str.endsWith( suff ) )
+    str = str.left( str.length() - suff.length() );
+  
+  QRegExp varNameMask( "([a-z]|[A-Z]|_).*" );
+  if ( varNameMask.exactMatch( str ) )
+    return;
+
+  QtxDoubleSpinBox::stepBy( steps );
+}
+
 /*!
   \brief Connect signals and slots.
 */
@@ -187,7 +232,67 @@ QString SalomeApp_DoubleSpinBox::textFromValue( double val ) const
 */
 QValidator::State SalomeApp_DoubleSpinBox::validate( QString& str, int& pos ) const
 {
-  return QValidator::Acceptable;
+  QValidator::State res = QValidator::Invalid;
+
+  // Considering the input text as a variable name
+  // Applying Python identifier syntax:
+  // either a string starting with a letter, or a string starting with
+  // an underscore followed by at least one alphanumeric character
+  if ( isAcceptNames() ){
+    QRegExp varNameMask( "(([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|_)*)|(_([a-z]|[A-Z]|[0-9])+([a-z]|[A-Z]|[0-9]|_)*)" );
+    if ( varNameMask.exactMatch( str ) )
+      res = QValidator::Acceptable;
+  
+    if ( res == QValidator::Invalid ){
+      varNameMask.setPattern( "_" );
+      if ( varNameMask.exactMatch( str ) )  
+        res = QValidator::Intermediate;
+    }
+  }
+  
+  // Trying to interpret the current input text as a numeric value
+  if ( res == QValidator::Invalid )
+    res = QtxDoubleSpinBox::validate( str, pos );  
+  
+  // Show tooltip in case of invalid manual input
+  if ( isShowTipOnValidate() && lineEdit()->hasFocus() ){
+    if ( res != QValidator::Acceptable ){ // san: do we need to warn the user in Intermediate state???
+      SalomeApp_DoubleSpinBox* that = const_cast<SalomeApp_DoubleSpinBox*>( this );
+      QPoint pos( size().width(), 0. );
+      QPoint globalPos = mapToGlobal( pos );
+      QString minVal = textFromValue( minimum() );
+      QString maxVal = textFromValue( maximum() );
+      
+      // Same stuff as in QtxDoubleSpinBox::textFromValue()
+      int digits = getPrecision();
+      
+      // For 'g' format, max. number of digits after the decimal point is getPrecision() - 1
+      // See also QtxDoubleSpinBox::validate()
+      if ( digits < 0 )
+        digits = qAbs( digits ) - 1;
+      
+      QString templ( isAcceptNames() ? tr( "VALID_RANGE_VAR_MSG" ) : tr( "VALID_RANGE_NOVAR_MSG" ) );
+      QString msg( templ.arg( minVal ).arg( maxVal ).arg( digits ) );
+      
+      // Add extra hints to the message (if any passed through dynamic properties)
+      QVariant propVal = property( "validity_tune_hint" );
+      if ( propVal.isValid() ){
+        QString extraInfo = propVal.toString();
+        if ( !extraInfo.isEmpty() ){
+          msg += "\n";
+          msg += extraInfo;
+        }
+      }
+      
+      QToolTip::showText( globalPos, 
+                          msg, 
+                          that );
+    }
+    else
+      QToolTip::hideText();
+  }
+      
+  return res;
 }
 
 /*!
@@ -372,3 +477,39 @@ void SalomeApp_DoubleSpinBox::showEvent( QShowEvent* )
 {
   setText( myTextValue );
 }
+
+/*!
+  \brief Enables or disables variable names in the spin box.
+         By default, variable names are enabled.
+  \param flag If true, variable names are enabled.
+*/
+void SalomeApp_DoubleSpinBox::setAcceptNames( const bool flag )
+{
+  myAcceptNames = flag;
+}
+
+/*!
+  \brief Returns true if the spin box accepts variable names.
+*/
+bool SalomeApp_DoubleSpinBox::isAcceptNames() const
+{
+  return myAcceptNames;
+}
+
+/*!
+  \brief Enables or disables  tooltips in case of invalid or intermediate-state input.
+         Tooltips are enabled by default.
+  \param flag If true, tooltips are enabled.
+*/
+void SalomeApp_DoubleSpinBox::setShowTipOnValidate( const bool flag )
+{
+  myShowTip = myShowTip;
+}
+
+/*!
+  \brief Returns true if tooltip should be shown in case of invalid or intermediate-state input.
+*/
+bool SalomeApp_DoubleSpinBox::isShowTipOnValidate() const
+{
+  return myShowTip;
+}

diff --git a/src/SalomeApp/SalomeApp_DoubleSpinBox.h b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
index c5b6539ca6f12e686f1b9c52ba8f42faa4d8d115..095ed23cd7f50239a90d0dacca8f20bea72663d7 100644 (file)
--- a/src/SalomeApp/SalomeApp_DoubleSpinBox.h
+++ b/src/SalomeApp/SalomeApp_DoubleSpinBox.h
@@ -1,24 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// 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.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  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.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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:      SalomeApp_DoubleSpinBox.h
 // Author:    Oleg UVAROV
-
+//
 #ifndef SALOMEAPP_DOUBLESPINBOX_H
 #define SALOMEAPP_DOUBLESPINBOX_H
 
@@ -38,9 +39,11 @@ class SALOMEAPP_EXPORT SalomeApp_DoubleSpinBox : public QtxDoubleSpinBox
 public:
   SalomeApp_DoubleSpinBox( QWidget* = 0 );
   SalomeApp_DoubleSpinBox( double, double, double = 1, QWidget* = 0 );
-  SalomeApp_DoubleSpinBox( double, double, double, int, int, QWidget* = 0 );
+  SalomeApp_DoubleSpinBox( double, double, double, int, int, QWidget* = 0, bool = true, bool = true );
   virtual ~SalomeApp_DoubleSpinBox();
 
+  virtual void              stepBy( int );
+
   virtual double            valueFromText( const QString& ) const;
   virtual QString           textFromValue( double ) const;
 
@@ -55,6 +58,12 @@ public:
 
   virtual void              setText(const QString& );
 
+  void                      setAcceptNames( const bool );
+  bool                      isAcceptNames() const;
+
+  void                      setShowTipOnValidate( const bool );
+  bool                      isShowTipOnValidate() const;
+
 signals:
   void                      textChanged( const QString& );
 
@@ -86,6 +95,9 @@ private:
 
   QString                   myCorrectValue;
   QString                   myTextValue;
+
+  bool                      myAcceptNames;
+  bool                      myShowTip;
 };
 
 #endif

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx b/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
index 01240d878b6fd850514a36f0a56f0e4465991898..f23c841220a39e46f12fe2d1bb7bd11edcdc6ab7 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.cxx
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.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 "SalomeApp_ExceptionHandler.h"
 #include "CASCatch.hxx"
 

diff --git a/src/SalomeApp/SalomeApp_ExceptionHandler.h b/src/SalomeApp/SalomeApp_ExceptionHandler.h
index 64a26afbe6be8f69a7309431482e6141ab8ba21a..ff582ceeca09f891bd1e11b0d20d0b279cc66e44 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExceptionHandler.h
+++ b/src/SalomeApp/SalomeApp_ExceptionHandler.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 SALOMEAPP_EXCEPTIONHANDLER_H
 #define SALOMEAPP_EXCEPTIONHANDLER_H
 

diff --git a/src/SalomeApp/SalomeApp_ExitDlg.cxx b/src/SalomeApp/SalomeApp_ExitDlg.cxx
index a1f15d93680f34eb6f866945dc5df9a6e86da5aa..222ed28b6d681f568710e31e40e26539077aba36 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExitDlg.cxx
+++ b/src/SalomeApp/SalomeApp_ExitDlg.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:      SalomeApp_ExitDlg.cxx
 // Author:    Margarita KARPUNINA, Open CASCADE S.A.S.
 //

diff --git a/src/SalomeApp/SalomeApp_ExitDlg.h b/src/SalomeApp/SalomeApp_ExitDlg.h
index 3398864847a8b6c3dde6b72335243ae12ffb3177..ffc1b8ef1fb9ad07983bb3695350d6112b188d86 100644 (file)
--- a/src/SalomeApp/SalomeApp_ExitDlg.h
+++ b/src/SalomeApp/SalomeApp_ExitDlg.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:      SalomeApp_ExitDlg.h
 // Author:    Margarita KARPUNINA, Open CASCADE S.A.S.
 //

diff --git a/src/SalomeApp/SalomeApp_Filter.cxx b/src/SalomeApp/SalomeApp_Filter.cxx
index ac614dadae6552765e9eabb6f0a0a8c211d20072..ceefede82c097bd05091b676e2d360fdc96b83f5 100644 (file)
--- a/src/SalomeApp/SalomeApp_Filter.cxx
+++ b/src/SalomeApp/SalomeApp_Filter.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 "SalomeApp_Filter.h"
 
 /*!Constructor.Initialize by study.*/

diff --git a/src/SalomeApp/SalomeApp_Filter.h b/src/SalomeApp/SalomeApp_Filter.h
index 3a1d988780775bc4a2619d9ce3a3f8472de61e98..81e56d7a55315e886fda89ed83cf067a8cdd74ef 100644 (file)
--- a/src/SalomeApp/SalomeApp_Filter.h
+++ b/src/SalomeApp/SalomeApp_Filter.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 SALOMEAPP_FILTER_H
 #define SALOMEAPP_FILTER_H
 

diff --git a/src/SalomeApp/SalomeApp_ImportOperation.cxx b/src/SalomeApp/SalomeApp_ImportOperation.cxx
index eb1b51680587af7ebc91c4dc13494d4976488eb1..22d8bf1561d6ba2c7e9d099499c3065261944229 100644 (file)
--- a/src/SalomeApp/SalomeApp_ImportOperation.cxx
+++ b/src/SalomeApp/SalomeApp_ImportOperation.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SALOMEGUI_ImportOperation.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/SalomeApp/SalomeApp_ImportOperation.h b/src/SalomeApp/SalomeApp_ImportOperation.h
index 337aa9a8306348b30bdd875fcf56f0ae73b400da..e3d00d517cb806fcb6aed5ad75ddc702aa81abe1 100644 (file)
--- a/src/SalomeApp/SalomeApp_ImportOperation.h
+++ b/src/SalomeApp/SalomeApp_ImportOperation.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 SALOMEAPP : implementation of desktop and GUI kernel
 //  File   : SalomeApp_ImportOperation.h
 //  Author : Nicolas REJNERI

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.cxx b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
index 76625adc9c7c12da3e7279678a76f6fc196dd070..cc8c98884bfd82fc1550e40acb3b82f667f9b2be 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.cxx
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.cxx
@@ -1,24 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// 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.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  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.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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:      SalomeApp_IntSpinBox.cxx
 // Author:    Oleg UVAROV
-
+//
 #include <PyConsole_Interp.h> //this include must be first (see PyInterp_base.h)!
 #include <PyConsole_Console.h>
 
@@ -33,6 +34,8 @@
 
 #include <QKeyEvent>
 #include <QLineEdit>
+#include <QToolTip>
+#include <QRegExp>
 
 #include <string>
 
@@ -50,7 +53,9 @@
 */
 SalomeApp_IntSpinBox::SalomeApp_IntSpinBox( QWidget* parent )
 : QtxIntSpinBox( parent ),
-  myDefaultValue( 0 )
+  myDefaultValue( 0 ),
+  myAcceptNames( true ),
+  myShowTip( true )
 {
   connectSignalsAndSlots();
 }
@@ -65,10 +70,19 @@ SalomeApp_IntSpinBox::SalomeApp_IntSpinBox( QWidget* parent )
   \param max spin box maximum possible value
   \param step spin box increment/decrement value
   \param parent parent object
+  \param acceptNames if true, enables variable names in the spin box
+  \param showTip if true, makes the widget show a tooltip when invalid text is entered by the user
 */
-SalomeApp_IntSpinBox::SalomeApp_IntSpinBox( int min, int max, int step, QWidget* parent )
+SalomeApp_IntSpinBox::SalomeApp_IntSpinBox( int min, 
+                                            int max, 
+                                            int step, 
+                                            QWidget* parent,
+                                            bool acceptNames,
+                                            bool showTip )
 : QtxIntSpinBox( min, max, step, parent ),
-  myDefaultValue( 0 )
+  myDefaultValue( 0 ),
+  myAcceptNames( acceptNames ),
+  myShowTip( showTip )
 {
   connectSignalsAndSlots();
 }
@@ -80,6 +94,34 @@ SalomeApp_IntSpinBox::~SalomeApp_IntSpinBox()
 {
 }
 
+
+/*!
+  \brief Perform \a steps increment/decrement steps.
+  
+  Re-implemented to handle cases when Notebook variable
+  name is specified by the user as the widget text.  
+  Otherwise, simply calls the base implementation.
+
+  \param steps number of increment/decrement steps
+*/
+void SalomeApp_IntSpinBox::stepBy( int steps )
+{
+  QString str  = text();
+  QString pref = prefix();
+  QString suff = suffix();
+  
+  if ( pref.length() && str.startsWith( pref ) )
+    str = str.right( str.length() - pref.length() );
+  if ( suff.length() && str.endsWith( suff ) )
+    str = str.left( str.length() - suff.length() );
+  
+  QRegExp varNameMask( "([a-z]|[A-Z]|_).*" );
+  if ( varNameMask.exactMatch( str ) )
+    return;
+
+  QtxIntSpinBox::stepBy( steps );
+}
+
 /*!
   \brief Connect signals and slots.
 */
@@ -157,7 +199,60 @@ QString SalomeApp_IntSpinBox::textFromValue( int val ) const
 */
 QValidator::State SalomeApp_IntSpinBox::validate( QString& str, int& pos ) const
 {
-  return QValidator::Acceptable;
+  //return QValidator::Acceptable;
+  QValidator::State res = QValidator::Invalid;
+
+  // Considering the input text as a variable name
+  // Applying Python identifier syntax:
+  // either a string starting with a letter, or a string starting with
+  // an underscore followed by at least one alphanumeric character
+  if ( isAcceptNames() ){
+    QRegExp varNameMask( "(([a-z]|[A-Z])([a-z]|[A-Z]|[0-9]|_)*)|(_([a-z]|[A-Z]|[0-9])+([a-z]|[A-Z]|[0-9]|_)*)" );
+    if ( varNameMask.exactMatch( str ) )
+      res = QValidator::Acceptable;
+  
+    if ( res == QValidator::Invalid ){
+      varNameMask.setPattern( "_" );
+      if ( varNameMask.exactMatch( str ) )  
+        res = QValidator::Intermediate;
+    }
+  }
+  
+  // Trying to interpret the current input text as a numeric value
+  if ( res == QValidator::Invalid )
+    res = QtxIntSpinBox::validate( str, pos );  
+  
+  // Show tooltip in case of invalid manual input
+  if ( isShowTipOnValidate() && lineEdit()->hasFocus() ){
+    if ( res != QValidator::Acceptable ){ // san: do we need to warn the user in Intermediate state???
+      SalomeApp_IntSpinBox* that = const_cast<SalomeApp_IntSpinBox*>( this );
+      QPoint pos( size().width(), 0. );
+      QPoint globalPos = mapToGlobal( pos );
+      QString minVal = textFromValue( minimum() );
+      QString maxVal = textFromValue( maximum() );
+      
+      QString templ( isAcceptNames() ? tr( "VALID_RANGE_VAR_MSG" ) : tr( "VALID_RANGE_NOVAR_MSG" ) );      
+      QString msg( templ.arg( minVal ).arg( maxVal ) );
+      
+      // Add extra hints to the message (if any passed through dynamic properties)
+      QVariant propVal = property( "validity_tune_hint" );
+      if ( propVal.isValid() ){
+        QString extraInfo = propVal.toString();
+        if ( !extraInfo.isEmpty() ){
+          msg += "\n";
+          msg += extraInfo;
+        }
+      }
+  
+      QToolTip::showText( globalPos, 
+                          msg, 
+                          that );
+    }
+    else
+      QToolTip::hideText();
+  }
+      
+  return res;
 }
 
 /*!
@@ -330,3 +425,39 @@ void SalomeApp_IntSpinBox::showEvent( QShowEvent* )
 {
   setText( myTextValue );
 }
+
+/*!
+  \brief Enables or disables variable names in the spin box.
+         By default, variable names are enabled.
+  \param flag If true, variable names are enabled.
+*/
+void SalomeApp_IntSpinBox::setAcceptNames( const bool flag )
+{
+  myAcceptNames = flag;
+}
+
+/*!
+  \brief Returns true if the spin box accepts variable names.
+*/
+bool SalomeApp_IntSpinBox::isAcceptNames() const
+{
+  return myAcceptNames;
+}
+
+/*!
+  \brief Enables or disables  tooltips in case of invalid or intermediate-state input.
+         Tooltips are enabled by default.
+  \param flag If true, tooltips are enabled.
+*/
+void SalomeApp_IntSpinBox::setShowTipOnValidate( const bool flag )
+{
+  myShowTip = myShowTip;
+}
+
+/*!
+  \brief Returns true if tooltip should be shown in case of invalid or intermediate-state input.
+*/
+bool SalomeApp_IntSpinBox::isShowTipOnValidate() const
+{
+  return myShowTip;
+}

diff --git a/src/SalomeApp/SalomeApp_IntSpinBox.h b/src/SalomeApp/SalomeApp_IntSpinBox.h
index d15fe99c1d811f777e93a1e645366729c124abb1..09bb7f2b2c57347f4f08f3b9e9f29d236d6a7a0c 100644 (file)
--- a/src/SalomeApp/SalomeApp_IntSpinBox.h
+++ b/src/SalomeApp/SalomeApp_IntSpinBox.h
@@ -1,24 +1,25 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// 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.
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
-// 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
+//  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.
 //
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//  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:      SalomeApp_IntSpinBox.h
 // Author:    Oleg UVAROV
-
+//
 #ifndef SALOMEAPP_INTSPINBOX_H
 #define SALOMEAPP_INTSPINBOX_H
 
@@ -37,9 +38,11 @@ class SALOMEAPP_EXPORT SalomeApp_IntSpinBox : public QtxIntSpinBox
 
 public:
   SalomeApp_IntSpinBox( QWidget* = 0 );
-  SalomeApp_IntSpinBox( int, int, int = 1, QWidget* = 0 );
+  SalomeApp_IntSpinBox( int, int, int = 1, QWidget* = 0, bool = true, bool = true );
   virtual ~SalomeApp_IntSpinBox();
 
+  virtual void              stepBy( int );
+
   virtual int               valueFromText( const QString& ) const;
   virtual QString           textFromValue( int ) const;
 
@@ -53,6 +56,12 @@ public:
 
   virtual void              setText(const QString& );
 
+  void                      setAcceptNames( const bool );
+  bool                      isAcceptNames() const;
+
+  void                      setShowTipOnValidate( const bool );
+  bool                      isShowTipOnValidate() const;
+
 signals:
   void                      textChanged( const QString& );
 
@@ -80,6 +89,9 @@ private:
 
   QString                   myCorrectValue;
   QString                   myTextValue;
+
+  bool                      myAcceptNames;
+  bool                      myShowTip;
 };
 
 #endif

diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index b6d2b51384473f04b1df5e257c7fc14f92d8a962..f8c76763a99b8d20854b80f8d5f5606082e6f678 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.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   : SalomeApp_ListView.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h
index ea418cad6ca0ec7c4ca0a8ecdb1c8e92ae66ba8f..ff19fe1f41089517d0d840e8f3440e9e0ea36daa 100644 (file)
--- a/src/SalomeApp/SalomeApp_ListView.h
+++ b/src/SalomeApp/SalomeApp_ListView.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   : SalomeApp_ListView.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
index a94089ac855f7621044ad93b9835945f55d34653..cb6e886fc4522b1d01b19acb724c15eb2251adb5 100644 (file)
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.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 "SalomeApp_LoadStudiesDlg.h"
 
 #include <QLabel>

diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
index 9637c0b10470d696308a378dbe85cda8839d6aff..033e9223440e4b3f3c179deeff346480bec829e7 100644 (file)
--- a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h
+++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.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 SALOMEAPP_LOADSTUDIESDLG_H
 #define SALOMEAPP_LOADSTUDIESDLG_H
 

diff --git a/src/SalomeApp/SalomeApp_Module.cxx b/src/SalomeApp/SalomeApp_Module.cxx
index e7b54c83ad1d36e4439d2d81e28eddedf5635c16..4e35ccca7fead8d40f8516e00b531ddc2c328090 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.cxx
+++ b/src/SalomeApp/SalomeApp_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
 //
+
 // File:      SalomeApp_Module.cxx
 // Created:   10/25/2004 11:39:56 AM
 // Author:    Sergey LITONIN

diff --git a/src/SalomeApp/SalomeApp_Module.h b/src/SalomeApp/SalomeApp_Module.h
index b248966dbcfd4010ca587d4a6d7f64ccdab6b494..9530f9da03c20e5feb36beed7efb63c9f7005d66 100644 (file)
--- a/src/SalomeApp/SalomeApp_Module.h
+++ b/src/SalomeApp/SalomeApp_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
 //
+
 // File:      SalomeApp_Module.h
 // Created:   10/25/2004 11:33:06 AM
 // Author:    Sergey LITONIN

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
index e4e4934b9d8353c0c3779bf00ce0eb77953952c4..061976175d2eb6faa7ac102857c25069a162ae8d 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.cxx
@@ -1,25 +1,26 @@
-// Copyright (C) 2008  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+//  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 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.
+//  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
+//  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    SalomeApp_NoteBookDlg.cxx
 // Author : Roman NIKOLAEV, Open CASCADE S.A.S.
 // Module : GUI
-
+//
 #include <PyConsole_Interp.h> // this include must be first (see PyInterp_base.h)!
 #include <PyConsole_Console.h>
 
@@ -73,8 +74,9 @@ using namespace std;
  *  Purpose  : Constructor
  */
 //============================================================================
-NoteBook_TableRow::NoteBook_TableRow(int index, QWidget* parent):
+NoteBook_TableRow::NoteBook_TableRow(int index, NoteBook_Table* parentTable, QWidget* parent):
   QWidget(parent),
+  myParentTable(parentTable),
   myIndex(index),
   myRowHeader(new QTableWidgetItem()),
   myVariableName(new QTableWidgetItem()),
@@ -279,7 +281,28 @@ bool NoteBook_TableRow::IsIntegerValue(const QString theValue, int* theResult)
 //============================================================================
 bool NoteBook_TableRow::IsValidStringValue(const QString theValue)
 {
-  return true;
+  int aNumRows = myParentTable->myRows.count();
+  if( aNumRows == 0 )
+    return true;
+
+  bool aLastRowIsEmpty = myParentTable->myRows[ aNumRows - 1 ]->GetName().isEmpty() &&
+                         myParentTable->myRows[ aNumRows - 1 ]->GetValue().isEmpty();
+
+  SalomeApp_Application* app = dynamic_cast<SalomeApp_Application*>( SUIT_Session::session()->activeApplication() );
+  PyConsole_Console* pyConsole = app->pythonConsole();
+  PyConsole_Interp* pyInterp = pyConsole->getInterp();
+  PyLockWrapper aLock = pyInterp->GetLockWrapper();
+  string command = "import salome_notebook ; ";
+  command += "salome_notebook.checkThisNoteBook(";
+  for( int i = 0, n = aLastRowIsEmpty ? aNumRows - 1 : aNumRows; i < n; i++ ) {
+    command += myParentTable->myRows[i]->GetName().toStdString();
+    command += "=\"";
+    command += myParentTable->myRows[i]->GetValue().toStdString();
+    command += "\", ";
+  }
+  command += ") ";
+  bool aResult = pyInterp->run(command.c_str());
+  return !aResult;
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -450,8 +473,7 @@ bool NoteBook_Table::IsValid() const
     }
   command += ")";
   bool aResult = pyInterp->run(command.c_str());
-  aResult = !aResult;
-  return aResult;
+  return !aResult;
 }
 
 //============================================================================
@@ -473,7 +495,7 @@ void NoteBook_Table::RenamberRowItems(){
 void NoteBook_Table::AddRow(const QString& theName, const QString& theValue)
 {
   int anIndex = getUniqueIndex();
-  NoteBook_TableRow* aRow = new NoteBook_TableRow(anIndex, this);
+  NoteBook_TableRow* aRow = new NoteBook_TableRow(anIndex, this, this);
   aRow->SetName(theName);
   aRow->SetValue(theValue);
   aRow->AddToTable(this);
@@ -919,7 +941,7 @@ void SalomeApp_NoteBookDlg::onApply()
       else if( NoteBook_TableRow::IsBooleanValue(aValue,&aBVal) )
         myStudy->SetBoolean(string(aName.toLatin1().constData()),aBVal);
     
-      else if( NoteBook_TableRow::IsValidStringValue(aValue) )
+      else
         myStudy->SetString(string(aName.toLatin1().constData()),aValue.toStdString());
     }
   }

diff --git a/src/SalomeApp/SalomeApp_NoteBookDlg.h b/src/SalomeApp/SalomeApp_NoteBookDlg.h
index 93709477c5b0be479d9bc67fa6d8cfb408da6158..5fbfa2d74bc08b1d222df6efafdd06295f05f5a6 100644 (file)
--- a/src/SalomeApp/SalomeApp_NoteBookDlg.h
+++ b/src/SalomeApp/SalomeApp_NoteBookDlg.h
@@ -1,25 +1,26 @@
-// Copyright (C) 2008  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
+//  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 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.
+//  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
+//  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
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File:    SalomeApp_NoteBookDlg.h
 // Author : Roman NIKOLAEV, Open CASCADE S.A.S.
 // Module : GUI
-
+//
 #ifndef SALOMEAPP_NOTEBOOKDLG_H
 #define SALOMEAPP_NOTEBOOKDLG_H
 
@@ -35,6 +36,7 @@
 class QWidget;
 class QPushButton;
 class QTableWidgetItem;
+class NoteBook_Table;
 
 struct NoteBoox_Variable
 {
@@ -53,7 +55,7 @@ typedef QMap< int, NoteBoox_Variable > VariableMap;
 class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
 {
  public:
-  NoteBook_TableRow(int, QWidget* parent=0);
+  NoteBook_TableRow(int, NoteBook_Table* parentTable, QWidget* parent=0 );
   virtual ~NoteBook_TableRow();
 
   int  GetIndex() const { return myIndex; }
@@ -76,10 +78,11 @@ class SALOMEAPP_EXPORT NoteBook_TableRow : public QWidget
   static bool IsRealValue(const QString theValue, double* theResult = 0);
   static bool IsIntegerValue(const QString theValue, int* theResult = 0);
   static bool IsBooleanValue(const QString theValue, bool* theResult = 0);
-  static bool IsValidStringValue(const QString theName);
+  bool IsValidStringValue(const QString theName);
   
  private:
   int               myIndex;
+  NoteBook_Table*   myParentTable;
   QTableWidgetItem* myRowHeader;
   QTableWidgetItem* myVariableName;
   QTableWidgetItem* myVariableValue;
@@ -119,6 +122,8 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
 
   void ResetMaps();
 
+  QList<NoteBook_TableRow*>          myRows;
+
   public slots:
     void onItemChanged(QTableWidgetItem* theItem);
 
@@ -127,7 +132,6 @@ class SALOMEAPP_EXPORT NoteBook_Table : public QTableWidget
     
  private:
   bool isProcessItemChangedSignal;
-  QList<NoteBook_TableRow*>          myRows;
 
   bool        myIsModified;
   QList<int>  myRemovedRows;

diff --git a/src/SalomeApp/SalomeApp_PyInterp.cxx b/src/SalomeApp/SalomeApp_PyInterp.cxx
index 51868318c8bff4113aabbadbda4f623567e3c54c..b985a2cc741b602c821bf0aba23a909d7541a6b0 100755 (executable)
--- a/src/SalomeApp/SalomeApp_PyInterp.cxx
+++ b/src/SalomeApp/SalomeApp_PyInterp.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SalomeApp_PyInterp.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/SalomeApp/SalomeApp_PyInterp.h b/src/SalomeApp/SalomeApp_PyInterp.h
index baef2fffda2f81159c3ea61747139d2a3a7f8fc2..0eaeb5f32c652718ee743b62bea3a71ee10b5b97 100755 (executable)
--- a/src/SalomeApp/SalomeApp_PyInterp.h
+++ b/src/SalomeApp/SalomeApp_PyInterp.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 SALOMEGUI : implementation of desktop and GUI kernel
 //  File   : SalomeApp_PyInterp.h
 //  Author : Nicolas REJNERI

diff --git a/src/SalomeApp/SalomeApp_Study.cxx b/src/SalomeApp/SalomeApp_Study.cxx
index 4b18f8a6c04853cc125adf858ebca23bfb344874..be3b096182c481471e634d8179eccc788c3eda76 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.cxx
+++ b/src/SalomeApp/SalomeApp_Study.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 "SalomeApp_Study.h"
 
 #include "SalomeApp_Module.h"

diff --git a/src/SalomeApp/SalomeApp_Study.h b/src/SalomeApp/SalomeApp_Study.h
index 217423d1a173ce62d835677b21dbd761fa3460ff..fe281212ded6b3f0f4b0e4dded0ea75e6cf271c3 100644 (file)
--- a/src/SalomeApp/SalomeApp_Study.h
+++ b/src/SalomeApp/SalomeApp_Study.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 SALOMEAPP_STUDY_H
 #define SALOMEAPP_STUDY_H
 

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
index 9f8467c3bfd637091a02b1663a1d1bfe3f05b5ed..983999c73b0804867f03d8d90f846304c7040276 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.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 SalomeApp
 //  File   : SalomeApp_StudyPropertiesDlg.cxx
 //  Author : Sergey ANIKIN

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
index ce56f996e97eee3c2a73579355233976316a950b..217d1af3f5decb7ba6fea46373d13575826c9dae 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.h
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.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   : SalomeApp_StudyPropertiesDlg.h
 //  Author : Sergey ANIKIN
 //  Module : SALOME

diff --git a/src/SalomeApp/SalomeApp_Tools.cxx b/src/SalomeApp/SalomeApp_Tools.cxx
index 80f6a963933d74d8b42363b03c651f3c34e9a111..ae50a81d62f40aa88591b5663cce9bf8557ddc53 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.cxx
+++ b/src/SalomeApp/SalomeApp_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
 //
+
 #include "SalomeApp_Tools.h"
 
 #include <SUIT_Session.h>

diff --git a/src/SalomeApp/SalomeApp_Tools.h b/src/SalomeApp/SalomeApp_Tools.h
index f341a2824f3fc512d23182e7212ac92acbf48529..fe0f8bd02ff54bb18378b8ac5c10c78de590e32e 100644 (file)
--- a/src/SalomeApp/SalomeApp_Tools.h
+++ b/src/SalomeApp/SalomeApp_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
 //
+
 #ifndef SALOMEAPP_TOOLS_H
 #define SALOMEAPP_TOOLS_H
 

diff --git a/src/SalomeApp/SalomeApp_TypeFilter.cxx b/src/SalomeApp/SalomeApp_TypeFilter.cxx
index f792c5432ec0aee6cd6a17e67842cbb0f1b28247..629f70b752bfd69daac819c91d09b741ce900a2a 100644 (file)
--- a/src/SalomeApp/SalomeApp_TypeFilter.cxx
+++ b/src/SalomeApp/SalomeApp_TypeFilter.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 "SalomeApp_TypeFilter.h"
 
 #include "LightApp_DataOwner.h"

diff --git a/src/SalomeApp/SalomeApp_TypeFilter.h b/src/SalomeApp/SalomeApp_TypeFilter.h
index 403e77ae2c2f3e991d12b0bbb2b3565c764849a3..3d979da47133b946418af5eedce9ab8dc37ca9fa 100644 (file)
--- a/src/SalomeApp/SalomeApp_TypeFilter.h
+++ b/src/SalomeApp/SalomeApp_TypeFilter.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 SALOMEAPP_TYPEFILTER_H
 #define SALOMEAPP_TYPEFILTER_H
 

diff --git a/src/SalomeApp/SalomeApp_VisualState.cxx b/src/SalomeApp/SalomeApp_VisualState.cxx
index a642bd2dfcef126487155654402b607d5cc0baf8..689038fa6e40a3f53689ba43a5c30a05aa1c7ecc 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.cxx
+++ b/src/SalomeApp/SalomeApp_VisualState.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 "SalomeApp_VisualState.h"
 
 #include "SalomeApp_Module.h"

diff --git a/src/SalomeApp/SalomeApp_VisualState.h b/src/SalomeApp/SalomeApp_VisualState.h
index 0720f31afb7b32e5e64df111e9304b37d77cce0f..efb3c765970ba9c730043ce6165f46fab9bc12b1 100644 (file)
--- a/src/SalomeApp/SalomeApp_VisualState.h
+++ b/src/SalomeApp/SalomeApp_VisualState.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 SALOMEAPP_VISUALSTATE_H
 #define SALOMEAPP_VISUALSTATE_H
 

diff --git a/src/SalomeApp/Test/Makefile.am b/src/SalomeApp/Test/Makefile.am
index 9ed60c64a72a70809baf7510a8ace8dc99a9a01c..dbfd3b4f1e5ed88881110b3468213efdad8f1d8a 100644 (file)
--- a/src/SalomeApp/Test/Makefile.am
+++ b/src/SalomeApp/Test/Makefile.am
@@ -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
 #
+
 #  SALOMELocalTrace : log on local machine
 #  File   : Makefile.in
 #  Author : Sergey RUIN

diff --git a/src/SalomeApp/Test/SalomeAppTest.cxx b/src/SalomeApp/Test/SalomeAppTest.cxx
index b49a59dd84fd3b411c618217b843782667222955..4be34b04ce8090be3b2d14b5ba044702d1cdcb9a 100644 (file)
--- a/src/SalomeApp/Test/SalomeAppTest.cxx
+++ b/src/SalomeApp/Test/SalomeAppTest.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 "SalomeAppTest.hxx"
 
 using namespace std;

diff --git a/src/SalomeApp/Test/SalomeAppTest.hxx b/src/SalomeApp/Test/SalomeAppTest.hxx
index c2cab3bf10f51660647bc2664e5b8290545643f0..a080f4100e208050de859d563decb64a376d4a8e 100644 (file)
--- a/src/SalomeApp/Test/SalomeAppTest.hxx
+++ b/src/SalomeApp/Test/SalomeAppTest.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 _SalomeAppTEST_HXX_
 #define _SalomeAppTEST_HXX_
 

diff --git a/src/SalomeApp/Test/TestSalomeApp.cxx b/src/SalomeApp/Test/TestSalomeApp.cxx
index bc917025cbb01f7496167d72e531795c06cb599a..64c3c6d46b094b37ad6502f0dc37718ffd127a4f 100644 (file)
--- a/src/SalomeApp/Test/TestSalomeApp.cxx
+++ b/src/SalomeApp/Test/TestSalomeApp.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 all SalomeApp Test from basics until the present directory
 //
 #include "SalomeAppTest.hxx"

diff --git a/src/SalomeApp/Test/TestSalomeApp.py b/src/SalomeApp/Test/TestSalomeApp.py
index ac3a85fdaa6c1952d62cc014ab9aaf9d38a3ef07..b432fa4a4fdfeb789300f0ed312fc31f19238044 100644 (file)
--- a/src/SalomeApp/Test/TestSalomeApp.py
+++ b/src/SalomeApp/Test/TestSalomeApp.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 sys, os,signal,string,commands
 import runSalome
 import orbmodule

diff --git a/src/SalomeApp/resources/SalomeApp.xml b/src/SalomeApp/resources/SalomeApp.xml
index 58b4cd7d698ca4c8e1c6adbc6054747210cf13df..0dab0572709d80cf0b646692fa8eb99e3178b724 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp.xml
+++ b/src/SalomeApp/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

diff --git a/src/SalomeApp/resources/SalomeApp_images.ts b/src/SalomeApp/resources/SalomeApp_images.ts
index f6152fb3d65f11b6426d94afb4efabd985e2200b..0d814c5d4c1b8cbadaee146672653fc75ef43622 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_images.ts
+++ b/src/SalomeApp/resources/SalomeApp_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.ts b/src/SalomeApp/resources/SalomeApp_msg_en.ts
index 0646238f98f29ada8c7c21d572b75537688cabf9..e12a7d532d3a74ca4c6fa96d5184ae6fafde962b 100644 (file)
--- a/src/SalomeApp/resources/SalomeApp_msg_en.ts
+++ b/src/SalomeApp/resources/SalomeApp_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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
@@ -29,6 +29,10 @@
         <translation>Please enter correct file name.
 Python file must include only letters, digits and underscores and start from letter or underscore.</translation>
     </message>
+    <message>
+        <source>WRN_FILE_NOT_EXIST</source>
+        <translation>The file %1 does not exist.</translation>
+    </message>
     <message>
         <source>CLOSE_LOCKED_STUDY</source>
         <translation>Close locked study?</translation>
@@ -402,11 +406,11 @@ Do you really want to rename it?</translation>
        </message>
         <message>      
            <source>VARNAME_INCORRECT</source>
-           <translation>Valiable Name Incorrect :%1</translation>
+           <translation>Variable Name Incorrect :%1</translation>
        </message>
         <message>      
            <source>VARNAME_EXISTS</source>
-           <translation>Valiable with name "%1" exists</translation>
+           <translation>Variable with name "%1" exists</translation>
        </message>
 </context>
 <context>
@@ -449,4 +453,30 @@ Please edit its parameters or remove it from table.</translation>
            <translation>Failed to update study!</translation>
        </message>
 </context>
+<context>
+    <name>SalomeApp_DoubleSpinBox</name>  
+        <message>
+            <source>VALID_RANGE_VAR_MSG</source>
+            <translation>Specify either a variable name or
+a floating-point value in range ( %1; %2 )
+with %3-digit precision</translation>
+        </message>   
+        <message>
+            <source>VALID_RANGE_NOVAR_MSG</source>
+            <translation>Specify a floating-point value in range ( %1; %2 )
+with %3-digit precision</translation>
+        </message>
+</context>
+<context>
+    <name>SalomeApp_IntSpinBox</name>  
+        <message>
+            <source>VALID_RANGE_VAR_MSG</source>
+            <translation>Specify either a variable name or
+an integer value in range ( %1; %2 )</translation>
+        </message>   
+        <message>
+            <source>VALID_RANGE_NOVAR_MSG</source>
+            <translation>Specify an integer value in range ( %1; %2 )</translation>
+        </message>
+</context>
 </TS>

diff --git a/src/SalomeApp/salome_pluginsmanager.py b/src/SalomeApp/salome_pluginsmanager.py
new file mode 100644 (file)
index 0000000..0019933
--- /dev/null
+++ b/src/SalomeApp/salome_pluginsmanager.py
@@ -0,0 +1,217 @@
+#  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
+#
+
+"""
+This module is imported from C++ SalomeApp_Application
+and initialized (call to initialize function with 4 parameters)
+module : 0 if it's plugins manager at the application level 1 if it is at the module level
+name : the name of the plugins manager. This name is used to build the name of the plugins files
+basemenuname : the name of the menu into we want to add the menu of the plugins ("Tools" for example)
+menuname : the name of plugins menu
+
+A plugins manager is created at when calling initialize.
+
+The plugins manager creates a submenu <menuname> in the <basemenuname> menu.
+
+The plugins manager searches in $HOME/.salome/Plugins, $HOME/$APPLI/Plugins, $SALOME_PLUGINS_PATH directories
+files named <name>_plugins.py and executes them.
+
+These files should contain python code that register functions into the plugins manager.
+
+Example of a plugins manager with name salome. It searches files with name salome_plugins.py (example follows)::
+
+  import salome_pluginsmanager
+
+  def about(context):
+    from PyQt4.QtGui import QMessageBox
+    QMessageBox.about(None, "About SALOME pluginmanager", "SALOME plugins manager in SALOME virtual application ")
+
+  salome_pluginsmanager.AddFunction('About plugins','About SALOME pluginmanager',about)
+
+First you need to import the python module salome_pluginsmanager
+Second write a function with one argument context (it's an object with 3 attributes)
+Third register the function with a call to AddFunction (entry in menu plugins, tooltip, function)
+
+context attributes:
+- sg : the SALOME Swig interface
+- studyId : the SALOME studyId that must be used to execute the plugin
+- study : the SALOME study object that must be used to execute the plugin
+
+"""
+
+import os,sys,traceback
+from PyQt4 import QtGui
+from PyQt4 import QtCore
+
+import salome
+
+SEP=":"
+if sys.platform == "win32":
+  SEP = ";"
+
+# Get SALOME PyQt interface
+import SalomePyQt
+sgPyQt = SalomePyQt.SalomePyQt()
+
+# Get SALOME Swig interface
+import libSALOME_Swig
+sg = libSALOME_Swig.SALOMEGUI_Swig()
+
+plugins={}
+current_plugins_manager=None
+
+def initialize(module,name,basemenuname,menuname):
+  if plugins.has_key(name):return
+  plugins[name]=PluginsManager(module,name,basemenuname,menuname)
+
+class Context:
+    def __init__(self,sg):
+        self.sg=sg
+        self.studyId=salome.sg.getActiveStudyId()
+        self.study= salome.myStudyManager.GetStudyByID(self.studyId)
+
+def find_menu(smenu):
+  lmenus=smenu.split("|")
+  main=lmenus.pop(0).strip()
+  menu=sgPyQt.getPopupMenu(main)
+  return findMenu(lmenus,menu)
+
+def findMenu(lmenu,menu):
+  if not lmenu:return menu
+  m=lmenu.pop(0).strip()
+  for a in menu.actions():
+    if a.menu():
+      if a.text() == m:
+        return findMenu(lmenu,a.menu())
+
+class PluginsManager:
+    def __init__(self,module,name,basemenuname,menuname):
+        self.name=name
+        self.basemenuname=basemenuname
+        self.menuname=menuname
+        self.module=module
+        self.registry={}
+        self.handlers={}
+        self.lasttime=0
+        self.plugindirs=[]
+        self.plugins_files=[]
+
+        # USER plugins directory
+        user_dir = os.path.expanduser("~/.salome/Plugins")
+        self.plugindirs.append(user_dir)
+
+        # APPLI plugins directory
+        appli=os.getenv("APPLI")
+        if appli:
+          appli_dir=os.path.join(os.path.expanduser("~"),appli,"Plugins")
+          self.plugindirs.append(appli_dir)
+
+        #SALOME_PLUGINS_PATH environment variable (list of directories separated by ":")
+        pluginspath=os.getenv("SALOME_PLUGINS_PATH")
+        if pluginspath:
+          for directory in pluginspath.split(SEP):
+            self.plugindirs.append(directory)
+
+        self.basemenu = find_menu(self.basemenuname)
+
+        if self.module:
+          self.menu=QtGui.QMenu(self.menuname)
+          mid=sgPyQt.createMenu(self.menu.menuAction(),self.basemenuname)
+        else:
+          self.menu=QtGui.QMenu(self.menuname,self.basemenu)
+          self.basemenu.addMenu(self.menu)
+
+        self.menu.menuAction().setVisible(False)
+
+        self.basemenu.connect(self.basemenu, QtCore.SIGNAL("aboutToShow()"), self.importPlugins)
+
+    def AddFunction(self,name,description,script):
+        """ Add a plugin function
+        """
+        self.registry[name]=script,description
+
+        def handler(obj=self,script=script):
+          try:
+            script(Context(sgPyQt))
+          except:
+            s=traceback.format_exc()
+            QtGui.QMessageBox.warning(None,"Exception occured",s)
+
+        self.handlers[name]=handler
+
+    def importPlugins(self):
+        """Execute the salome_plugins file that contains plugins definition """
+        studyId=sg.getActiveStudyId()
+        if studyId == 0:
+          self.menu.clear()
+          self.menu.menuAction().setVisible(False)
+          return
+        elif self.lasttime ==0:
+          salome.salome_init(embedded=1)
+
+        lasttime=0
+
+        plugins_files=[]
+        plugins_file_name=self.name+"_plugins.py"
+        for directory in self.plugindirs:
+          plugins_file = os.path.join(directory,plugins_file_name)
+          if os.path.isfile(plugins_file):
+            plugins_files.append((directory,plugins_file))
+            lasttime=max(lasttime,os.path.getmtime(plugins_file))
+
+        plugins_files.sort()
+
+        if not plugins_files:
+          self.registry.clear()
+          self.handlers.clear()
+          self.lasttime=0
+          self.menu.clear()
+          self.menu.menuAction().setVisible(False)
+          return
+
+        if self.plugins_files != plugins_files or lasttime > self.lasttime:
+          global current_plugins_manager
+          current_plugins_manager=self
+          self.registry.clear()
+          self.handlers.clear()
+          self.lasttime=lasttime
+          for directory,plugins_file in plugins_files:
+            if directory not in sys.path:
+              sys.path.insert(0,directory)
+            try:
+              execfile(plugins_file,globals(),{})
+            except:
+              print "Error while loading plugins from file:",plugins_file
+              traceback.print_exc()
+
+          self.updateMenu()
+
+    def updateMenu(self):
+        """Update the Plugins menu"""
+        self.menu.clear()
+        for name,handler in self.handlers.items():
+          act=self.menu.addAction(name,handler)
+          act.setStatusTip(self.registry[name][1])
+        self.menu.menuAction().setVisible(True)
+
+def AddFunction(name,description,script):
+   """ Add a plugin function
+       Called by a user to register a function (script)
+   """
+   return current_plugins_manager.AddFunction(name,description,script)

diff --git a/src/Session/Makefile.am b/src/Session/Makefile.am
index 6ee316dd5bfe1f2f3dc6319f033d9e1a89649e32..a5400fcf30ad2be28b8aca9394a1987ee6e051d7 100755 (executable)
--- a/src/Session/Makefile.am
+++ b/src/Session/Makefile.am
@@ -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 Session : implementation of Session.idl
 #  File   : Makefile.in
 #  Author : Paul RASCLE, EDF

diff --git a/src/Session/SALOME_Session.hxx b/src/Session/SALOME_Session.hxx
index c780df96e645d99e30b2fe7e3374da8e9fd81e8b..3f0ab2b0dc34868e47faf3be74e3fefcca0021b5 100755 (executable)
--- a/src/Session/SALOME_Session.hxx
+++ b/src/Session/SALOME_Session.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   : SALOME_Session.hxx
 //  Author : Alexander A. BORODIN
 //  Module : GUI

diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx
index b9fdb1525c0806e341932c0a870ba32bd3123018..40e5a7ad03799acc0840e6a737543c88b27f1db9 100755 (executable)
--- a/src/Session/SALOME_Session_Server.cxx
+++ b/src/Session/SALOME_Session_Server.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 Session : implementation of Session.idl
 //  File : SALOME_Session_Server.cxx
 //  Author : Paul RASCLE, EDF
@@ -58,6 +59,7 @@
 #include "Session_ServerLauncher.hxx"
 #include "Session_ServerCheck.hxx"
 
+#include <Qtx.h>
 #include <QtxSplash.h>
 #include <Style_Salome.h>
 #include <SUIT_Tools.h>
@@ -257,7 +259,15 @@ public:
 #ifdef ENABLE_TESTRECORDER
   SALOME_QApplication( int& argc, char** argv ) : TestApplication( argc, argv ), myHandler ( 0 ) {}
 #else
-  SALOME_QApplication( int& argc, char** argv ) : QApplication( argc, argv ), myHandler ( 0 ) {}
+  SALOME_QApplication( int& argc, char** argv )
+#ifndef WIN32
+  // san: Opening an X display and choosing a visual most suitable for 3D visualization
+  // in order to make SALOME viewers work with non-native X servers
+  : QApplication( (Display*)Qtx::getDisplay(), argc, argv, Qtx::getVisual() ),
+#else
+  : QApplication( argc, argv ), 
+#endif
+    myHandler ( 0 ) {}
 #endif
 
   virtual bool notify( QObject* receiver, QEvent* e )
@@ -597,7 +607,7 @@ int main( int argc, char **argv )
     // std::cerr << "Caught unexpected exception on destroy : ignored !!" << std::endl;
   }
 
-  PyGILState_STATE gstate = PyGILState_Ensure();
+  PyGILState_Ensure();
   //Destroy orb from python (for chasing memory leaks)
   //PyRun_SimpleString("from omniORB import CORBA");
   //PyRun_SimpleString("orb=CORBA.ORB_init([''], CORBA.ORB_ID)");

diff --git a/src/Session/SalomeApp_Engine_i.cxx b/src/Session/SalomeApp_Engine_i.cxx
index e861236f795ef804218052c4a5e54963eb1d2958..6349e76063402f63992b9416a1af38950e571be2 100644 (file)
--- a/src/Session/SalomeApp_Engine_i.cxx
+++ b/src/Session/SalomeApp_Engine_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
 //
+
 //  SalomeApp_Engine_i : implementation of SalomeApp_Engine.idl
 //  File   : SalomeApp_Engine_i.cxx
 //  Author : Alexander SLADKOV

diff --git a/src/Session/SalomeApp_Engine_i.hxx b/src/Session/SalomeApp_Engine_i.hxx
index b338785d27b8826761a9b3cbfa5992c53d3cf5ec..35723cb3bee4e59f88305263847d696a1af466f5 100755 (executable)
--- a/src/Session/SalomeApp_Engine_i.hxx
+++ b/src/Session/SalomeApp_Engine_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
 //
+
 //  SalomeApp_Engine_i : implementation of SalomeApp_Engine.idl
 //  File   : SalomeApp_Engine_i.hxx
 //  Author : Alexander SLADKOV

diff --git a/src/Session/Session.pro b/src/Session/Session.pro
index 1fb30bbbd5a63db70f69dcd19f5cac98d380398d..e5d10242d9dfbbf7ad4e0b8030c54b9463ca246e 100644 (file)
--- a/src/Session/Session.pro
+++ b/src/Session/Session.pro
@@ -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
 #
+
 #TEMPLATE = lib
 #TARGET = SalomeSession
 #DESTDIR = ../../lib
 #MOC_DIR = ../../moc
 #OBJECTS_DIR = ../../obj/$$TARGET
-
 # ================>
-
+#
 TEMPLATE = 
 TARGET = SALOME_Session_Server
 DESTDIR = ../../bin

diff --git a/src/Session/Session_ServerCheck.cxx b/src/Session/Session_ServerCheck.cxx
index 37218c1903feb071bb1565c6e069cc52446b2064..2b538623e6f71262334cb3adab939bad938b251e 100644 (file)
--- a/src/Session/Session_ServerCheck.cxx
+++ b/src/Session/Session_ServerCheck.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   : Session_ServerCheck.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Session/Session_ServerCheck.hxx b/src/Session/Session_ServerCheck.hxx
index e23568ed2f0d9402bfc63c1040a70629879c3fe9..b0bd0c2d3c9f204fe68d275e9f8e70f435c53b41 100644 (file)
--- a/src/Session/Session_ServerCheck.hxx
+++ b/src/Session/Session_ServerCheck.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   : Session_ServerCheck.hxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com)
 //

diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx
index 14f952927a618c7d5aebaddb809a558a324d56c9..da0853855483b9aad23583353bece9bb40e157d3 100755 (executable)
--- a/src/Session/Session_ServerLauncher.cxx
+++ b/src/Session/Session_ServerLauncher.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 Session : implementation of Session_ServerLauncher.cxx
 //  File   : Session_ServerLauncher.xx
 //  Author : Paul RASCLE, EDF

diff --git a/src/Session/Session_ServerLauncher.hxx b/src/Session/Session_ServerLauncher.hxx
index 3f7e4df07d94744eb24d561a6e2536bd2740deb5..a7c478b1de55831612fe868e3c5f196b842277a2 100755 (executable)
--- a/src/Session/Session_ServerLauncher.hxx
+++ b/src/Session/Session_ServerLauncher.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 Session : implementation of Session_ServerLauncher.hxx
 //  File   : Session_ServerLauncher.hxx
 //  Author : Paul RASCLE, EDF

diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx
index 83f6c2de8314e0a58f64e896c023440e1db5141e..13dc4db9f904b4ef90aae0497d47cec231f713bf 100755 (executable)
--- a/src/Session/Session_ServerThread.cxx
+++ b/src/Session/Session_ServerThread.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 Session : implementation of Session_ServerThread.cxx
 //  File   : Session_ServerThread.cxx
 //  Author : Paul RASCLE, EDF
@@ -297,7 +298,7 @@ void Session_ServerThread::ActivateContainerManager(int argc,
   try {
     PortableServer::POA_var root_poa=PortableServer::POA::_the_root_poa();
     cout << "Activate SalomeLauncher ......!!!! " << endl;
-    SALOME_Launcher * myContainer = new SALOME_Launcher(_orb,root_poa);
+    new SALOME_Launcher(_orb,root_poa);
   }
   catch(CORBA::SystemException&) {
     INFOS("Caught CORBA::SystemException.");
@@ -370,8 +371,7 @@ void Session_ServerThread::ActivateContainer(int argc,
       containerName = argv[1];
     }
     
-    Engines_Container_i * myContainer 
-      = new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false);
+    new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false);
   }
   catch(CORBA::SystemException&) {
     INFOS("Caught CORBA::SystemException.");

diff --git a/src/Session/Session_ServerThread.hxx b/src/Session/Session_ServerThread.hxx
index f92c8fadf761ca250931b1cae2321750870bc753..15184d8cf7cb0834892b8378c8c6f0563a399b36 100755 (executable)
--- a/src/Session/Session_ServerThread.hxx
+++ b/src/Session/Session_ServerThread.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 Session : implementation of Session_ServerThread.hxx
 //  File   : Session_ServerThread.hxx
 //  Author : Paul RASCLE, EDF

diff --git a/src/Session/Session_Session_i.cxx b/src/Session/Session_Session_i.cxx
index ec065d692e9d54eba8f75d76af6167fba1133026..0525e9d366398dfc26690004b69f15fde5cfaae4 100755 (executable)
--- a/src/Session/Session_Session_i.cxx
+++ b/src/Session/Session_Session_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 Session : implementation of Session.idl
 //  File   : SALOME_Session_i.cxx
 //  Author : Paul RASCLE, EDF

diff --git a/src/Session/Session_Session_i.hxx b/src/Session/Session_Session_i.hxx
index 1b24d5cef73f86ffda7fa9e0972a50c764326be0..23899f6681f357cf587da272366c93f050cbd42c 100755 (executable)
--- a/src/Session/Session_Session_i.hxx
+++ b/src/Session/Session_Session_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
 //
+
 //  SALOME Session : implementation of Session.idl
 //  File   : Session_Session_i.hxx
 //  Author : Paul RASCLE, EDF

diff --git a/src/Style/Makefile.am b/src/Style/Makefile.am
index 18cef3c1907727562e92954ce33faf249279f5c4..4b2d215a5db6bf771ee7b3febc38d8133e067918 100644 (file)
--- a/src/Style/Makefile.am
+++ b/src/Style/Makefile.am
@@ -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   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : SalomeApp

diff --git a/src/Style/Style.h b/src/Style/Style.h
index 576c637e2697b7d08876859c14fb72c7b23099ec..ca54dc18345cbdee0bad9adbde0c741c8b419833 100644 (file)
--- a/src/Style/Style.h
+++ b/src/Style/Style.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   : Style.h
 // Author : Natalia Ermolaeva, Open CASCADE S.A.S.
 //

diff --git a/src/Style/Style.qrc b/src/Style/Style.qrc
index 7c529c5412f6955b17648883e0dc34fbc685609a..db45cce23be647b14804e019c53f3fcf1e2617a3 100644 (file)
--- a/src/Style/Style.qrc
+++ b/src/Style/Style.qrc
@@ -6,3 +6,4 @@
      <file>images/warning.png</file>
  </qresource>
  </RCC>
+ 
\ No newline at end of file

diff --git a/src/Style/Style_Model.cxx b/src/Style/Style_Model.cxx
index e3f8fd6cab6a184407c1ad6ba0e54cd79a9f93cb..17cebc2e1f62149a95dedca393b217ae67a579e2 100644 (file)
--- a/src/Style/Style_Model.cxx
+++ b/src/Style/Style_Model.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,12 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 // File   : Style_Model.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //
 #include "Style_Model.h"
+#include "Style_Salome.h"
 
 #include <QtxResourceMgr.h>
 
@@ -106,10 +105,11 @@ void Style_Model::fromApplication( bool reset )
   if ( !QApplication::instance() )  // application object is not created yet
     return;
 
-  if ( !myAppData )  {
-    // if not yes initialized from the application,
-    // store current application's style, palette, etc
+  if ( !myAppData ) // if not yes initialized from the application init myAppData
     myAppData = new AppData;
+
+  // store original application's style, palette, etc
+  if ( !Style_Salome::isActive() ) {
     myAppData->myStyle   = QApplication::style();
     myAppData->myPalette = QApplication::palette();
     myAppData->myFont    = QApplication::font();

diff --git a/src/Style/Style_Model.h b/src/Style/Style_Model.h
index 7d94ba7c16762c0e0248f2bc7a6fca936392d8f2..cde9e4388cad71d58474dba197939c3e093f5a9e 100644 (file)
--- a/src/Style/Style_Model.h
+++ b/src/Style/Style_Model.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   : Style_Model.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //

diff --git a/src/Style/Style_PrefDlg.cxx b/src/Style/Style_PrefDlg.cxx
index a5627e63fbf674a44a25cfaf754df43ff017d7a5..326dbcc03a2389bcfe7b5ebf065b406257cf3040 100644 (file)
--- a/src/Style/Style_PrefDlg.cxx
+++ b/src/Style/Style_PrefDlg.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   : Style_PrefDlg.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //

diff --git a/src/Style/Style_PrefDlg.h b/src/Style/Style_PrefDlg.h
index d96a4f0838c0ca74a783c19f98b947fce4d12190..6cda95abb2140dda11b741986f99590e4e0e043a 100644 (file)
--- a/src/Style/Style_PrefDlg.h
+++ b/src/Style/Style_PrefDlg.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   : Style_PrefDlg.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //

diff --git a/src/Style/Style_ResourceMgr.cxx b/src/Style/Style_ResourceMgr.cxx
index 22cef09fc8077b3103adc9708d9ff17e1d0e0f9c..3aee5baa712f1023ebb33e887ffe71c85cdc975f 100644 (file)
--- a/src/Style/Style_ResourceMgr.cxx
+++ b/src/Style/Style_ResourceMgr.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   : Style_ResourceMgr.cxx
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //

diff --git a/src/Style/Style_ResourceMgr.h b/src/Style/Style_ResourceMgr.h
index ab2aaa2fb24879487210503f7b7ec9c798665c91..03ddb2b0003425671e948ae21a91e01683bb9113 100644 (file)
--- a/src/Style/Style_ResourceMgr.h
+++ b/src/Style/Style_ResourceMgr.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   : Style_ResourceMgr.h
 // Author : Vadim SANDLER, Open CASCADE S.A.S (vadim.sandler@opencascade.com)
 //

diff --git a/src/Style/Style_Salome.cxx b/src/Style/Style_Salome.cxx
index 82d58ff717390342549d985385f4a325ccf47d25..edc398565fa88b9e9d3698721f90142e5d5e2b5b 100644 (file)
--- a/src/Style/Style_Salome.cxx
+++ b/src/Style/Style_Salome.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   : Style_Salome.cxx
 // Author : Natalia Ermolaeva, Open CASCADE S.A.S.
 //
@@ -259,6 +257,7 @@ void Style_Salome::apply()
     // set SALOME style
     QApplication::style()->setParent( 0 );           // avoid deleting original application style
     QApplication::setStyle( new Style_Salome() );    // set style
+    QApplication::setDesktopSettingsAware(false);    // prevent the style changing from another tools
   }
   update();                                          // update style
 }
@@ -275,6 +274,9 @@ void Style_Salome::restore()
   // check if SALOME style is set to the application
   if ( !isActive() )
     return;
+
+  QApplication::setDesktopSettingsAware(true);
+
   // restore previous style
   model()->restore();
 }

diff --git a/src/Style/Style_Salome.h b/src/Style/Style_Salome.h
index 8502acd920c6d1d9df14e99f96229117363d35ba..854649dde547142a6bab168281f95fc204434ad9 100644 (file)
--- a/src/Style/Style_Salome.h
+++ b/src/Style/Style_Salome.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   : Style_Salome.h
 // Author : Natalia Ermolaeva, Open CASCADE S.A.S.
 //

diff --git a/src/Style/Style_Tools.cxx b/src/Style/Style_Tools.cxx
index 83f1ba0eaf4d5f15f4428151fb3fb7533aed7e76..c010e160d10eef67ca35bde01b9f60795c57f3d4 100644 (file)
--- a/src/Style/Style_Tools.cxx
+++ b/src/Style/Style_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   : Style_Tools.cxx
 // Author : Natalia Ermolaeva, Open CASCADE S.A.S.
 //

diff --git a/src/Style/Style_Tools.h b/src/Style/Style_Tools.h
index 9f94ec750e84d4f1c77dc17af0af02d1fbf63592..f61c0fc3e82f5d56e591763a8b7ff43f2fc6f6dd 100644 (file)
--- a/src/Style/Style_Tools.h
+++ b/src/Style/Style_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   : Style_Tools.h
 // Author : Natalia Ermolaeva, Open CASCADE S.A.S.
 //

diff --git a/src/Style/resources/SalomeStyle.xml b/src/Style/resources/SalomeStyle.xml
index 3603c1de5296a43793ad746cff311a47f6f0727f..9cb2fea627f5830338805e57b7e6aec73b42f4ca 100644 (file)
--- a/src/Style/resources/SalomeStyle.xml
+++ b/src/Style/resources/SalomeStyle.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

diff --git a/src/TOOLSGUI/Makefile.am b/src/TOOLSGUI/Makefile.am
index a901bf1efbe289e3f885308dbbda9e1504e422ac..0c41e9a8d7f0258fac6a0676a84d6f09895f7c5c 100755 (executable)
--- a/src/TOOLSGUI/Makefile.am
+++ b/src/TOOLSGUI/Makefile.am
@@ -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 TOOLSGUI : implementation of desktop "Tools" optioins
 #  File   : Makefile.in
 #  Author : Marc Tajchman (CEA)

diff --git a/src/TOOLSGUI/TOOLSGUI.pro b/src/TOOLSGUI/TOOLSGUI.pro
index a52f844ce3c559983f205e0ea9417be65bf67328..1328017583453c6864163ce47b0ea39ee82f9945 100644 (file)
--- a/src/TOOLSGUI/TOOLSGUI.pro
+++ b/src/TOOLSGUI/TOOLSGUI.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = ToolsGUI
 DESTDIR = ../../lib

diff --git a/src/TOOLSGUI/ToolsGUI.cxx b/src/TOOLSGUI/ToolsGUI.cxx
index 45190056fb73a7f069531bdbeb83bd5b722dca43..9ad7a32b6447c6e9b325bb47f8faa7648685d047 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI.cxx
+++ b/src/TOOLSGUI/ToolsGUI.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 TOOLSGUI : implementation of desktop "Tools" optioins
 //  File   : ToolsGUI.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/TOOLSGUI/ToolsGUI.h b/src/TOOLSGUI/ToolsGUI.h
index ec62ef5a197891fb6cb70897bd4d2c81e92e1a18..375e656ba48eb99986e723322f7c5bb81b79a1a4 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI.h
+++ b/src/TOOLSGUI/ToolsGUI.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 TOOLSGUI : implementation of desktop "Tools" optioins
 //  File   : ToolsGUI.h
 //  Author : Nicolas REJNERI

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
index 0326eecd4470fd728dd328be13df55d6d1401caa..ec617f9fb80b51cf43b353517c4386a88dc676d2 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.cxx
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.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 TOOLSGUI : implementation of desktop "Tools" optioins
 //  File   : ToolsGUI_CatalogGeneratorDlg.cxx
 //  Author : Nicolas REJNERI

diff --git a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
index 646b0c56b8bc82930c6671cf363e1cf571006061..a62f6ba2d3d7d6883c78517b58f78e24ea8a1a1f 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.h
+++ b/src/TOOLSGUI/ToolsGUI_CatalogGeneratorDlg.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 TOOLSGUI : implementation of desktop "Tools" optioins
 //  File   : ToolsGUI_CatalogGeneratorDlg.h
 //  Author : Nicolas REJNERI

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index 038eaafbf86e646054ed46355506a765b537d5b3..ef267b1e3524f9faaa9813f52bf0c6dad12d6526 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.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 RegistryDisplay : GUI for Registry server implementation
 //  File   : ToolsGUI_RegWidget.cxx
 //  Author : Pascale NOYRET, EDF

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.h b/src/TOOLSGUI/ToolsGUI_RegWidget.h
index b1df2375c696b50536eb360023cf21655c9629fd..586cc9867c9538b420f66ef4e4f62e198d0498b5 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.h
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.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 RegistryDisplay : GUI for Registry server implementation
 //  File   : ToolsGUI_RegWidget.h
 //  Author : Pascale NOYRET, EDF

diff --git a/src/TOOLSGUI/resources/ToolsGUI_msg_en.ts b/src/TOOLSGUI/resources/ToolsGUI_msg_en.ts
index 91c40434fbda950fab9614efac584b55fe0da744..8f25a61e57b256772b67920bd01b18be0054ce46 100644 (file)
--- a/src/TOOLSGUI/resources/ToolsGUI_msg_en.ts
+++ b/src/TOOLSGUI/resources/ToolsGUI_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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

diff --git a/src/VTKViewer/Makefile.am b/src/VTKViewer/Makefile.am
index 7d94c6cc01fa2228aab68d8113b4a93bb7601b9a..b5187b2956358372726d568ad6b920e6107c881d 100755 (executable)
--- a/src/VTKViewer/Makefile.am
+++ b/src/VTKViewer/Makefile.am
@@ -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,15 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 #  File   : Makefile.in
 #  Author : Vladimir Klyachin (OCN)
 #  Module : VTKViewer
-
+#
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+EXTRA_DIST += textures
+
 lib_LTLIBRARIES = libVTKViewer.la
 
 salomeinclude_HEADERS =                                \
@@ -50,7 +53,13 @@ salomeinclude_HEADERS =                              \
        VTKViewer_ViewModel.h                   \
        VTKViewer_ViewWindow.h                  \
        VTKViewer_Functor.h                     \
-       VTKViewer_ArcBuilder.h
+       VTKViewer_ArcBuilder.h                  \
+       VTKViewer_MarkerDef.h                   \
+       VTKViewer_MarkerUtils.h                 \
+       VTKViewer_MarkerWidget.h                \
+       VTKViewer_MarkerDlg.h                   \
+       VTKViewer_PolyDataMapper.h              \
+       VTKViewer_DataSetMapper.h
 
 dist_libVTKViewer_la_SOURCES =                 \
        VTKViewer_CellLocationsArray.cxx        \
@@ -73,15 +82,26 @@ dist_libVTKViewer_la_SOURCES =                      \
        VTKViewer_ViewModel.cxx                 \
        VTKViewer_ConvexTool.cxx                \
        VTKViewer_ViewWindow.cxx                \
-       VTKViewer_ArcBuilder.cxx
+       VTKViewer_ArcBuilder.cxx                \
+       VTKViewer_MarkerUtils.cxx               \
+       VTKViewer_MarkerWidget.cxx              \
+       VTKViewer_MarkerDlg.cxx                 \
+       VTKViewer_PolyDataMapper.cxx            \
+       VTKViewer_DataSetMapper.cxx
 
 MOC_FILES =                                            \
        VTKViewer_RenderWindow_moc.cxx                  \
        VTKViewer_RenderWindowInteractor_moc.cxx        \
        VTKViewer_ViewManager_moc.cxx                   \
        VTKViewer_ViewModel_moc.cxx                     \
-       VTKViewer_ViewWindow_moc.cxx 
-nodist_libVTKViewer_la_SOURCES = $(MOC_FILES)
+       VTKViewer_ViewWindow_moc.cxx                    \
+       VTKViewer_MarkerWidget_moc.cxx                      \
+       VTKViewer_MarkerDlg_moc.cxx
+
+QRC_FILES = \
+       qrc_VTKViewer.cxx
+
+nodist_libVTKViewer_la_SOURCES = $(MOC_FILES) $(QRC_FILES)
 
 dist_salomeres_DATA =                          \
        resources/vtk_view_back.png             \
@@ -98,7 +118,16 @@ dist_salomeres_DATA =                               \
        resources/vtk_view_rotate.png           \
        resources/vtk_view_top.png              \
        resources/vtk_view_triedre.png          \
-       resources/vtk_view_zoom.png
+       resources/vtk_view_zoom.png             \
+       resources/marker_1.png                  \
+       resources/marker_2.png                  \
+       resources/marker_3.png                  \
+       resources/marker_4.png                  \
+       resources/marker_5.png                  \
+       resources/marker_6.png                  \
+       resources/marker_7.png                  \
+       resources/marker_8.png                  \
+       resources/marker_9.png
 
 nodist_salomeres_DATA =                \
        VTKViewer_images.qm     \
@@ -106,8 +135,10 @@ nodist_salomeres_DATA =            \
 
 libVTKViewer_la_CPPFLAGS = $(QT_INCLUDES) $(VTK_INCLUDES) $(CAS_CPPFLAGS)      \
        -I$(srcdir)/../Qtx -I$(srcdir)/../SUIT
-libVTKViewer_la_LDFLAGS = $(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(OGL_LIBS)  \
-       ../Qtx/libqtx.la ../SUIT/libsuit.la
+libVTKViewer_la_LDFLAGS = $(KERNEL_LDFLAGS) $(VTK_LIBS) $(QT_MT_LIBS)           \
+       $(CAS_KERNEL) $(OGL_LIBS) ../Qtx/libqtx.la ../SUIT/libsuit.la
+
+libVTKViewer_la_LIBADD = -lSALOMELocalTrace
 
 # Executable
 
@@ -116,5 +147,6 @@ bin_PROGRAMS = VTKViewer
 dist_VTKViewer_SOURCES = VTKViewer.cxx
 
 VTKViewer_CPPFLAGS = $(libVTKViewer_la_CPPFLAGS)
-VTKViewer_LDADD    = libVTKViewer.la $(libVTKViewer_la_LDFLAGS)
+VTKViewer_LDFLAGS = $(libVTKViewer_la_LDFLAGS)
+VTKViewer_LDADD = libVTKViewer.la $(libVTKViewer_la_LIBADD)
 

diff --git a/src/VTKViewer/VTKViewer.cxx b/src/VTKViewer/VTKViewer.cxx
index 0c39feb56241ccc06cbf82a9587904912d66a96b..fb78a600aafa0098a3fdfd70e07803a578a31fde 100644 (file)
--- a/src/VTKViewer/VTKViewer.cxx
+++ b/src/VTKViewer/VTKViewer.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/VTKViewer/VTKViewer.h b/src/VTKViewer/VTKViewer.h
index 3cac9e50109a975aca14f19cb7fae2fa7df7ab82..691953b3abbbb6ab107ab264b614978439ff484e 100755 (executable)
--- a/src/VTKViewer/VTKViewer.h
+++ b/src/VTKViewer/VTKViewer.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 VTKVIEWER_H
 #define VTKVIEWER_H
 

diff --git a/src/VTKViewer/VTKViewer.pro b/src/VTKViewer/VTKViewer.pro
index 0d7fb63f15b6d4306f4da06360ce4f5e3cada843..3e6984b2b5af1ab5910901ee63b375403fdc905c 100644 (file)
--- a/src/VTKViewer/VTKViewer.pro
+++ b/src/VTKViewer/VTKViewer.pro
@@ -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
 #
+
 TEMPLATE = lib
 TARGET = VTKViewer
 DESTDIR = ../../lib

diff --git a/src/VTKViewer/VTKViewer.qrc b/src/VTKViewer/VTKViewer.qrc
new file mode 100644 (file)
index 0000000..6256bfb
--- /dev/null
+++ b/src/VTKViewer/VTKViewer.qrc
@@ -0,0 +1,14 @@
+ <!DOCTYPE RCC><RCC version="1.0">
+ <qresource>
+     <file>textures/texture1.dat</file>
+     <file>textures/texture2.dat</file>
+     <file>textures/texture3.dat</file>
+     <file>textures/texture4.dat</file>
+     <file>textures/texture5.dat</file>
+     <file>textures/texture6.dat</file>
+     <file>textures/texture7.dat</file>
+     <file>textures/texture8.dat</file>
+     <file>textures/texture9.dat</file>
+ </qresource>
+ </RCC>
+ 
\ No newline at end of file

diff --git a/src/VTKViewer/VTKViewer_Actor.cxx b/src/VTKViewer/VTKViewer_Actor.cxx
index 5118c43902a556cd93c2b127e84c06a26ef0c30e..872ddefcd36d7b0d4deef2bda3baceca8b8e5361 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.cxx
+++ b/src/VTKViewer/VTKViewer_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,6 +19,7 @@
 //
 //  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   : SALOME_Actor.cxx
 //  Author : Nicolas REJNERI
@@ -653,6 +654,16 @@ VTKViewer_Actor
   return myIsHighlighted; 
 }
 
+/*!
+  \return true if the VTKViewer_Actor is already preselected
+*/
+bool
+VTKViewer_Actor
+::isPreselected() 
+{ 
+  return myIsPreselected; 
+}
+
 /*!
   Set preselection mode
 */

diff --git a/src/VTKViewer/VTKViewer_Actor.h b/src/VTKViewer/VTKViewer_Actor.h
index d41760d9f26a5af8b762beeb6034a6344feba031..af13d6c9609368b3b4d1ed2440d69a686c584db0 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Actor.h
+++ b/src/VTKViewer/VTKViewer_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,6 +19,7 @@
 //
 //  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   : SALOME_Actor.h
 //  Author : Nicolas REJNERI
@@ -287,6 +288,11 @@ class VTKVIEWER_EXPORT VTKViewer_Actor : public vtkLODActor
   bool
   isHighlighted();
 
+  //! Ask, if the VTKViewer_Actor is already preselected
+  virtual
+  bool
+  isPreselected();
+
   //! Set preselection mode
   virtual
   void

diff --git a/src/VTKViewer/VTKViewer_Algorithm.cxx b/src/VTKViewer/VTKViewer_Algorithm.cxx
index b80ec9cc404129b929c6ff6a826e1325c2d492be..b6cdb33c714d8f61a89393eba309928683c88894 100644 (file)
--- a/src/VTKViewer/VTKViewer_Algorithm.cxx
+++ b/src/VTKViewer/VTKViewer_Algorithm.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 "VTKViewer_Algorithm.h"
 
 namespace VTK

diff --git a/src/VTKViewer/VTKViewer_Algorithm.h b/src/VTKViewer/VTKViewer_Algorithm.h
index 78d489b058d06d1cd496cb17a5af527df2b843fc..56148c505e4642aaf5f1d423a60a4d6f092c01b5 100644 (file)
--- a/src/VTKViewer/VTKViewer_Algorithm.h
+++ b/src/VTKViewer/VTKViewer_Algorithm.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   : VTKViewer_ViewFrame.h
 //  Author : Nicolas REJNERI

diff --git a/src/VTKViewer/VTKViewer_AppendFilter.cxx b/src/VTKViewer/VTKViewer_AppendFilter.cxx
index fe6550c8247fc557c1102d3f67ce4db828d6084e..0b4af0fe8e238685d75f0c86fda0b6da40f5e5ac 100644 (file)
--- a/src/VTKViewer/VTKViewer_AppendFilter.cxx
+++ b/src/VTKViewer/VTKViewer_AppendFilter.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/VTKViewer/VTKViewer_AppendFilter.h b/src/VTKViewer/VTKViewer_AppendFilter.h
index 5531d38d66ef5dcc033798fcba64c119a8bded24..3c7972f4c9d634383d763f83d28809ccf4c822d9 100644 (file)
--- a/src/VTKViewer/VTKViewer_AppendFilter.h
+++ b/src/VTKViewer/VTKViewer_AppendFilter.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 VTKVIEWER_APPENDFILTER_H
 #define VTKVIEWER_APPENDFILTER_H
 

diff --git a/src/VTKViewer/VTKViewer_ArcBuilder.cxx b/src/VTKViewer/VTKViewer_ArcBuilder.cxx
index 392cbd18726331df4eeed462e8eb2a8fe5c91b13..c453a1589b1c3ed76196d59192d5e877b16117da 100644 (file)
--- a/src/VTKViewer/VTKViewer_ArcBuilder.cxx
+++ b/src/VTKViewer/VTKViewer_ArcBuilder.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   : VTKViewer_ArcBuilder.cxx
 //  Author : Roman NIKOLAEV
 //  Module : GUI
@@ -452,8 +450,8 @@ vtkUnstructuredGrid* VTKViewer_ArcBuilder::BuildArc(std::vector<double>& theScal
   else 
     yCenter =  (-1/K1)*(xCenter - (x1+x2)/2.0) + (y1 + y2)/2.0;
   
-  double zCenter = z;
 #ifdef _MY_DEBUG_   
+  double zCenter = z;
   std::cout<<"xCenter : "<<xCenter<<endl;
   std::cout<<"yCenter : "<<yCenter<<endl;
   std::cout<<"zCenter : "<<zCenter<<endl;

diff --git a/src/VTKViewer/VTKViewer_ArcBuilder.h b/src/VTKViewer/VTKViewer_ArcBuilder.h
index 4362b6df0ebcacbd3c3a0514582291f448580315..0a70834464e1b712867b901f6fc23d132e606177 100644 (file)
--- a/src/VTKViewer/VTKViewer_ArcBuilder.h
+++ b/src/VTKViewer/VTKViewer_ArcBuilder.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 VTKVIEWER_ARCBUILDER_H
 #define VTKVIEWER_ARCBUILDER_H
 

diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx b/src/VTKViewer/VTKViewer_CellLocationsArray.cxx
index c928d26f1f77b6f3c47791c7d1d11226070cc96d..09219a46d8608e98b3e2a470007e298eb3870de6 100644 (file)
--- a/src/VTKViewer/VTKViewer_CellLocationsArray.cxx
+++ b/src/VTKViewer/VTKViewer_CellLocationsArray.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 : implementation of interactive object visualization for OCC and VTK viewers
 //  File   :
 //  Author :

diff --git a/src/VTKViewer/VTKViewer_CellLocationsArray.h b/src/VTKViewer/VTKViewer_CellLocationsArray.h
index 5fad08ef84dec2bf05259a6ecfe5dfeb969812bc..be154a2b37c8a822704908b173b8b4a8434ccf04 100644 (file)
--- a/src/VTKViewer/VTKViewer_CellLocationsArray.h
+++ b/src/VTKViewer/VTKViewer_CellLocationsArray.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 VTKVIEWER_CELLLOCATIONS_H
 #define VTKVIEWER_CELLLOCATIONS_H
 

diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx
index 229f28e1b7de5833019df3bbe707c50a0c77cd6a..ce1327a86593df7b75b048276db25dc25ae488e8 100644 (file)
--- a/src/VTKViewer/VTKViewer_ConvexTool.cxx
+++ b/src/VTKViewer/VTKViewer_ConvexTool.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 "VTKViewer_ConvexTool.h"
 
 #include <set>

diff --git a/src/VTKViewer/VTKViewer_ConvexTool.h b/src/VTKViewer/VTKViewer_ConvexTool.h
index 57ee30ee875d4cdf081a72efdfb5ea6712452524..ff618bb661f1f88067964b781886a7b3129ee039 100644 (file)
--- a/src/VTKViewer/VTKViewer_ConvexTool.h
+++ b/src/VTKViewer/VTKViewer_ConvexTool.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 _VTKViewer_ConvexTool_H
 #define _VTKViewer_ConvexTool_H
 

diff --git a/src/VTKViewer/VTKViewer_DataSetMapper.cxx b/src/VTKViewer/VTKViewer_DataSetMapper.cxx
new file mode 100644 (file)
index 0000000..840d559
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_DataSetMapper.cxx
@@ -0,0 +1,111 @@
+//  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
+//
+
+#include "VTKViewer_DataSetMapper.h"
+#include "VTKViewer_PolyDataMapper.h"
+
+#include <vtkDataSetSurfaceFilter.h>
+#include <vtkObjectFactory.h>
+
+vtkCxxRevisionMacro(VTKViewer_DataSetMapper, "Revision$");
+vtkStandardNewMacro(VTKViewer_DataSetMapper);
+
+//----------------------------------------------------------------------------
+VTKViewer_DataSetMapper::VTKViewer_DataSetMapper()
+{
+  this->MarkerEnabled = false;
+  this->MarkerType    = VTK::MT_NONE;
+  this->MarkerScale   = VTK::MS_NONE;
+  this->MarkerId      = 0;
+}
+
+//----------------------------------------------------------------------------
+VTKViewer_DataSetMapper::~VTKViewer_DataSetMapper()
+{
+}
+
+//----------------------------------------------------------------------------
+void VTKViewer_DataSetMapper::Render(vtkRenderer *ren, vtkActor *act)
+{
+  // just to create VTKViewer_PolyDataMapper instead of vtkPolyDataMapper
+  if( this->PolyDataMapper == NULL )
+  {
+    vtkDataSetSurfaceFilter *gf = vtkDataSetSurfaceFilter::New();
+    VTKViewer_PolyDataMapper *pm = VTKViewer_PolyDataMapper::New();
+    pm->SetInput(gf->GetOutput());
+
+    pm->SetMarkerEnabled( this->MarkerEnabled );
+    if( this->MarkerType != VTK::MT_USER )
+      pm->SetMarkerStd( this->MarkerType, this->MarkerScale );
+    else
+      pm->SetMarkerTexture( this->MarkerId, this->MarkerTexture );
+
+    this->GeometryExtractor = gf;
+    this->PolyDataMapper = pm;
+  }
+  vtkDataSetMapper::Render(ren, act);
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_DataSetMapper::SetMarkerEnabled( bool theMarkerEnabled )
+{
+  this->MarkerEnabled = theMarkerEnabled;
+  if( this->PolyDataMapper )
+    if( VTKViewer_PolyDataMapper* aMapper = dynamic_cast<VTKViewer_PolyDataMapper*>( this->PolyDataMapper ) )
+      aMapper->SetMarkerEnabled( theMarkerEnabled );
+}
+
+//----------------------------------------------------------------------------
+void VTKViewer_DataSetMapper::SetMarkerStd( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  this->MarkerType = theMarkerType;
+  this->MarkerScale = theMarkerScale;
+  if( this->PolyDataMapper )
+    if( VTKViewer_PolyDataMapper* aMapper = dynamic_cast<VTKViewer_PolyDataMapper*>( this->PolyDataMapper ) )
+      aMapper->SetMarkerStd( theMarkerType, theMarkerScale );
+}
+
+//----------------------------------------------------------------------------
+void VTKViewer_DataSetMapper::SetMarkerTexture( int theMarkerId, VTK::MarkerTexture theMarkerTexture )
+{
+  this->MarkerType = VTK::MT_USER;
+  this->MarkerId = theMarkerId;
+  this->MarkerTexture = theMarkerTexture;
+  if( this->PolyDataMapper )
+    if( VTKViewer_PolyDataMapper* aMapper = dynamic_cast<VTKViewer_PolyDataMapper*>( this->PolyDataMapper ) )
+      aMapper->SetMarkerTexture( theMarkerId, theMarkerTexture );
+}
+
+//-----------------------------------------------------------------------------
+VTK::MarkerType VTKViewer_DataSetMapper::GetMarkerType()
+{
+  return this->MarkerType;
+}
+
+//-----------------------------------------------------------------------------
+VTK::MarkerScale VTKViewer_DataSetMapper::GetMarkerScale()
+{
+  return this->MarkerScale;
+}
+
+//-----------------------------------------------------------------------------
+int VTKViewer_DataSetMapper::GetMarkerTexture()
+{
+  return this->MarkerId;
+}

diff --git a/src/VTKViewer/VTKViewer_DataSetMapper.h b/src/VTKViewer/VTKViewer_DataSetMapper.h
new file mode 100644 (file)
index 0000000..549fe8c
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_DataSetMapper.h
@@ -0,0 +1,71 @@
+//  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
+//
+
+#ifndef VTKViewer_DATASETMAPPER_H
+#define VTKViewer_DATASETMAPPER_H
+
+#include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
+
+#include <vtkDataSetMapper.h>
+
+class VTKVIEWER_EXPORT VTKViewer_DataSetMapper : public vtkDataSetMapper 
+{
+public:
+  static VTKViewer_DataSetMapper *New();
+  vtkTypeRevisionMacro(VTKViewer_DataSetMapper,vtkDataSetMapper);
+
+  //! Set point marker enabled
+  void SetMarkerEnabled( bool );
+
+  //! Set standard point marker
+  void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
+
+  //! Set custom point marker
+  void SetMarkerTexture( int, VTK::MarkerTexture );
+
+  //! Get type of the point marker
+  VTK::MarkerType GetMarkerType();
+
+  //! Get scale of the point marker
+  VTK::MarkerScale GetMarkerScale();
+
+  //! Get texture identifier of the point marker
+  int GetMarkerTexture();
+
+  //! Implement superclass render method.
+  void Render(vtkRenderer *ren, vtkActor *act);
+
+protected:
+  VTKViewer_DataSetMapper();
+  ~VTKViewer_DataSetMapper();
+
+private:
+  VTKViewer_DataSetMapper(const VTKViewer_DataSetMapper&);  // Not implemented.
+  void operator=(const VTKViewer_DataSetMapper&);  // Not implemented.
+
+private:
+  bool               MarkerEnabled;
+  VTK::MarkerType    MarkerType;
+  VTK::MarkerScale   MarkerScale;
+  int                MarkerId;
+  VTK::MarkerTexture MarkerTexture;
+};
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
index 243c2cd08d3ea429e9de00f50fa8fc393144a9d3..d2ee28678a2afc8a2f20ce2f0bcc2fc667540c78 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx
+++ b/src/VTKViewer/VTKViewer_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
@@ -38,12 +39,6 @@
 
 using namespace std;
 
-#ifdef _DEBUG_
-static int MYDEBUG = 0;
-#else
-static int MYDEBUG = 0;
-#endif
-
 #if defined __GNUC__
   #if __GNUC__ == 2
     #define __GNUC_2__

diff --git a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h
index 8c3b4a7dc5bc3b3545bf0c58274ae654487a6216..91ff1d95316c128e269c48f4b698bb7010e90185 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.h
+++ b/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.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 VTKVIEWER_EXTRACTUNSTRUCTUREDGRID_H
 #define VTKVIEWER_EXTRACTUNSTRUCTUREDGRID_H
 

diff --git a/src/VTKViewer/VTKViewer_Filter.cxx b/src/VTKViewer/VTKViewer_Filter.cxx
index ca9907a840137474baebe9e321be0f9837fc8af5..146672cc06f6f069a8f70e0725a010ea77441227 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Filter.cxx
+++ b/src/VTKViewer/VTKViewer_Filter.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
 //
+
 //  VTKViewer_Filter : Filter for VTK viewer
 //  File   : VTKViewer_Filter.cxx
 //  Author : Sergey LITONIN

diff --git a/src/VTKViewer/VTKViewer_Filter.h b/src/VTKViewer/VTKViewer_Filter.h
index 74bcb2041e2639922e8eadc9b4beb1592df695fa..e19caf12f58412c16cd1c5539a1036dc6b200942 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Filter.h
+++ b/src/VTKViewer/VTKViewer_Filter.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
 //
+
 //  SMESHGUI_Filter : Filter for VTK viewer
 //  File   : VTKViewer_Filter.h
 //  Author : Sergey LITONIN

diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.cxx b/src/VTKViewer/VTKViewer_FramedTextActor.cxx
index bd20dc84b6a53c8b3dce99a6793aa6288e524918..55a4e7643ada3682a9860dae1e6c0e62f5f71542 100644 (file)
--- a/src/VTKViewer/VTKViewer_FramedTextActor.cxx
+++ b/src/VTKViewer/VTKViewer_FramedTextActor.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

diff --git a/src/VTKViewer/VTKViewer_FramedTextActor.h b/src/VTKViewer/VTKViewer_FramedTextActor.h
index abc93cb40f22dcd7469972ce34d2c96c98f56d7f..6f7659530d5f70dfeb18aba0a7ba4ec9f13064cc 100644 (file)
--- a/src/VTKViewer/VTKViewer_FramedTextActor.h
+++ b/src/VTKViewer/VTKViewer_FramedTextActor.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 VTKVIEWER_FRAMEDTEXTACTOR_H
 #define VTKVIEWER_FRAMEDTEXTACTOR_H
 

diff --git a/src/VTKViewer/VTKViewer_Functor.h b/src/VTKViewer/VTKViewer_Functor.h
index b0cdf1483f94b272ed26c4689a20cf6c22834308..65d444a14a549384feffa678629486f4d5a8b871 100644 (file)
--- a/src/VTKViewer/VTKViewer_Functor.h
+++ b/src/VTKViewer/VTKViewer_Functor.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   : VTKViewer_ViewFrame.h
 //  Author : Nicolas REJNERI

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.cxx b/src/VTKViewer/VTKViewer_GeometryFilter.cxx
index b5f44058cb1826deec00c7cda4a0601d3d561dc8..ae44393d4e170814106bb27e205d6a97c5ec8824 100755 (executable)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.cxx
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.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 : Michael ZORIN

diff --git a/src/VTKViewer/VTKViewer_GeometryFilter.h b/src/VTKViewer/VTKViewer_GeometryFilter.h
index ae50f4af0f9494f031c51f15c1aee53137212855..f96cc455ebf2d637ebb41256533de16e62fe043d 100755 (executable)
--- a/src/VTKViewer/VTKViewer_GeometryFilter.h
+++ b/src/VTKViewer/VTKViewer_GeometryFilter.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 VTKVIEWER_GEOMETRYFILTER_H
 #define VTKVIEWER_GEOMETRYFILTER_H
 

diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.cxx b/src/VTKViewer/VTKViewer_InteractorStyle.cxx
index 6a11d6eda760125504d02622d27a515d4e3725d5..68fcb0b000f2794c019e4a9c562b4ed7bf657ece 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyle.cxx
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.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   : VTKViewer_InteractorStyle.cxx
 //  Author : Christophe ATTANASIO

diff --git a/src/VTKViewer/VTKViewer_InteractorStyle.h b/src/VTKViewer/VTKViewer_InteractorStyle.h
index f7391b19c360c127873b21eb5e4ab2ee00478fb3..ec778ed5d04c0dad644c08ea332700f4e2cec996 100644 (file)
--- a/src/VTKViewer/VTKViewer_InteractorStyle.h
+++ b/src/VTKViewer/VTKViewer_InteractorStyle.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   : VTKViewer_InteractorStyle.h
 //  Author : Christophe ATTANASIO

diff --git a/src/VTKViewer/VTKViewer_MarkerDef.h b/src/VTKViewer/VTKViewer_MarkerDef.h
new file mode 100644 (file)
index 0000000..a33665d
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerDef.h
@@ -0,0 +1,65 @@
+//  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
+//
+
+#ifndef VTKVIEWER_MARKERDEF_H
+#define VTKVIEWER_MARKERDEF_H
+
+#include <list>
+#include <map>
+#include <string>
+
+namespace VTK
+{
+  //! Type of standard marker for advanced rendering of vtk points
+  typedef int MarkerType;
+  const MarkerType MT_NONE    = 0;
+  const MarkerType MT_POINT   = 1;
+  const MarkerType MT_PLUS    = 2;
+  const MarkerType MT_STAR    = 3;
+  const MarkerType MT_O       = 4;
+  const MarkerType MT_X       = 5;
+  const MarkerType MT_O_POINT = 6;
+  const MarkerType MT_O_PLUS  = 7;
+  const MarkerType MT_O_STAR  = 8;
+  const MarkerType MT_O_X     = 9;
+  const MarkerType MT_USER    = 10;
+
+  //! Scale of standard marker for advanced rendering of vtk points
+  typedef int MarkerScale;
+  const MarkerScale MS_NONE   = 0;
+  const MarkerScale MS_10     = 1;
+  const MarkerScale MS_15     = 2;
+  const MarkerScale MS_20     = 3;
+  const MarkerScale MS_25     = 4;
+  const MarkerScale MS_30     = 5;
+  const MarkerScale MS_35     = 6;
+  const MarkerScale MS_40     = 7;
+  const MarkerScale MS_45     = 8;
+  const MarkerScale MS_50     = 9;
+  const MarkerScale MS_55     = 10;
+  const MarkerScale MS_60     = 11;
+  const MarkerScale MS_65     = 12;
+  const MarkerScale MS_70     = 13;
+
+  typedef std::list<unsigned short>             MarkerTexture;
+  typedef std::pair<std::string, MarkerTexture> MarkerData;
+  typedef std::map<int, MarkerData>             MarkerMap;
+}
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.cxx b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
new file mode 100644 (file)
index 0000000..baa4a1f
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.cxx
@@ -0,0 +1,87 @@
+//  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
+//
+
+#include "VTKViewer_MarkerDlg.h"
+#include "VTKViewer_MarkerWidget.h"
+
+#include <QFrame>
+#include <QHBoxLayout>
+
+/*!
+ * Class       : VTKViewer_MarkerDlg
+ * Description : Dialog for specifying point marker parameters
+ */
+
+/*!
+  Constructor
+*/
+VTKViewer_MarkerDlg::VTKViewer_MarkerDlg( QWidget* theParent )
+: QtxDialog( theParent, true, true )
+{
+  setWindowTitle( tr( "SET_MARKER_TLT" ) );
+
+  myMarkerWidget = new VTKViewer_MarkerWidget( mainFrame() );
+
+  QBoxLayout* aTopLayout = new QHBoxLayout( mainFrame() );
+  aTopLayout->setSpacing( 0 );
+  aTopLayout->setMargin( 0 );
+  aTopLayout->addWidget( myMarkerWidget );
+}
+
+/*!
+  Destructor
+*/
+VTKViewer_MarkerDlg::~VTKViewer_MarkerDlg()
+{
+}
+
+void VTKViewer_MarkerDlg::setCustomMarkerMap( VTK::MarkerMap theMarkerMap )
+{
+  myMarkerWidget->setCustomMarkerMap( theMarkerMap );
+}
+
+VTK::MarkerMap VTKViewer_MarkerDlg::getCustomMarkerMap()
+{
+  return myMarkerWidget->getCustomMarkerMap();
+}
+
+void VTKViewer_MarkerDlg::setStandardMarker( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  myMarkerWidget->setStandardMarker( theMarkerType, theMarkerScale );
+}
+
+void VTKViewer_MarkerDlg::setCustomMarker( int theId )
+{
+  myMarkerWidget->setCustomMarker( theId );
+}
+
+VTK::MarkerType VTKViewer_MarkerDlg::getMarkerType() const
+{
+  return myMarkerWidget->getMarkerType();
+}
+
+VTK::MarkerScale VTKViewer_MarkerDlg::getStandardMarkerScale() const
+{
+  return myMarkerWidget->getStandardMarkerScale();
+}
+
+int VTKViewer_MarkerDlg::getCustomMarkerID() const
+{
+  return myMarkerWidget->getCustomMarkerID();
+}

diff --git a/src/VTKViewer/VTKViewer_MarkerDlg.h b/src/VTKViewer/VTKViewer_MarkerDlg.h
new file mode 100644 (file)
index 0000000..8cbe935
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerDlg.h
@@ -0,0 +1,55 @@
+//  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
+//
+
+#ifndef VTKVIEWER_MARKERDLG_H
+#define VTKVIEWER_MARKERDLG_H
+
+#include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
+
+#include <QtxDialog.h>
+
+class VTKViewer_MarkerWidget;
+
+/*!
+ * Class       : VTKViewer_MarkerDlg
+ * Description : Dialog for specifying point marker parameters
+ */
+class VTKVIEWER_EXPORT VTKViewer_MarkerDlg : public QtxDialog
+{
+  Q_OBJECT
+
+public:
+  VTKViewer_MarkerDlg( QWidget* = 0 );
+  virtual ~VTKViewer_MarkerDlg();
+
+  void                    setCustomMarkerMap( VTK::MarkerMap );
+  VTK::MarkerMap          getCustomMarkerMap();
+
+  void                    setStandardMarker( VTK::MarkerType, VTK::MarkerScale );
+  void                    setCustomMarker( int );
+  VTK::MarkerType         getMarkerType() const;
+  VTK::MarkerScale        getStandardMarkerScale() const;
+  int                     getCustomMarkerID() const;
+
+private:
+  VTKViewer_MarkerWidget* myMarkerWidget;
+};
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.cxx b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
new file mode 100755 (executable)
index 0000000..e4871ba
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.cxx
@@ -0,0 +1,161 @@
+//  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
+//
+
+#include "VTKViewer_MarkerUtils.h"
+
+// VTK Includes
+#include <vtkImageData.h>
+
+// QT Includes
+#include <QFile>
+#include <QImage>
+#include <QString>
+#include <QTextStream>
+
+using namespace std;
+
+namespace VTK
+{
+  bool LoadTextureData( const QString& theFileName,
+                        VTK::MarkerScale theMarkerScale,
+                        VTK::MarkerTexture& theMarkerTexture )
+  {
+    theMarkerTexture.clear();
+
+    QFile aFile( theFileName );
+    if( !aFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
+      return false;
+
+    bool ok;
+    int aWidth = 0, aHeight = 0;
+
+    int aTextureIndex = theMarkerScale == VTK::MS_NONE ? 0 : (int)theMarkerScale-1;
+    int aCurrentTexture = 0;
+
+    QTextStream aTextStream( &aFile );
+    while( !aTextStream.atEnd() )
+    {
+      QString aLine = aTextStream.readLine();
+      if( aLine.isEmpty() )
+      {
+        aCurrentTexture++;
+        continue;
+      }
+
+      if( aCurrentTexture != aTextureIndex )
+        continue;
+
+      int aLineSize = aLine.size();
+      for( int i = 0; i < aLineSize; i++ )
+      {
+        ok = false;
+        unsigned int aPixel = QString( aLine.at( i ) ).toUInt( &ok );
+        if( ok )
+          theMarkerTexture.push_back( aPixel );
+      }
+      if( aWidth == 0 )
+        aWidth = aLineSize;
+      aHeight++;
+    }
+
+    if( theMarkerTexture.size() != aWidth * aHeight )
+      return false;
+
+    theMarkerTexture.push_front( aWidth );
+    theMarkerTexture.push_front( aHeight );
+    return true;
+  }
+
+  vtkSmartPointer<vtkImageData> MakeVTKImage( const VTK::MarkerTexture& theMarkerTexture,
+                                              bool theWhiteForeground )
+  {
+    VTK::MarkerTexture::const_iterator anIter = theMarkerTexture.begin();
+
+    int aWidth = *anIter++;
+    int aHeight = *anIter++;
+
+    vtkSmartPointer<vtkImageData> anImageData = vtkImageData::New();
+    anImageData->Delete();
+
+    anImageData->SetExtent( 0, aWidth-1, 0, aHeight-1, 0, 0 );
+    anImageData->SetScalarTypeToUnsignedChar();
+    anImageData->SetNumberOfScalarComponents( 4 );
+    anImageData->AllocateScalars();
+
+    unsigned char* aDataPtr = (unsigned char*)anImageData->GetScalarPointer();
+
+    int anId = 0;
+    int aSize = aWidth * aHeight * 4;
+    int aCoef = theWhiteForeground ? 1 : 0;
+    while( anId < aSize )
+    {
+      int aValue = (*anIter++) * 255;
+      aDataPtr[ anId++ ] = aValue * aCoef;
+      aDataPtr[ anId++ ] = aValue * aCoef;
+      aDataPtr[ anId++ ] = aValue * aCoef;
+      aDataPtr[ anId++ ] = aValue;
+    }
+    anImageData->Update();
+
+    return anImageData;
+  }
+
+  QImage ConvertToQImage( vtkImageData* theImageData )
+  {
+    if( theImageData->GetScalarType() != VTK_UNSIGNED_CHAR )
+      return QImage();
+
+    int extent[6];
+    theImageData->GetExtent( extent );
+    int width = extent[1] - extent[0] + 1;
+    int height = extent[3] - extent[2] + 1;
+  
+    QImage anImage(width, height, QImage::Format_ARGB32);
+    for( int i = 0; i < height; i++ )
+    {
+      QRgb* bits = reinterpret_cast<QRgb*>( anImage.scanLine(i) );
+      unsigned char* row = static_cast<unsigned char*>(
+        theImageData->GetScalarPointer( extent[0], extent[2] + height - i - 1, extent[4] ) );
+      for( int j = 0; j < width; j++ )
+      {
+        unsigned char* data = &row[ j*4 ];
+        bits[j] = qRgba( data[0], data[1], data[2], data[3] );
+      }
+    }
+    return anImage;
+  }
+
+  int GetUniqueId( const VTK::MarkerMap& theMarkerMap )
+  {
+    int anId = 0;
+    while( anId++ < 100 ) {
+      bool anOk = true;
+      VTK::MarkerMap::const_iterator anIter = theMarkerMap.begin();
+      for( ; anIter != theMarkerMap.end(); anIter++ ) {
+        if( anId == anIter->first ) {
+          anOk = false;
+          continue;
+        }
+      }
+      if( anOk )
+        return anId;
+    }
+    return theMarkerMap.size() + 1;
+  }
+}

diff --git a/src/VTKViewer/VTKViewer_MarkerUtils.h b/src/VTKViewer/VTKViewer_MarkerUtils.h
new file mode 100755 (executable)
index 0000000..159ae17
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerUtils.h
@@ -0,0 +1,48 @@
+//  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
+//
+
+#ifndef VTKVIEWER_MARKERUTILS_H
+#define VTKVIEWER_MARKERUTILS_H
+
+#include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
+
+// VTK Includes
+#include <vtkSmartPointer.h>
+
+class vtkImageData;
+
+class QImage;
+class QString;
+
+namespace VTK
+{
+  VTKVIEWER_EXPORT bool                          LoadTextureData( const QString& theFileName,
+                                                                  VTK::MarkerScale theMarkerScale,
+                                                                  VTK::MarkerTexture& theTextureData );
+
+  VTKVIEWER_EXPORT vtkSmartPointer<vtkImageData> MakeVTKImage( const VTK::MarkerTexture& theTextureData,
+                                                               bool theWhiteForeground = true );
+
+  VTKVIEWER_EXPORT QImage                        ConvertToQImage( vtkImageData* theImageData );
+
+  VTKVIEWER_EXPORT int                           GetUniqueId( const VTK::MarkerMap& theMarkerMap );
+}
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.cxx b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
new file mode 100644 (file)
index 0000000..81a0754
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.cxx
@@ -0,0 +1,254 @@
+//  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
+//
+
+#include "VTKViewer_MarkerWidget.h"
+#include "VTKViewer_MarkerUtils.h"
+
+#include <QtxComboBox.h>
+
+#include <SUIT_ResourceMgr.h>
+#include <SUIT_Session.h>
+
+#include <vtkImageData.h>
+
+#include <QButtonGroup>
+#include <QGridLayout>
+#include <QHBoxLayout>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QStackedWidget>
+
+#define MARGIN  9
+#define SPACING 6
+
+/*!
+ * Class       : VTKViewer_MarkerWidget
+ * Description : Widget for specifying point marker parameters
+ */
+
+/*!
+  Constructor
+*/
+VTKViewer_MarkerWidget::VTKViewer_MarkerWidget( QWidget* theParent )
+: QWidget( theParent )
+{
+  QRadioButton* aStandardTypeRB = new QRadioButton( tr( "STANDARD_MARKER" ), this );
+  QRadioButton* aCustomTypeRB   = new QRadioButton( tr( "CUSTOM_MARKER" ), this );
+  myTypeGroup = new QButtonGroup( this );
+  myTypeGroup->addButton( aStandardTypeRB, 0 );
+  myTypeGroup->addButton( aCustomTypeRB,   1 );
+
+  QHBoxLayout* aRadioLayout = new QHBoxLayout;
+  aRadioLayout->setMargin( 0 );
+  aRadioLayout->setSpacing( SPACING );
+  aRadioLayout->addWidget( aStandardTypeRB );
+  aRadioLayout->addWidget( aCustomTypeRB );
+
+  // ---
+
+  myWGStack = new QStackedWidget( this );
+  myWGStack->setFrameStyle( QFrame::Box | QFrame::Sunken );
+
+  // ---
+
+  QWidget* aStdWidget = new QWidget( myWGStack );
+
+  QLabel* aTypeLab  = new QLabel( tr( "TYPE" ),  aStdWidget );
+  QLabel* aScaleLab = new QLabel( tr( "SCALE" ), aStdWidget );
+
+  myStdTypeCombo  = new QtxComboBox( aStdWidget );
+  myStdScaleCombo = new QtxComboBox( aStdWidget );
+
+  QGridLayout* aStdLayout = new QGridLayout;
+  aStdLayout->setMargin( MARGIN );
+  aStdLayout->setSpacing( SPACING );
+  aStdLayout->addWidget( aTypeLab,        0, 0 );
+  aStdLayout->addWidget( myStdTypeCombo,  0, 1 );
+  aStdLayout->addWidget( aScaleLab,       1, 0 );
+  aStdLayout->addWidget( myStdScaleCombo, 1, 1 );
+  aStdWidget->setLayout( aStdLayout );
+
+  // ---
+
+  QWidget* aCustomWidget = new QWidget( myWGStack );
+
+  QLabel* aCustomLab = new QLabel( tr( "CUSTOM" ), aCustomWidget );
+  myCustomTypeCombo = new QtxComboBox( aCustomWidget );
+  QPushButton* aBrowseBtn = new QPushButton( tr( "BROWSE" ), aCustomWidget );
+
+  QGridLayout* aCustomLayout = new QGridLayout;
+  aCustomLayout->setMargin( MARGIN );
+  aCustomLayout->setSpacing( SPACING );
+  aCustomLayout->addWidget( aCustomLab,        0, 0 );
+  aCustomLayout->addWidget( myCustomTypeCombo, 0, 1 );
+  aCustomLayout->addWidget( aBrowseBtn,        0, 2 );
+  aCustomLayout->setRowStretch( 1, 5 );
+  aCustomWidget->setLayout( aCustomLayout );
+
+  // ---
+  
+  myWGStack->insertWidget( 0, aStdWidget );
+  myWGStack->insertWidget( 1, aCustomWidget );
+
+  // ---
+
+  QVBoxLayout* aTopLayout = new QVBoxLayout;
+  aTopLayout->setMargin( MARGIN );
+  aTopLayout->setSpacing( SPACING );
+  aTopLayout->addLayout( aRadioLayout );
+  aTopLayout->addWidget( myWGStack );
+  setLayout( aTopLayout );
+
+  // ---
+
+  connect( myTypeGroup, SIGNAL( buttonClicked( int ) ), myWGStack, SLOT( setCurrentIndex( int ) ) );
+  connect( aBrowseBtn,  SIGNAL( clicked() ), this, SLOT( browse() ) );
+
+  // ---
+
+  aStandardTypeRB->setChecked( true );
+  init();
+}
+
+/*!
+  Destructor
+*/
+VTKViewer_MarkerWidget::~VTKViewer_MarkerWidget()
+{
+}
+
+void VTKViewer_MarkerWidget::setCustomMarkerMap( VTK::MarkerMap theMarkerMap )
+{
+  myCustomMarkerMap = theMarkerMap;
+
+  VTK::MarkerMap::const_iterator it = theMarkerMap.begin(), itEnd = theMarkerMap.end();
+  for( ; it != itEnd; it++ )
+  {
+    int anId = it->first;
+    VTK::MarkerData aMarkerData = it->second;
+    QPixmap aPixmap = markerFromData( aMarkerData );
+    if( !aPixmap.isNull() )
+    {
+      myCustomTypeCombo->addItem( aPixmap, QString::number( anId ) );
+      myCustomTypeCombo->setId( myCustomTypeCombo->count()-1, anId );
+    }
+  }
+}
+
+VTK::MarkerMap VTKViewer_MarkerWidget::getCustomMarkerMap()
+{
+  return myCustomMarkerMap;
+}
+
+void VTKViewer_MarkerWidget::setStandardMarker( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  if ( theMarkerType > VTK::MT_NONE && theMarkerType < VTK::MT_USER ) {
+    myTypeGroup->button( 0 )->setChecked( true );
+    myWGStack->setCurrentIndex( 0 );
+    myStdTypeCombo->setCurrentIndex( (int)theMarkerType-1 );
+    int aMarkerScale = std::max( (int)VTK::MS_10, std::min( (int)VTK::MS_70, (int)theMarkerScale ) );
+    myStdScaleCombo->setCurrentIndex( aMarkerScale-1 );
+  }
+}
+
+void VTKViewer_MarkerWidget::setCustomMarker( int theId )
+{
+  if ( theId > 0 ) {
+    myTypeGroup->button( 1 )->setChecked( true );
+    myWGStack->setCurrentIndex( 1 );
+    addTexture( theId );
+    myCustomTypeCombo->setCurrentId( theId );
+  }
+}
+
+VTK::MarkerType VTKViewer_MarkerWidget::getMarkerType() const
+{
+  return myWGStack->currentIndex() == 0 ? (VTK::MarkerType)myStdTypeCombo->currentId() : VTK::MT_USER;
+}
+
+VTK::MarkerScale VTKViewer_MarkerWidget::getStandardMarkerScale() const
+{
+  return myWGStack->currentIndex() == 0 ? (VTK::MarkerScale)myStdScaleCombo->currentId() : VTK::MS_NONE;
+}
+
+int VTKViewer_MarkerWidget::getCustomMarkerID() const
+{
+  return myWGStack->currentIndex() == 1 ? myCustomTypeCombo->currentId() : 0;
+}
+
+void VTKViewer_MarkerWidget::init()
+{
+  SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr();
+
+  for ( int i = VTK::MT_POINT; i < VTK::MT_USER; i++ ) {
+    QString icoFile = QString( "ICON_VERTEX_MARKER_%1" ).arg( i );
+    QPixmap pixmap = resMgr->loadPixmap( "VTKViewer", tr( qPrintable( icoFile ) ) );
+    myStdTypeCombo->addItem( pixmap, QString() );
+    myStdTypeCombo->setId( myStdTypeCombo->count()-1, i );
+  }
+
+  for ( int i = VTK::MS_10; i <= VTK::MS_70; i++ ) {
+    myStdScaleCombo->addItem( QString::number( (i-1)*0.5 + 1.0 ) );
+    myStdScaleCombo->setId( myStdScaleCombo->count()-1, i );
+  }
+}
+
+void VTKViewer_MarkerWidget::addTexture( int id, bool select )
+{
+  if ( id > 0 && myCustomTypeCombo->index( id ) == -1 &&
+       myCustomMarkerMap.find( id ) != myCustomMarkerMap.end() ) {
+    VTK::MarkerData aMarkerData = myCustomMarkerMap[ id ];
+    QPixmap pixmap = markerFromData( aMarkerData );
+    if( !pixmap.isNull() ) {
+      myCustomTypeCombo->addItem( pixmap, QString::number( id ) );
+      myCustomTypeCombo->setId( myCustomTypeCombo->count()-1, id );
+      if ( select ) myCustomTypeCombo->setCurrentId( id );
+    }
+  }
+}
+
+QPixmap VTKViewer_MarkerWidget::markerFromData( const VTK::MarkerData& theMarkerData )
+{
+  const VTK::MarkerTexture& aMarkerTexture = theMarkerData.second;
+  vtkSmartPointer<vtkImageData> anImageData = VTK::MakeVTKImage( aMarkerTexture, false );
+
+  QImage anImage = VTK::ConvertToQImage( anImageData.GetPointer() );
+  if( anImage.isNull() )
+    return QPixmap();
+
+  return QPixmap::fromImage( anImage );
+}
+
+void VTKViewer_MarkerWidget::browse()
+{
+  QStringList filters;
+  filters << tr( "Texture files (*.dat)" ) << tr( "All files (*)" );
+  QString aFileName = SUIT_Session::session()->activeApplication()->getFileName( true, QString(), filters.join( ";;" ), tr( "LOAD_TEXTURE_TLT" ), this );
+  if ( !aFileName.isEmpty() ) {
+    VTK::MarkerTexture aMarkerTexture;
+    if ( VTK::LoadTextureData( aFileName, VTK::MS_NONE, aMarkerTexture ) ) {
+      int anId = VTK::GetUniqueId( myCustomMarkerMap );
+      VTK::MarkerData& aMarkerData = myCustomMarkerMap[ anId ];
+      aMarkerData.first = aFileName.toStdString();
+      aMarkerData.second = aMarkerTexture;
+      addTexture( anId, true );
+    }
+  }
+}

diff --git a/src/VTKViewer/VTKViewer_MarkerWidget.h b/src/VTKViewer/VTKViewer_MarkerWidget.h
new file mode 100644 (file)
index 0000000..bfa0186
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_MarkerWidget.h
@@ -0,0 +1,72 @@
+//  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
+//
+
+#ifndef VTKVIEWER_MARKERWIDGET_H
+#define VTKVIEWER_MARKERWIDGET_H
+
+#include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
+
+#include <QWidget>
+
+class QButtonGroup;
+class QStackedWidget;
+
+class QtxComboBox;
+
+/*!
+ * Class       : VTKViewer_MarkerWidget
+ * Description : Widget for specifying point marker parameters
+ */
+class VTKVIEWER_EXPORT VTKViewer_MarkerWidget : public QWidget
+{
+  Q_OBJECT
+
+public:
+  VTKViewer_MarkerWidget( QWidget* );
+  virtual ~VTKViewer_MarkerWidget();
+
+  void             setCustomMarkerMap( VTK::MarkerMap );
+  VTK::MarkerMap   getCustomMarkerMap();
+
+  void             setStandardMarker( VTK::MarkerType, VTK::MarkerScale );
+  void             setCustomMarker( int );
+  VTK::MarkerType  getMarkerType() const;
+  VTK::MarkerScale getStandardMarkerScale() const;
+  int              getCustomMarkerID() const;
+
+private:
+  void             init();
+  void             addTexture( int, bool = false );
+  QPixmap          markerFromData( const VTK::MarkerData& );
+
+private slots:
+  void             browse();
+
+private:
+  QButtonGroup*    myTypeGroup;
+  QStackedWidget*  myWGStack;
+  QtxComboBox*     myStdTypeCombo;
+  QtxComboBox*     myStdScaleCombo;
+  QtxComboBox*     myCustomTypeCombo;
+
+  VTK::MarkerMap   myCustomMarkerMap;
+};
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_PassThroughFilter.cxx b/src/VTKViewer/VTKViewer_PassThroughFilter.cxx
index 3c0e74395ac47440d57241fbf0f96e06eca8da8c..c86c4a580b65e403d9291b272b2648f32cac962b 100755 (executable)
--- a/src/VTKViewer/VTKViewer_PassThroughFilter.cxx
+++ b/src/VTKViewer/VTKViewer_PassThroughFilter.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 FILTER : interactive object for VISU entities implementation
 //  File   : SALOME_PassThroughFilter.cxx
 //  Author : Laurent CORNABE with help of Nicolas REJNERI

diff --git a/src/VTKViewer/VTKViewer_PassThroughFilter.h b/src/VTKViewer/VTKViewer_PassThroughFilter.h
index 92ce5bb569d588aca6c45bc0e9d3d9696be980d0..6dd5c140c51d6cad16fa1a0c363a4dd8308de2bb 100755 (executable)
--- a/src/VTKViewer/VTKViewer_PassThroughFilter.h
+++ b/src/VTKViewer/VTKViewer_PassThroughFilter.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 VTKVIEWER_PASSTHROUGHFILTER_H
 #define VTKVIEWER_PASSTHROUGHFILTER_H
 

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.cxx b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
new file mode 100644 (file)
index 0000000..50ea7c8
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.cxx
@@ -0,0 +1,590 @@
+//  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
+//
+
+#include "VTKViewer_PolyDataMapper.h"
+#include "VTKViewer_MarkerUtils.h"
+
+#include <utilities.h>
+
+#include <QString>
+
+#include <vtkCellArray.h>
+#include <vtkImageData.h>
+#include <vtkObjectFactory.h>
+#include <vtkPointData.h>
+#include <vtkPolyData.h>
+#include <vtkProperty.h>
+#include <vtkRenderer.h>
+#include <vtkSmartPointer.h>
+#include <vtkTimerLog.h>
+#include <vtkWindow.h>
+
+#ifndef WNT
+# ifndef GLX_GLXEXT_LEGACY
+#  define GLX_GLXEXT_LEGACY
+# endif
+# include <GL/glx.h>
+# include <dlfcn.h>
+#else
+# include <wingdi.h>
+#endif
+
+#ifndef VTK_IMPLEMENT_MESA_CXX
+vtkCxxRevisionMacro(VTKViewer_PolyDataMapper, "Revision$");
+vtkStandardNewMacro(VTKViewer_PolyDataMapper);
+#endif
+
+// some definitions for what the polydata has in it
+#define VTK_PDPSM_COLORS             0x0001
+#define VTK_PDPSM_CELL_COLORS        0x0002
+#define VTK_PDPSM_POINT_TYPE_FLOAT   0x0004
+#define VTK_PDPSM_POINT_TYPE_DOUBLE  0x0008
+#define VTK_PDPSM_NORMAL_TYPE_FLOAT  0x0010
+#define VTK_PDPSM_NORMAL_TYPE_DOUBLE 0x0020
+#define VTK_PDPSM_OPAQUE_COLORS      0x0040
+
+#ifndef APIENTRY
+#define APIENTRY
+#endif
+#ifndef APIENTRYP
+#define APIENTRYP APIENTRY *
+#endif
+
+#ifndef GL_VERTEX_PROGRAM_POINT_SIZE_ARB
+#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB  0x8642
+#endif
+
+#ifndef GL_ARB_point_sprite
+#define GL_POINT_SPRITE_ARB               0x8861
+#define GL_COORD_REPLACE_ARB              0x8862
+#endif
+
+#ifndef GL_ARB_vertex_buffer_object
+typedef ptrdiff_t GLsizeiptrARB;
+
+#define GL_ARRAY_BUFFER_ARB               0x8892
+#define GL_STATIC_DRAW_ARB                0x88E4
+#endif
+
+typedef void (APIENTRYP PFNGLBINDBUFFERARBPROC) (GLenum target, GLuint buffer);
+typedef void (APIENTRYP PFNGLDELETEBUFFERSARBPROC) (GLsizei n, const GLuint *buffers);
+typedef void (APIENTRYP PFNGLGENBUFFERSARBPROC) (GLsizei n, GLuint *buffers);
+typedef void (APIENTRYP PFNGLBUFFERDATAARBPROC) (GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage);
+
+static PFNGLGENBUFFERSARBPROC               vglGenBuffersARB              = NULL;
+static PFNGLBINDBUFFERARBPROC               vglBindBufferARB              = NULL;
+static PFNGLBUFFERDATAARBPROC               vglBufferDataARB              = NULL;
+static PFNGLDELETEBUFFERSARBPROC            vglDeleteBuffersARB           = NULL;
+
+#ifndef WNT
+#define GL_GetProcAddress( x )   glXGetProcAddressARB( (const GLubyte*)x )
+#else
+#define GL_GetProcAddress( x )   wglGetProcAddress( (const LPCSTR)x )
+#endif
+
+bool InitializeBufferExtensions()
+{
+  vglGenBuffersARB = (PFNGLGENBUFFERSARBPROC)GL_GetProcAddress( "glGenBuffersARB" );
+  if( !vglGenBuffersARB )
+    return false;
+
+  vglBindBufferARB = (PFNGLBINDBUFFERARBPROC)GL_GetProcAddress( "glBindBufferARB" );
+  if( !vglBindBufferARB )
+    return false;
+
+  vglBufferDataARB = (PFNGLBUFFERDATAARBPROC)GL_GetProcAddress( "glBufferDataARB" );
+  if( !vglBufferDataARB )
+    return false;
+
+  vglDeleteBuffersARB = (PFNGLDELETEBUFFERSARBPROC)GL_GetProcAddress( "glDeleteBuffersARB" );
+  if( !vglDeleteBuffersARB )
+    return false;
+
+  return true;
+};
+
+static bool IsBufferExtensionsInitialized = InitializeBufferExtensions();
+
+//-----------------------------------------------------------------------------
+VTKViewer_PolyDataMapper::VTKViewer_PolyDataMapper()
+{
+  Q_INIT_RESOURCE( VTKViewer );
+
+  this->ExtensionsInitialized     = 0;
+
+  this->PointSpriteTexture        = 0;
+
+  this->MarkerEnabled             = false;
+  this->MarkerType                = VTK::MT_NONE;
+  this->MarkerScale               = VTK::MS_NONE;
+  this->MarkerId                  = 0;
+}
+
+//-----------------------------------------------------------------------------
+VTKViewer_PolyDataMapper::~VTKViewer_PolyDataMapper()
+{
+  if( PointSpriteTexture > 0 )
+    glDeleteTextures( 1, &PointSpriteTexture );
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::SetMarkerEnabled( bool theMarkerEnabled )
+{
+  if( this->MarkerEnabled == theMarkerEnabled )
+    return;
+
+  this->MarkerEnabled = theMarkerEnabled;
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::SetMarkerStd( VTK::MarkerType theMarkerType, VTK::MarkerScale theMarkerScale )
+{
+  if( this->MarkerType == theMarkerType && this->MarkerScale == theMarkerScale )
+    return;
+
+  this->MarkerType = theMarkerType;
+  this->MarkerScale = theMarkerScale;
+
+  if( this->MarkerType == VTK::MT_NONE || this->MarkerType == VTK::MT_USER ) {
+    this->ImageData = NULL;
+    this->Modified();
+    return;
+  }
+
+  int aMarkerType = (int)this->MarkerType;
+  int aMarkerScale = (int)this->MarkerScale;
+
+  int anId = (int)VTK::MS_70 * aMarkerType + aMarkerScale;
+
+  if( this->StandardTextures.find( anId ) == this->StandardTextures.end() )
+  {
+    QString aFileName = QString( ":/textures/texture%1.dat" ).arg( aMarkerType );
+    VTK::MarkerTexture aMarkerTexture;
+    if( VTK::LoadTextureData( aFileName, theMarkerScale, aMarkerTexture ) )
+      this->StandardTextures[ anId ] = VTK::MakeVTKImage( aMarkerTexture );
+  }
+
+  this->ImageData = this->StandardTextures[ anId ];
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::SetMarkerTexture( int theMarkerId, VTK::MarkerTexture theMarkerTexture )
+{
+  if( this->MarkerType == VTK::MT_USER && this->MarkerId == theMarkerId )
+    return;
+
+  this->MarkerType = VTK::MT_USER;
+  this->MarkerId = theMarkerId;
+
+  if( this->CustomTextures.find( theMarkerId ) == this->CustomTextures.end() )
+    this->CustomTextures[ theMarkerId ] = VTK::MakeVTKImage( theMarkerTexture );
+
+  this->ImageData = this->CustomTextures[ theMarkerId ];
+  this->Modified();
+}
+
+//-----------------------------------------------------------------------------
+VTK::MarkerType VTKViewer_PolyDataMapper::GetMarkerType()
+{
+  return this->MarkerType;
+}
+
+//-----------------------------------------------------------------------------
+VTK::MarkerScale VTKViewer_PolyDataMapper::GetMarkerScale()
+{
+  return this->MarkerScale;
+}
+
+//-----------------------------------------------------------------------------
+int VTKViewer_PolyDataMapper::GetMarkerTexture()
+{
+  return this->MarkerId;
+}
+
+//-----------------------------------------------------------------------------
+bool VTKViewer_PolyDataMapper::InitExtensions()
+{
+  if( this->ExtensionsInitialized )
+    return true;
+
+  InitializeBufferExtensions();
+
+  char* ext = (char*)glGetString( GL_EXTENSIONS );
+  if( !IsBufferExtensionsInitialized ||
+      strstr( ext, "GL_ARB_point_sprite" ) == NULL ||
+      strstr( ext, "GL_ARB_vertex_buffer_object" ) == NULL )
+  {
+    INFOS("Initializing ARB extensions failed");
+    return false;
+  }
+
+  this->ExtensionsInitialized = 1;
+  return true;
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::InitPointSprites()
+{
+  glEnable( GL_POINT_SPRITE_ARB );
+  glEnable( GL_VERTEX_PROGRAM_POINT_SIZE_ARB );
+
+  glPushAttrib( GL_COLOR_BUFFER_BIT | GL_CURRENT_BIT | GL_DEPTH_BUFFER_BIT | GL_ENABLE_BIT | GL_LIGHTING_BIT );
+
+  glDepthFunc( GL_LEQUAL );
+  glEnable( GL_DEPTH_TEST );
+
+  glEnable( GL_ALPHA_TEST );
+  glAlphaFunc( GL_GREATER, 0.0 );
+
+  glDisable( GL_LIGHTING );
+
+  glDisable( GL_COLOR_MATERIAL );
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::CleanupPointSprites()
+{
+  glPopAttrib();
+
+  glDisable( GL_VERTEX_PROGRAM_POINT_SIZE_ARB );
+  glDisable( GL_POINT_SPRITE_ARB );
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::InitTextures()
+{
+  if( !this->ImageData.GetPointer() )
+    return;
+
+  glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT );
+  glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT );
+  glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST );
+  glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST );
+
+  int* aSize = this->ImageData->GetDimensions();
+  unsigned char* dataPtr = (unsigned char*)this->ImageData->GetScalarPointer();
+  glTexImage2D( GL_TEXTURE_2D, 0, GL_RGBA, aSize[0], aSize[1], 0,
+                GL_RGBA, GL_UNSIGNED_BYTE, dataPtr );
+
+  //glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT );
+  glEnable( GL_TEXTURE_2D );
+  glTexEnvf( GL_POINT_SPRITE_ARB, GL_COORD_REPLACE_ARB, GL_TRUE );
+  glBindTexture( GL_TEXTURE_2D, this->PointSpriteTexture );
+}
+
+//-----------------------------------------------------------------------------
+void VTKViewer_PolyDataMapper::RenderPiece( vtkRenderer* ren, vtkActor* act )
+{
+  bool isUsePointSprites = this->MarkerEnabled && this->MarkerType != VTK::MT_NONE;
+  if( isUsePointSprites )
+  {
+    this->InitExtensions();
+    this->InitPointSprites();
+    this->InitTextures();
+  }
+
+  MAPPER_SUPERCLASS::RenderPiece( ren, act );
+
+  if( isUsePointSprites )
+    this->CleanupPointSprites();
+}
+
+//-----------------------------------------------------------------------------
+// Definition of structures and fuctions used in Draw() method
+namespace VTK
+{
+  //-----------------------------------------------------------------------------
+  struct TVertex
+  {
+    GLfloat r, g, b, a;
+    GLfloat vx, vy, vz;
+  };
+
+  //-----------------------------------------------------------------------------
+  struct TColorFunctorBase
+  {
+    vtkFloatingPointType myAlpha;
+
+    TColorFunctorBase( vtkProperty* theProperty )
+    {
+      myAlpha = theProperty->GetOpacity();
+    }
+
+    virtual
+    void
+    get( TVertex& theVertex, vtkIdType thePointId, vtkIdType theCellId ) = 0;
+  };
+
+  //-----------------------------------------------------------------------------
+  struct TPropertyColor : TColorFunctorBase
+  {
+    vtkFloatingPointType myColor[3];
+
+    TPropertyColor( vtkProperty* theProperty ):
+      TColorFunctorBase( theProperty )
+    {
+      theProperty->GetColor( myColor );
+    }
+
+    virtual
+    void
+    get( TVertex& theVertex, vtkIdType thePointId, vtkIdType theCellId )
+    {
+      theVertex.r = myColor[0];
+      theVertex.g = myColor[1];
+      theVertex.b = myColor[2];
+      theVertex.a = myAlpha;
+    }
+  };
+
+  //-----------------------------------------------------------------------------
+  struct TColors2Color : TColorFunctorBase
+  {
+    vtkUnsignedCharArray* myColors;
+
+    TColors2Color( vtkProperty* theProperty,
+                   vtkUnsignedCharArray* theColors ):
+      TColorFunctorBase( theProperty ),
+      myColors( theColors )
+    {}
+
+    virtual
+    void
+    get( TVertex& theVertex, vtkIdType thePointId, vtkIdType theCellId )
+    {
+      vtkIdType aTupleId = GetTupleId( thePointId, theCellId );
+      unsigned char* aColor = myColors->GetPointer( aTupleId << 2 );
+
+      theVertex.r = int( aColor[0] ) / 255.0;
+      theVertex.g = int( aColor[1] ) / 255.0;
+      theVertex.b = int( aColor[2] ) / 255.0;
+      theVertex.a = myAlpha;
+    }
+
+    virtual
+    vtkIdType
+    GetTupleId( vtkIdType thePointId, vtkIdType theCellId ) = 0;
+  };
+
+  //-----------------------------------------------------------------------------
+  struct TPointColors2Color : TColors2Color
+  {
+    TPointColors2Color( vtkProperty* theProperty,
+                        vtkUnsignedCharArray* theColors ):
+      TColors2Color( theProperty, theColors )
+    {}
+
+    virtual
+    vtkIdType
+    GetTupleId( vtkIdType thePointId, vtkIdType theCellId )
+    {
+      return thePointId;
+    }
+  };
+
+  //-----------------------------------------------------------------------------
+  struct TCellColors2Color : TColors2Color
+  {
+    TCellColors2Color( vtkProperty* theProperty,
+                       vtkUnsignedCharArray* theColors ):
+      TColors2Color( theProperty, theColors )
+    {}
+
+    virtual
+    vtkIdType
+    GetTupleId( vtkIdType thePointId, vtkIdType theCellId )
+    {
+      return theCellId;
+    }
+  };
+
+  //-----------------------------------------------------------------------------
+  template < class TCoordinates >
+  void DrawPoints( TCoordinates* theStartPoints,
+                   vtkCellArray* theCells,
+                   TColorFunctorBase* theColorFunctor,
+                   TVertex* theVertexArr,
+                   vtkIdType &theCellId,
+                   vtkIdType &theVertexId )
+  {
+    vtkIdType* ptIds = theCells->GetPointer();
+    vtkIdType* endPtIds = ptIds + theCells->GetNumberOfConnectivityEntries();
+
+    while ( ptIds < endPtIds ) {
+      vtkIdType nPts = *ptIds;
+      ++ptIds;
+
+      while ( nPts > 0 ) {
+        TVertex& aVertex = theVertexArr[ theVertexId ];
+        vtkIdType aPointId = *ptIds;
+
+        TCoordinates* anOffsetPoints = theStartPoints + 3 * aPointId;
+        aVertex.vx = anOffsetPoints[0];
+        aVertex.vy = anOffsetPoints[1];
+        aVertex.vz = anOffsetPoints[2];
+
+        theColorFunctor->get( aVertex, aPointId, theCellId );
+
+        ++theVertexId;
+        ++ptIds; 
+        --nPts; 
+      }
+
+      ++theCellId;
+    }
+  }
+
+  //-----------------------------------------------------------------------------
+  template < class TCoordinates >
+  void DrawCellsPoints( vtkPolyData* theInput,
+                        vtkPoints* thePoints,
+                        TColorFunctorBase* theColorFunctor,
+                        TVertex* theVertexArr )
+  {
+    vtkIdType aCellId = 0, aVertexId = 0;
+
+    TCoordinates* aStartPoints = (TCoordinates*)thePoints->GetVoidPointer(0);
+
+    if ( vtkCellArray* aCellArray = theInput->GetVerts() )
+      DrawPoints( aStartPoints, aCellArray, theColorFunctor, theVertexArr, aCellId, aVertexId );
+  
+    if ( vtkCellArray* aCellArray = theInput->GetLines() )
+      DrawPoints( aStartPoints, aCellArray, theColorFunctor, theVertexArr, aCellId, aVertexId );
+  
+    if ( vtkCellArray* aCellArray = theInput->GetPolys() )
+      DrawPoints( aStartPoints, aCellArray, theColorFunctor, theVertexArr, aCellId, aVertexId );
+  
+    if ( vtkCellArray* aCellArray = theInput->GetStrips() )
+      DrawPoints( aStartPoints, aCellArray, theColorFunctor, theVertexArr, aCellId, aVertexId ); 
+  }
+} // namespace VTK
+
+//-----------------------------------------------------------------------------
+int VTKViewer_PolyDataMapper::Draw( vtkRenderer* ren, vtkActor* act )
+{
+  if( !this->MarkerEnabled || this->MarkerType == VTK::MT_NONE || !this->ImageData.GetPointer() )
+    return MAPPER_SUPERCLASS::Draw( ren, act );
+
+  vtkUnsignedCharArray* colors = NULL;
+  vtkPolyData* input  = this->GetInput();
+  vtkPoints* points;
+  int noAbort = 1;
+  int cellScalars = 0;
+  vtkProperty* prop = act->GetProperty();
+
+  points = input->GetPoints();
+
+  if ( this->Colors )
+  {
+    colors = this->Colors;
+    if ( (this->ScalarMode == VTK_SCALAR_MODE_USE_CELL_DATA ||
+          this->ScalarMode == VTK_SCALAR_MODE_USE_CELL_FIELD_DATA ||
+          !input->GetPointData()->GetScalars() )
+         && this->ScalarMode != VTK_SCALAR_MODE_USE_POINT_FIELD_DATA)
+      cellScalars = 1;
+  }
+
+  {
+    vtkIdType aTotalConnectivitySize = 0;
+
+    if ( vtkCellArray* aCellArray = input->GetVerts() )
+      aTotalConnectivitySize += aCellArray->GetNumberOfConnectivityEntries() - aCellArray->GetNumberOfCells();
+
+    if ( vtkCellArray* aCellArray = input->GetLines() )
+      aTotalConnectivitySize += aCellArray->GetNumberOfConnectivityEntries() - aCellArray->GetNumberOfCells();
+
+    if ( vtkCellArray* aCellArray = input->GetPolys() )
+      aTotalConnectivitySize += aCellArray->GetNumberOfConnectivityEntries() - aCellArray->GetNumberOfCells();
+
+    if ( vtkCellArray* aCellArray = input->GetStrips() )
+      aTotalConnectivitySize += aCellArray->GetNumberOfConnectivityEntries() - aCellArray->GetNumberOfCells();
+
+    if ( aTotalConnectivitySize > 0 ) {
+      VTK::TVertex* aVertexArr = new VTK::TVertex[ aTotalConnectivitySize ];
+
+      int* aSize = this->ImageData->GetDimensions();
+      glPointSize( std::max( aSize[0], aSize[1] ) );
+
+      int aMode = 0; // to remove
+      {
+        VTK::TColorFunctorBase* aColorFunctor = NULL;
+        if( colors && aMode != 1 ) {
+          if ( cellScalars )
+            aColorFunctor = new VTK::TCellColors2Color( prop, colors );
+          else
+            aColorFunctor = new VTK::TPointColors2Color( prop, colors );
+        } else {
+          aColorFunctor = new VTK::TPropertyColor( prop );
+        }
+        if ( points->GetDataType() == VTK_FLOAT )
+          VTK::DrawCellsPoints< float >( input, points, aColorFunctor, aVertexArr );
+        else
+          VTK::DrawCellsPoints< double >( input, points, aColorFunctor, aVertexArr );
+
+        delete aColorFunctor;
+      }
+
+      if( this->ExtensionsInitialized ) {
+        GLuint aBufferObjectID = 0;
+        vglGenBuffersARB( 1, &aBufferObjectID );
+        vglBindBufferARB( GL_ARRAY_BUFFER_ARB, aBufferObjectID );
+        
+        int anArrayObjectSize = sizeof( VTK::TVertex ) * aTotalConnectivitySize;
+        vglBufferDataARB( GL_ARRAY_BUFFER_ARB, anArrayObjectSize, aVertexArr, GL_STATIC_DRAW_ARB );
+        
+        delete [] aVertexArr;
+        
+        vglBindBufferARB( GL_ARRAY_BUFFER_ARB, 0 );
+        vglBindBufferARB( GL_ARRAY_BUFFER_ARB, aBufferObjectID );
+        
+        glColorPointer( 4, GL_FLOAT, sizeof(VTK::TVertex), (void*)0 );
+        glVertexPointer( 3, GL_FLOAT, sizeof(VTK::TVertex), (void*)(4*sizeof(GLfloat)) );
+        
+        glEnableClientState( GL_VERTEX_ARRAY );
+        glEnableClientState( GL_COLOR_ARRAY );
+        
+        glDrawArrays( GL_POINTS, 0, aTotalConnectivitySize );
+        
+        glDisableClientState( GL_COLOR_ARRAY );
+        glDisableClientState( GL_VERTEX_ARRAY );
+        
+        vglDeleteBuffersARB( 1, &aBufferObjectID );
+      } else { // there are no extensions
+        glColorPointer( 4, GL_FLOAT, sizeof(VTK::TVertex), aVertexArr );
+        glVertexPointer( 3, GL_FLOAT, sizeof(VTK::TVertex), 
+                         (void*)((GLfloat*)((void*)(aVertexArr)) + 4));
+
+        glEnableClientState( GL_VERTEX_ARRAY );
+        glEnableClientState( GL_COLOR_ARRAY );
+        
+        glDrawArrays( GL_POINTS, 0, aTotalConnectivitySize );
+        
+        glDisableClientState( GL_COLOR_ARRAY );
+        glDisableClientState( GL_VERTEX_ARRAY );
+
+        delete [] aVertexArr;
+      }
+    }
+  }
+
+  this->UpdateProgress(1.0);
+  return noAbort;
+}

diff --git a/src/VTKViewer/VTKViewer_PolyDataMapper.h b/src/VTKViewer/VTKViewer_PolyDataMapper.h
new file mode 100644 (file)
index 0000000..38b4838
--- /dev/null
+++ b/src/VTKViewer/VTKViewer_PolyDataMapper.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
+//
+
+#ifndef VTKViewer_POLYDATAMAPPER_H
+#define VTKViewer_POLYDATAMAPPER_H
+
+#include "VTKViewer.h"
+#include "VTKViewer_MarkerDef.h"
+
+#ifdef WNT
+#include <windows.h>
+#endif
+
+#include <map>
+
+#include <GL/gl.h>
+
+#include <vtkSmartPointer.h>
+
+class vtkImageData;
+
+#ifndef VTK_IMPLEMENT_MESA_CXX
+#include <vtkOpenGLPolyDataMapper.h>
+#define MAPPER_SUPERCLASS vtkOpenGLPolyDataMapper
+#else
+#include <vtkMesaPolyDataMapper.h>
+#define MAPPER_SUPERCLASS vtkMesaPolyDataMapper
+#endif
+
+//----------------------------------------------------------------------------
+//! OpenGL Point Sprites PolyData Mapper.
+/*!
+ * VTKViewer_PolyDataMapper is a class that maps polygonal data 
+ * (i.e., vtkPolyData) to graphics primitives. It is performing the mapping
+ * to the rendering/graphics hardware/software. It is now possible to set a 
+ * memory limit for the pipeline in the mapper. If the total estimated memory 
+ * usage of the pipeline is larger than this limit, the mapper will divide 
+ * the data into pieces and render each in a for loop.
+ */
+class VTKVIEWER_EXPORT VTKViewer_PolyDataMapper : public MAPPER_SUPERCLASS
+{
+public:
+  static VTKViewer_PolyDataMapper* New();
+  vtkTypeRevisionMacro( VTKViewer_PolyDataMapper, MAPPER_SUPERCLASS );
+
+  //! Set point marker enabled
+  void SetMarkerEnabled( bool );
+
+  //! Set standard point marker
+  void SetMarkerStd( VTK::MarkerType, VTK::MarkerScale );
+
+  //! Set custom point marker
+  void SetMarkerTexture( int, VTK::MarkerTexture );
+
+  //! Get type of the point marker
+  VTK::MarkerType GetMarkerType();
+
+  //! Get scale of the point marker
+  VTK::MarkerScale GetMarkerScale();
+
+  //! Get texture identifier of the point marker
+  int GetMarkerTexture();
+
+  //! Implement superclass render method.
+  virtual void RenderPiece( vtkRenderer*, vtkActor* );
+
+  //! Draw method for OpenGL.
+  virtual int Draw( vtkRenderer*, vtkActor* );
+
+protected:
+  VTKViewer_PolyDataMapper();
+  ~VTKViewer_PolyDataMapper();
+
+  //! Initializing OpenGL extensions.
+  bool              InitExtensions();
+
+  //! Activate Point Sprites.
+  void              InitPointSprites();
+
+  //! Deactivate Point Sprites.
+  void              CleanupPointSprites();
+
+  //! Initializing textures for Point Sprites.
+  void              InitTextures();
+
+private:
+  int               ExtensionsInitialized;
+
+  GLuint            PointSpriteTexture;
+
+  vtkSmartPointer<vtkImageData> ImageData;
+
+  bool              MarkerEnabled;
+  VTK::MarkerType   MarkerType;
+  VTK::MarkerScale  MarkerScale;
+  int               MarkerId;
+
+  typedef std::map< int, vtkSmartPointer<vtkImageData> > ImageDataMap;
+  ImageDataMap      StandardTextures;
+  ImageDataMap      CustomTextures;
+};
+
+#endif

diff --git a/src/VTKViewer/VTKViewer_RenderWindow.cxx b/src/VTKViewer/VTKViewer_RenderWindow.cxx
index 62ad380d2292f9322486bcbee999310d9a3f058b..51b3327c532c50cb82708529a704801aafe3c357 100755 (executable)
--- a/src/VTKViewer/VTKViewer_RenderWindow.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindow.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 "VTKViewer_RenderWindow.h"
 
 #include <QColorDialog>

diff --git a/src/VTKViewer/VTKViewer_RenderWindow.h b/src/VTKViewer/VTKViewer_RenderWindow.h
index 4bc7297b2714429a32c4dfdd6090e37f714f7a67..fd84268cf42baefa9b273ef67bdfc32d9dce4524 100755 (executable)
--- a/src/VTKViewer/VTKViewer_RenderWindow.h
+++ b/src/VTKViewer/VTKViewer_RenderWindow.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 VTKVIEWER_RENDERWINDOW_H
 #define VTKVIEWER_RENDERWINDOW_H
 

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx b/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
index 8e6a7faef31b2f720a7f19a0d5db3397b3b576ad..4483c3b74de8acd3081a974eb0715fed5c3fab3d 100755 (executable)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.cxx
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.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 "VTKViewer_RenderWindowInteractor.h"
 #include "VTKViewer_RenderWindow.h"
 #include "VTKViewer_InteractorStyle.h"
@@ -570,7 +571,7 @@ void VTKViewer_RenderWindowInteractor::Remove( VTKViewer_Actor* SActor, bool upd
 {
   if ( SActor != 0 )
   {
-    GetRenderer()->RemoveProp( SActor );
+    GetRenderer()->RemoveViewProp( SActor );
     if ( updateViewer )
       emit RenderWindowModified();
   }

diff --git a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h b/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
index 18d58645ca76f33820a276af4c639b9e98f4b065..7e274be229e769fd494aca97fbb19c01cc0f61c8 100755 (executable)
--- a/src/VTKViewer/VTKViewer_RenderWindowInteractor.h
+++ b/src/VTKViewer/VTKViewer_RenderWindowInteractor.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 VTKVIEWER_RENDERWINDOWINTERACTOR_H
 #define VTKVIEWER_RENDERWINDOWINTERACTOR_H
 

diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx b/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
index 8abd09202b94affa549123eb10b29f47317f454d..ea3cae27108cf8a6a6f5a2d1e171f96d7a3e4c95 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ShrinkFilter.cxx
+++ b/src/VTKViewer/VTKViewer_ShrinkFilter.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   : SALOME_GeometryFilter.cxx
 //  Author : Michael ZORIN

diff --git a/src/VTKViewer/VTKViewer_ShrinkFilter.h b/src/VTKViewer/VTKViewer_ShrinkFilter.h
index 46f912446e83bf0d2735852e07a5a3aee655a73a..3da5dcd2244876bf520d9135e4df1231911b0f61 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ShrinkFilter.h
+++ b/src/VTKViewer/VTKViewer_ShrinkFilter.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 VTKVIEWER_SHRINKFILTER_H
 #define VTKVIEWER_SHRINKFILTER_H
 

diff --git a/src/VTKViewer/VTKViewer_Transform.cxx b/src/VTKViewer/VTKViewer_Transform.cxx
index 2385a2309075ddc92427c731b48c360874e9a7bb..da4b7a4b1eec9a9495947fb9fc364a82e7670753 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Transform.cxx
+++ b/src/VTKViewer/VTKViewer_Transform.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 FILTER : interactive object for VISU entities implementation
 //  File   : SALOME_Transform.cxx
 //  Author : Laurent CORNABE with help of Nicolas REJNERI

diff --git a/src/VTKViewer/VTKViewer_Transform.h b/src/VTKViewer/VTKViewer_Transform.h
index 45277d86d2745fd956e9cd4f4ba5ca8e016e44e7..23634866a7ea05dfb2eb41203ff2fc5fcb32f0c5 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Transform.h
+++ b/src/VTKViewer/VTKViewer_Transform.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 VTKVIEWER_TRANSFORM_H
 #define VTKVIEWER_TRANSFORM_H
 

diff --git a/src/VTKViewer/VTKViewer_TransformFilter.cxx b/src/VTKViewer/VTKViewer_TransformFilter.cxx
index 2c463f50871d9300941b0b7588bad195ee304df8..d06a4729505e8a96e3f4945388c8dd617d24840f 100755 (executable)
--- a/src/VTKViewer/VTKViewer_TransformFilter.cxx
+++ b/src/VTKViewer/VTKViewer_TransformFilter.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 FILTER : interactive object for VISU entities implementation
 //  File   : SALOME_TransformFilter.h
 //  Author : Laurent CORNABE with help of Nicolas REJNERI

diff --git a/src/VTKViewer/VTKViewer_TransformFilter.h b/src/VTKViewer/VTKViewer_TransformFilter.h
index d4937c801e933e6bf678e6319eefe04f6c9d5a71..263c2aca87a0ebc84cd3883b19fde0f4d73b6b9e 100755 (executable)
--- a/src/VTKViewer/VTKViewer_TransformFilter.h
+++ b/src/VTKViewer/VTKViewer_TransformFilter.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 VTKVIEWER_TRANSFORMFILTER_H
 #define VTKVIEWER_TRANSFORMFILTER_H
 

diff --git a/src/VTKViewer/VTKViewer_Trihedron.cxx b/src/VTKViewer/VTKViewer_Trihedron.cxx
index b0a608231a80a0751c5dec945762b71b7bb9f45a..ff6471788d0decc9bbafc4bdd66393ef2cb40e91 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Trihedron.cxx
+++ b/src/VTKViewer/VTKViewer_Trihedron.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 "VTKViewer_Trihedron.h"
 #include "VTKViewer_Actor.h"
 #include "VTKViewer_Algorithm.h"

diff --git a/src/VTKViewer/VTKViewer_Trihedron.h b/src/VTKViewer/VTKViewer_Trihedron.h
index dab330e615aae5aa02493dc1c39b96f70a41c4c9..cad235d152c58cec9e47cc6394b05c67d5c6e3d7 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Trihedron.h
+++ b/src/VTKViewer/VTKViewer_Trihedron.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 VTKVIEWER_TRIHEDRON_H
 #define VTKVIEWER_TRIHEDRON_H
 

diff --git a/src/VTKViewer/VTKViewer_Utilities.cxx b/src/VTKViewer/VTKViewer_Utilities.cxx
index 01e6e4ebeaddecade4fe01d53103946b3f270d22..cd4667f4d1089e7914f7538815feefa2052f9240 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Utilities.cxx
+++ b/src/VTKViewer/VTKViewer_Utilities.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 "VTKViewer_Utilities.h"
 #include "VTKViewer_Actor.h"
 #include "VTKViewer_Algorithm.h"

diff --git a/src/VTKViewer/VTKViewer_Utilities.h b/src/VTKViewer/VTKViewer_Utilities.h
index b52ff5cbe2d35e4f4aafbc7007f048fe7e095735..85784d32e17d81ff82b6ee4e46010921ee493ec5 100755 (executable)
--- a/src/VTKViewer/VTKViewer_Utilities.h
+++ b/src/VTKViewer/VTKViewer_Utilities.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 VTKVIEWER_UTILITIES_H
 #define VTKVIEWER_UTILITIES_H
 

diff --git a/src/VTKViewer/VTKViewer_ViewManager.cxx b/src/VTKViewer/VTKViewer_ViewManager.cxx
index cae65130c49935a8ee481a9ec2323bfca46448c2..3010e20a012cd72158c728be17527723f557a946 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewManager.cxx
+++ b/src/VTKViewer/VTKViewer_ViewManager.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 "VTKViewer_ViewManager.h"
 #include "VTKViewer_ViewModel.h"
 

diff --git a/src/VTKViewer/VTKViewer_ViewManager.h b/src/VTKViewer/VTKViewer_ViewManager.h
index 213df207a1dbb110a8d0820d1fc06009918d612a..fc353e9e5c3973ee56b27426d5699a468b2c69ef 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewManager.h
+++ b/src/VTKViewer/VTKViewer_ViewManager.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 VTKVIEWER_VIEWMANAGER_H
 #define VTKVIEWER_VIEWMANAGER_H
 

diff --git a/src/VTKViewer/VTKViewer_ViewModel.cxx b/src/VTKViewer/VTKViewer_ViewModel.cxx
index 6da15fdf82c003bfc787bc5f93242ad6c9f6508f..7189a6dc411ea3eba054fcd28385251d51c4a829 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewModel.cxx
+++ b/src/VTKViewer/VTKViewer_ViewModel.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 "VTKViewer_ViewModel.h"
 #include "VTKViewer_ViewWindow.h"
 #include "VTKViewer_ViewManager.h"

diff --git a/src/VTKViewer/VTKViewer_ViewModel.h b/src/VTKViewer/VTKViewer_ViewModel.h
index 37298af3cdbf754a83d84495a161582863ed0a7b..145b84cdb00ae7ee2f6aebb432b5eb16e007d304 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewModel.h
+++ b/src/VTKViewer/VTKViewer_ViewModel.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 VTKVIEWER_VIEWMODEL_H
 #define VTKVIEWER_VIEWMODEL_H
 

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.cxx b/src/VTKViewer/VTKViewer_ViewWindow.cxx
index 58238ca4a7785dfef6c316105c9d4bbb1a33fe4e..436ac7a9830051890c92233e62008f52255bb615 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewWindow.cxx
+++ b/src/VTKViewer/VTKViewer_ViewWindow.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 "VTKViewer_ViewWindow.h"
 #include "VTKViewer_ViewModel.h"
 #include "VTKViewer_RenderWindow.h"

diff --git a/src/VTKViewer/VTKViewer_ViewWindow.h b/src/VTKViewer/VTKViewer_ViewWindow.h
index 56b139837ffe36855332d7129f89d8be295ff5bc..411d8d74ce2875677dc3165eeed9d1dddc91f000 100755 (executable)
--- a/src/VTKViewer/VTKViewer_ViewWindow.h
+++ b/src/VTKViewer/VTKViewer_ViewWindow.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 VTKVIEWER_VIEWWINDOW_H
 #define VTKVIEWER_VIEWWINDOW_H
 

diff --git a/src/VTKViewer/resources/VTKViewer_images.ts b/src/VTKViewer/resources/VTKViewer_images.ts
index 7dd35028090e1f18fbbc0a73dd8a8055eda90a38..4bc6602a14c01a01ba1b2c5662c1cc116d173036 100644 (file)
--- a/src/VTKViewer/resources/VTKViewer_images.ts
+++ b/src/VTKViewer/resources/VTKViewer_images.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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
@@ -23,6 +23,42 @@
 -->
 <context>
     <name>@default</name>
+    <message>
+        <source>ICON_VERTEX_MARKER_1</source>
+        <translation>marker_1.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_2</source>
+        <translation>marker_2.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_3</source>
+        <translation>marker_3.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_4</source>
+        <translation>marker_4.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_5</source>
+        <translation>marker_5.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_6</source>
+        <translation>marker_6.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_7</source>
+        <translation>marker_7.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_8</source>
+        <translation>marker_8.png</translation>
+    </message>
+    <message>
+        <source>ICON_VERTEX_MARKER_9</source>
+        <translation>marker_9.png</translation>
+    </message>
     <message>
         <source>ICON_VTKVIEWER_VIEW_GLOBALPAN</source>
         <translation>vtk_view_glpan.png</translation>

diff --git a/src/VTKViewer/resources/VTKViewer_msg_en.ts b/src/VTKViewer/resources/VTKViewer_msg_en.ts
index 6efdc426705d1ae5603e62212e89d31e724aabee..76b6902fae887868d0d731bfb4dd1ecacd9dd6bd 100644 (file)
--- a/src/VTKViewer/resources/VTKViewer_msg_en.ts
+++ b/src/VTKViewer/resources/VTKViewer_msg_en.ts
@@ -1,6 +1,6 @@
 <!DOCTYPE TS><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
@@ -165,6 +165,44 @@
         <translation>Back View</translation>
     </message>
 </context>
+<context>
+    <name>VTKViewer_MarkerDlg</name>
+    <message>
+        <source>SET_MARKER_TLT</source>
+        <translation>Set Point Marker</translation>
+    </message>
+</context>
+<context>
+    <name>VTKViewer_MarkerWidget</name>
+    <message>
+        <source>STANDARD_MARKER</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>CUSTOM_MARKER</source>
+        <translation>Custom</translation>
+    </message>
+    <message>
+        <source>TYPE</source>
+        <translation>Type:</translation>
+    </message>
+    <message>
+        <source>SCALE</source>
+        <translation>Scale:</translation>
+    </message>
+    <message>
+        <source>CUSTOM</source>
+        <translation>Texture:</translation>
+    </message>
+    <message>
+        <source>BROWSE</source>
+        <translation>Browse...</translation>
+    </message>
+    <message>
+        <source>LOAD_TEXTURE_TLT</source>
+        <translation>Load Texture</translation>
+    </message>
+</context>
 <context>
     <name>VTKViewer_ViewManager</name>
     <message>

diff --git a/src/VTKViewer/resources/marker_1.png b/src/VTKViewer/resources/marker_1.png
new file mode 100755 (executable)
index 0000000..8bbaa85
Binary files /dev/null and b/src/VTKViewer/resources/marker_1.png differ

diff --git a/src/VTKViewer/resources/marker_2.png b/src/VTKViewer/resources/marker_2.png
new file mode 100755 (executable)
index 0000000..f0d2109
Binary files /dev/null and b/src/VTKViewer/resources/marker_2.png differ

diff --git a/src/VTKViewer/resources/marker_3.png b/src/VTKViewer/resources/marker_3.png
new file mode 100755 (executable)
index 0000000..345d8ab
Binary files /dev/null and b/src/VTKViewer/resources/marker_3.png differ

diff --git a/src/VTKViewer/resources/marker_4.png b/src/VTKViewer/resources/marker_4.png
new file mode 100755 (executable)
index 0000000..78c8055
Binary files /dev/null and b/src/VTKViewer/resources/marker_4.png differ

diff --git a/src/VTKViewer/resources/marker_5.png b/src/VTKViewer/resources/marker_5.png
new file mode 100755 (executable)
index 0000000..a994c11
Binary files /dev/null and b/src/VTKViewer/resources/marker_5.png differ

diff --git a/src/VTKViewer/resources/marker_6.png b/src/VTKViewer/resources/marker_6.png
new file mode 100755 (executable)
index 0000000..967b93e
Binary files /dev/null and b/src/VTKViewer/resources/marker_6.png differ

diff --git a/src/VTKViewer/resources/marker_7.png b/src/VTKViewer/resources/marker_7.png
new file mode 100755 (executable)
index 0000000..7a3eb90
Binary files /dev/null and b/src/VTKViewer/resources/marker_7.png differ

diff --git a/src/VTKViewer/resources/marker_8.png b/src/VTKViewer/resources/marker_8.png
new file mode 100755 (executable)
index 0000000..3b3ccc4
Binary files /dev/null and b/src/VTKViewer/resources/marker_8.png differ

diff --git a/src/VTKViewer/resources/marker_9.png b/src/VTKViewer/resources/marker_9.png
new file mode 100755 (executable)
index 0000000..0d76036
Binary files /dev/null and b/src/VTKViewer/resources/marker_9.png differ

diff --git a/src/VTKViewer/textures/texture1.dat b/src/VTKViewer/textures/texture1.dat
new file mode 100644 (file)
index 0000000..eb5e52c
--- /dev/null
+++ b/src/VTKViewer/textures/texture1.dat
@@ -0,0 +1,284 @@
+000000000
+000000000
+000000000
+000000000
+000010000
+000000000
+000000000
+000000000
+000000000
+
+00000000000
+00000000000
+00000000000
+00000000000
+00000110000
+00000110000
+00000000000
+00000000000
+00000000000
+00000000000
+00000000000
+
+0000000000000
+0000000000000
+0000000000000
+0000000000000
+0000000000000
+0000001100000
+0000001100000
+0000000000000
+0000000000000
+0000000000000
+0000000000000
+0000000000000
+0000000000000
+
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000011000000
+000000011000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+000000000000000
+
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000001110000000
+00000001110000000
+00000001110000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+00000000000000000
+
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000011110000000
+0000000011110000000
+0000000011110000000
+0000000011110000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+0000000000000000000
+
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000111100000000
+000000000111100000000
+000000000111100000000
+000000000111100000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+000000000000000000000
+
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000001111000000000
+00000000001111000000000
+00000000001111000000000
+00000000001111000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+00000000000000000000000
+
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000111110000000000
+0000000000111110000000000
+0000000000111110000000000
+0000000000111110000000000
+0000000000111110000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+0000000000000000000000000
+
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000001111110000000000
+000000000001111110000000000
+000000000001111110000000000
+000000000001111110000000000
+000000000001111110000000000
+000000000001111110000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+000000000000000000000000000
+
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000011111100000000000
+00000000000011111100000000000
+00000000000011111100000000000
+00000000000011111100000000000
+00000000000011111100000000000
+00000000000011111100000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+00000000000000000000000000000
+
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000111111000000000000
+0000000000000111111000000000000
+0000000000000111111000000000000
+0000000000000111111000000000000
+0000000000000111111000000000000
+0000000000000111111000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+0000000000000000000000000000000
+
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000001111111000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000
+00000000000000000000000000000000

diff --git a/src/VTKViewer/textures/texture2.dat b/src/VTKViewer/textures/texture2.dat
new file mode 100644 (file)
index 0000000..431f780
--- /dev/null
+++ b/src/VTKViewer/textures/texture2.dat
@@ -0,0 +1,284 @@
+000010000
+000010000
+000010000
+000010000
+111111111
+000010000
+000010000
+000010000
+000010000
+
+00000100000
+00000100000
+00000100000
+00000100000
+00000100000
+11111111111
+00000100000
+00000100000
+00000100000
+00000100000
+00000100000
+
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+1111111111111
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+0000001000000
+
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+111111111111111
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+000000010000000
+
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+11111111111111111
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+1111111111111111111
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+111111111111111111111
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+11111111111111111111111
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+1111111111111111111111111
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+111111111111111111111111111
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+11111111111111111111111111111
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+1111111111111111111111111111111
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+11111111111111111111111111111111
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000

diff --git a/src/VTKViewer/textures/texture3.dat b/src/VTKViewer/textures/texture3.dat
new file mode 100644 (file)
index 0000000..21683f1
--- /dev/null
+++ b/src/VTKViewer/textures/texture3.dat
@@ -0,0 +1,284 @@
+000010000
+000010000
+110010011
+001111100
+000010000
+001111100
+110010011
+000010000
+000010000
+
+00000100000
+00000100000
+10000100001
+01100100110
+00011111000
+00000100000
+00011111000
+01100100110
+10000100001
+00000100000
+00000100000
+
+0000001000000
+0000001000000
+0000001000000
+1100001000011
+0011001001100
+0000111110000
+0000001000000
+0000111110000
+0011001001100
+1100001000011
+0000001000000
+0000001000000
+0000001000000
+
+000000010000000
+000000010000000
+000000010000000
+100000010000001
+011000010000110
+000110010011000
+000001111100000
+000000010000000
+000001111100000
+000110010011000
+011000010000110
+100000010000001
+000000010000000
+000000010000000
+000000010000000
+
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+11000000100000011
+00110000100001100
+00001100100110000
+00000011111000000
+00000000100000000
+00000011111000000
+00001100100110000
+00110000100001100
+11000000100000011
+00000000100000000
+00000000100000000
+00000000100000000
+00000000100000000
+
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+1000000001000000001
+0110000001000000110
+0001100001000011000
+0000011001001100000
+0000000111110000000
+0000000001000000000
+0000000111110000000
+0000011001001100000
+0001100001000011000
+0110000001000000110
+1000000001000000001
+0000000001000000000
+0000000001000000000
+0000000001000000000
+0000000001000000000
+
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+110000000010000000011
+001100000010000001100
+000011000010000110000
+000000110010011000000
+000000001111100000000
+000000000010000000000
+000000001111100000000
+000000110010011000000
+000011000010000110000
+001100000010000001100
+110000000010000000011
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+000000000010000000000
+
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+10000000000100000000001
+01100000000100000000110
+00011000000100000011000
+00000110000100001100000
+00000001100100110000000
+00000000011111000000000
+00000000000100000000000
+00000000011111000000000
+00000001100100110000000
+00000110000100001100000
+00011000000100000011000
+01100000000100000000110
+10000000000100000000001
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+00000000000100000000000
+
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+1100000000001000000000011
+0011000000001000000001100
+0000110000001000000110000
+0000001100001000011000000
+0000000011001001100000000
+0000000000111110000000000
+0000000000001000000000000
+0000000000111110000000000
+0000000011001001100000000
+0000001100001000011000000
+0000110000001000000110000
+0011000000001000000001100
+1100000000001000000000011
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+0000000000001000000000000
+
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+100000000000010000000000001
+011000000000010000000000110
+000110000000010000000011000
+000001100000010000001100000
+000000011000010000110000000
+000000000110010011000000000
+000000000001111100000000000
+000000000000010000000000000
+000000000001111100000000000
+000000000110010011000000000
+000000011000010000110000000
+000001100000010000001100000
+000110000000010000000011000
+011000000000010000000000110
+100000000000010000000000001
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+000000000000010000000000000
+
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+11000000000000100000000000011
+00110000000000100000000001100
+00001100000000100000000110000
+00000011000000100000011000000
+00000000110000100001100000000
+00000000001100100110000000000
+00000000000011111000000000000
+00000000000000100000000000000
+00000000000011111000000000000
+00000000001100100110000000000
+00000000110000100001100000000
+00000011000000100000011000000
+00001100000000100000000110000
+00110000000000100000000001100
+11000000000000100000000000011
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+00000000000000100000000000000
+
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+1000000000000001000000000000001
+0110000000000001000000000000110
+0001100000000001000000000011000
+0000011000000001000000001100000
+0000000110000001000000110000000
+0000000001100001000011000000000
+0000000000011001001100000000000
+0000000000000111110000000000000
+0000000000000001000000000000000
+0000000000000111110000000000000
+0000000000011001001100000000000
+0000000001100001000011000000000
+0000000110000001000000110000000
+0000011000000001000000001100000
+0001100000000001000000000011000
+0110000000000001000000000000110
+1000000000000001000000000000001
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+0000000000000001000000000000000
+
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+10000000000000010000000000000010
+01100000000000010000000000001100
+00011000000000010000000000110000
+00000110000000010000000011000000
+00000001100000010000001100000000
+00000000011000010000110000000000
+00000000000110010011000000000000
+00000000000001111100000000000000
+00000000000001111100000000000000
+00000000000110010011000000000000
+00000000011000010000110000000000
+00000001100000010000001100000000
+00000110000000010000000011000000
+00011000000000010000000000110000
+01100000000000010000000000001100
+10000000000000010000000000000010
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000
+00000000000000010000000000000000

diff --git a/src/VTKViewer/textures/texture4.dat b/src/VTKViewer/textures/texture4.dat
new file mode 100644 (file)
index 0000000..3d69641
--- /dev/null
+++ b/src/VTKViewer/textures/texture4.dat
@@ -0,0 +1,284 @@
+000111000
+011000110
+010000010
+100000001
+100000001
+100000001
+010000010
+011000110
+000111000
+
+00001110000
+00110001100
+01000000010
+01000000010
+10000000001
+10000000001
+10000000001
+01000000010
+01000000010
+00110001100
+00001110000
+
+0000111110000
+0001000001000
+0010000000100
+0100000000010
+0100000000010
+1000000000001
+1000000000001
+1000000000001
+0100000000010
+0100000000010
+0010000000100
+0001000001000
+0000111110000
+
+000001111100000
+000110000011000
+001000000000100
+010000000000010
+010000000000010
+100000000000001
+100000000000001
+100000000000001
+100000000000001
+100000000000001
+010000000000010
+010000000000010
+001000000000100
+000110000011000
+000001111100000
+
+00000011111000000
+00001100000110000
+00010000000001000
+00100000000000100
+01000000000000010
+01000000000000010
+10000000000000001
+10000000000000001
+10000000000000001
+10000000000000001
+10000000000000001
+01000000000000010
+01000000000000010
+00100000000000100
+00010000000001000
+00001100000110000
+00000011111000000
+
+0000000111110000000
+0000011000001100000
+0001100000000011000
+0010000000000000100
+0010000000000000100
+0100000000000000010
+0100000000000000010
+1000000000000000001
+1000000000000000001
+1000000000000000001
+1000000000000000001
+1000000000000000001
+0100000000000000010
+0100000000000000010
+0010000000000000100
+0010000000000000100
+0001100000000011000
+0000011000001100000
+0000000111110000000
+
+000000001111100000000
+000000110000011000000
+000011000000000110000
+000100000000000001000
+001000000000000000100
+001000000000000000100
+010000000000000000010
+010000000000000000010
+100000000000000000001
+100000000000000000001
+100000000000000000001
+100000000000000000001
+100000000000000000001
+010000000000000000010
+010000000000000000010
+001000000000000000100
+001000000000000000100
+000100000000000001000
+000011000000000110000
+000000110000011000000
+000000001111100000000
+
+00000000011111000000000
+00000011100000111000000
+00000100000000000100000
+00011000000000000011000
+00010000000000000001000
+00100000000000000000100
+01000000000000000000010
+01000000000000000000010
+01000000000000000000010
+10000000000000000000001
+10000000000000000000001
+10000000000000000000001
+10000000000000000000001
+10000000000000000000001
+01000000000000000000010
+01000000000000000000010
+01000000000000000000010
+00100000000000000000100
+00010000000000000001000
+00011000000000000011000
+00000100000000000100000
+00000011100000111000000
+00000000011111000000000
+
+0000000000111110000000000
+0000000111000001110000000
+0000011000000000001100000
+0000100000000000000010000
+0001000000000000000001000
+0010000000000000000000100
+0010000000000000000000100
+0100000000000000000000010
+0100000000000000000000010
+0100000000000000000000010
+1000000000000000000000001
+1000000000000000000000001
+1000000000000000000000001
+1000000000000000000000001
+1000000000000000000000001
+0100000000000000000000010
+0100000000000000000000010
+0100000000000000000000010
+0010000000000000000000100
+0010000000000000000000100
+0001000000000000000001000
+0000100000000000000010000
+0000011000000000001100000
+0000000111000001110000000
+0000000000111110000000000
+
+000000000001111100000000000
+000000001110000011100000000
+000000110000000000011000000
+000001000000000000000100000
+000010000000000000000010000
+000100000000000000000001000
+001000000000000000000000100
+001000000000000000000000100
+010000000000000000000000010
+010000000000000000000000010
+010000000000000000000000010
+100000000000000000000000001
+100000000000000000000000001
+100000000000000000000000001
+100000000000000000000000001
+100000000000000000000000001
+010000000000000000000000010
+010000000000000000000000010
+010000000000000000000000010
+001000000000000000000000100
+001000000000000000000000100
+000100000000000000000001000
+000010000000000000000010000
+000001000000000000000100000
+000000110000000000011000000
+000000001110000011100000000
+000000000001111100000000000
+
+00000000000011111000000000000
+00000000011100000111100000000
+00000001100000000000010000000
+00000010000000000000001100000
+00001100000000000000000010000
+00001000000000000000000001000
+00010000000000000000000001000
+00100000000000000000000000100
+00100000000000000000000000010
+01000000000000000000000000010
+01000000000000000000000000010
+01000000000000000000000000010
+10000000000000000000000000001
+10000000000000000000000000001
+10000000000000000000000000001
+10000000000000000000000000001
+10000000000000000000000000001
+01000000000000000000000000010
+01000000000000000000000000010
+01000000000000000000000000010
+00100000000000000000000000010
+00100000000000000000000000100
+00010000000000000000000001000
+00001000000000000000000001000
+00001100000000000000000110000
+00000010000000000000001000000
+00000001100000000000110000000
+00000000011100000111000000000
+00000000000011111000000000000
+
+0000000000000111110000000000000
+0000000001111000001111000000000
+0000000010000000000000100000000
+0000001100000000000000011000000
+0000010000000000000000000100000
+0000100000000000000000000010000
+0001000000000000000000000001000
+0001000000000000000000000001000
+0010000000000000000000000000100
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+1000000000000000000000000000001
+1000000000000000000000000000001
+1000000000000000000000000000001
+1000000000000000000000000000001
+1000000000000000000000000000001
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0010000000000000000000000000100
+0001000000000000000000000001000
+0001000000000000000000000001000
+0000100000000000000000000010000
+0000010000000000000000000100000
+0000001100000000000000011000000
+0000000010000000000000100000000
+0000000001111000001111000000000
+0000000000000111110000000000000
+
+00000000000001111110000000000000
+00000000001110000001110000000000
+00000000110000000000001100000000
+00000001000000000000000010000000
+00000110000000000000000001100000
+00001000000000000000000000010000
+00001000000000000000000000010000
+00010000000000000000000000001000
+00100000000000000000000000000100
+00100000000000000000000000000100
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+10000000000000000000000000000001
+10000000000000000000000000000001
+10000000000000000000000000000001
+10000000000000000000000000000001
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+00100000000000000000000000000100
+00100000000000000000000000000100
+00010000000000000000000000001000
+00001000000000000000000000010000
+00001000000000000000000000010000
+00000110000000000000000001100000
+00000001000000000000000010000000
+00000000110000000000001100000000
+00000000001110000001110000000000
+00000000000001111110000000000000

diff --git a/src/VTKViewer/textures/texture5.dat b/src/VTKViewer/textures/texture5.dat
new file mode 100644 (file)
index 0000000..221e1e9
--- /dev/null
+++ b/src/VTKViewer/textures/texture5.dat
@@ -0,0 +1,284 @@
+100000001
+010000010
+001000100
+000101000
+000010000
+000101000
+001000100
+010000010
+100000001
+
+10000000001
+01000000010
+00100000100
+00010001000
+00001010000
+00000100000
+00001010000
+00010001000
+00100000100
+01000000010
+10000000001
+
+1000000000001
+0100000000010
+0010000000100
+0001000001000
+0000100010000
+0000010100000
+0000001000000
+0000010100000
+0000100010000
+0001000001000
+0010000000100
+0100000000010
+1000000000001
+
+100000000000001
+010000000000010
+001000000000100
+000100000001000
+000010000010000
+000001000100000
+000000101000000
+000000010000000
+000000101000000
+000001000100000
+000010000010000
+000100000001000
+001000000000100
+010000000000010
+100000000000001
+
+10000000000000001
+01000000000000010
+00100000000000100
+00010000000001000
+00001000000010000
+00000100000100000
+00000010001000000
+00000001010000000
+00000000100000000
+00000001010000000
+00000010001000000
+00000100000100000
+00001000000010000
+00010000000001000
+00100000000000100
+01000000000000010
+10000000000000001
+
+1000000000000000001
+0100000000000000010
+0010000000000000100
+0001000000000001000
+0000100000000010000
+0000010000000100000
+0000001000001000000
+0000000100010000000
+0000000010100000000
+0000000001000000000
+0000000010100000000
+0000000100010000000
+0000001000001000000
+0000010000000100000
+0000100000000010000
+0001000000000001000
+0010000000000000100
+0100000000000000010
+1000000000000000001
+
+100000000000000000001
+010000000000000000010
+001000000000000000100
+000100000000000001000
+000010000000000010000
+000001000000000100000
+000000100000001000000
+000000010000010000000
+000000001000100000000
+000000000101000000000
+000000000010000000000
+000000000101000000000
+000000001000100000000
+000000010000010000000
+000000100000001000000
+000001000000000100000
+000010000000000010000
+000100000000000001000
+001000000000000000100
+010000000000000000010
+100000000000000000001
+
+10000000000000000000001
+01000000000000000000010
+00100000000000000000100
+00010000000000000001000
+00001000000000000010000
+00000100000000000100000
+00000010000000001000000
+00000001000000010000000
+00000000100000100000000
+00000000010001000000000
+00000000001010000000000
+00000000000100000000000
+00000000001010000000000
+00000000010001000000000
+00000000100000100000000
+00000001000000010000000
+00000010000000001000000
+00000100000000000100000
+00001000000000000010000
+00010000000000000001000
+00100000000000000000100
+01000000000000000000010
+10000000000000000000001
+
+1000000000000000000000001
+0100000000000000000000010
+0010000000000000000000100
+0001000000000000000001000
+0000100000000000000010000
+0000010000000000000100000
+0000001000000000001000000
+0000000100000000010000000
+0000000010000000100000000
+0000000001000001000000000
+0000000000100010000000000
+0000000000010100000000000
+0000000000001000000000000
+0000000000010100000000000
+0000000000100010000000000
+0000000001000001000000000
+0000000010000000100000000
+0000000100000000010000000
+0000001000000000001000000
+0000010000000000000100000
+0000100000000000000010000
+0001000000000000000001000
+0010000000000000000000100
+0100000000000000000000010
+1000000000000000000000001
+
+100000000000000000000000001
+010000000000000000000000010
+001000000000000000000000100
+000100000000000000000001000
+000010000000000000000010000
+000001000000000000000100000
+000000100000000000001000000
+000000010000000000010000000
+000000001000000000100000000
+000000000100000001000000000
+000000000010000010000000000
+000000000001000100000000000
+000000000000101000000000000
+000000000000010000000000000
+000000000000101000000000000
+000000000001000100000000000
+000000000010000010000000000
+000000000100000001000000000
+000000001000000000100000000
+000000010000000000010000000
+000000100000000000001000000
+000001000000000000000100000
+000010000000000000000010000
+000100000000000000000001000
+001000000000000000000000100
+010000000000000000000000010
+100000000000000000000000001
+
+10000000000000000000000000001
+01000000000000000000000000010
+00100000000000000000000000100
+00010000000000000000000001000
+00001000000000000000000010000
+00000100000000000000000100000
+00000010000000000000001000000
+00000001000000000000010000000
+00000000100000000000100000000
+00000000010000000001000000000
+00000000001000000010000000000
+00000000000100000100000000000
+00000000000010001000000000000
+00000000000001010000000000000
+00000000000000100000000000000
+00000000000001010000000000000
+00000000000010001000000000000
+00000000000100000100000000000
+00000000001000000010000000000
+00000000010000000001000000000
+00000000100000000000100000000
+00000001000000000000010000000
+00000010000000000000001000000
+00000100000000000000000100000
+00001000000000000000000010000
+00010000000000000000000001000
+00100000000000000000000000100
+01000000000000000000000000010
+10000000000000000000000000001
+
+1000000000000000000000000000001
+0100000000000000000000000000010
+0010000000000000000000000000100
+0001000000000000000000000001000
+0000100000000000000000000010000
+0000010000000000000000000100000
+0000001000000000000000001000000
+0000000100000000000000010000000
+0000000010000000000000100000000
+0000000001000000000001000000000
+0000000000100000000010000000000
+0000000000010000000100000000000
+0000000000001000001000000000000
+0000000000000100010000000000000
+0000000000000010100000000000000
+0000000000000001000000000000000
+0000000000000010100000000000000
+0000000000000100010000000000000
+0000000000001000001000000000000
+0000000000010000000100000000000
+0000000000100000000010000000000
+0000000001000000000001000000000
+0000000010000000000000100000000
+0000000100000000000000010000000
+0000001000000000000000001000000
+0000010000000000000000000100000
+0000100000000000000000000010000
+0001000000000000000000000001000
+0010000000000000000000000000100
+0100000000000000000000000000010
+1000000000000000000000000000001
+
+10000000000000000000000000000001
+01000000000000000000000000000010
+00100000000000000000000000000100
+00010000000000000000000000001000
+00001000000000000000000000010000
+00000100000000000000000000100000
+00000010000000000000000001000000
+00000001000000000000000010000000
+00000000100000000000000100000000
+00000000010000000000001000000000
+00000000001000000000010000000000
+00000000000100000000100000000000
+00000000000010000001000000000000
+00000000000001000010000000000000
+00000000000000100100000000000000
+00000000000000011000000000000000
+00000000000000011000000000000000
+00000000000000100100000000000000
+00000000000001000010000000000000
+00000000000010000001000000000000
+00000000000100000000100000000000
+00000000001000000000010000000000
+00000000010000000000001000000000
+00000000100000000000000100000000
+00000001000000000000000010000000
+00000010000000000000000001000000
+00000100000000000000000000100000
+00001000000000000000000000010000
+00010000000000000000000000001000
+00100000000000000000000000000100
+01000000000000000000000000000010
+10000000000000000000000000000001

diff --git a/src/VTKViewer/textures/texture6.dat b/src/VTKViewer/textures/texture6.dat
new file mode 100644 (file)
index 0000000..caf5163
--- /dev/null
+++ b/src/VTKViewer/textures/texture6.dat
@@ -0,0 +1,284 @@
+000111000
+011000110
+010000010
+100000001
+100010001
+100000001
+010000010
+011000110
+000111000
+
+00001110000
+00110001100
+01000000010
+01000000010
+10000110001
+10000110001
+10000000001
+01000000010
+01000000010
+00110001100
+00001110000
+
+0000111110000
+0001000001000
+0010000000100
+0100000000010
+0100000000010
+1000001100001
+1000001100001
+1000000000001
+0100000000010
+0100000000010
+0010000000100
+0001000001000
+0000111110000
+
+000001111100000
+000110000011000
+001000000000100
+010000000000010
+010000000000010
+100000000000001
+100000011000001
+100000011000001
+100000000000001
+100000000000001
+010000000000010
+010000000000010
+001000000000100
+000110000011000
+000001111100000
+
+00000011111000000
+00001100000110000
+00010000000001000
+00100000000000100
+01000000000000010
+01000000000000010
+10000000000000001
+10000001110000001
+10000001110000001
+10000001110000001
+10000000000000001
+01000000000000010
+01000000000000010
+00100000000000100
+00010000000001000
+00001100000110000
+00000011111000000
+
+0000000111110000000
+0000011000001100000
+0001100000000011000
+0010000000000000100
+0010000000000000100
+0100000000000000010
+0100000000000000010
+1000000011110000001
+1000000011110000001
+1000000011110000001
+1000000011110000001
+1000000000000000001
+0100000000000000010
+0100000000000000010
+0010000000000000100
+0010000000000000100
+0001100000000011000
+0000011000001100000
+0000000111110000000
+
+000000001111100000000
+000000110000011000000
+000011000000000110000
+000100000000000001000
+001000000000000000100
+001000000000000000100
+010000000000000000010
+010000000000000000010
+100000000111100000001
+100000000111100000001
+100000000111100000001
+100000000111100000001
+100000000000000000001
+010000000000000000010
+010000000000000000010
+001000000000000000100
+001000000000000000100
+000100000000000001000
+000011000000000110000
+000000110000011000000
+000000001111100000000
+
+00000000011111000000000
+00000011100000111000000
+00000100000000000100000
+00011000000000000011000
+00010000000000000001000
+00100000000000000000100
+01000000000000000000010
+01000000000000000000010
+01000000000000000000010
+10000000001111000000001
+10000000001111000000001
+10000000001111000000001
+10000000001111000000001
+10000000000000000000001
+01000000000000000000010
+01000000000000000000010
+01000000000000000000010
+00100000000000000000100
+00010000000000000001000
+00011000000000000011000
+00000100000000000100000
+00000011100000111000000
+00000000011111000000000
+
+0000000000111110000000000
+0000000111000001110000000
+0000011000000000001100000
+0000100000000000000010000
+0001000000000000000001000
+0010000000000000000000100
+0010000000000000000000100
+0100000000000000000000010
+0100000000000000000000010
+0100000000000000000000010
+1000000000111110000000001
+1000000000111110000000001
+1000000000111110000000001
+1000000000111110000000001
+1000000000111110000000001
+0100000000000000000000010
+0100000000000000000000010
+0100000000000000000000010
+0010000000000000000000100
+0010000000000000000000100
+0001000000000000000001000
+0000100000000000000010000
+0000011000000000001100000
+0000000111000001110000000
+0000000000111110000000000
+
+000000000001111100000000000
+000000001110000011100000000
+000000110000000000011000000
+000001000000000000000100000
+000010000000000000000010000
+000100000000000000000001000
+001000000000000000000000100
+001000000000000000000000100
+010000000000000000000000010
+010000000000000000000000010
+010000000001111110000000010
+100000000001111110000000001
+100000000001111110000000001
+100000000001111110000000001
+100000000001111110000000001
+100000000001111110000000001
+010000000000000000000000010
+010000000000000000000000010
+010000000000000000000000010
+001000000000000000000000100
+001000000000000000000000100
+000100000000000000000001000
+000010000000000000000010000
+000001000000000000000100000
+000000110000000000011000000
+000000001110000011100000000
+000000000001111100000000000
+
+00000000000011111000000000000
+00000000011100000111100000000
+00000001100000000000010000000
+00000010000000000000001100000
+00001100000000000000000010000
+00001000000000000000000001000
+00010000000000000000000001000
+00100000000000000000000000100
+00100000000000000000000000010
+01000000000000000000000000010
+01000000000000000000000000010
+01000000000011111100000000010
+10000000000011111100000000001
+10000000000011111100000000001
+10000000000011111100000000001
+10000000000011111100000000001
+10000000000011111100000000001
+01000000000000000000000000010
+01000000000000000000000000010
+01000000000000000000000000010
+00100000000000000000000000010
+00100000000000000000000000100
+00010000000000000000000001000
+00001000000000000000000001000
+00001100000000000000000110000
+00000010000000000000001000000
+00000001100000000000110000000
+00000000011100000111000000000
+00000000000011111000000000000
+
+0000000000000111110000000000000
+0000000001111000001111000000000
+0000000010000000000000100000000
+0000001100000000000000011000000
+0000010000000000000000000100000
+0000100000000000000000000010000
+0001000000000000000000000001000
+0001000000000000000000000001000
+0010000000000000000000000000100
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000111111000000000010
+1000000000000111111000000000001
+1000000000000111111000000000001
+1000000000000111111000000000001
+1000000000000111111000000000001
+1000000000000111111000000000001
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0100000000000000000000000000010
+0010000000000000000000000000100
+0001000000000000000000000001000
+0001000000000000000000000001000
+0000100000000000000000000010000
+0000010000000000000000000100000
+0000001100000000000000011000000
+0000000010000000000000100000000
+0000000001111000001111000000000
+0000000000000111110000000000000
+
+00000000000001111110000000000000
+00000000001110000001110000000000
+00000000110000000000001100000000
+00000001000000000000000010000000
+00000110000000000000000001100000
+00001000000000000000000000010000
+00001000000000000000000000010000
+00010000000000000000000000001000
+00100000000000000000000000000100
+00100000000000000000000000000100
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000001111111000000000010
+01000000000001111111000000000010
+10000000000001111111000000000001
+10000000000001111111000000000001
+10000000000001111111000000000001
+10000000000001111111000000000001
+01000000000001111111000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+01000000000000000000000000000010
+00100000000000000000000000000100
+00100000000000000000000000000100
+00010000000000000000000000001000
+00001000000000000000000000010000
+00001000000000000000000000010000
+00000110000000000000000001100000
+00000001000000000000000010000000
+00000000110000000000001100000000
+00000000001110000001110000000000
+00000000000001111110000000000000

diff --git a/src/VTKViewer/textures/texture7.dat b/src/VTKViewer/textures/texture7.dat
new file mode 100644 (file)
index 0000000..a75e7bb
--- /dev/null
+++ b/src/VTKViewer/textures/texture7.dat
@@ -0,0 +1,284 @@
+000111000
+011010110
+010010010
+100010001
+111111111
+100010001
+010010010
+011010110
+000111000
+
+00001110000
+00110101100
+01000100010
+01000100010
+10000100001
+11111111111
+10000100001
+01000100010
+01000100010
+00110101100
+00001110000
+
+0000111110000
+0001001001000
+0010001000100
+0100001000010
+0100001000010
+1000001000001
+1111111111111
+1000001000001
+0100001000010
+0100001000010
+0010001000100
+0001001001000
+0000111110000
+
+000001111100000
+000110010011000
+001000010000100
+010000010000010
+010000010000010
+100000010000001
+100000010000001
+111111111111111
+100000010000001
+100000010000001
+010000010000010
+010000010000010
+001000010000100
+000110010011000
+000001111100000
+
+00000011111000000
+00001100100110000
+00010000100001000
+00100000100000100
+01000000100000010
+01000000100000010
+10000000100000001
+10000000100000001
+11111111111111111
+10000000100000001
+10000000100000001
+01000000100000010
+01000000100000010
+00100000100000100
+00010000100001000
+00001100100110000
+00000011111000000
+
+0000000111110000000
+0000011001001100000
+0001100001000011000
+0010000001000000100
+0010000001000000100
+0100000001000000010
+0100000001000000010
+1000000001000000001
+1000000001000000001
+1111111111111111111
+1000000001000000001
+1000000001000000001
+0100000001000000010
+0100000001000000010
+0010000001000000100
+0010000001000000100
+0001100001000011000
+0000011001001100000
+0000000111110000000
+
+000000001111100000000
+000000110010011000000
+000011000010000110000
+000100000010000001000
+001000000010000000100
+001000000010000000100
+010000000010000000010
+010000000010000000010
+100000000010000000001
+100000000010000000001
+111111111111111111111
+100000000010000000001
+100000000010000000001
+010000000010000000010
+010000000010000000010
+001000000010000000100
+001000000010000000100
+000100000010000001000
+000011000010000110000
+000000110010011000000
+000000001111100000000
+
+00000000011111000000000
+00000011100100111000000
+00000100000100000100000
+00011000000100000011000
+00010000000100000001000
+00100000000100000000100
+01000000000100000000010
+01000000000100000000010
+01000000000100000000010
+10000000000100000000001
+10000000000100000000001
+11111111111111111111111
+10000000000100000000001
+10000000000100000000001
+01000000000100000000010
+01000000000100000000010
+01000000000100000000010
+00100000000100000000100
+00010000000100000001000
+00011000000100000011000
+00000100000100000100000
+00000011100100111000000
+00000000011111000000000
+
+0000000000111110000000000
+0000000111001001110000000
+0000011000001000001100000
+0000100000001000000010000
+0001000000001000000001000
+0010000000001000000000100
+0010000000001000000000100
+0100000000001000000000010
+0100000000001000000000010
+0100000000001000000000010
+1000000000001000000000001
+1000000000001000000000001
+1111111111111111111111111
+1000000000001000000000001
+1000000000001000000000001
+0100000000001000000000010
+0100000000001000000000010
+0100000000001000000000010
+0010000000001000000000100
+0010000000001000000000100
+0001000000001000000001000
+0000100000001000000010000
+0000011000001000001100000
+0000000111001001110000000
+0000000000111110000000000
+
+000000000001111100000000000
+000000001110010011100000000
+000000110000010000011000000
+000001000000010000000100000
+000010000000010000000010000
+000100000000010000000001000
+001000000000010000000000100
+001000000000010000000000100
+010000000000010000000000010
+010000000000010000000000010
+010000000000010000000000010
+100000000000010000000000001
+100000000000010000000000001
+111111111111111111111111111
+100000000000010000000000001
+100000000000010000000000001
+010000000000010000000000010
+010000000000010000000000010
+010000000000010000000000010
+001000000000010000000000100
+001000000000010000000000100
+000100000000010000000001000
+000010000000010000000010000
+000001000000010000000100000
+000000110000010000011000000
+000000001110010011100000000
+000000000001111100000000000
+
+00000000000011111000000000000
+00000000011100100111100000000
+00000001100000100000010000000
+00000010000000100000001100000
+00001100000000100000000010000
+00001000000000100000000001000
+00010000000000100000000001000
+00100000000000100000000000100
+00100000000000100000000000010
+01000000000000100000000000010
+01000000000000100000000000010
+01000000000000100000000000010
+10000000000000100000000000001
+10000000000000100000000000001
+11111111111111111111111111111
+10000000000000100000000000001
+10000000000000100000000000001
+01000000000000100000000000010
+01000000000000100000000000010
+01000000000000100000000000010
+00100000000000100000000000010
+00100000000000100000000000100
+00010000000000100000000001000
+00001000000000100000000001000
+00001100000000100000000110000
+00000010000000100000001000000
+00000001100000100000110000000
+00000000011100100111000000000
+00000000000011111000000000000
+
+0000000000000111110000000000000
+0000000001111001001111000000000
+0000000010000001000000100000000
+0000001100000001000000011000000
+0000010000000001000000000100000
+0000100000000001000000000010000
+0001000000000001000000000001000
+0001000000000001000000000001000
+0010000000000001000000000000100
+0100000000000001000000000000010
+0100000000000001000000000000010
+0100000000000001000000000000010
+0100000000000001000000000000010
+1000000000000001000000000000001
+1000000000000001000000000000001
+1111111111111111111111111111111
+1000000000000001000000000000001
+1000000000000001000000000000001
+0100000000000001000000000000010
+0100000000000001000000000000010
+0100000000000001000000000000010
+0100000000000001000000000000010
+0010000000000001000000000000100
+0001000000000001000000000001000
+0001000000000001000000000001000
+0000100000000001000000000010000
+0000010000000001000000000100000
+0000001100000001000000011000000
+0000000010000001000000100000000
+0000000001111001001111000000000
+0000000000000111110000000000000
+
+00000000000001111110000000000000
+00000000001110010001110000000000
+00000000110000010000001100000000
+00000001000000010000000010000000
+00000110000000010000000001100000
+00001000000000010000000000010000
+00001000000000010000000000010000
+00010000000000010000000000001000
+00100000000000010000000000000100
+00100000000000010000000000000100
+01000000000000010000000000000010
+01000000000000010000000000000010
+01000000000000010000000000000010
+01000000000000010000000000000010
+10000000000000010000000000000001
+11111111111111111111111111111111
+10000000000000010000000000000001
+10000000000000010000000000000001
+01000000000000010000000000000010
+01000000000000010000000000000010
+01000000000000010000000000000010
+01000000000000010000000000000010
+00100000000000010000000000000100
+00100000000000010000000000000100
+00010000000000010000000000001000
+00001000000000010000000000010000
+00001000000000010000000000010000
+00000110000000010000000001100000
+00000001000000010000000010000000
+00000000110000010000001100000000
+00000000001110010001110000000000
+00000000000001111110000000000000

diff --git a/src/VTKViewer/textures/texture8.dat b/src/VTKViewer/textures/texture8.dat
new file mode 100644 (file)
index 0000000..7ffdbf0
--- /dev/null
+++ b/src/VTKViewer/textures/texture8.dat
@@ -0,0 +1,284 @@
+000111000
+011010110
+110010011
+101111101
+100010001
+101111101
+110010011
+011010110
+000111000
+
+00001110000
+00110101100
+11000100011
+01100100110
+10011111001
+10000100001
+10011111001
+01100100110
+11000100011
+00110101100
+00001110000
+
+0000111110000
+0001001001000
+0010001000100
+1100001000011
+0111001001110
+1000111110001
+1000001000001
+1000111110001
+0111001001110
+1100001000011
+0010001000100
+0001001001000
+0000111110000
+
+000001111100000
+000110010011000
+001000010000100
+110000010000011
+011000010000110
+100110010011001
+100001111100001
+100000010000001
+100001111100001
+100110010011001
+011000010000110
+110000010000011
+001000010000100
+000110010011000
+000001111100000
+
+00000011111000000
+00001100100110000
+00010000100001000
+00100000100000100
+11000000100000011
+01110000100001110
+10001100100110001
+10000011111000001
+10000000100000001
+10000011111000001
+10001100100110001
+01110000100001110
+11000000100000011
+00100000100000100
+00010000100001000
+00001100100110000
+00000011111000000
+
+0000000111110000000
+0000011001001100000
+0001100001000011000
+0010000001000000100
+1010000001000000101
+0110000001000000110
+0101100001000011010
+1000011001001100001
+1000000111110000001
+1000000001000000001
+1000000111110000001
+1000011001001100001
+0101100001000011010
+0110000001000000110
+1010000001000000101
+0010000001000000100
+0001100001000011000
+0000011001001100000
+0000000111110000000
+
+000000001111100000000
+000000110010011000000
+000011000010000110000
+000100000010000001000
+001000000010000000100
+111000000010000000111
+011100000010000001110
+010011000010000110010
+100000110010011000001
+100000001111100000001
+100000000010000000001
+100000001111100000001
+100000110010011000001
+010011000010000110010
+011100000010000001110
+111000000010000000111
+001000000010000000100
+000100000010000001000
+000011000010000110000
+000000110010011000000
+000000001111100000000
+
+00000000011111000000000
+00000011100100111000000
+00000100000100000100000
+00011000000100000011000
+00010000000100000001000
+10100000000100000000101
+01100000000100000000110
+01011000000100000011010
+01000110000100001100010
+10000001100100110000001
+10000000011111000000001
+10000000000100000000001
+10000000011111000000001
+10000001100100110000001
+01000110000100001100010
+01011000000100000011010
+01100000000100000000110
+10100000000100000000101
+00010000000100000001000
+00011000000100000011000
+00000100000100000100000
+00000011100100111000000
+00000000011111000000000
+
+0000000000111110000000000
+0000000111001001110000000
+0000011000001000001100000
+0000100000001000000010000
+0001000000001000000001000
+0010000000001000000000100
+1110000000001000000000111
+0111000000001000000001110
+0100110000001000000110010
+0100001100001000011000010
+1000000011001001100000001
+1000000000111110000000001
+1000000000001000000000001
+1000000000111110000000001
+1000000011001001100000001
+0100001100001000011000010
+0100110000001000000110010
+0111000000001000000001110
+1110000000001000000000111
+0010000000001000000000100
+0001000000001000000001000
+0000100000001000000010000
+0000011000001000001100000
+0000000111001001110000000
+0000000000111110000000000
+
+000000000001111100000000000
+000000001110010011100000000
+000000110000010000011000000
+000001000000010000000100000
+000010000000010000000010000
+000100000000010000000001000
+101000000000010000000000101
+011000000000010000000000110
+010110000000010000000011010
+010001100000010000001100010
+010000011000010000110000010
+100000000110010011000000001
+100000000001111100000000001
+100000000000010000000000001
+100000000001111100000000001
+100000000110010011000000001
+010000011000010000110000010
+010001100000010000001100010
+010110000000010000000011010
+011000000000010000000000110
+101000000000010000000000101
+000100000000010000000001000
+000010000000010000000010000
+000001000000010000000100000
+000000110000010000011000000
+000000001110010011100000000
+000000000001111100000000000
+
+00000000000011111000000000000
+00000000011100100111100000000
+00000001100000100000010000000
+00000010000000100000001100000
+00001100000000100000000010000
+00001000000000100000000001000
+00010000000000100000000001000
+11100000000000100000000000111
+00110000000000100000000001110
+01001100000000100000000110010
+01000011000000100000011000010
+01000000110000100001100000010
+10000000001100100110000000001
+10000000000011111000000000001
+10000000000000100000000000001
+10000000000011111000000000001
+10000000001100100110000000001
+01000000110000100001100000010
+01000011000000100000011000010
+01001100000000100000000110010
+00110000000000100000000001110
+11100000000000100000000000111
+00010000000000100000000001000
+00001000000000100000000001000
+00001100000000100000000110000
+00000010000000100000001000000
+00000001100000100000110000000
+00000000011100100111000000000
+00000000000011111000000000000
+
+0000000000000111110000000000000
+0000000001111001001111000000000
+0000000010000001000000100000000
+0000001100000001000000011000000
+0000010000000001000000000100000
+0000100000000001000000000010000
+0001000000000001000000000001000
+1001000000000001000000000001001
+0110000000000001000000000000110
+0101100000000001000000000011010
+0100011000000001000000001100010
+0100000110000001000000110000010
+0100000001100001000011000000010
+1000000000011001001100000000001
+1000000000000111110000000000001
+1000000000000001000000000000001
+1000000000000111110000000000001
+1000000000011001001100000000001
+0100000001100001000011000000010
+0100000110000001000000110000010
+0100011000000001000000001100010
+0101100000000001000000000011010
+0110000000000001000000000000110
+1001000000000001000000000001001
+0001000000000001000000000001000
+0000100000000001000000000010000
+0000010000000001000000000100000
+0000001100000001000000011000000
+0000000010000001000000100000000
+0000000001111001001111000000000
+0000000000000111110000000000000
+
+00000000000001111110000000000000
+00000000001110010001110000000000
+00000000110000010000001100000000
+00000001000000010000000010000000
+00000110000000010000000001100000
+00001000000000010000000000010000
+00001000000000010000000000010000
+00010000000000010000000000001000
+10100000000000010000000000000110
+01100000000000010000000000001100
+01011000000000010000000000110010
+01000110000000010000000011000010
+01000001100000010000001100000010
+01000000011000010000110000000010
+10000000000110010011000000000001
+10000000000001111100000000000001
+10000000000001111100000000000001
+10000000000110010011000000000001
+01000000011000010000110000000010
+01000001100000010000001100000010
+01000110000000010000000011000010
+01011000000000010000000000110010
+01100000000000010000000000001100
+10100000000000010000000000000110
+00010000000000010000000000001000
+00001000000000010000000000010000
+00001000000000010000000000010000
+00000110000000010000000001100000
+00000001000000010000000010000000
+00000000110000010000001100000000
+00000000001110010001110000000000
+00000000000001111110000000000000

diff --git a/src/VTKViewer/textures/texture9.dat b/src/VTKViewer/textures/texture9.dat
new file mode 100644 (file)
index 0000000..01fa9ee
--- /dev/null
+++ b/src/VTKViewer/textures/texture9.dat
@@ -0,0 +1,284 @@
+100111001
+011000110
+011000110
+100101001
+100010001
+100101001
+011000110
+011000110
+100111001
+
+10001110001
+01110001110
+01100000110
+01010001010
+10001010001
+10000100001
+10001010001
+01010001010
+01100000110
+01110001110
+10001110001
+
+1000111110001
+0101000001010
+0010000000100
+0101000001010
+0100100010010
+1000010100001
+1000001000001
+1000010100001
+0100100010010
+0101000001010
+0010000000100
+0101000001010
+1000111110001
+
+100001111100001
+010110000011010
+001000000000100
+010100000001010
+010010000010010
+100001000100001
+100000101000001
+100000010000001
+100000101000001
+100001000100001
+010010000010010
+010100000001010
+001000000000100
+010110000011010
+100001111100001
+
+10000011111000001
+01001100000110010
+00110000000001100
+00110000000001100
+01001000000010010
+01000100000100010
+10000010001000001
+10000001010000001
+10000000100000001
+10000001010000001
+10000010001000001
+01000100000100010
+01001000000010010
+00110000000001100
+00110000000001100
+01001100000110010
+10000011111000001
+
+1000000111110000001
+0100011000001100010
+0011100000000011100
+0011000000000001100
+0010100000000010100
+0100010000000100010
+0100001000001000010
+1000000100010000001
+1000000010100000001
+1000000001000000001
+1000000010100000001
+1000000100010000001
+0100001000001000010
+0100010000000100010
+0010100000000010100
+0011000000000001100
+0011100000000011100
+0100011000001100010
+1000000111110000001
+
+100000001111100000001
+010000110000011000010
+001011000000000110100
+000100000000000001000
+001010000000000010100
+001001000000000100100
+010000100000001000010
+010000010000010000010
+100000001000100000001
+100000000101000000001
+100000000010000000001
+100000000101000000001
+100000001000100000001
+010000010000010000010
+010000100000001000010
+001001000000000100100
+001010000000000010100
+000100000000000001000
+001011000000000110100
+010000110000011000010
+100000001111100000001
+
+10000000011111000000001
+01000011100000111000010
+00100100000000000100100
+00011000000000000011000
+00011000000000000011000
+00100100000000000100100
+01000010000000001000010
+01000001000000010000010
+01000000100000100000010
+10000000010001000000001
+10000000001010000000001
+10000000000100000000001
+10000000001010000000001
+10000000010001000000001
+01000000100000100000010
+01000001000000010000010
+01000010000000001000010
+00100100000000000100100
+00011000000000000011000
+00011000000000000011000
+00100100000000000100100
+01000011100000111000010
+10000000011111000000001
+
+1000000000111110000000001
+0100000111000001110000010
+0010011000000000001100100
+0001100000000000000011000
+0001100000000000000011000
+0010010000000000000100100
+0010001000000000001000100
+0100000100000000010000010
+0100000010000000100000010
+0100000001000001000000010
+1000000000100010000000001
+1000000000010100000000001
+1000000000001000000000001
+1000000000010100000000001
+1000000000100010000000001
+0100000001000001000000010
+0100000010000000100000010
+0100000100000000010000010
+0010001000000000001000100
+0010010000000000000100100
+0001100000000000000011000
+0001100000000000000011000
+0010011000000000001100100
+0100000111000001110000010
+1000000000111110000000001
+
+100000000001111100000000001
+010000001110000011100000010
+001000110000000000011000100
+000101000000000000000101000
+000010000000000000000010000
+000101000000000000000101000
+001000100000000000001000100
+001000010000000000010000100
+010000001000000000100000010
+010000000100000001000000010
+010000000010000010000000010
+100000000001000100000000001
+100000000000101000000000001
+100000000000010000000000001
+100000000000101000000000001
+100000000001000100000000001
+010000000010000010000000010
+010000000100000001000000010
+010000001000000000100000010
+001000010000000000010000100
+001000100000000000001000100
+000101000000000000000101000
+000010000000000000000010000
+000101000000000000000101000
+001000110000000000011000100
+010000001110000011100000010
+100000000001111100000000001
+
+10000000000011111000000000001
+01000000011100000111100000010
+00100001100000000000010000100
+00010010000000000000001101000
+00001100000000000000000010000
+00001100000000000000000101000
+00010010000000000000001001000
+00100001000000000000010000100
+00100000100000000000100000010
+01000000010000000001000000010
+01000000001000000010000000010
+01000000000100000100000000010
+10000000000010001000000000001
+10000000000001010000000000001
+10000000000000100000000000001
+10000000000001010000000000001
+10000000000010001000000000001
+01000000000100000100000000010
+01000000001000000010000000010
+01000000010000000001000000010
+00100000100000000000100000010
+00100001000000000000010000100
+00010010000000000000001001000
+00001100000000000000000101000
+00001100000000000000000110000
+00010010000000000000001001000
+00100001100000000000110000100
+01000000011100000111000000010
+10000000000011111000000000001
+
+1000000000000111110000000000001
+0100000001111000001111000000010
+0010000010000000000000100000100
+0001001100000000000000011001000
+0000110000000000000000000110000
+0000110000000000000000000110000
+0001001000000000000000001001000
+0001000100000000000000010001000
+0010000010000000000000100000100
+0100000001000000000001000000010
+0100000000100000000010000000010
+0100000000010000000100000000010
+0100000000001000001000000000010
+1000000000000100010000000000001
+1000000000000010100000000000001
+1000000000000001000000000000001
+1000000000000010100000000000001
+1000000000000100010000000000001
+0100000000001000001000000000010
+0100000000010000000100000000010
+0100000000100000000010000000010
+0100000001000000000001000000010
+0010000010000000000000100000100
+0001000100000000000000010001000
+0001001000000000000000001001000
+0000110000000000000000000110000
+0000110000000000000000000110000
+0001001100000000000000011001000
+0010000010000000000000100000100
+0100000001111000001111000000010
+1000000000000111110000000000001
+
+10000000000001111110000000000001
+01000000001110000001110000000010
+00100000110000000000001100000100
+00010001000000000000000010001000
+00001110000000000000000001110000
+00001100000000000000000000110000
+00001010000000000000000001010000
+00010001000000000000000010001000
+00100000100000000000000100000100
+00100000010000000000001000000100
+01000000001000000000010000000010
+01000000000100000000100000000010
+01000000000010000001000000000010
+01000000000001000010000000000010
+10000000000000100100000000000001
+10000000000000011000000000000001
+10000000000000011000000000000001
+10000000000000100100000000000001
+01000000000001000010000000000010
+01000000000010000001000000000010
+01000000000100000000100000000010
+01000000001000000000010000000010
+00100000010000000000001000000100
+00100000100000000000000100000100
+00010001000000000000000010001000
+00001010000000000000000001010000
+00001100000000000000000000110000
+00001110000000000000000001110000
+00010001000000000000000010001000
+00100000110000000000001100000100
+01000000001110000001110000000010
+10000000000001111110000000000001

diff --git a/src/src.pro b/src/src.pro
index 74f5e47bc88b384a09ae9bc50f24ca616f3fccb4..a6d9afbd75ef81b412ed6cdc0eac8003d6a6185d 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -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