From: vsr Date: Tue, 5 Jun 2012 10:50:13 +0000 (+0000) Subject: Merge from V6_5_BR 05/06/2012 X-Git-Tag: B4WheelZoom~5 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1217fd81a001ac8bf467346d19aa7588d7a9aa4a;p=modules%2Fgui.git Merge from V6_5_BR 05/06/2012 --- diff --git a/GUI_version.h.in b/GUI_version.h.in index d4732e901..f01d60122 100644 --- a/GUI_version.h.in +++ b/GUI_version.h.in @@ -1,4 +1,4 @@ -// Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +// Copyright (C) 2007-2012 CEA/DEN, EDF R&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/Makefile.am b/Makefile.am index 37609afc4..b14bfd85b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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 b3c37f7e6..4781976b7 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake index 7491a5a27..77bbd5cbb 100644 --- a/adm_local/cmake_files/FindCAS.cmake +++ b/adm_local/cmake_files/FindCAS.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 8e8a2456a..fa255f786 100644 --- a/adm_local/cmake_files/FindGUI.cmake +++ b/adm_local/cmake_files/FindGUI.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 80467bee1..d7e8d4fed 100644 --- a/adm_local/cmake_files/FindOPENGL.cmake +++ b/adm_local/cmake_files/FindOPENGL.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 b5634459b..bf713c01f 100644 --- a/adm_local/cmake_files/FindQT4.cmake +++ b/adm_local/cmake_files/FindQT4.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 4c008cc5a..186341267 100644 --- a/adm_local/cmake_files/FindQWT.cmake +++ b/adm_local/cmake_files/FindQWT.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 2145885ee..6a76d6a7e 100644 --- a/adm_local/cmake_files/FindSIPPYQT.cmake +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -63,16 +63,14 @@ SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtNetwork -I${PYQT_SIPS}/QtSql SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtSvg -I${PYQT_SIPS}/QtTest) EXECUTE_PROCESS( - COMMAND ${PYTHON_EXECUTABLE} -c "import re, PyQt4.pyqtconfig ; s = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags ; m = re.search('(Qt_[0-9_]+)',s) ; print m.group(1)" - OUTPUT_VARIABLE SUPPORTED + COMMAND ${PYTHON_EXECUTABLE} -c "import re, PyQt4.pyqtconfig ; s = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags ; print s;" + OUTPUT_VARIABLE COMPILE_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE ) +string(REPLACE " " ";" FLAGS_LIST ${COMPILE_FLAGS}) +FOREACH(FLG ${FLAGS_LIST}) +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${FLG}) +ENDFOREACH(FLG ${FLAGS_LIST}) -IF(WINDOWS) - SET(ws_flag WS_WIN) -ELSE(WINDOWS) - SET(ws_flag WS_X11) -ENDIF(WINDOWS) - -SET(PYQT_SIPFLAGS -x VendorID -x PyQt_NoPrintRangeBug -t ${ws_flag} -t ${SUPPORTED} -g -s .cc -c .) -SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES}) +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} -s .cc -c . ) +SET( PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES} ) \ No newline at end of file diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake index 718734281..bf74db8ab 100644 --- a/adm_local/cmake_files/FindVTK.cmake +++ b/adm_local/cmake_files/FindVTK.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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/Makefile.am b/adm_local/cmake_files/Makefile.am index 1bfd833f5..11f2ecd87 100644 --- a/adm_local/cmake_files/Makefile.am +++ b/adm_local/cmake_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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/UseQT4EXT.cmake b/adm_local/cmake_files/UseQT4EXT.cmake index e55db80c5..e3a8605c4 100644 --- a/adm_local/cmake_files/UseQT4EXT.cmake +++ b/adm_local/cmake_files/UseQT4EXT.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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/unix/Makefile.am b/adm_local/unix/Makefile.am index 1513b52d2..dc81a356d 100644 --- a/adm_local/unix/Makefile.am +++ b/adm_local/unix/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 137a1002f..fab65aae3 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/adm_local/unix/config_files/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/unix/config_files/check_GLViewer.m4 b/adm_local/unix/config_files/check_GLViewer.m4 index 4ac408bba..48dc02092 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_GUI.m4 b/adm_local/unix/config_files/check_GUI.m4 index d07f1b367..ef1836958 100755 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_OCCViewer.m4 b/adm_local/unix/config_files/check_OCCViewer.m4 index a2c5b5bff..6f1ca7109 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_Plot2dViewer.m4 b/adm_local/unix/config_files/check_Plot2dViewer.m4 index 4b40d2177..72915af59 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_PyConsole.m4 b/adm_local/unix/config_files/check_PyConsole.m4 index 5d7644b57..fcb4223a4 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_QxGraphViewer.m4 b/adm_local/unix/config_files/check_QxGraphViewer.m4 index b6ae90ba9..2ec1403fa 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_SalomeObject.m4 b/adm_local/unix/config_files/check_SalomeObject.m4 index 5319b1d71..14c93dffe 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_SupervGraphViewer.m4 b/adm_local/unix/config_files/check_SupervGraphViewer.m4 index c49c6c47b..f73979a7c 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_TestRecorder.m4 b/adm_local/unix/config_files/check_TestRecorder.m4 index d06b8d993..6baec44f6 100644 --- a/adm_local/unix/config_files/check_TestRecorder.m4 +++ b/adm_local/unix/config_files/check_TestRecorder.m4 @@ -1,4 +1,4 @@ -dnl Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_VTKViewer.m4 b/adm_local/unix/config_files/check_VTKViewer.m4 index c471e8e12..56065212c 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_disable_Corba.m4 b/adm_local/unix/config_files/check_disable_Corba.m4 index 6743e8a66..eea675cdc 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_msg2qm.m4 b/adm_local/unix/config_files/check_msg2qm.m4 index 70a622b25..a8eea4e14 100755 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_opengl.m4 b/adm_local/unix/config_files/check_opengl.m4 index f00e346ae..f003684c1 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_pyqt.m4 b/adm_local/unix/config_files/check_pyqt.m4 index afd349e7f..ec0acce59 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_qt.m4 b/adm_local/unix/config_files/check_qt.m4 index 54636cd49..c1e1d3e08 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_qwt.m4 b/adm_local/unix/config_files/check_qwt.m4 index 213c7b37f..65180571f 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/config_files/check_salome_version.m4 b/adm_local/unix/config_files/check_salome_version.m4 index 03e025af1..308d4af3a 100644 --- a/adm_local/unix/config_files/check_salome_version.m4 +++ b/adm_local/unix/config_files/check_salome_version.m4 @@ -1,23 +1,23 @@ -dnl Copyright (C) 2007-2010 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 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 -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License. +dnl This library is free software; you can redistribute it and/or +dnl modify it under the terms of the GNU Lesser General Public +dnl License as published by the Free Software Foundation; either +dnl version 2.1 of the License. dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. +dnl This library is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl Lesser General Public License for more details. dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library; if not, write to the Free Software -dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +dnl You should have received a copy of the GNU Lesser General Public +dnl License along with this library; if not, write to the Free Software +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 See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com dnl # Check SALOME version diff --git a/adm_local/unix/config_files/check_sip.m4 b/adm_local/unix/config_files/check_sip.m4 index 9d6030d87..f7c60477e 100644 --- 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-2011 CEA/DEN, EDF R&D, OPEN CASCADE +dnl Copyright (C) 2007-2012 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 diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 1b7b18794..260923bdc 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/Makefile.am b/bin/Makefile.am index 56dd87cdc..cb7e596c1 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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.csh b/bin/runLightSalome.csh index 8c3cb3573..8101300c2 100755 --- a/bin/runLightSalome.csh +++ b/bin/runLightSalome.csh @@ -1,5 +1,5 @@ #!/bin/csh -f -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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 8af8227cb..7fb497840 100755 --- a/bin/runLightSalome.sh +++ b/bin/runLightSalome.sh @@ -1,6 +1,6 @@ #!/bin/bash -f -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/build_cmake b/build_cmake index becbe58bb..b8fe099ce 100755 --- a/build_cmake +++ b/build_cmake @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, 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 aaa04ba5e..b5e1ffc53 100644 --- a/build_cmake.bat +++ b/build_cmake.bat @@ -1,4 +1,4 @@ -@REM Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +@REM Copyright (C) 2007-2012 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 diff --git a/build_configure b/build_configure index 0cfa4a893..dfdad322f 100755 --- a/build_configure +++ b/build_configure @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/clean_configure b/clean_configure index 550456d90..ec17918df 100755 --- a/clean_configure +++ b/clean_configure @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&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/configure.ac b/configure.ac index 0b6bed253..379f5bc81 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -26,7 +26,7 @@ # Modified by : Marc Tajchman (CEA) # Modified by : Mikhail PONIKAROV (OCN) - autotools usage # -AC_INIT([Salome2 Project GUI module], [6.4.0], [webmaster.salome@opencascade.com], [SalomeGUI]) +AC_INIT([Salome2 Project GUI module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGUI]) AC_CONFIG_AUX_DIR(adm_local/unix/config_files) AC_CANONICAL_HOST AC_CANONICAL_TARGET diff --git a/doc/Makefile.am b/doc/Makefile.am index f8f8926ee..583c18bab 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 520c91eb7..705a2675b 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index 81dd95ea2..974858410 100644 --- a/doc/salome/gui/Makefile.am +++ b/doc/salome/gui/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in index 7776e6f6d..16006e338 100755 --- a/doc/salome/gui/doxyfile.in +++ b/doc/salome/gui/doxyfile.in @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2011 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS @@ -40,7 +40,12 @@ WARNINGS = YES #--------------------------------------------------------------------------- INPUT = @srcdir@/input FILE_PATTERNS = *.doc -IMAGE_PATH = @srcdir@/images @top_srcdir@/src/OCCViewer/resources @top_srcdir@/src/VTKViewer/resources @top_srcdir@/src/SVTK/resources @top_srcdir@/src/Plot2d/resources +IMAGE_PATH = @srcdir@/images @top_srcdir@/src/OCCViewer/resources \ + @top_srcdir@/src/VTKViewer/resources \ + @top_srcdir@/src/SVTK/resources \ + @top_srcdir@/src/Plot2d/resources \ + @top_srcdir@/src/GLViewer/resources \ + @top_srcdir@/src/QxScene/resources \ #--------------------------------------------------------------------------- #HTML related options diff --git a/doc/salome/gui/images/batchmode.png b/doc/salome/gui/images/batchmode.png deleted file mode 100644 index 34329463f..000000000 Binary files a/doc/salome/gui/images/batchmode.png and /dev/null differ diff --git a/doc/salome/gui/images/change_background_dlg.png b/doc/salome/gui/images/change_background_dlg.png index debf41f2b..2b0e6a4a3 100644 Binary files a/doc/salome/gui/images/change_background_dlg.png and b/doc/salome/gui/images/change_background_dlg.png differ diff --git a/doc/salome/gui/images/choicepage.png b/doc/salome/gui/images/choicepage.png deleted file mode 100644 index 7c997287e..000000000 Binary files a/doc/salome/gui/images/choicepage.png and /dev/null differ diff --git a/doc/salome/gui/images/directorypage.png b/doc/salome/gui/images/directorypage.png deleted file mode 100755 index fafc98936..000000000 Binary files a/doc/salome/gui/images/directorypage.png and /dev/null differ diff --git a/doc/salome/gui/images/featureedgesprops.png b/doc/salome/gui/images/featureedgesprops.png deleted file mode 100755 index 13aa470fe..000000000 Binary files a/doc/salome/gui/images/featureedgesprops.png and /dev/null differ diff --git a/doc/salome/gui/images/glviewer_toolbar.png b/doc/salome/gui/images/glviewer_toolbar.png new file mode 100644 index 000000000..c18f17807 Binary files /dev/null and b/doc/salome/gui/images/glviewer_toolbar.png differ diff --git a/doc/salome/gui/images/installtypepage.png b/doc/salome/gui/images/installtypepage.png deleted file mode 100755 index 8359d54c0..000000000 Binary files a/doc/salome/gui/images/installtypepage.png and /dev/null differ diff --git a/doc/salome/gui/images/intropage.png b/doc/salome/gui/images/intropage.png deleted file mode 100644 index de29d067a..000000000 Binary files a/doc/salome/gui/images/intropage.png and /dev/null differ diff --git a/doc/salome/gui/images/platformpage.png b/doc/salome/gui/images/platformpage.png deleted file mode 100755 index cfbf60c3c..000000000 Binary files a/doc/salome/gui/images/platformpage.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref0.png b/doc/salome/gui/images/ppref0.png deleted file mode 100755 index d984287ac..000000000 Binary files a/doc/salome/gui/images/ppref0.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref1.png b/doc/salome/gui/images/ppref1.png deleted file mode 100755 index 45262f500..000000000 Binary files a/doc/salome/gui/images/ppref1.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref2.png b/doc/salome/gui/images/ppref2.png deleted file mode 100755 index caae528b7..000000000 Binary files a/doc/salome/gui/images/ppref2.png and /dev/null differ diff --git a/doc/salome/gui/images/ppref3.png b/doc/salome/gui/images/ppref3.png deleted file mode 100755 index 32e05f934..000000000 Binary files a/doc/salome/gui/images/ppref3.png and /dev/null differ diff --git a/doc/salome/gui/images/pref15.png b/doc/salome/gui/images/pref15.png deleted file mode 100755 index 3d9e5f628..000000000 Binary files a/doc/salome/gui/images/pref15.png and /dev/null differ diff --git a/doc/salome/gui/images/pref21.png b/doc/salome/gui/images/pref21.png deleted file mode 100755 index d30add416..000000000 Binary files a/doc/salome/gui/images/pref21.png and /dev/null differ diff --git a/doc/salome/gui/images/pref22.png b/doc/salome/gui/images/pref22.png deleted file mode 100755 index b56c4e540..000000000 Binary files a/doc/salome/gui/images/pref22.png and /dev/null differ diff --git a/doc/salome/gui/images/pref23.png b/doc/salome/gui/images/pref23.png deleted file mode 100644 index 07858d726..000000000 Binary files a/doc/salome/gui/images/pref23.png and /dev/null differ diff --git a/doc/salome/gui/images/pref24.png b/doc/salome/gui/images/pref24.png deleted file mode 100755 index f1cdcf8fc..000000000 Binary files a/doc/salome/gui/images/pref24.png and /dev/null differ diff --git a/doc/salome/gui/images/pref31.png b/doc/salome/gui/images/pref31.png deleted file mode 100755 index 86555668a..000000000 Binary files a/doc/salome/gui/images/pref31.png and /dev/null differ diff --git a/doc/salome/gui/images/pref32.png b/doc/salome/gui/images/pref32.png deleted file mode 100755 index efadf97ff..000000000 Binary files a/doc/salome/gui/images/pref32.png and /dev/null differ diff --git a/doc/salome/gui/images/pref33.png b/doc/salome/gui/images/pref33.png deleted file mode 100755 index 4a516496a..000000000 Binary files a/doc/salome/gui/images/pref33.png and /dev/null differ diff --git a/doc/salome/gui/images/pref34.png b/doc/salome/gui/images/pref34.png deleted file mode 100755 index 515b09c4d..000000000 Binary files a/doc/salome/gui/images/pref34.png and /dev/null differ diff --git a/doc/salome/gui/images/pref35.png b/doc/salome/gui/images/pref35.png deleted file mode 100755 index 77d73a09b..000000000 Binary files a/doc/salome/gui/images/pref35.png and /dev/null differ diff --git a/doc/salome/gui/images/pref37.png b/doc/salome/gui/images/pref37.png deleted file mode 100755 index ec0607c97..000000000 Binary files a/doc/salome/gui/images/pref37.png and /dev/null differ diff --git a/doc/salome/gui/images/pref_salome_directories.png b/doc/salome/gui/images/pref_salome_directories.png index 01dd7ef9b..c47b45788 100644 Binary files a/doc/salome/gui/images/pref_salome_directories.png and b/doc/salome/gui/images/pref_salome_directories.png differ diff --git a/doc/salome/gui/images/pref_salome_general.png b/doc/salome/gui/images/pref_salome_general.png index 768404cfc..db05ca064 100644 Binary files a/doc/salome/gui/images/pref_salome_general.png and b/doc/salome/gui/images/pref_salome_general.png differ diff --git a/doc/salome/gui/images/pref_salome_objbrowser.png b/doc/salome/gui/images/pref_salome_objbrowser.png index 8901595cb..9242935e8 100644 Binary files a/doc/salome/gui/images/pref_salome_objbrowser.png and b/doc/salome/gui/images/pref_salome_objbrowser.png differ diff --git a/doc/salome/gui/images/pref_salome_occviewer.png b/doc/salome/gui/images/pref_salome_occviewer.png index 73e44e7e2..953d07211 100644 Binary files a/doc/salome/gui/images/pref_salome_occviewer.png and b/doc/salome/gui/images/pref_salome_occviewer.png differ diff --git a/doc/salome/gui/images/pref_salome_plot2dviewer.png b/doc/salome/gui/images/pref_salome_plot2dviewer.png index f1efa0c1e..f427aee9d 100644 Binary files a/doc/salome/gui/images/pref_salome_plot2dviewer.png and b/doc/salome/gui/images/pref_salome_plot2dviewer.png differ diff --git a/doc/salome/gui/images/pref_salome_shortcuts.png b/doc/salome/gui/images/pref_salome_shortcuts.png index 7c0aee69a..5f4c19454 100644 Binary files a/doc/salome/gui/images/pref_salome_shortcuts.png and b/doc/salome/gui/images/pref_salome_shortcuts.png differ diff --git a/doc/salome/gui/images/pref_salome_vtkviewer.png b/doc/salome/gui/images/pref_salome_vtkviewer.png index 6d62b6f7a..29ac576dd 100644 Binary files a/doc/salome/gui/images/pref_salome_vtkviewer.png and b/doc/salome/gui/images/pref_salome_vtkviewer.png differ diff --git a/doc/salome/gui/images/productpage1.png b/doc/salome/gui/images/productpage1.png deleted file mode 100644 index 1033c0c73..000000000 Binary files a/doc/salome/gui/images/productpage1.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage2.png b/doc/salome/gui/images/productpage2.png deleted file mode 100644 index dc39f2ed4..000000000 Binary files a/doc/salome/gui/images/productpage2.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage3.png b/doc/salome/gui/images/productpage3.png deleted file mode 100755 index 7c2db8b20..000000000 Binary files a/doc/salome/gui/images/productpage3.png and /dev/null differ diff --git a/doc/salome/gui/images/productpage4.png b/doc/salome/gui/images/productpage4.png deleted file mode 100755 index 9f0de3675..000000000 Binary files a/doc/salome/gui/images/productpage4.png and /dev/null differ diff --git a/doc/salome/gui/images/progresspage1.png b/doc/salome/gui/images/progresspage1.png deleted file mode 100644 index 20ac54bd9..000000000 Binary files a/doc/salome/gui/images/progresspage1.png and /dev/null differ diff --git a/doc/salome/gui/images/progresspage2.png b/doc/salome/gui/images/progresspage2.png deleted file mode 100755 index c2aad1f87..000000000 Binary files a/doc/salome/gui/images/progresspage2.png and /dev/null differ diff --git a/doc/salome/gui/images/qxviewer_toolbar.png b/doc/salome/gui/images/qxviewer_toolbar.png new file mode 100644 index 000000000..716a078c0 Binary files /dev/null and b/doc/salome/gui/images/qxviewer_toolbar.png differ diff --git a/doc/salome/gui/images/readmepage.png b/doc/salome/gui/images/readmepage.png deleted file mode 100644 index 0ddd39aff..000000000 Binary files a/doc/salome/gui/images/readmepage.png and /dev/null differ diff --git a/doc/salome/gui/input/geometry_preferences.doc b/doc/salome/gui/input/geometry_preferences.doc deleted file mode 100644 index 3930c03bb..000000000 --- a/doc/salome/gui/input/geometry_preferences.doc +++ /dev/null @@ -1,94 +0,0 @@ -/*! - -\page geometry_preferences_page Geometry preferences - -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 - -\par -For all color definitions click on the respective line to access to -the \ref select_color_and_font_page "Select Color" dialog box. - - - - - - - - - - - - - -*/ diff --git a/doc/salome/gui/input/gl_2d_viewer.doc b/doc/salome/gui/input/gl_2d_viewer.doc new file mode 100644 index 000000000..3f0c35f57 --- /dev/null +++ b/doc/salome/gui/input/gl_2d_viewer.doc @@ -0,0 +1,71 @@ +/*! + +\page gl_2d_viewer_page GL 2D Viewer + +

Operations

+ +The functionalities of GL viewer are available via its Viewer +Toolbar. Buttons marked with small downward triangles have extended +functionality which can be accessed by locking on them with left mouse +button. + +\image html glviewer_toolbar.png +
+ +\image html gl_view_dump.png + +Dump View - exports an object from the viewer in bmp, png or +jpeg image format. +
+ +\image html gl_view_fitall.png + +Fit all - scales the presentation so that it could fit within +the Viewer boundaries. +
+ +\image html gl_view_fitarea.png + +Fit area - resizes the view to place in the visible area only +the contents of a frame drawn with pressed left mouse button. +
+ +\image html gl_view_fitselect.png + +Fit selection - resizes the view to fit in the visible area +only currently selected objects. +
+ +\image html gl_view_zoom.png + +Zoom - allows to zoom in and out. +
+ +\image html gl_view_pan.png + +Panning - if the represented objects are greater that the +visible area and you don't wish to use Fit all functionality, +click on this button and you'll be able to drag the scene to see its +remote parts. +
+ +\image html gl_view_glpan.png + +Global panning - allows to select a point to be the center of +the presentation showing all displayed objects in the visible ares. +
+ +\image html gl_view_reset.png + +Reset - restores the default position the scene. +
+ +\anchor gl_background +

Background

+ +GL Viewer background can be customized using the "Change background" +popup menu command that opens standard "Select Color" dialog box: + +\image html selectcolor.png + +*/ diff --git a/doc/salome/gui/input/howtos_and_best_practives.doc b/doc/salome/gui/input/howtos_and_best_practives.doc index 40e3d6879..e064bf281 100644 --- a/doc/salome/gui/input/howtos_and_best_practives.doc +++ b/doc/salome/gui/input/howtos_and_best_practives.doc @@ -22,28 +22,29 @@ data server, namely \c SALOMEDS::StudyBuilder. As soon as data entities are publ in the study, they are shown in the Object browser, in the same order as they appear in the study tree. Re-arrangement of the data entities with such approach is not a trivial task: for example, when copying/moving any data entity at the new position -within the tree, it is necessary to copy all its attributes also and clear (in case -of move operation) data entity at the original position. Also, it is not possible to -have some data items in the tree "invisible" for the user (though it might be useful). +within the tree, it is necessary to copy all its attributes as well +and to clear (in case of move operation) the data entity at the original position. Also, it is not possible to +make some data items in the tree "invisible" for the user (though it might be useful). -Use case builder provides alternative and more flexible way for customizing of the +Use case builder provides an alternative and more flexible way for customizing the data tree representation. It implements another approach to the data tree hierarchy, based on the tree node attributes. With use case builder it is possible to arrange and easily re-arrange the data items in the data tree in any appropriate way. -For example, with use case builder it is easy to implement such operations like +For example, with use case builder it is easy to implement such operations as \ref drag_and_drop "Drag and Drop" and Copy/Cut/Paste. With use case builder approach -it's not important how data entities are arranged in the study tree, they even may be -lying on the same level - use case builder allows providing custom data tree +it is not important how data entities are arranged in the study tree, they even may +lie on the same level - use case builder allows providing custom data tree representation, completely indepedent on the study data tree itself. It is even possible to hide some data entities in the tree representation while still keeping them in the study (to store specific module data). -Object browser automatically checks it the module root data object contains tree node -attribute and switches to the browsing of the data tree for such module using use case -builder. Otherwise, it browses data using ordinary study tree iterator. Thus, it is +Object browser automatically checks it the module root data object +contains a tree node attribute and switches to the browsing of the +data tree for such module using the use case +builder. Otherwise, it browses data using an ordinary study tree iterator. Thus, it is possible to have in the same study some modules based on use case builder approach and -other ones not using it. +others not using it. \section use_case_builder_usage Use case builder usage @@ -59,26 +60,27 @@ interface Study \endcode \c SALOMEDS::UseCaseBuilder interface of the \c SALOMEDS CORBA module provides several -methods that can be used to build custom data tree. Its API is similar to that one of +methods that can be used to build a custom data tree. Its API is +similar to the API of \c SALOMEDS::StudyBuilder interface - it operates with terms \a "father object" and \a "child object". In addition, use case builder uses term \a "current object" that is -used as a parent of the children objects being added if parent is not explicitly +used as a parent of the children objects added if the parent is not explicitly specified. \code interface UseCaseBuilder { - // Set top-level root object of the use case tree as current + // Set top-level root object of the use case tree as the current one. // This method is usually used to add SComponent items to the top level of the tree boolean SetRootCurrent(); - // Set the object theObject as current object of the use case builder + // Set the object theObject as the current object of the use case builder boolean SetCurrentObject(in SObject theObject); // Append object SObject to the end of children list of the current object boolean Append(in SObject theObject); - // Append object SObject to the end of children list of parent object theFather + // Append object SObject to the end of children list of the parent object theFather boolean AppendTo(in SObject theFather, in SObject theObject); // Insert object theFirst before the object theNext (under the same parent object) @@ -111,7 +113,7 @@ interface: \code interface UseCaseBuilder { - // Get reference to the use case iterator and initialize it + // Get a reference to the use case iterator and initialize it // by the given object theObject UseCaseIterator GetUseCaseIterator(in SObject theObject); }; @@ -125,13 +127,13 @@ interface UseCaseIterator { // Activate or reset use case iterator; boolean parameter allLevels // specifies if the iterator should browse recursively on all sub-levels or - // on the first sub-level only + // on the first sub-level only. void Init(in boolean allLevels); - // Check if iterator can browse to the next item + // Check if the iterator can browse to the next item boolean More(); - // Browse iterator to the next object + // Browse the iterator to the next object void Next(); - // Get object currently pointed by the iterator + // Get the object currently pointed by the iterator SObject Value(); }; \endcode @@ -142,12 +144,12 @@ Typical usage of the \c UseCaseIterator is as follows: // get use case builder SALOMEDS::UseCaseBuilder_var useCaseBuilder = study->GetUseCaseBuilder(); -// get use case iterator +// get the use case iterator SALOMEDS::UseCaseIterator_var iter = useCaseIter->GetUseCaseIterator( sobject.in() ); // iterate through the sub-items recursively for ( useCaseIter->Init( true ); useCaseIter->More(); useCaseIter->Next() ) { SALOMEDS::SObject_var child = useCaseIter->Value(); - // do something with child + // do something with the child // ... // clean-up child->UnRegister(); @@ -159,24 +161,25 @@ useCaseBuilder->UnRegister(); \section use_case_compatibility Remark about compatibility with existing studies -If one day you decided to switch your module to the use case builder approach to provide -customization for the data tree representation, you must take care about compatibility -with existing SALOME studies. Basically it means that you have to add simple code to your -module's \c Load() (and \c LoadASCII() if necessary) method, that adds tree node -attributes to all the data entities in your module's data tree. The simplest way to do -this, is to iterate through all the data items and recursively add them to the use case -builder: +If you decide to switch your module to the use case builder approach to provide +customization for the data tree representation, you must take care of compatibility +with existing SALOME studies. Basically it means that you have to add +a simple code to \c Load() (and \c LoadASCII() if necessary) method +of your module, which adds tree node attributes to all data entities +in the data tree of your module. The simplest way to do +this is to iterate through all data items and recursively add them to +the use case builder: \code // find component SALOMEDS::SComponent_var comp = study->FindComponent( "MYMODULE" ); -// add tree node attributes only if component data is present in study +// add tree node attributes only if component data is present in the study if ( !CORBA::is_nil( comp ) ) { - // get use case builder + // get the use case builder SALOMEDS::UseCaseBuilder_var useCaseBuilder = study->GetUseCaseBuilder(); // check if tree nodes are already set if ( !useCaseBuilder->IsUseCaseNode( comp.in() ) ) { - // set use case builder's current node to the root + // set the current node of the use case builder to the root useCaseBuilder->SetRootCurrent(); // add component item to the top level of the use case tree useCaseBuilder->Append( comp.in() ); @@ -185,7 +188,7 @@ if ( !CORBA::is_nil( comp ) ) { for ( iter->InitEx( true ); iter->More(); iter->Next() ) { SALOMEDS::SObject_var sobj = iter->Value(); SALOMEDS::SObject_var father = sobj->GetFather(); - // add object to the corresponding level in the use case tree + // add an object to the corresponding level in the use case tree useCaseBuilder->AppendTo( father.in(), sobj.in() ); // clean up (avoid memory leaks) sobj->UnRegister(); @@ -200,25 +203,25 @@ if ( !CORBA::is_nil( comp ) ) { \tableofcontents -Drag and Drop provides a simple visual mechanism which users can use to transfer +Drag and Drop provides a simple visual mechanism to transfer information between and within applications. -In certain aspect Drag and drop is similar in function to the clipboard's copy/cut/paste +In some aspects Drag and drop operates similarly to the clipboard copy/cut/paste mechanism. Since SALOME GUI is implemented on Qt, the drag and drop functionality support is provided by means of the corresponding Qt mechanisms. -Currently, dragging and dropping of the items can be done within Object browser only, -however this functionality can be extended to other GUI elements also. +Currently dragging and dropping of the items can be done within Object browser only, +however this functionality can be extended to other GUI elements as well. \section enable_drag_and_drop Enabling drag and drop in SALOME module The Drag and drop functionality is enabled by default in the Object browser. However, -to allow dragging of some data object or dropping data on it, it is necessary to redefine +to allow dragging of a data object or dropping data on it, it is necessary to redefine \c isDraggable() and \c isDropAccepted() methods of the corresponding class, a successor of the \c SUIT_DataObject. These methods are defined in the base class \c SUIT_DataObject -and default implementation of both functions return \c false, that prevents dragging and +and default implementation of both functions returns \c false, which prevents dragging and dropping: \code @@ -238,12 +241,12 @@ re-implement these functions in your successor data object class and return \c t when it is needed (for example, depending on the data object type, state, etc). Another alternative is available if your module is directly inherited from -\c LightApp_Module or \c SalomeApp_Module class (as majority of existing SALOME modules). +\c LightApp_Module or \c SalomeApp_Module class (as the majority of existing SALOME modules). The class \c LightApp_Module (and thus \c SalomeApp_Module also) already provides high-level API that can be used for enabling drag and drop functionality. To enable dragging, redefine \c isDraggable() method of your module class. In this method -you can analyze the data object that is a subject of the drag operation and decide if +you can analyze the data object subject to the drag operation and decide if it is necessary to enable or prevent its dragging: \code @@ -262,11 +265,11 @@ bool MyModuleGUI::isDraggable( const SUIT_DataObject* what ) const Note, that you should not invoke here method \c isDragEnabled() of your data object class (in case if it inherits \c LightApp_DataObject or \c SalomeApp_DataObject), unless you redefine methods \c isDraggable() and \c isDropAccepted() in your data object class. -The reason is that \c LightApp_DataObject class's implementation of these methods +The reason is that the implementation of these methods in \c LightApp_DataObject class redirects calls to the \c LightApp_Module - be careful to avoid entering endless recursion loop. -To alllow dropping of the data to some object (the object under the mouse cursor in the +To allow data dropping to an object (the object under the mouse cursor in the Object browser during the drag operation) redefine \c isDropAccepted() method of your module class: @@ -288,8 +291,8 @@ The caution about avoiding recursive loop mentioned above is also valid for \section handle_data_dropping Handling data dropping -When dragging operation is completed (data is dropped to some object) the module owning -the item on which data is dropped to is notified by invoking its \c dropObjects() method: +When dragging operation is completed (the data is dropped to an object) the module owning +the item on which the data is dropped is notified by invoking its \c dropObjects() method: \code void LightApp_Module::dropObjects( const DataObjectList& what, @@ -300,18 +303,18 @@ void LightApp_Module::dropObjects( const DataObjectList& what, } \endcode -Default implementation does nothing. However, this method can be redifined in the -successor class and handle the operation properly. The list of data objects being dropped -is passed via \c what parameter. The data object on which data is being dropped is passed -via \c where parameter. The parameter \c row specifies the position in the children list -of \c where data object at which data is dropped; it this parameter is equal to -1, the -data is dropped to the end of children list. Drop action being performed is passed +The default implementation does nothing. However, this method can be redifined in the +successor class and handle the operation properly. The list of dropped +data objects is passed via \c what parameter. The data object on which +the data is dropped is passed via \c where parameter. The parameter \c row specifies in the children list +the position of object where data is dropped; if this parameter is equal to -1, the +data is dropped to the end of the children list. Performed drop action is passed via \c action parameter; possible values are \c Qt::CopyAction and \c Qt::MoveAction (other actions are currently unsupported). -The method \c dropObjects() should analyze the parameters and apply corresponding actions -for rearrangement of the data tree, copying or moving the data items depending on the -operation being performed. For example: +The method \c dropObjects() should analyze the parameters and apply +the corresponding actions for rearrangement of the data tree, copying or moving the data items depending on the +operation performed. For example: \code void MyModuleGUI::dropObjects( const DataObjectList& what, SUIT_DataObject* where, @@ -344,9 +347,10 @@ In the above code the function \c copyOrMove() performs actual data tree rearran \section drag_drop_light_modules Drag and Drop in "light" modules The data model of the \a light (not having CORBA engine) SALOME module is usually -based on the custom tree of data objects. The general approach is to inherit own data -object class from the \c LightApp_DataObject and own data model from the -\c LightApp_DataModel class. The data model class is responsible for building of the +based on the custom tree of data objects. The general approach is to +inherit a custom data +object class from the \c LightApp_DataObject and a custom data model from the +\c LightApp_DataModel class. The data model class is responsible for building the appropriate presentation of the data tree in the Object browser. Thus, the implementation of the drag and drop functionality in a \a light module (more @@ -358,14 +362,14 @@ tree representation automatically, as soon as \c updateObjectBrowser() function \section drag_drop_full_modules Using UseCaseBuilder for Drag and Drop handling in "full" modules Drag and drop operation requires underlying data model to allow flexible re-arrangement of -the data entities inside the data tree. However, in a \a full (CORBA engine based) SALOME +the data entities inside the data tree. In a \a full (CORBA engine based) SALOME module, which data model is usually based on the hierarchy of \c SALOMEDS::SObject entities -provided by the data server functionality, re-arrangement of the data tree is not a trivial -task. +provided by the data server functionality, re-arrangement of the data +tree is not a trivial task. -However, SALOME data server (\c SALOMEDS) CORBA module proposes mechanism that can be used -to customize data tree representation in a simple and flexible way - \ref use_case_builder -"use case builder". +However, SALOME data server (\c SALOMEDS) CORBA module proposes a mechanism that can be used +to customize data tree representation in a simple and flexible way - +\ref use_case_builder "use case builder". With use case builder, the \c dropObjects() function can be easily implemented. For example: @@ -421,7 +425,7 @@ void MyModule::copyOrMove( const MYMODULE_ORB::object_list& what, SALOMEDS::SObject_var objAfter; if ( row >= 0 && useCaseBuilder->HasChildren( where ) ) { - // insert at given row -> find insertion position + // insert at a given row -> find insertion position SALOMEDS::UseCaseIterator_var useCaseIt = useCaseBuilder->GetUseCaseIterator( where ); int i; for ( i = 0; i < row && useCaseIt->More(); i++, useCaseIt->Next() ); @@ -435,21 +439,22 @@ void MyModule::copyOrMove( const MYMODULE_ORB::object_list& what, if ( CORBA::is_nil( sobj ) ) continue; // skip bad object if ( isCopy ) { // copying is performed - // get name of the object + // get the name of the object CORBA::String_var name = sobj->GetName(); - // create new object, as a child of the component object + // create a new object, as a child of the component object SALOMEDS::SObject_var new_sobj = studyBuilder->NewObject( father ); new_sobj->SetAttrString( "AttributeName", name.in() ); sobj = new_sobj; // ... perform other necessary data copying like - // adding corresponding attributes or creation - // of a servant data entities... + // adding the corresponding attributes or creation + // of servant data entities... } // insert the object or its copy to the use case tree if ( !CORBA::is_nil( objAfter ) ) - useCaseBuilder->InsertBefore( sobj, objAfter ); // insert at given row + useCaseBuilder->InsertBefore( sobj, objAfter ); // insert at a given row else - useCaseBuilder->AppendTo( where, sobj ); // append to the end of list + useCaseBuilder->AppendTo( where, sobj ); // append to the + end of the list } } diff --git a/doc/salome/gui/input/index.doc b/doc/salome/gui/input/index.doc index e986d0923..f86d4028b 100644 --- a/doc/salome/gui/input/index.doc +++ b/doc/salome/gui/input/index.doc @@ -68,10 +68,8 @@ integrated Python console From the point of view of the \subpage salome_architecture_page "Architecture", -Salome is composed of several modules, which provides a -great flexibility in its structure during -\subpage installing_salome_page "Installation" and -\subpage running_salome_page "Running". +Salome is composed of several modules. +To run salome (with different options) refer to \subpage running_salome_page page. This part of documentation on Salome also covers \subpage introduction_to_gui_page "general Salome functionalities", diff --git a/doc/salome/gui/input/installing_salome.doc b/doc/salome/gui/input/installing_salome.doc deleted file mode 100644 index f03bbee01..000000000 --- a/doc/salome/gui/input/installing_salome.doc +++ /dev/null @@ -1,710 +0,0 @@ -/*! - -\page installing_salome_page SALOME Installation Wizard Help - -
- -
-\anchor installing_products -

Installing products with the Installation Wizard

- -The Installation Wizard can be launched in two modes: \b GUI and \b -batch. -
The root directory of the Installation Wizard contains Python -script \b runInstall. To run the Installation Wizard just type \b runInstall. -in the terminal window: -

[ python ] \b runInstall [options] - -Without options this script will launch the SALOME Installation -Wizard in the default mode (GUI). \n The default installation settings -can be overridden by using command line options. Each option has a -short and a long notation: - --g / --gui -\par -Runs the Installation Wizard in the GUI mode (this is the default -mode). - --b / --batch -\par -Runs the Installation Wizard in the terminal mode. - --f FILE / --file=FILE -\par -The XML configuration file to be used by the Installation Wizard. If -this option is not used then the installation script tries to define -the \e Linux version and use the corresponding XML file if it exists. For -examle, for Linux Mandrake 10.1 the config_Mandrake_10.1.xml file -will be used by default. If no appropriate file is found, the file -config.xml will be used. This file refers to the basic target platform -which is Linux Mandrake 10.1 for SALOME 3.0 and newer. If config.xml -file is not found either, a warning message box is shown (in GUI mode) -or printed to the console (in batch mode) and the Installation Wizard -quits. - --d DIR / --target=DIR -\par -The target directory SALOME platform is to be installed to. -If used, this option overrides the default target directory, given in -the configuration XML file (usually ${HOME}/salome_\, -see \ref modifying_xml "here" for more details). - --t DIR / --tmp=DIR -\par -The directory, which should be used for temporary files. If given, -this option overrides the default temporary directory, given in the -configuration xml file (usually \b /tmp, see \ref modifying_xml "here" -for more information). - --a / --all-from-sources -\par -Forces all the products to be installed from sources (including all -SALOME modules). If this option is used, all default installation -modes for all products are ignored. -\n This option is helpful when the user wants to install SALOME on the -platform which is not officially supported. In this case, the user can -try to run the SALOME Installation Wizard with the \b -a option in order -to build all the products from sources. -\nNote, that this is a time-consuming operation which can take -more than 24 hours depending on the computer. - --s / --single-directory -\par -Install all SALOME binaries packages to one directory.
-This option is ignored when --all-from-sources (-a) option is used. - --h / --help -\par -Prints help information on the Installation Wizard's use. - --v / --version -\par -Prints version information (\b Note: this is the Installation Wizard's -version number, not the number of SALOME platform version). - -The installation procedure supports different \em Linux platforms and -installs various installation 3d-party prerequisite products which are -required by SALOME platform. As it was mentioned above, the basic -target platform for SALOME 3.0 and newer is Linux Mandrake 10.1. -Use of configuration XML files gives a flexible way to modify the list -of products to be installed by the Installation Wizard without -changing the program source code. Just create your own XML -configuration file and implement installation scripts for the -prerequisite products you need and then use this XML file with the -Installation Wizard. This can be done, for example, for some Linux -platform which is not supported directly by the Installation -Wizard. See \ref modifying_xml "Modifying XML configuration file" and -\ref installation_scripts "Implementing installation scripts for the new products" -sections for more information. - -
-
-\anchor gui_mode_install -

GUI mode

- -The Installation Wizard GUI has been developed using -Trolltech's Qt 3.0.5 toolkit. After launching the Installation -Wizard in the GUI mode the wizard window is shown to the user. This -wizard guides the user through several subsequent pages. To navigate -between the pages use \em "Next" and \em "Back" buttons in the lower -part of the wizard window. The \em "Cancel" button closes the wizard -window and quits the installation procedure after the user's -confirmation. The \em "Help" button opens an additional window to show -help information. - -The first \em "Introduction" page is shown in \ref figure_1 "Figure 1". -Skip this page by clicking \em "Next": - -\anchor figure_1 -\image html intropage.png -\n
Figure 1: "Introduction" page
- -In the second page you are proposed to select the type of the SALOME installation.

-At this step three possible types of installation are available: - -1. "Install binaries" type: -\par - - all binaries and sources of the chosen modules are installed; - - all binaries of the chosen prerequisites are installed. - -2. "Install sources" type: -\par - - all sources of the chosen modules and prerequisites are installed without compilation. - -3. "Install sources and make compilation" type: -\par - - all sources of the chosen modules and prerequisites are installed;
- - all sources are compiled. - -In case you select "Install sources and make compilation" installation type, then you can also check "Remove sources and temporary files after compilation" option. - -\anchor figure_2 -\image html installtypepage.png -\n
Figure 1: "Type Of Installation" page
- -After the installation type has been selected you click "Next" button and the Installation Wizard tries to determine the Linux platform to load the corresponding configuration file. If the user system is not defined or the current SALOME package does not support this one, the warning will appear ("Install binaries" and "Install sources" installation types only): - -\anchor figure_3 -\image html platformpage.png -\n
Figure 3: "Installation platform" page
- -If "Install sources and make compilation" installation type has been selected, the warning message will be slightly different: "Your Linux platform is not supported by this SALOME package and compilation is not tested on this one".
-There is a list of all platforms supported by SALOME, but only those supported by the current package are available for selection. in this page you need to to select the reference platform, if you wish to proceed with the present installation procedure. - -\b Note: this page is not displayed if the installation platform has been defined automatically. - -In the next page you are proposed to enter the target directory -where the SALOME platform should be installed to. You can also click -"Browse..." and choose the destination folder using the standard -browse directory dialog box. -\n If the necessary directory does not exist you -are prompted to confirm directory creation. If you type a wrong -directory path, or if you do not have write permissions -for the directory you use, the corresponding message box is shown. - - Note: you are strongly recommended to avoid using directory names containing spaces. Otherwise you can experience some troubles with the installation. -\n -\anchor figure_4 -\image html directorypage.png -\n
Figure 4: "Installation directory" page
- -You can select the products to be installed in the "Choice of the products to be installed" page. -\n In the default mode it gives you the possibility to view and select SALOME modules only. There is a hidden list of 3d-party prerequisite products. To show it, just click "Show prerequisites..." button. - -\anchor figure_5 -\image html productpage1.png -\n
Figure 5: Choice of the SALOME modules
- -In the full mode you also have the possibility to select prerequisites. -\n The checkbox before each product indicates if this one will be installed or not (checked or unchecked). The second column shows the disk space occupied by the corresponding module. This value depends on the selected type of installation. -\n To hide the prerequisites list - click "Hide prerequisites" button. - -\anchor figure_6 -\image html productpage2.png -\n
Figure 6: Choice of the prerequisites
- -Some products may require some other prerequisite products to be installed. So the installation procedure has a special feature to automatically mark these products in the list view. For example, to install PyQt it is necessary to have gcc, Python, Qt and Sip installed, and these products will be also turned on when you check on PyQt. GEOM module requires KERNEL, GUI modules and such prerequisites as: OpenCascade, Python, Swig, Qt, etc. -\n -\n The dependencies between SALOME modules are managed in the following way: -\par -- If one module is unchecked, all modules which depend on this one are also unchecked automatically;\n -- If one module is checked, all modules required for this one are also checked automatically. - -Dependency between modules and prerequisites is realized in the following way: -\par -- The choices made by the user in the list of modules have a direct impact on the list of prerequisites; -- Whenever a module is checked, all the necessary prerequisites are checked automatically with no possibility for the user to uncheck them (see \ref figure_7 "Fig. 7" below); -- Whenever a module is unchecked, according to the remaining checked modules, the unnecessary prerequisites are unchecked automatically (see \ref figure_7 "Fig. 7" below). - -It is possible to check again the prerequisites, which have been automatically unchecked. In other words, it is possible to add more prerequisites than necessary. - -\anchor figure_7 -\image html productpage3.png -\n
Figure 7: Dependencies between modules and prerequisites
- -The "Installation with GUI" checkbox allows managing the installation of the graphical interface. Only modules for that 'woguimode' attribute is set to "true" value in the XML file (see \ref modifying_xml "here" for more information about customizing this installation mode) support without GUI mode and will be checked and installed with their necessary prerequisites in case of installation without GUI. And other modules are unchecked with no possibility to check them in this mode (see \ref figure_8 "Figure below"). -\n By default 'Installation with GUI' checkbox is switched on. - -\anchor figure_8 -\image html productpage4.png -\n
Figure 8: Installation without GUI mode
- -The box at the right side of the page displays the information about -currently selected product: name, version and short description, -required disk space, disk space required for temporary files and the list of -prerequisites (this information is provided in the XML file). - -The "Disk space required:" field displays how much disk space -on the hard drive is required for installation of selected products. -\n\b Note: Please, take into account that the displayed amount of -required disk space is approximate and may differ when you actually install -products on your hard drive. - -The installation procedure uses a special directory to store temporary -files. The "Space for temporary files:" field shows the information -about required disk space on the hard drive for extracting and -compiling the selected products. You can change the temporary directory (this information is provided in the XML file) to the folder you want. -\n\b Note: Actually, temporary files are not stored directly in the -directory entered by the user. The Installation Wizard creates in this directory an additional folder named like INSTALLWORKXXXXX where XXXXX is a unique number. This allows launching several Installation Wizards simultaneously. This temporary directory is removed automatically when the installation finishes. - -The installation procedure also checks the available disk space. If there is not enough disk space on your hard drive you will see the corresponding error message box. - -Also in the current version of Installation Wizard is possible to install all binaries of the selected SALOME modules into a \b single directory. It is "SALOME" directory. For this purpose there is a checkbox "Install modules to a single directory" checkbox exists (see \ref figure_8 "Fig. 8"). -\n This feature helps to get shorter PYTHONPATH and LD_LIBRARY_PATH environment variables. -\n\b Note: the installation into a single directory is available with the binaries installation type only. - -To proceed further click "Next". At this moment the program will make some tests to check the installation settings: if there is enough disk space on the hard drive, check for the dependencies for each product you have selected to be installed. If any test fails you will see the corresponding warning message box. Otherwise the wizard will proceed to the next page: - -\anchor figure_9 -\image html choicepage.png -\n
Figure 9: "Check your choice" page
- -This page summarizes the installation options you've selected in the previous pages. You can review again your choices and change them if necessary returning to the previous pages. -\n When you are sure that everything is OK, click "Next" to -follow to the \ref figure_10 "progress page". - -\anchor figure_10 -\image html progresspage1.png -\n
Figure 10: "Installation progress" page
- -To start the installation of the selected products click "Start" button. It launches the shell installation script and you will be able to see the output of the script in the topmost frame of the dialog box. If any errors occur during the installation progress, the corresponding messages will be printed to the log window in the bold red font. -\n It is possible to break the installation at any time by pressing "Stop" button. Then you can get back to the previous pages if you wish to change the installation settings or restart the installation by pressing "Start" button again. - -\b Note: in the current implementation it is not possible to resume the stopped installation process; the installation will restart from the very beginning. - -\anchor figure_11 -\image html progresspage2.png -\n
Figure 11: "Installation progress" page: installation in progress
- -The "Installation Status" frame window shows you the progress of -installation. \c "Waiting" status means that installation of this product -has not been started yet. The product currently being installed is -marked as \c "Processing" and is displayed in the status bar under "Installation Status" view. All installed products have \c "Completed" -status. - -You can abort installation and close the installation procedure using -\em "Cancel" button. - -\b Note: This button sends the signal "SIGTERM" to the shell -script. The script tries to clear all temporary files. The process of -removing temporary files can take some time, so the installation -wizard will wait 3 seconds before closing. - -At the end of the installation "Installation completed" message -will appear in the status bar. You can return to the previous pages to -start a new installation or click \em "Next" button to go to the readme page: - -\anchor figure_12 -\image html readmepage.png -\n
Figure 12: "Finish installation" page
- -In this page you can read important information about the Instalation -Wizard itself and some tips: how to run and test SALOME or how to -build SALOME from the sources. This is the contents of the README file -which you can find in the root directory of the Installation Wizard. - -You can also launch SALOME Desktop from this page or read the Release -Notes file by clicking on the corresponding buttons in the lower part -of the page (see \ref modifying_xml "here" and \ref finish_buttons -"here" for more information about customizing these buttons). - -
-
-\anchor batch_mode_install -

Batch mode

- -To launch the Installation Wizard in the batch mode use -\b b (--\b batch) -parameter. -\n In this mode the GUI wizard is not shown but all the installation -status is displayed directly in the console. In the batch mode the -user does not have a possibility to change installation settings which -are given in the configuration file, except target and temporary -directories which can be overridden by the corresponding command line -options. -\n The only exception is --\b all-from-sources (-\b a) option which enables -special installation mode in which all the products (including SALOME -modules) are installed from sources, ignoring the default mode defined -in the XML configuration file (see \ref installing_products "here" for details) and --single-directory (-s) option which defines that all SALOME modules have to be installed into the one directory (SALOME_, by default, where is SALOME version). - -\anchor figure_13 -\image html batchmode.png -\n
Figure 13: Batch mode
- -
-
-\anchor environment_files -

Environment files

- -During the process of installation the script creates some environment -files to simplify the procedure of launching SALOME. These shell -scripts set all necessary environment variables for all products you -have installed. To learn how installation scripts collects the -environment, see \ref pick_up_env "here". These files are: \b -salome.csh + \b salome.sh in the KERNEL module sources -and KERNEL module binaries root directories and -\b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh in the target installation directory. - -\b Note: there is some difference between these files: \b env_build.* -files are optimized to be used for building SALOME modules from -sources (see \b README file provided with the installation procedure -on the CD). The \b env_products.* (and \b salome.*) files are -optimized for SALOME launching. The behavior is defined by the -environment variable \b ENV_FOR_LAUNCH which is set to \b 0 in -env_build.* files and to \b 1 in env_products.* (salome.*) files. - -
-
-\anchor pick_up_env -

Pick up the environment

- -Please, read carefully the following information. This section -describes how the installation procedure generates the environment -scripts for the SALOME platform being installed. - -After installing each product shell the script creates a special -environment file for the product in its installation folder. The name -of the file is generated from the name of product by the following -scheme: \b env_.sh (for example \b env_Vtk.sh for the -Vtk). This file includes all necessary environment settings. At the -final step of the installation the script picks up all the settings -files and generates two common environment files from them: \b salome.sh -and \b salome.csh for \b bash and \b csh shells correspondingly. -Such approach helps to save time when reinstalling products and you may not bother about setting all environment variables manually to build/launch -SALOME. What you simply need is to source one of these environment -files. - -This also concerns those products which are not being installed. For -example, you install some SALOME binaries to the directory where you -have previously installed other products. The Installation procedure -tries to collect environment files from the target directory if it -finds necessary products installed there. If some product is not found -in the target directory the corresponding section of -\b salome.sh/salome.csh files will be skipped. -\n For native products (like \b gcc, \b tcl, etc...) the installation -procedure tries to find them first using \b PATH / \b LD_LIBRARY_PATH -variables and then in the system default directories (\b /usr/bin, -\b /usr/lib etc., depending on the product). -

-In any case you may edit \b salome.* files after the installation -procedure finishes, if you want. - -\n\b Note: As it was mentioned \ref environment_files "above" there are -other environment files which are generated by the installation -procedure: \b env_products.csh + \b env_products.sh and \b env_build.csh + -\b env_build.sh. These files can be found in the target installation root -directory. - -
-
-\anchor modifying_xml -

Modifying XML configuration file

- -You can create your own XML configuration file. The Installation -Wizard can then take it as a command line argument to provide a list -of products you want to install with it. The list of products and some -other settings for the Installation Wizard are provided in the XML -file. -\n This section describes the structure of the configuration file, optional sections/tags are in brackets. - -\code - - ] - [ caption= ] - [ copyright= ] - [ license= ] - platforms= - [ targetdir= ] - [ tempdir= ] - /> - [ - [