GEOM preferences

- Product	- Algorithm of checking	- Preliminary steps before launching -the installation procedure	- Notes
gcc 3.4.1	ver=`gcc - -dumpversion`	- -	It is recommended to use the native - gcc for Mandrake 10.1.
tcl 8.4.5	1) - check if TCLHOME variable is set -2) existence of tclsh8.4 -3) existence of wish8.4 -4) existence of libtcl8.4.so -5) existence of libtk8.4.so	set TCLHOME - if you have a preinstalled version of tcl. -add a directory where libraries can be found to the LD_LIBRARY_PATH	Unfortunately there is no strict - way to check the tcl version number. -It is recommended to use the native tcl/tk for Mandrake 10.1.
boost 1.31.0	1) check if BOOSTDIR variable is set. -2) ver=`egrep 'BOOST_VERSION - [0-9]+' ${BOOSTDIR}/boost/version.hpp \| sed 's/.*BOOST_VERSION \([0-9]\+\)/\1/g'`	set BOOSTDIR if - you have a preinstalled version of boost	we use file version.hpp in the boost distribution to get - the version information. -ver should be equal to 103100.
Open CASCADE - Technology 6.1	1) - check if CASROOT variable is set -2) ver_major=`grep "!define OCC_VERSION_MAJOR" ${CASROOT}/inc/Standard_Version.hxx - \| awk '{print $3}'` -3) ver_minor=`grep "!define OCC_VERSION_MINOR" ${CASROOT}/inc/Standard_Version.hxx - \| awk '{print $3}'` -4) ver="$ver_major.$ver_minor" -5) Check the existence of libStdPlugin.so in OpenCASCADE distribution,	set CASROOT - if you have a preinstalled version of Open CASCADE	Open CASCADE's Standard_Version.hxx - file provides the version information. -ver should be equal to 6.1.
Python 2.3.4	1) - PYTHONHOME variable should be - set -2) isPython=`which python` -3) ver=`python -V`	set PYTHONHOME - to root Python distribution folder; -add the directory where python can be found to the PATH - variable	Python should exist and ver - should be equal to 2.3.4 -It is recommended to use the native Python for Mandrake 10.1.
Swig 1.3.24	ver=`swig - -version 2>&1 \| grep -i version \| awk '{ print $3 }' \| sed -e 's/^\([0-9.]\)\(.\)/\1/'`	add the directory where swig binary - can be found to the PATH variable	Swig should exist and ver - should be equal to 1.3.24.
Qt 3.3.3	1) - QTDIR variable should be set. -2) ver=`grep "QT_VERSION_STR" ${QTDIR}/include/qglobal.h - \| sed -e 's%^#define QT_VERSION_STR\([[:space:]]*\)%%g' -e 's%\"%%g'`	set QTDIR - if you have a preinstalled version of qt	Qt's qglobal.h file provides version - information: ver should be equal - to 3.3.3. -It is recommended to use the native Qt for Mandrake 10.1.
msg2qm (Qt 3.3.3 compatible)	MSG2QM_ROOT - variable should be set.	set MSG2QM_ROOT - if you have preinstalled version of msg2qm tool	msg2qm is a Qt tool used to convert - text .po files to .qm resource files. Unfortunately this tool is not - included in the Qt distribution and is provided only in its sources package. - We distribute this tool with the Installation Wizard. -In addition there is no way to check the version number of msg2qm tool.
Qwt 4.2.0/0.2.4	1) - QWTHOME variable should be set. -2) check if libqwt.so.4.2.0 exists	set QWTHOME - if you have a preinstalled version of qwt	Unfortunately there is no strict - way to check the qwt version number. -We try to find libqwt.so.4.2.0 in the ${QWTHOME}/lib - folder.
Hdf 51.6.3	1) - HDF5HOME variable should be set. -2) existence of libhdf5.so.0.0.0 -3) existence of libhdf5.settings -4) ver=`grep "HDF5 - Version:" ${HDF5HOME}/lib/libhdf5.settings \| awk '{print $3}'`	set HDF5HOME - if you have a preinstalled version of hdf	We try to find libhdf5.so.0.0.0 and - libhdf5.settings in ${HDF5HOME}/lib - folder. -File libhdf5.settings contains the following version information: -HDF5 Version: 1.6.3
Med 2.2.3	1) - MED2HOME variable should be set. -2) existence of libmed.so.1.0.1	set MED2HOME - if you have a preinstalled version of med	Unfortunately there is no strict - way to check the med version number. -We try to find libmed.so.1.0.1 in ${MED2HOME}/lib - folder. -If you have a problem with the preinstalled version of med, please, reinstall - it.
Vtk 4.2.6	1) - VTKHOME variable should be set. -2) existence of libvtkCommon.so	set VTKHOME - if you have a preinstalled version of vtk	Unfortunately there is no strict - way to check the VTK version number. -We try to find libvtkCommon.so in ${VTKHOME}/lib/vtk - folder. -If you have a problem with the preinstalled version of vtk, please, reinstall - it.
Netgen 4.5	NETGENROOT variable - should be set.	set NETGENROOT if - you have a preinstalled version of Netgen.	Unfortunately we can't find anything about NETGEN version. -We just check if the NETGENROOT - environment variable is set. The NETGEN version should be patched.
OmniORB 4.0.5, -OmniORBpy 2.5, -OmniNotify 2.1	1) - OMNIORBDIR variable should be set. -2) existence of libomniORB4.so.0.5 -3) existence of _omnipymodule.so.2.5 -4) existence of libCOSNotify4.so.0.1 -5) existence of notifd	set OMNIORBDIR - if you have a preinstalled version of omni	We try to find several omni libraries - and binaries in the ${OMNIORBDIR}/lib - and ${OMNIORBDIR}/bin directories.
Numeric 23.7	ver=`python - -c 'import Numeric; print Numeric.__version__' 2>/dev/null`	add the directory where you - have the preinstalled version of Numeric package to your PYTHONHOME - variable	If you have problem with the preinstalled - version of Numeric 23.7, please, reinstall it.
Sip 4.1	1) - SIPDIR variable should be set. -2) ver=`${SIPDIR}/sip -V \| awk '{print $1}'`	set SIPDIR - to the directory where you have sip preinstalled	ver - should be equal to 4.1.
PyQt 3.13	1) - PYQTDIR variable should be set. -2) existence of qt.so library	set PYQTDIR - to the directory where you have PyQt preinstalled	Unfortunately we can't exactly check - the PyQt version number. -We just try to find qt.so in ${PYQTDIR}. - - Note that PyQt officially doesn't support Qt 3.3.3, but nevertheless - it can be used.
Doxygen 1.4.6	1) - existence of doxygen -2) existence of doxytag -3) existence of doxywizard -4) ver=`doxygen --version`	add the directory where you have - doxygen binaries preinstalled to the PATH - variable.	doxygen, doxytag, doxywizard binaries - should exist; ver should be equal - to 1.4.6. -If you have problems with the preinstalled version of doxygen, reinstall - it. -It is recommended to use the native doxygen for Mandrake 10.1.
Graphviz 2.2.1	1) - existence of dot binary. -2) ver=`dot -V 2>&1 - \| awk '{print $3}'`	add the graphviz bin directory to - the PATH environment variable	We try to find dot program in the - ${PATH}. -ver should be equal to 2.2.1.
MODULE - binaries -(where MODULE = KERNEL, GUI, GEOM, - ...)	1) - MODULE_ROOT_DIR variable should be set -2) existence of VERSION file -3) ver=`cat ${MODULE_ROOT_DIR}/bin/salome/VERSION - \| awk -F: '{print $NF}' \| tr -d '[:space:]'`	set MODULE_ROOT_DIR - if you have preinstalled binaries of MODULE - version 3.2.0.	MODULE - binaries should exist and ver - should be equal to 3.2.0.
MODULE - sources -(where MODULE = KERNEL, GUI, GEOM, - ...)	1) - existence of MODULE_SRC_DIR -2) existence of VERSION file -3) ver=`cat ${MODULE_SRC_DIR}/bin/VERSION - \| awk -F: '{print $NF}' \| tr -d '[:space:]'`	set MODULE_SRC_DIR - if you have preinstalled sources of MODULE - version 3.2.0.	MODULE - sources should exist and ver should be equal to 3.2.0.

Example:
+med-2.2.3.sh install_binary /tmp/work ./Products/BINARIES/Mandrake10.1 + /usr/salome 'gcc Hdf' med

Copy the created script + into the <Install_Wizard_root_directory>/config_files sub-directory where all installation scripts + are stored. Installation Wizard will automatically search and call your + script during the installation procedure. +

Customizing Readme page + buttons

<product_script_name> - the script name itself (retrieved from the + XML configuration xml file);
+<function_name> - the name + of function;
+<target_directory> - root + target directory where the product is installed to;
+<temp_folder> - temporary + files directory;
+

Note: The standard Installation Wizard buttons "Launch + SALOME" and "Release Notes" are implemented with this feature. + Refer to scripts start_salome.sh and release_notes.sh for sample implementation.
+
+Note: Any button (even standard) can be ignored by + the Installation Wizard if the attribute <disable> in the XML configuration file is set to the + "true" value.

OCC 3D Viewer

OCC (Open CasCade) 3D viewer + has been developed on the basis of Open CASCADE Technology. This is the + default viewer for Geometry Module, providing good representation of construction + and transformation of geometrical objects. Only this viewer allows to + work with groups and sub-shapes. This viewer can also work in Mesh module, + however, it doesn't allow to visualize meshes.

The functionalities of OCC 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.

By default the rotation point is located + in the Center of the bounding box of an object.

Unchecking Use + Bounding Box Center box allows you to define the coordinates of + the rotation point manually.

Select Point + from View button allows to select the rotation point in the 3D + Viewer

VTK 3D Viewer

VTK + 3D viewer is the default viewer for Mesh Module, allowing to visualize + meshes. It is also used in Post-Pro module for all 3D presentations except + for Gauss Points.

The functionalities of + VTK 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.

By default the rotation point is located + in the Center of the bounding box of an object.

Unchecking Use + Bounding Box Center box allows you to define the coordinates of + the rotation point manually.

Select Point + from View button allows to select the rotation point in the 3D + Viewer

"; else - //sHTML+="

"; - sHTML+="

"; + sHTML+="

"; return sHTML; } } diff --git a/doc/salome/gui/GUI/whskin_info.htm b/doc/salome/gui/GUI/whskin_info.htm index 65b15aa27..d1faf173b 100755 --- a/doc/salome/gui/GUI/whskin_info.htm +++ b/doc/salome/gui/GUI/whskin_info.htm @@ -9,10 +9,10 @@ - + - +

Start Page	index.htm
Skin Name
Generating Time	12:34 06/02/2006
Generating Time	12:57 01/22/2007
Language ID	1033
Compile Script	webhelp5_compile_script.xml
Compile Build Version	13.10.606
Compile Build Version	13.10.801
Product Name	WebHelp 5.50
Authoring Tool Name	RoboHelp X5

diff --git a/doc/salome/gui/GUI/whxdata/whftdata0.xml b/doc/salome/gui/GUI/whxdata/whftdata0.xml index e5729238b..b7e1347fa 100755 --- a/doc/salome/gui/GUI/whxdata/whftdata0.xml +++ b/doc/salome/gui/GUI/whxdata/whftdata0.xml @@ -14,7 +14,7 @@ - + @@ -24,8 +24,10 @@ + + diff --git a/doc/salome/gui/GUI/whxdata/whfwdata0.xml b/doc/salome/gui/GUI/whxdata/whfwdata0.xml index a6ea6fb6d..8aa4a5702 100755 --- a/doc/salome/gui/GUI/whxdata/whfwdata0.xml +++ b/doc/salome/gui/GUI/whxdata/whfwdata0.xml @@ -2,576 +2,603 @@ 14, 14, - 6,14,2,24,16, - 24, - 24, - 5,14,24,15, - 14,24, - 24, + 14, + 14, + 6,2,25,16,14, + 25, + 25, + 5,25,15,14, + 25,14, + 25, 14, 14, - 24, - 24, - 5,14,24,15, - 24, + 25, + 25, + 5,25,15,14, + 25, 14, 14, - 24, - 6,10,2,24, - 6,14,2,15,16, + 25, + 14, + 6,10,2,25, + 6,2,15,16,14, 14, - 24, - 10,2,24,18, + 25, + 10,2,24,25,14,18,28, 14, 14, - 24, - 14, - 24, + 25, + 25, 14, 14, 14, 14, - 3,6,14,18, + 3,6,24,14,18,28, 14, 8,14, - 23,24, - 24, + 23,25, + 25, 5, - 24, - 3,1,23,24,16,18,21, - 10,26, - 14, - 14,24,15,16, + 14, + 25, + 3,1,23,24,25,16,18,21,28, + 10,27, + 25,15,16,14, 14, 3, 4, - 24, - 5,6,24,16,17, + 25,14, + 5,6,25,16,17, 5,16,17, - 24, - 5, - 0,25,19, + 25, + 5,14, + 0,14,26,19, 3, - 14,15,16,25,18,19, + 15,16,14,26,18,19, 5,14, - 3,14,2,24,15,16,21, - 24, - 24, + 3,2,25,15,16,14,21, + 25, + 25, 14,19, 3, - 6,14,12,17, - 3,14,11, - 3,0,7,1,14,11,23,24,15,16,17,25,18,26,19,22, + 6,12,14,17, + 3,11,14, + 3,0,7,1,11,23,24,25,15,16,14,17,26,18,27,19,22,28, 17, - 11,18, + 11,18,28, 19, - 24, + 25, 14, 11, 14, - 24, - 14, + 25, 3,17, - 14, - 3,4,6,8,14,11,12,24,15,16,17,26, + 3,4,6,1,8,11,12,25,15,16,14,17,27, 14, - 26, - 0,24, + 27, + 0,25, 0,8,9,14,18,19,22, 23, 4, - 3,6,0,10,2,15,16,17,18,26,19, - 14,11,16, - 14,10, + 1, + 3,6,0,10,2,15,16,14,17,18,27,19, + 11,16,14, + 10,14, 14, - 25, + 26, 3,0,10, - 6,16,18, + 6,24,16,18,28, 14, - 24, + 24,28, + 25, 17,18, - 14, - 24, - 13,24,21, - 10, - 21, + 25, + 13,25,21, + 10,14, + 14,21, 8,19, - 14,18, - 23,18, - 0,14,23,13,24,15,16,17,26, + 18, + 23,14,18, + 0,23,13,25,15,16,14,17,27, 7, - 3,5,7,14,10, - 24, - 24, + 3,5,7,10,24,14,28, + 25, + 25, 0,14, 14, - 14, - 18, - 18, + 24,18,28, + 18,28, 14, - 14,23, - 24,18, - 23,24,21, - 3,10,2,17, + 23,14, + 25,18, + 23,25,21, + 3,10,2,24,14,17, 14, - 3, - 3,14,11,16,25, - 3,0,14,15, - 14, - 6,24, + 3,24,25, + 3,11,16,14,26, + 3,0,15,14, + 1,14, + 6,25,14, 14, - 18,22, + 14,18,22, 3, - 10, - 24, - 14,12,24, - 24, - 24, - 24, - 14,15,19, + 10,14, + 25, + 12,25,14, + 25, + 25, + 25, + 15,14,19, 14, - 14,17, + 17, 14, 3, + 24,28, 14, 20, 14, 14, 14, 23,16, - 2,23,24, - 10,23,24,18, - 0,1,8,14,23,13,24,17,25,18,26,19,22, + 2,23,25,14, + 10,23,25,14,18, + 24,28, + 1, + 0,1,8,23,24,13,25,14,17,26,18,27,19,22,28, 14, + 14, 10, - 6,14,12, + 6,12, 2, - 4,5,6,0,14,2,13,16,17,18,19,21, - 14, - 14,24,19, - 14,11,24, - 14,2,12,13,24,17,25,18,26,19,22, - 3,14,15, + 4,5,6,0,2,13,25,16,14,17,18,19,21, + 25,14,19, + 11,25,14, + 2,12,24,13,25,14,17,26,18,27,19,22,28, + 14, + 14, + 14, + 3,15,14, 10, 10,11, 3,0,14, 9,10,11, 14,17,19,22, 3, - 24, + 25, 14, 19, 14, - 14,10, + 10, 14, 23, 10, - 3,8,14,11,24,16,17, - 14, + 3,8,11,25,16,14,17, + 24,14, 14, - 14, 19, 19, 19, 2,15, 20, 14, - 24,25, - 24, - 24, - 24, + 25,26, + 24,28, + 25, + 25, + 25, 15, - 3,6,8,14,23,24,16,17,18,26, - 24, + 3,6,8,23,24,25,16,14,17,18,27,28, + 25, 4, - 25, + 26, 14, - 0,14,24,16,18, + 0,25,16,14,18,28, + 14, 14, - 14,23,24,18, - 0,14,24,25, - 5,7,1,8,14,23,13,24,16,25,19,22, - 24,25,19, - 24, + 23,25,14,18, + 0,25,14,26, + 5,7,1,8,23,24,13,25,16,14,26,19,22,28, + 25,26,19, + 25, 16, + 25, 14, 16, - 5,6,0,7,1,8,14,23,12,13,24,16,17,25,18,26,19,20,21,22, + 5,6,0,7,1,8,23,12,24,13,25,16,14,17,26,18,27,19,20,21,22,28, 12, 3, - 24, - 3,14,12,24,17,26,20, + 24,25, + 24, + 3,12,25,14,17,27,20, 3, 3,14, 23, 14, 14, - 1,23,24,25,18, + 1,23,25,26,18,28, 18,21,22, - 11,24, + 11,25, 16, 14, - 3,0,14,15, - 14,2,11,16,17,26, + 3,0,15,14, + 2,11,16,14,17,27, 3,23, - 14, 14, 8,14,20,22, 3,10, - 3,4,0,7,10,2,11,12,13,24,16,17,18,19,21,22, - 24, + 3,4,0,7,10,2,11,12,13,25,16,17,18,19,21,22, + 25, 14,18, 3,10, 10, 3,12, - 14,10, + 10,14, 3, 14, 14, - 14, - 14,10, + 14, + 10,14, 11, 14, 0,14, + 14, + 14, 9,11,13,16,18, 16, - 6,14,10,15,16,17,18, + 6,10,15,16,14,17,18, 3,15, - 10,11, - 0, - 3,4,5,0,8,14,13,15,16,26,19,20,21,22, + 10,11,24, + 0,14, + 3,4,5,0,8,13,15,16,14,27,19,20,21,22, 15, - 0,14,24,20, - 14,16,21, + 0,24,25,14,20,28, + 16,14,21, 14, - 5,14,23,24, + 5,23,25, 0,14, 11, - 18, - 24, - 7,14,16,17, + 24,18,28, + 25, + 7,16,14,17, 14, 3,5,2,15, - 24,17,25, + 25,17,26, 16, - 14,23,13,24,15,20, + 23,13,25,15,14,20, 10, 3,10, 15, 15, - 3,4,5,6,0,9,14,10,2,11,23,13,15,16,17,18,19,21, - 3,14,2, - 12,17, - 14,15, + 3,4,5,6,0,9,10,2,11,23,24,13,25,15,16,14,17,18,19,21, + 3,2,25,14, + 12,24,17, + 15,14, 15, - 24, - 6,0,8,14,12,24,15,17,18,26,21,22, - 24, - 18, - 10,25,18,19, - 3, - 24, - 25, + 25, + 6,0,8,12,24,25,15,14,17,18,27,21,22, + 25, + 25,18, + 10,15,26,18,19, + 14, + 3,14, + 25, + 25, + 25, + 26, 14, 8,22, - 3,5,0,9,14,10,2,11,17,18,19, + 3,5,0,9,10,2,11,25,17,18,19, 3, 21, - 24, - 5,1,14,23,24,15,16,17,18,26,21, - 3,0,1,14,10,23,24,15,25, + 25, + 5,1,23,24,25,15,16,14,17,18,27,21,28, + 3,0,1,10,23,24,25,14,26,28, 3,5,7,15,16,21,22, - 3,10,20, + 3,1,10,20, + 28, 10, 17, - 10,2,24, - 7,14,21, + 10,2,25, + 7,25,14,21, 14, 14, 3, 3,4,14,19, - 14,15,19, - 10,24, + 15,14,19, + 10,25, 19, - 6,9,14,2,16,17, + 6,9,2,16,14,17, 9,16,21,22, - 12, + 12,14, 14,18, - 14, - 3, + 3,24,14, 3,10, - 24, + 25, 23, - 0,1,8,14,23,13,24,16,17,25,18,26,19,22, + 0,1,8,23,13,25,16,14,17,26,18,27,19,22, 14, 16, - 3,14,16,17, - 3,4,5,9,14,13,24,15,16,17,21, + 3,16,14,17, + 3,4,5,9,13,25,15,16,14,17,21, 23, 10, 14, - 6,24, + 14, + 6,24,25, 14,18, - 14,15,17,18,26,19, - 14,24,15, + 15,14,17,18,27,19, + 25,15,14, 14, - 14,15, - 6,1,14,23,12,24,15,16,17,18,20,21,22, - 24, + 15,14, + 6,1,23,12,24,25,15,16,14,17,18,20,21,22,28, + 25,28, 3, - 3,14, + 3, 14, - 4,24,22, + 4,25,22, 7,14, 6,2,16,17, - 5,0,9,14,16, - 14, + 5,0,9,16,14, + 24, 3,11, - 24, - 14,24,19, + 25, + 24,25,14,19,28, 14, 22, 8,12, + 24,28, 14, - 14, - 14, - 16, + 24,16,28, 3, + 24,28, 14, 12,16, - 0, + 0,24,28, 14, + 24, 2, - 11,24, - 14,2,15,16,17, + 11,25, + 2,15,16,14,17, 3,10, 3, 3, - 23, - 7,8,14,2,15, - 24, - 24, - 26, + 1,23, + 7,8,2,25,15,14, + 25, + 25, + 27, 10, - 14, - 24,25,18,19, + 25,14,26,18,19, 10, 10, - 10,23,24, + 10,23,25, 15, 6, - 18,20, + 14,18,20, 3, - 3,14,24,18,26, + 3,25,14,18,27, 3, 3, 14, 3,10, - 8,14,15,17, + 8,15,14,17, 14, 23, 18,21, 14, + 14, 14, 14, 14, - 3,6,9,14,10,2,15, + 3,6,9,10,2,15,14, + 14, 3,14, 10, 0,14, - 3,14,2,11,24,16, + 3,2,11,25,16,14, 22, - 3,16, - 10,20, + 3,16,14, + 10,25,20, 14, 10, 3, 15, - 14,24, - 6,14,10,16,17,19, - 24, - 2,15, + 25,14, + 14, + 6,10,16,14,17,19, + 25, + 14,28, + 2,15,14, 3, + 14, + 14, 10,11, - 3,14,11,13,17,26,19, + 3,11,13,14,17,27,19, 14, 12, 3, 10, + 14, 0, 3, 4, - 10,23, + 10,23,24,28, 3, - 25, - 17,26, - 18, + 24,26,28, + 17,27, + 14,18, 14, 10, - 14,15, - 23,24,18, + 15,14, + 23,25,18, 3,11, - 14,16, + 16, 19, 14, 14, - 24, - 4,14,24, - 8,14,10,23,24,25, + 25, + 4,25,14, + 14, + 8,10,23,25,14,26, 14, 1,14, - 5,0,8,14,11,13,24,15,16,17,18,26,19, + 5,0,8,11,13,25,15,16,14,17,18,27,19, 23, + 14, 14,19,20, 14, 3, - 14,12,24, + 12,25,14, 10, - 0,14,24,18,21, - 18, + 0,25,14,18,21, + 24,18,28, 14, 3,0, - 14,10,2, - 24, + 10,2,14, + 25, 12, 14,17,21, - 3,0,8,9,14,12,13,15,16,17,18,26,19,20,22, - 23,24,25,18, + 14, + 3,0,8,9,12,13,15,16,14,17,18,27,19,20,22, + 23,25,14,26,18,28, + 14, 19, - 4,10,13,18, - 24, - 24, - 14,24, + 14, + 4,10,24,13,18,28, + 25, + 25, + 24,25,14,28, 2, - 10,24, + 1,10,25, 10, - 24, + 25, 0, - 24,20, - 0,14,10,11,16,17, + 25,20, + 0,10,11,16,14,17, 14, 16, - 10, - 3,4,7,9,16,19, + 10,24,28, + 3,4,7,9,24,16,19,28, 3, 14, - 14,15, + 15,14, 23, - 2,24, + 2,25,28, 14, - 9,14,23,16,18, - 0,14,11,19, + 9,23,16,14,18, + 0,11,25,14,19, 10,2,19, 10,11, - 14,11, - 1,10,11,24, - 3,1,11,24,16, - 4,9,14,10,21, - 0,8,14,16,25, - 14,11,24, - 24, - 24, + 11,14, + 1,10,11,24,25, + 3,1,11,24,25,16, + 4,9,10,14,21, + 0,8,16,14,26, + 11,25,14, + 25, + 24,25,28, 20, - 14,12, + 12,14, + 24, + 28, 6,11,18, - 24, + 25, 0,2, 14, - 0,24, - 25, - 14, - 23,24,25, - 3,5,0,14,2,11,15,17,18,26, - 14,15, - 24, + 0,24,25,28, + 26, + 23,24,25,26, + 3,5,0,2,11,15,14,17,18,27, + 14, + 15,14, + 25, 3,12,20, - 14,10,2,15, - 14,15, + 10,2,15, + 15,14, 17, 11,12,21, 18, - 14,13,17,18, + 13,14,17,18, 14, 14, 10, - 23,24, + 23,25, 22, - 3,4,14,10,12,13,15,18,20,21, + 3,4,10,12,13,15,14,18,20,21, 14, - 14,23,24,18, + 23,25,14,18, 10, - 24,16,18,21, - 14,10, - 14,23,21, - 14, + 24,25,16,18,21,28, + 10, + 23,14,21, 22, - 14,26, - 6,23,24,18, + 14,27, + 14, + 6,23,25,18, 3, 12, + 14, 3,14, 14, 4,20, 14, - 14,2,15,16,17, + 2,15,16,17, 5,7,16,19, 14, 21,22, 14, 3,19, 18, - 5,6,0,7,14,23,13,24,15,16,17,18,19,21, + 5,6,0,7,23,24,13,25,15,16,14,17,18,19,21,28, 10, 14, - 10,24, + 10,24,25,28, 12, 3,14, - 3,19, - 14, - 0,14,10,2,11,24,16,26, + 3,14,19, + 0,10,2,11,25,16,14,27, 14, - 24, - 2, - 14, - 14,12,24,20, + 25, + 2,14, + 12,25,14,20, 3, - 0,10,24, - 1,24, + 0,10,25, + 1,25, 3, 3, 3, 23,21, 16,17, - 3,8,14,12,24,17,20,22, + 3,8,12,25,14,17,20,22, 9, 10,19, - 14, - 3,6,12,24,19, - 14,24, + 3,6,12,25,19, + 25,14, 14,19, 14, - 14,15, + 15,14, 14, 14, 14, + 14, 14, 14, 14, 14, 14, - 14,15, + 15,14, 14, 14, 14, 14, 14, 5, + 14, 3, 14, 23, 3,10,2,11, 3,10,2,19, - 14, 2, 3,0,10,2,16,19, 23, @@ -581,146 +608,145 @@ 21, 15, 2,16, - 24,22, - 14,10,2,11, + 25,22, + 10,2,11,14, 17, - 14,16, + 24,25, + 16,14, 18,21, - 18, - 14, + 1, + 1,18, + 24,28, 8,10,2, - 24, + 25, 14, 4, + 24,28, + 24,28, 14,18, 15, 14, - 14,11,15, - 14,24, - 24, + 11,15,14, + 25,14, + 25, 15, 15, 8,12, 19, 0, 15, - 23,24, + 23,25,14,28, 3, 14, - 24, - 18,22, - 24, - 25, - 4,0,14,13,15,26,19,22, + 25, + 14,18,22, + 25, + 26, + 4,0,13,15,14,27,19,22, 5, 0,17, 14, 17, - 14,10, - 14,23,24,25,18,20, + 10,14, + 23,24,25,14,26,18,20,28, 18, - 24, - 24, - 3,23,24, + 25,28, + 25, + 3,23,25, 14, 14, 14, 14, 14, - 14, 14, - 14,2, - 14, - 14, - 14, + 2,14, 14, 14, - 3,6,14,12,24,16,17,19,21, + 3,6,12,25,16,14,17,19,21, 14, - 24, - 24, - 4,1,14,23,24,15,18, + 25, + 25, + 4,1,23,25,15,14,18, 18, 3,10,12, 4,14, - 8,14,12,24,15,18,20,22, + 8,12,25,15,14,18,20,22, 14, - 18, - 3,0,2,13,24,15,16,18,26,21, - 24, - 3,24,15,16,18,20,21, + 24,18,28, + 3,0,2,13,25,15,16,18,27,21, + 25, + 3,24,25,15,16,18,20,21,28, 0,19, - 8,24, - 15, - 24,18, + 8,24,25,28, + 15,14, + 25,18, 3,14, 14,19,20, - 23,24, + 23,25, 17, 16, - 14,24,25,20, + 25,14,26,20, 15, 3,17,22, 4, - 3, - 24, - 5,0,7,8,14,10,13,24,16,17,18,19,22, + 3,14, + 25, + 5,0,7,8,10,13,25,16,14,17,18,19,22, 14, - 5,14,10,23, + 5,10,23,14, 14, 14, 10,18, 10,2,16, 14, 14, - 24, - 24, - 4,0,14,18, + 25, + 25, + 4,0,24,14,18,28, 3, - 14,18, + 24,25,14,18,28, 18, 10, 3, 14, 20, - 24, - 24, + 25, + 25, 5, - 24, - 6,9,14,24,16,17, + 25, + 6,9,25,16,14,17, 0,2,15, 14, 10, - 24, + 24, + 25, 14, - 3,5,0,7,8,2,23,12,13,24,16,17,25,18,26,19,21,22, + 3,5,0,7,8,2,23,12,13,25,16,17,26,18,27,19,21,22, 16, - 3,10,11,23,24,16, - 8,14,2,15, - 14, - 24, + 3,10,11,23,24,25,16,14,28, + 8,2,15,14, + 25, 5, - 24, + 25, 14, 16, 16, - 3,0,1,14,23,24,15, + 3,0,1,23,25,15,14, 3,10,11,23, 10, + 14, 3,0,8, - 0,14,10, - 3,4,7,1,14,2,11,23,24,15,16,17,18,26,19, - 14, - 14, + 0,10,14, + 3,4,7,1,2,11,23,24,25,15,16,14,17,18,27,19,28, 15, 15, 15, - 24, - 14,24, - 24, - 23,24,16, + 25, + 25,14, + 25, + 23,24,25,16,28, 6, - 24, + 25, 18, 14, 14, @@ -728,119 +754,121 @@ 6,9,10,2,16,19, 17,18, 17, - 24, + 25, 3, 3,10,11, - 14,24,15, - 3,5,0,8,14,17,19,21,22, + 25,15,14, + 3,5,0,8,14,17,19,21,22,28, 14, 7, 3, - 14,12, - 4,12,24, + 12,14, + 4,12,25, 4, - 6,14,12,25,18, - 0,14,23,15,16,17,21, - 24, - 24, + 6,12,14,26,18, + 0,23,15,16,14,17,21, + 25, + 25, 14, 14, 4,18, - 14, - 3,5,8,9,14,10,17,18,26,19, - 8,14,15,26,19, - 14, + 3,5,8,9,10,24,25,14,17,18,27,19, + 8,15,14,27,19, 23,19, 6, - 14,15, + 15,14, 14, 3, 14, - 26, - 24, + 27, + 25, 9, 16, - 24, - 14,24, - 14,11,23,24,15,18,26,22, - 14,23,24, - 14,10,11,25, + 25, + 25, + 11,23,25,15,14,18,27,22,28, + 23,25,14, + 10,11,14,26, 3,9,10, 15, - 3,5,6,0,7,2,23,13,24,16,17,18,26,21, + 3,5,6,0,7,2,23,24,13,25,16,17,18,27,21,28, 3, 14, - 5,6,2,18, + 25, + 5,6,2,24,18, + 14, 14, 14, 14, + 14, 14, 3, + 14, 14, + 28, 10, - 14,13,26, + 13,14,27, 3, - 14, - 14, 14, 14, 14, 14, - 3,6,0,7,14,2,12,13,24,15,16,17,25,18,26,19, - 24, + 3,6,0,7,2,12,13,25,15,16,14,17,26,18,27,19, + 25, 20, - 24, - 6,0,9,14,10,11,12,13,24,15,17,19,20, - 14, + 25, + 6,0,9,10,11,12,24,13,25,15,14,17,19,20, 0, - 7,9,23,24,17, - 14,10,24, + 7,9,23,25,14,17, + 10,25,14, 11, - 7,8,14,13,24,15,16,17,18,21, - 14,10,11, + 7,8,13,25,15,16,14,17,18,21, + 10,11,14, 14, - 23,24, + 23,25, 3, - 23,24, - 23,24, + 24,28, + 23,24,25, + 23,24,25,28, 0, 11, 14, 14, 4,0, - 0,14,24,17, - 10,23,25, + 0,25,14,17, + 10,23,24,26,28, 23, - 14,2, - 24,16, + 2,14, + 25,16, 14, - 14,2,11,16, + 14, + 2,11,16,14, 15, - 14,15,19, + 15,14,19, 14,20, - 12,17,20, + 12,24,17,20,28, 3, 14,19, - 3,14,24,25,18,19, - 24, - 6,14,16, + 3,25,26,18,19,28, + 25, + 6,24,16,14,28, 10,17, - 11, - 14, + 11,14, 7,16, 14, - 24, - 14,24, + 25, + 25,14, 3, - 24, - 14,10,11,23,24, - 3,9,10, + 25, + 10,11,23,24,25,14,28, + 3,9,10,25,14, + 25, 14, 3, 20, 10, 3,10,11, - 14,24, + 25,14, 14, 14, 14, @@ -848,59 +876,59 @@ 8, 22, 3, - 24, - 6,14,2,16, - 23,24, - 3,4,6,0,9,14,10,2,11,15,16,17,19,22, + 25, + 6,2,24,16,14,28, + 23,25, + 24,14, + 3,4,6,0,9,10,2,11,15,16,14,17,19,22, 0, 14, - 6,2, + 6,2,25, 5,18, 2, + 24,28, 14, - 3,14,2,23,24,18, + 3,1,2,23,24,25,14,18,28, 12,13,16,21, 12, 15, 15, - 24,16,17,18, + 24,25,16,17,18,28, 16, - 3,0,14,15,25,19, - 3,0,14,16,17,25,21, - 3,10,11,24,16,17, + 3,0,15,14,26,19, + 3,0,16,14,17,26,21, + 3,10,11,25,16,17,28, 2, - 10,11, + 10,11,14, 23, 14, - 3,14,25, + 3,14,26, 15, - 1,23,24,25,18,26,21, - 14, + 1,23,25,26,18,27,21, 14, - 14, 14, - 14,24,18, + 24,25,14,18,28, 23, 23, - 23,24, - 5,23,24,16,18, - 24, - 25, - 14,13, - 14,11,13,17, - 24, - 14,15, + 23,25, + 5,23,25,16,18,28, + 25, + 24,25,26, + 13,14, + 11,13,25,14,17, + 25, + 15,14, 14, 10, - 3,11,24,16,17, + 3,11,25,16,17,28, 5, - 0,14,10, + 0,10,14, 9,14, - 14,15, - 3,0,14,10,2,11,24,22, + 15,14, + 3,0,10,2,11,25,14,22, 3,10, - 24, - 14,10,15, + 25, + 10,15,14, 14, 14, 14, @@ -911,190 +939,205 @@ 15, 3,14, 10, - 14,24, - 24, - 14,15, + 25,14, + 25, + 15,14, 0, - 14, 14, - 8,10,11,24,18, - 14,2, - 3,7,14,10,2,11,24,15,25,19,20,22, + 8,10,11,25,18,28, + 25, + 2,14, + 3,7,10,2,11,24,25,15,14,26,19,20,22, 0,17, 3, 9,21, - 15, + 14, + 15,14, 15, 14, + 14, 14, - 24, - 3,6,0,14,10,2,15,16,17,18, + 25, + 3,6,0,10,2,15,16,14,17,18, 14, + 14, 14, 14, 14, 14, 14, - 10,23,24, + 10,23,25, 10, - 14, 14,18,21, - 0,14,17,26, + 0,14,17,27, 14, 14, + 14, + 14, 14, 15, 14, - 24, - 11,24, + 25, + 11,25, 3, - 24, + 25, 0, - 24, - 0,12, + 25, + 0,12,14, 10, - 14,10,12, + 10,12,14, 14, - 24, + 25, 9, - 24, - 26, - 14,24, - 8,24, - 21, + 14, + 25, + 27, + 25,14, + 8,25, + 14,21, + 28, 15, 10, - 18,26, + 14,18,27, 14, - 4,12,24,18,21, - 10,24, + 4,12,25,18,21, + 10,25, 22, 22, - 24, + 25, 2,15,22, 14, 14, 14, 12,20, - 14,23,18, + 23,14,18, 14, + 14, 12, 10, 17, 16, - 3, - 5, - 14,18, + 3,24, + 5,24,28, + 24,25,14,18, 17, - 24, + 25, + 25, 18, - 24, - 3,9,10,11,20, - 6,11,24,18, - 24, - 14,10,13,24,17, + 25, + 3,9,10,11,24,20,28, + 6,11,24,25,18, + 25, + 10,13,25,14,17, 3,10,15, - 14, - 18, - 24, + 14, + 24,14,28, + 24,18,28, + 25, 0, - 14,2,24,15, - 24,26, - 24, + 2,25,15,14, + 1,25,27, + 25, 3, 14, 18, - 10,17,18,26, - 9,10,24, - 26, + 14, + 10,24,25,17,18,27,28, + 9,10,24,25, + 14, + 14, + 27, + 24,14, 3, 10, - 0,24, - 6,14,12,13,24,16,17,25,18,20,21, + 0,25, + 6,12,13,25,16,14,17,26,18,20,21, 10, 10, 3, 14, - 24, - 24, + 24,25,28, + 24,25,28, 14, - 3,14,15,19,22, - 25, + 3,15,14,19,22, + 26, 14, 15,19, 19, - 3,14,12,15, + 3,12,15,14, 2, - 3,4,5,6,0,7,9,14,10,2,11,12,13,24,15,16,17,18,26,19,20,21,22, + 3,4,5,6,0,7,9,10,2,11,12,13,25,15,16,14,17,18,27,19,20,21,22, 14, 19, 15, - 26, + 27, 0, - 6,12,24,16,17,19,22, - 25, - 3,0,14,10,2,16,17,18,26, - 3,24,18, - 23,24, - 3,14,10, + 6,12,25,16,14,17,19,22, + 14,26, + 3,0,10,2,24,16,14,17,18,27, + 3,25,18,28, + 23,25, + 24,28, + 3,10,14, 10, 3, 6,15, - 3,0,14,15,25,19, + 3,0,15,14,26,19, 8, - 6,8,14,13,17,18,19,21, - 4,14,13,17,20, - 0,14,24, - 14,16,18, - 14, - 14, + 6,8,24,13,14,17,18,19,21,28, + 4,13,14,17,20, + 0,25,14, + 24,16,14,18, 23, - 5,6,0,1,8,14,23,13,24,17,25,18,20, + 5,6,0,1,8,23,24,13,25,14,17,26,18,20,28, 16, - 2,23,24, + 2,23,25, 14, 16,21, - 3,14,24,16, + 3,25,16,14, 3,19, 3,15, 3,14,19, - 1,23,13,24,15,17,18,26,21,22, - 4,0,1,8,14,10,23,24,15,16,17,18,26,21,22, - 14,24,16,17,18,26, + 1,23,13,25,15,17,18,27,21,22, + 4,0,1,8,10,23,24,25,15,16,14,17,18,27,21,22,28, + 25,16,14,17,18,27, 10, 14, - 1,23,24, - 24, + 1,23,25, + 24,25, 15, - 14,2,11,15, + 14, + 2,11,15,14, 14,20, 6, 9,14,17,19, - 14, + 24,25,14,28, 8,14, 23, - 23,24, - 14,2, + 23,25,14, + 2,14, 14, 14, + 14, + 14, 3, 14, 3, 10,11, - 6,9,14, + 6,9,25,14, 2, 14, 14, 14, 3, - 6,23,24,16,17,25,18, + 6,23,25,16,17,26,18, 14, - 14, - 24, - 24, + 25, + 24,28, + 25, 18, - 24, - 3,7,14,24,15,20,21, + 25, + 3,7,25,15,14,20,21, 3,10,11, 10, 10, @@ -1102,154 +1145,169 @@ 14, 18, 14, - 14,10,11,15, - 14,23,24, - 24, - 24, - 3,14,13,24,15,16,17,18, - 3,24, - 3,0,10,15,16,26,20, + 10,11,15,14, + 23,25,14, + 25, + 25, + 3,13,25,15,16,14,17,18, + 3,25, + 3,0,10,15,16,14,27,20, 11, 17,18,19, - 24, + 25, 1, 15, 18, 6, - 24, - 24, + 25, + 25, 2,15, - 3,5,14,2,13,24,16,17,26,19, + 3,5,2,13,25,16,14,17,27,19, 14, - 6,9,14,16,18,26,19,22, + 6,9,25,16,14,18,27,19,22, + 14, 0,14,17,18, 3, 14, - 1,14,10,24, - 14, - 3,0,14,13,17,18,19, + 1,10,25,14, + 14, + 3,0,13,14,17,18,19, 14, - 14, + 28, + 24,14,28, 14, - 25, - 3,14,10,2,13,21, + 26, + 3,10,2,13,25,14,21, 10, 5,6,7,9,10,2,13,16,17, - 3,5,6,0,7,8,9,10,2,13,24,15,16,17,18,26,19,21,22, + 3,5,6,0,7,8,9,10,2,13,25,15,16,17,18,27,19,21,22, 5, - 25,18, - 14,20, + 28, + 26,18, + 24,14,20, 5,16,18, - 25, - 24, + 14, + 26, + 25, 14, 2, 14, - 24, + 25, 15, 15, 2,15,19, 11,18,19, 21,22, - 14,10,19, + 14, + 10,14,19, 14, 14, 23, - 24, + 25, 14, - 6,14,2,24, - 3,4,14,10,12,24,20, - 7,14,24,15,16,17,18,19, + 6,2,25,14, + 14, + 3,4,10,12,25,14,20, + 7,24,25,15,16,14,17,18,19,28, 6,20,22, - 14,25, + 25,26, 14, 10, 3,14, - 14,15, + 25,15,14, 14, 14, 14, 14, 0, 14, + 14, + 14, 14, - 14, 3, 10, - 3,14, - 14, + 3,24, 14, 14, 14, 14, 14, - 24, + 25, 10,12,20, - 14,15, + 15,14, 3,14,19, - 14,12,20, - 24, - 3,6,14,10,23,15,16,25,22, + 12,14,20, + 25, + 3,6,10,23,24,15,16,14,26,22,28, 14, 11, 14,18,20, 14, - 24, - 3,0, - 3,6,0,8,14,10,24,15,17,26,19,22, - 14,23,24,18, + 25, + 3,0,14, + 28, + 3,6,0,8,10,25,15,14,17,27,19,22, + 14, + 23,25,14,18, 14, + 14, + 14, 14, 14, - 14, - 23,24,21, - 24, - 3,14,2,11,16,19,22, - 3,5,7,2,13,16,17, - 2, - 5,14,2,24,16,18, + 23,25,21, + 25, + 3,2,11,16,14,19,22, + 3,5,7,2,24,13,16,17,28, + 2,14, + 14, + 5,2,25,16,14,18, 4,12,20, 14, 14, 3, 0, - 14, 10, - 24, - 24, - 24, - 24, + 24, + 25, + 25, + 25, + 25, 5,14,18,19,21, 14, - 18, + 24,28, + 24,18,28, 14, + 14, 14, 8,14,17,19, 14, 14, 14, - 24, - 6,14,12,24,17,19, - 0,14,23,24,25,18,19, + 14, + 25, + 6,12,25,14,17,19, + 0,23,25,14,26,18,19, 19, 18, 3, - 24,16, - 25, + 24,25,16,28, + 26, + 14, 14, 14, - 24, + 25, 4, 13,17, 14, + 14, 14, 0, - 14,10,12,13,16,17,25,21, - 23,24,16,17,19, + 10,12,13,16,14,17,26,21, + 23,25,16,17,19, 2,16, - 3,0,1,8,9,14,10,2,11,23,24,15,16,17,25,18,26,19,20,21,22, + 3,0,1,8,9,10,2,11,23,24,25,15,16,14,17,26,18,27,19,20,21,22,28, 2, - 14,24, + 25,14, 8,19, 14, 14, @@ -1257,70 +1315,71 @@ 14,18, 18, 3, - 1,14,23,24,18,21, - 14,15, + 1,23,25,14,18,21, + 15,14, 4,12, - 14,11, + 11,14, 14,18, - 24, - 14, - 14, - 14, - 6,14,2,16,26,19, - 6,23,24,18, - 14,10,2,24,16, - 3,5,8,14,2,23,12,24,16,18,20,22, + 1,25, + 6,2,16,14,27,19, + 1, + 6,23,25,18, + 10,2,25,16,14, + 24,14,28, + 3,5,8,2,23,12,24,25,16,14,18,20,22,28, 5,6,2,11,16,17,18, + 24,28, 11, - 1,24, - 10,24, + 1,25, + 10,24,25,28, 9,10,2,11,16, - 5,6,14,2,18, + 5,6,2,14,18,28, 14, 14, - 6,14,12, - 8,14,24, - 14,11,19, + 6,12,14, + 8,25,14, + 11,14,19, 4, 4,10, - 3,14,10,12,26,21, + 3,10,12,14,27,21, 23,18, 6, - 14, 3, - 24,18,26, + 25,18,27, 23, - 4,11,25, + 14, + 4,11,26, 11, - 23,24, - 4,5,0,8,14,23,13,24,15,16,17,25,18,26,19,21,22, - 4,5,6,9,14,2,12,24,15,16,17,25,18,22, + 23,25, + 4,5,0,8,23,24,13,25,15,16,14,17,26,18,27,19,21,22, + 4,5,6,9,2,12,25,15,16,14,17,26,18,22, + 1, 1,23, - 6, - 14, + 6,24,14,28, 3,5,7,22, - 3,0,14,24,15,26, + 3,0,25,15,14,27, 14, - 7,14,15, + 7,15, 20, - 3,6,0,9,14,11,24,16,17, - 14,16,17,19, - 10,17, + 3,6,0,9,11,24,25,16,14,17, + 16,17,19, + 10,14,17, 3,17, 14, 3, - 23,24,15, - 14,15,19, + 23,25,15, + 15,14,19, 15, 14, - 14,23,24, + 25, + 23,25, 10, 8,14, 14,18, - 5,6,0,7,8,14,23,24,15,17,18,26,19, - 25, + 5,6,0,7,8,23,25,15,14,17,18,27,19, + 26, 15, - 5,6,24, - 24,17, + 5,6,25, + 24,25,17,28, diff --git a/doc/salome/gui/GUI/whxdata/whtdata0.xml b/doc/salome/gui/GUI/whxdata/whtdata0.xml index 6b0205e6a..d79d74806 100755 --- a/doc/salome/gui/GUI/whxdata/whtdata0.xml +++ b/doc/salome/gui/GUI/whxdata/whtdata0.xml @@ -28,6 +28,10 @@ + + + + diff --git a/src/LightApp/LightApp_DataOwner.cxx b/src/LightApp/LightApp_DataOwner.cxx index 979140ad7..dd3c22f16 100644 --- a/src/LightApp/LightApp_DataOwner.cxx +++ b/src/LightApp/LightApp_DataOwner.cxx @@ -16,18 +16,11 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + #include "LightApp_DataOwner.h" #include "LightApp_DataObject.h" -#ifndef WNT -#include -#define _typeinfo std::type_info -#else -#include -#define _typeinfo type_info -#endif - #include /*!Constructor. Initialize by \a theEntry.*/ @@ -36,16 +29,11 @@ LightApp_DataOwner::LightApp_DataOwner( const QString& theEntry ) { } -LightApp_DataOwner::LightApp_DataOwner( const LightApp_DataObject* obj ) -: myEntry( obj ? obj->entry() : QString::null ) -{ -} - #ifndef DISABLE_SALOMEOBJECT /*!Constructor. Initialize by \a SALOME_InteractiveObject.*/ -LightApp_DataOwner::LightApp_DataOwner( const Handle(SALOME_InteractiveObject)& theIO ) -: myEntry( !theIO.IsNull() ? theIO->getEntry() : "" ), -myIO( theIO ) +LightApp_DataOwner::LightApp_DataOwner( const Handle(SALOME_InteractiveObject)& theIO ): + myEntry(!theIO.IsNull()? theIO->getEntry(): ""), + myIO(theIO) { } #endif @@ -55,32 +43,21 @@ LightApp_DataOwner::~LightApp_DataOwner() { } -/*!Checks: Is current data owner equal \a obj.*/ -bool LightApp_DataOwner::isEqual( const SUIT_DataOwner& obj ) const +/*!Gets key string, used for data owners comparison.*/ +QString LightApp_DataOwner::keyString() const { - const LightApp_DataOwner* other = dynamic_cast( &obj ); - return other && entry() == other->entry(); -} - -bool LightApp_DataOwner::isLess( const SUIT_DataOwner& obj ) const -{ - const LightApp_DataOwner* other = dynamic_cast( &obj ); - return other && entry() < other->entry(); + return myEntry; } /*!Gets entry.*/ -QString -LightApp_DataOwner -::entry() const +QString LightApp_DataOwner::entry() const { return myEntry; } #ifndef DISABLE_SALOMEOBJECT /*!Gets SALOME_InteractiveObject.*/ -const Handle(SALOME_InteractiveObject)& -LightApp_DataOwner -::IO() const +const Handle(SALOME_InteractiveObject)& LightApp_DataOwner::IO() const { return myIO; } diff --git a/src/LightApp/LightApp_DataOwner.h b/src/LightApp/LightApp_DataOwner.h index 989e30c73..e2df564ef 100644 --- a/src/LightApp/LightApp_DataOwner.h +++ b/src/LightApp/LightApp_DataOwner.h @@ -27,7 +27,6 @@ #include "SALOME_InteractiveObject.hxx" #endif -class LightApp_DataObject; /*! This class provide data owner objects. @@ -38,12 +37,12 @@ public: #ifndef DISABLE_SALOMEOBJECT LightApp_DataOwner( const Handle(SALOME_InteractiveObject)& theIO ); #endif - LightApp_DataOwner( const LightApp_DataObject* ); LightApp_DataOwner( const QString& ); virtual ~LightApp_DataOwner(); - virtual bool isEqual( const SUIT_DataOwner& ) const; - virtual bool isLess( const SUIT_DataOwner& ) const; + // *** jfa: The below line has been put here 14.02.2007. + // *** It cancels modifications from branch BR_Dev_For_4_0 + virtual QString keyString() const; #ifndef DISABLE_SALOMEOBJECT const Handle(SALOME_InteractiveObject)& IO() const; diff --git a/src/LightApp/LightApp_DataSubOwner.cxx b/src/LightApp/LightApp_DataSubOwner.cxx index 80c7d13a3..c64c739eb 100644 --- a/src/LightApp/LightApp_DataSubOwner.cxx +++ b/src/LightApp/LightApp_DataSubOwner.cxx @@ -20,10 +20,6 @@ #include "LightApp_DataObject.h" -#ifdef WNT -#include -#endif - /*!Constructor.Initialize by \a entry and \a index*/ LightApp_DataSubOwner::LightApp_DataSubOwner( const QString& entry, const int index ) : LightApp_DataOwner( entry ), @@ -36,24 +32,12 @@ LightApp_DataSubOwner::~LightApp_DataSubOwner() { } -/*!Checks: Is current data sub owner equal \a obj.*/ -bool LightApp_DataSubOwner::isEqual( const SUIT_DataOwner& obj ) const -{ - if (LightApp_DataOwner::isEqual(obj)) { - const LightApp_DataSubOwner* other = dynamic_cast( &obj ); - return other && index() == other->index(); - } - return false; -} - -/*!Checks: Is current data sub owner less \a obj.*/ -bool LightApp_DataSubOwner::isLess( const SUIT_DataOwner& obj ) const +/*!Gets key string, used for data owners comparison.*/ +QString LightApp_DataSubOwner::keyString() const { - const LightApp_DataSubOwner* other = dynamic_cast( &obj ); - if(other && entry() == other->entry()){ - return index() < other->index(); - } - return other && entry() < other->entry(); + QString aKey = LightApp_DataOwner::keyString(); + aKey += QString("_%1").arg(index()); + return aKey; } /*!Gets index.*/ diff --git a/src/LightApp/LightApp_DataSubOwner.h b/src/LightApp/LightApp_DataSubOwner.h index 9b21d18a8..7e8e7f3ea 100644 --- a/src/LightApp/LightApp_DataSubOwner.h +++ b/src/LightApp/LightApp_DataSubOwner.h @@ -32,9 +32,10 @@ public: LightApp_DataSubOwner( const QString&, const int ); virtual ~LightApp_DataSubOwner(); - virtual bool isEqual( const SUIT_DataOwner& ) const; - virtual bool isLess( const SUIT_DataOwner& obj ) const; - int index() const; + // *** jfa: The below line has been put here 14.02.2007. + // *** It cancels modifications from branch BR_Dev_For_4_0 + virtual QString keyString() const; + int index() const; private: int myIndex; diff --git a/src/LightApp/LightApp_OCCSelector.cxx b/src/LightApp/LightApp_OCCSelector.cxx index 690f8da64..534cad26e 100644 --- a/src/LightApp/LightApp_OCCSelector.cxx +++ b/src/LightApp/LightApp_OCCSelector.cxx @@ -54,33 +54,6 @@ OCCViewer_Viewer* LightApp_OCCSelector::viewer() const return myViewer; } -/*! - Acess to external selection for reading( protected ) -*/ -const SUIT_DataOwnerPtrList& LightApp_OCCSelector::getSelectedExt() const -{ - return mySelectedExternals; -} - - -/*! - Append owner to external selection ( protected ) -*/ -void LightApp_OCCSelector::appendSelExtOwner( SUIT_DataOwner* theOwner ) -{ - if ( theOwner ) - mySelectedExternals.append( theOwner ); -} - -/*! - Clear external selection -*/ -void LightApp_OCCSelector::clearSelExtOwners() -{ - mySelectedExternals.clear(); -} - - /*!On selection changed.*/ void LightApp_OCCSelector::onSelectionChanged() @@ -91,7 +64,7 @@ void LightApp_OCCSelector::onSelectionChanged() /*!On selection cleared.*/ void LightApp_OCCSelector::onDeselection() { - clearSelExtOwners(); + mySelectedExternals.clear(); } /*!Gets selection list.*/ @@ -115,7 +88,7 @@ void LightApp_OCCSelector::getSelection( SUIT_DataOwnerPtrList& aList ) const } // add externally selected objects SUIT_DataOwnerPtrList::const_iterator anExtIter; - for(anExtIter = getSelectedExt().begin(); anExtIter != getSelectedExt().end(); anExtIter++) { + for(anExtIter = mySelectedExternals.begin(); anExtIter != mySelectedExternals.end(); anExtIter++) { aList.append(*anExtIter); } } @@ -141,7 +114,7 @@ void LightApp_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) aDisplayed.insert( entryStr, it.Value() ); } - clearSelExtOwners(); + mySelectedExternals.clear(); for ( SUIT_DataOwnerPtrList::const_iterator itr = aList.begin(); itr != aList.end(); ++itr ) { @@ -149,7 +122,7 @@ void LightApp_OCCSelector::setSelection( const SUIT_DataOwnerPtrList& aList ) if ( owner && aDisplayed.contains( owner->entry() ) ) aSelList.Append( aDisplayed[owner->entry()] ); else - appendSelExtOwner( *itr ); + mySelectedExternals.append(*itr); } myViewer->unHighlightAll( false ); diff --git a/src/LightApp/LightApp_OCCSelector.h b/src/LightApp/LightApp_OCCSelector.h index 4a8e82f62..905267435 100644 --- a/src/LightApp/LightApp_OCCSelector.h +++ b/src/LightApp/LightApp_OCCSelector.h @@ -54,12 +54,10 @@ protected: QString entry( const Handle_AIS_InteractiveObject& ) const; - const SUIT_DataOwnerPtrList& getSelectedExt() const; - void appendSelExtOwner( SUIT_DataOwner* ); - void clearSelExtOwners(); + SUIT_DataOwnerPtrList mySelectedExternals; + private: OCCViewer_Viewer* myViewer; - SUIT_DataOwnerPtrList mySelectedExternals; }; #endif diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx index bd5ace4c6..ff4ef0551 100755 --- a/src/OCCViewer/OCCViewer_ViewPort.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort.cxx @@ -104,9 +104,9 @@ static Colormap choose_cmap( Display *dpy, XVisualInfo *vi ) XStandardColormap *c; int n, i; -#ifdef DEBUG - cout << "Choosing cmap for vID = " << vi->visualid << endl; -#endif + //#ifdef DEBUG + //cout << "Choosing cmap for vID = " << vi->visualid << endl; + //#endif if ( vi->visualid == XVisualIDFromVisual( (Visual*)QPaintDevice::x11AppVisual() ) ) { diff --git a/src/OCCViewer/OCCViewer_ViewPort3d.cxx b/src/OCCViewer/OCCViewer_ViewPort3d.cxx index 1a83b55ea..cbeb3ce9c 100755 --- a/src/OCCViewer/OCCViewer_ViewPort3d.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort3d.cxx @@ -296,8 +296,12 @@ void OCCViewer_ViewPort3d::fitRect( const QRect& rect ) */ void OCCViewer_ViewPort3d::zoom( int x0, int y0, int x, int y ) { - if ( !activeView().IsNull() ) - activeView()->Zoom( x0, y0, x, y ); + if ( !activeView().IsNull() ) { + // as OCCT respects a sign of only dx, + // but we want both signes to be taken into account + //activeView()->Zoom( x0, y0, x, y ); + activeView()->Zoom( x0 + y0, 0, x + y, 0 ); + } } /*! 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 89ba1c681..048145b73 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx @@ -167,7 +167,8 @@ SALOME_PYQT_Module* SALOME_PYQT_Module::getInitModule() SALOME_PYQT_Module::SALOME_PYQT_Module() : SalomeApp_Module( __DEFAULT_NAME__ ), myModule( 0 ), - myXmlHandler ( 0 ) + myXmlHandler ( 0 ), + myLastActivateStatus( true ) { } @@ -250,6 +251,9 @@ bool SALOME_PYQT_Module::activateModule( SUIT_Study* theStudy ) if ( !res ) return res; + // reset the activation status to the default value + myLastActivateStatus = true; + // ActivateReq: request class for internal activate() operation class ActivateReq : public PyInterp_Request { @@ -274,6 +278,9 @@ bool SALOME_PYQT_Module::activateModule( SUIT_Study* theStudy ) // Posting the request PyInterp_Dispatcher::Get()->Exec( new ActivateReq( theStudy, this ) ); + if ( !lastActivationStatus() ) + return false; + // activate menus, toolbars, etc setMenuShown( true ); setToolShown( true ); @@ -365,6 +372,15 @@ bool SALOME_PYQT_Module::deactivateModule( SUIT_Study* theStudy ) return SalomeApp_Module::deactivateModule( theStudy ); } +/*! + * Returns the status of last trying of module activation. + * Before fisrt activation - status is false +*/ +bool SALOME_PYQT_Module::lastActivationStatus() const +{ + return myLastActivateStatus; +} + /*! Preferences changing (application) - called when preference is changed */ @@ -815,9 +831,15 @@ void SALOME_PYQT_Module::activate( SUIT_Study* theStudy ) // call Python module's activate() method (for the new modules) if(PyObject_HasAttrString(myModule , "activate")){ - PyObjWrapper res1( PyObject_CallMethod( myModule, "activate", "" ) ); - if( !res1 ) { + PyObject* res1 = PyObject_CallMethod( myModule, "activate", "" ); + if ( !res1 || !PyBool_Check( res1 ) ) { PyErr_Print(); + //= true: for support of old modules + myLastActivateStatus = true; + } + else { + //detect return status + myLastActivateStatus = PyObject_IsTrue( res1 ); } } } 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 b8b9aeb90..65def75f6 100644 --- a/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h +++ b/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.h @@ -74,6 +74,9 @@ private: QMap myWindowsMap; /* compatible view managers list */ QStringList myViewMgrList; + + /* status of last trying of module activation*/ + bool myLastActivateStatus; /****************************** * Construction/destruction @@ -200,6 +203,10 @@ private: void init ( CAM_Application* ); /* internal activation */ void activate ( SUIT_Study* ); + + /* getting status of last module activation */ + bool lastActivationStatus() const; + /* internal deactivation */ void deactivate ( SUIT_Study* ); /* customization */ diff --git a/src/SUIT/SUIT_DataOwner.cxx b/src/SUIT/SUIT_DataOwner.cxx index 3090afa91..a0aa525c4 100755 --- a/src/SUIT/SUIT_DataOwner.cxx +++ b/src/SUIT/SUIT_DataOwner.cxx @@ -16,6 +16,7 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // + #include "SUIT_DataOwner.h" #ifndef WNT @@ -40,11 +41,13 @@ SUIT_DataOwner::~SUIT_DataOwner() bool operator==( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 ) { if ( !p1.isNull() && !p2.isNull() ) - return (p1->isEqual( *p2 ) && p2->isEqual( *p1 )); + return (p1->keyString() == p2->keyString()); return p1.isNull() && p2.isNull(); } - +// *** jfa: The below function has been put here 14.02.2007 from branch BR_Dev_For_4_0 +// *** and also improved for better comparison of DataOwners with DataSubOwners. +// *** This comment is to be removed after merging with BR_Dev_For_4_0. /*! Operator < allows to order suit data owners for map */ bool operator<( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 ) { @@ -55,22 +58,14 @@ bool operator<( const SUIT_DataOwnerPtr& p1, const SUIT_DataOwnerPtr& p2 ) else if ( p2.isNull() ) return false; - //bug with acrossentry of DataOwner and DataSubOwner - const _typeinfo& ti1 = typeid( *(p1.operator->()) ); - const _typeinfo& ti2 = typeid( *(p2.operator->()) ); - - int res = strcmp( ti1.name(), ti2.name() ); - - if ( !res ) - return p1->isLess( *p2 ); - - return res; + return (p1->keyString() < p2->keyString()); } +// *** end /*! \class SUIT_DataOwnerPtrList implements value list with unique items (uniqueness is - provided by operator==()) + provided by operator==() and operator<()) */ /*! diff --git a/src/SUIT/SUIT_DataOwner.h b/src/SUIT/SUIT_DataOwner.h index 2d364fd57..7e88c58ff 100755 --- a/src/SUIT/SUIT_DataOwner.h +++ b/src/SUIT/SUIT_DataOwner.h @@ -40,9 +40,9 @@ class SUIT_EXPORT SUIT_DataOwner : public RefCount public: SUIT_DataOwner();//!< constructor virtual ~SUIT_DataOwner();//!< destructor - //! compare function - virtual bool isEqual( const SUIT_DataOwner& ) const = 0; - virtual bool isLess( const SUIT_DataOwner& ) const = 0; + // *** jfa: The below line has been put here 14.02.2007. + // *** It cancels modifications from branch BR_Dev_For_4_0 + virtual QString keyString() const = 0;//!< used for comparison }; /*! \typedef SUIT_DataOwnerPtr diff --git a/src/SUIT/SUIT_ResourceMgr.cxx b/src/SUIT/SUIT_ResourceMgr.cxx index 8a81306bb..b076babd3 100755 --- a/src/SUIT/SUIT_ResourceMgr.cxx +++ b/src/SUIT/SUIT_ResourceMgr.cxx @@ -20,7 +20,8 @@ #include #include -#include +#include +#include /*! Constructor @@ -73,15 +74,31 @@ QString SUIT_ResourceMgr::loadDoc( const QString& prefix, const QString& id ) co */ QString SUIT_ResourceMgr::userFileName( const QString& appName, const bool for_load ) const { - QString pathName = QtxResourceMgr::userFileName( appName ); + QString pathName; + + // Try config file, given in arguments + for (int i = 1; i < qApp->argc(); i++) { + QRegExp rx ("--resources=(.+)"); + if ( rx.search( QString(qApp->argv()[i]) ) >= 0 && rx.capturedTexts().count() > 1 ) { + QString file = rx.capturedTexts()[1]; + QFileInfo fi (file); + pathName = fi.absFilePath(); + } + } + + if (!pathName.isEmpty()) + return pathName; + + // QtxResourceMgr::userFileName() + '.' + version() + pathName = QtxResourceMgr::userFileName( appName ); if ( !version().isEmpty() ) pathName += QString( "." ) + version(); - if( !QFileInfo( pathName ).exists() && for_load ) + if ( !QFileInfo( pathName ).exists() && for_load ) { QString newName = findAppropriateUserFile( pathName ); - if( !newName.isEmpty() ) + if ( !newName.isEmpty() ) pathName = newName; } diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index ae624c653..93f1e10aa 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -134,7 +134,10 @@ extern "C" SALOMEAPP_EXPORT SUIT_Application* createApplication() /*!Constructor.*/ SalomeApp_Application::SalomeApp_Application() : LightApp_Application() -{} +{ + connect( desktop(), SIGNAL( message( const QString& ) ), + this, SLOT( onDesktopMessage( const QString& ) ) ); +} /*!Destructor. *\li Destroy event filter. @@ -155,38 +158,57 @@ void SalomeApp_Application::start() static bool isFirst = true; if ( isFirst ) { isFirst = false; + QString hdffile; QStringList pyfiles; + for (int i = 1; i < qApp->argc(); i++) { - QRegExp rx("--test=(.+)"); - if ( rx.search( QString(qApp->argv()[i]) ) >= 0 && rx.capturedTexts().count() > 0 ) { - QStringList files = QStringList::split(",",rx.capturedTexts()[1],false); - for (uint j = 0; j < files.count(); j++ ) { - QFileInfo fi( files[j] ); - QString extension = fi.extension( false ).lower(); - if ( extension == "hdf" && fi.exists() ) - hdffile = fi.absFilePath(); - else if ( extension == "py" || extension == "" ) - pyfiles.append( fi.baseName( true ) ); - } + QRegExp rxs ("--study-hdf=(.+)"); + if ( rxs.search( QString(qApp->argv()[i]) ) >= 0 && rxs.capturedTexts().count() > 1 ) { + QString file = rxs.capturedTexts()[1]; + QFileInfo fi ( file ); + QString extension = fi.extension( false ).lower(); + if ( extension == "hdf" && fi.exists() ) + hdffile = fi.absFilePath(); + } + else { + QRegExp rxp ("--pyscript=(.+)"); + if ( rxp.search( QString(qApp->argv()[i]) ) >= 0 && rxp.capturedTexts().count() > 1 ) { + QStringList files = QStringList::split(",",rxp.capturedTexts()[1],false); + pyfiles += files; + } } } + if ( !hdffile.isEmpty() ) // open hdf file given as parameter onOpenDoc( hdffile ); else if ( pyfiles.count() > 0 ) // create new study onNewDoc(); - // import python scripts + + // import/execute python scripts if ( pyfiles.count() > 0 && activeStudy() ) { SalomeApp_Study* appStudy = dynamic_cast( activeStudy() ); if ( appStudy ) { _PTR(Study) aStudy = appStudy->studyDS(); if ( !aStudy->GetProperties()->IsLocked() ) { - for ( uint i = 0; i < pyfiles.count(); i++ ) { - QString command = QString( "import %1" ).arg( pyfiles[i] ); + for (uint j = 0; j < pyfiles.count(); j++ ) { + QFileInfo fi ( pyfiles[j] ); PythonConsole* pyConsole = pythonConsole(); - if ( pyConsole ) - pyConsole->exec( command ); - } + if ( pyConsole ) { + QString extension = fi.extension( false ).lower(); + if ( extension == "py" && fi.exists() ) { + // execute python script + QString command = QString( "execfile(\"%1\")" ).arg( fi.absFilePath() ); + pyConsole->exec( command ); + } + else { + // import python module + QString command = QString( "import %1" ).arg( pyfiles[j] ); + //QString command = QString( "import %1" ).arg( fi.baseName( true ) ); + pyConsole->exec( command ); + } + } + } } } } @@ -1236,3 +1258,13 @@ bool SalomeApp_Application::checkDataObject(LightApp_DataObject* theObj) return false; } + +/*! Process standard messages from desktop */ +void SalomeApp_Application::onDesktopMessage( const QString& message ) +{ + // update object browser + if ( message.lower() == "updateobjectbrowser" || + message.lower() == "updateobjbrowser" ) + updateObjectBrowser(); +} + diff --git a/src/SalomeApp/SalomeApp_Application.h b/src/SalomeApp/SalomeApp_Application.h index 507c872ff..09ece677d 100644 --- a/src/SalomeApp/SalomeApp_Application.h +++ b/src/SalomeApp/SalomeApp_Application.h @@ -106,6 +106,7 @@ public slots: protected slots: void onStudySaved( SUIT_Study* ); void onStudyOpened( SUIT_Study* ); + void onDesktopMessage( const QString& ); protected: virtual void createActions(); diff --git a/src/SalomeApp/SalomeApp_DataObject.cxx b/src/SalomeApp/SalomeApp_DataObject.cxx index 5eb3c97a9..dd9ff8960 100644 --- a/src/SalomeApp/SalomeApp_DataObject.cxx +++ b/src/SalomeApp/SalomeApp_DataObject.cxx @@ -134,7 +134,9 @@ QString SalomeApp_DataObject::text( const int id ) const #else if ( componentObject() != (SUIT_DataObject*)this ) #endif - txt = value( referencedObject() ); + txt = value( object() ); + if ( txt.isEmpty() ) + txt = value( referencedObject() ); break; case CT_Entry: txt = entry( object() ); diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index 8ae2b1d72..8ae6b7d2f 100755 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -425,7 +425,7 @@ int main( int argc, char **argv ) PortableServer::POAManager_var pman = poa->the_POAManager(); pman->activate() ; - INFOS( "pman->activate()" ); + MESSAGE( "pman->activate()" ); _NS = new SALOME_NamingService( orb ); @@ -499,7 +499,7 @@ int main( int argc, char **argv ) SALOME::Session_var session = SALOME::Session::_narrow( obj ) ; ASSERT ( ! CORBA::is_nil( session ) ); // ...create GUI launcher - INFOS( "Session activated, Launch IAPP..." ); + MESSAGE( "Session activated, Launch IAPP..." ); guiThread = new GetInterfaceThread( session ); } @@ -518,7 +518,7 @@ int main( int argc, char **argv ) aGUISession = new SALOME_Session(); // Load SalomeApp dynamic library - INFOS( "creation SUIT_Application" ); + MESSAGE( "creation SUIT_Application" ); SUIT_Application* aGUIApp = aGUISession->startApplication( "SalomeApp", 0, 0 ); if ( aGUIApp ) { diff --git a/src/Session/Session_ServerLauncher.cxx b/src/Session/Session_ServerLauncher.cxx index 0604c7731..3909efc01 100755 --- a/src/Session/Session_ServerLauncher.cxx +++ b/src/Session/Session_ServerLauncher.cxx @@ -193,7 +193,7 @@ void Session_ServerLauncher::ActivateAll() argv[i+1] = _argv[(*itServ)._firstArg + i]; } - std::cout << "*** activating [" << argc << "] : " << argv[0] << std::endl; + MESSAGE("*** activating [" << argc << "] : " << argv[0]); Session_ServerThread* aServerThread = new Session_ServerThread(argc, argv, _orb,_root_poa); @@ -205,7 +205,7 @@ void Session_ServerLauncher::ActivateAll() } // Always launch Session Server - std::cout << "*** activating [ SESSION ] " << std::endl; + MESSAGE("*** activating [ SESSION ] "); int argc=1; char** argv = new char*[argc]; diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx index 1407cf4a2..9c6f7c838 100755 --- a/src/Session/Session_ServerThread.cxx +++ b/src/Session/Session_ServerThread.cxx @@ -185,7 +185,7 @@ void Session_ServerThread::ActivateModuleCatalog(int argc, { try { - INFOS("ModuleCatalog thread started"); + MESSAGE("ModuleCatalog thread started"); // allocation on heap to allow destruction by POA SALOME_ModuleCatalogImpl* Catalogue_i @@ -224,7 +224,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc, { try { - INFOS("SALOMEDS thread started"); + MESSAGE("SALOMEDS thread started"); // We allocate the objects on the heap. Since these are reference // counted objects, they will be deleted by the POA when they are no // longer needed. @@ -255,7 +255,7 @@ void Session_ServerThread::ActivateSALOMEDS(int argc, void Session_ServerThread::ActivateRegistry(int argc, char ** argv) { - INFOS("Registry thread started"); + MESSAGE("Registry thread started"); SCRUTE(argc); if( argc<3 ) { @@ -345,7 +345,7 @@ void Session_ServerThread::ActivateContainer(int argc, { try { - INFOS("Container thread started"); + MESSAGE("Container thread started"); // get or create the child POA @@ -357,7 +357,7 @@ void Session_ServerThread::ActivateContainer(int argc, } catch (PortableServer::POA::AdapterNonExistent&) { - INFOS("factory_poa does not exists, create..."); + MESSAGE("factory_poa does not exists, create..."); // define policy objects PortableServer::ImplicitActivationPolicy_var implicitActivation = _root_poa->create_implicit_activation_policy( @@ -428,14 +428,10 @@ void Session_ServerThread::ActivateEngine(int /*argc*/, char ** /*argv*/) { try { - INFOS("SalomeApp_Engine thread started"); + MESSAGE("SalomeApp_Engine thread started"); SalomeApp_Engine_i* anEngine = new SalomeApp_Engine_i(); - // declare variable and get value for them to avoid compilation warning of unused variable - // this variable is necessary to avoid memory leak of memory allocated in corba - PortableServer::ObjectId_var id = 0; - id = _root_poa->activate_object( anEngine ); - ///*PortableServer::ObjectId_var id = */_root_poa->activate_object( anEngine ); - INFOS("poa->activate_object( SalomeApp_Engine )"); + /*PortableServer::ObjectId_var id = */_root_poa->activate_object( anEngine ); + MESSAGE("poa->activate_object( SalomeApp_Engine )"); CORBA::Object_var obj = anEngine->_this(); _NS->Register( obj ,"/SalomeAppEngine"); @@ -488,12 +484,12 @@ void Session_SessionThread::ActivateSession(int argc, { try { - INFOS("Session thread started"); + MESSAGE("Session thread started"); SALOME_Session_i * mySALOME_Session = new SALOME_Session_i(argc, argv, _orb, _root_poa, _GUIMutex, _GUILauncher) ; PortableServer::ObjectId_var mySALOME_Sessionid = _root_poa->activate_object(mySALOME_Session); - INFOS("poa->activate_object(mySALOME_Session)"); + MESSAGE("poa->activate_object(mySALOME_Session)"); CORBA::Object_var obj = mySALOME_Session->_this(); CORBA::String_var sior(_orb->object_to_string(obj)); diff --git a/src/VTKViewer/VTKViewer_AppendFilter.cxx b/src/VTKViewer/VTKViewer_AppendFilter.cxx index 19390bac1..266103369 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.cxx +++ b/src/VTKViewer/VTKViewer_AppendFilter.cxx @@ -80,21 +80,21 @@ VTKViewer_AppendFilter void VTKViewer_AppendFilter -::SetPoints(vtkPoints* thePoints) +::SetSharedPointsDataSet(vtkPointSet* thePointsDataSet) { - if(GetPoints() == thePoints) + if(GetSharedPointsDataSet() == thePointsDataSet) return; - myPoints = thePoints; + mySharedPointsDataSet = thePointsDataSet; - this->Modified(); + Modified(); } -vtkPoints* +vtkPointSet* VTKViewer_AppendFilter -::GetPoints() +::GetSharedPointsDataSet() { - return myPoints.GetPointer(); + return mySharedPointsDataSet.GetPointer(); } int @@ -105,7 +105,7 @@ VTKViewer_AppendFilter vtkInformationVector *outputVector) { int aRet = 0; - if(myPoints.GetPointer()) + if(GetSharedPointsDataSet()) aRet = MakeOutput(request,inputVector,outputVector); else aRet = Superclass::RequestData(request,inputVector,outputVector); @@ -130,7 +130,7 @@ VTKViewer_AppendFilter for(vtkIdType aDataSetId = 0; aDataSetId < this->GetNumberOfInputPorts(); ++aDataSetId){ vtkDataSet* aDataSet = (vtkDataSet *)(this->GetInput(aDataSetId)); // Do mapping of the nodes - if(!myPoints.GetPointer()){ + if(!GetSharedPointsDataSet()){ vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); myNodeRanges.push_back(aPntStartId + aNbPnts); aPntStartId += aNbPnts; @@ -166,7 +166,7 @@ VTKViewer_AppendFilter ::GetPointOutputID(vtkIdType theInputID, vtkIdType theInputDataSetID) { - if(myPoints.GetPointer()) + if(GetSharedPointsDataSet()) return theInputID; return GetOutputID(theInputID,theInputDataSetID,myNodeRanges); @@ -178,7 +178,7 @@ VTKViewer_AppendFilter ::GetCellOutputID(vtkIdType theInputID, vtkIdType theInputDataSetID) { - if(myPoints.GetPointer()) + if(GetSharedPointsDataSet()) return theInputID; return GetOutputID(theInputID,theInputDataSetID,myCellRanges); @@ -225,7 +225,7 @@ VTKViewer_AppendFilter vtkIdType& theStartID, vtkIdType& theInputDataSetID) { - if(myPoints.GetPointer()) { + if(GetSharedPointsDataSet()) { theStartID = theInputDataSetID = 0; theInputID = theOutputID; return; @@ -275,7 +275,7 @@ VTKViewer_AppendFilter vtkUnstructuredGrid *output = vtkUnstructuredGrid::SafeDownCast( outInfo->Get(vtkDataObject::DATA_OBJECT())); // - numPts = myPoints->GetNumberOfPoints(); + numPts = mySharedPointsDataSet->GetNumberOfPoints(); if (numPts < 1) { return 0; } @@ -308,7 +308,8 @@ VTKViewer_AppendFilter // Append each input dataset together // // 1.points - output->SetPoints(myPoints.GetPointer()); + output->SetPoints(GetSharedPointsDataSet()->GetPoints()); + output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData()); // 2.cells for (idx = 0; idx < numInputs; ++idx) { inInfo = inputVector[0]->GetInformationObject(idx); diff --git a/src/VTKViewer/VTKViewer_AppendFilter.h b/src/VTKViewer/VTKViewer_AppendFilter.h index 3ff617541..ef2e7f11d 100644 --- a/src/VTKViewer/VTKViewer_AppendFilter.h +++ b/src/VTKViewer/VTKViewer_AppendFilter.h @@ -27,7 +27,7 @@ #include #include -class vtkPoints; +class vtkPointSet; #ifdef WIN32 #pragma warning ( disable:4251 ) @@ -52,10 +52,10 @@ public: bool DoMappingFlag() const; void - SetPoints(vtkPoints* thePoints); + SetSharedPointsDataSet(vtkPointSet* thePointsDataSet); - vtkPoints* - GetPoints(); + vtkPointSet* + GetSharedPointsDataSet(); vtkIdType GetPointOutputID(vtkIdType theInputID, @@ -103,7 +103,7 @@ protected: bool myDoMappingFlag; TVectorIds myNodeRanges; TVectorIds myCellRanges; - vtkSmartPointer myPoints; + vtkSmartPointer mySharedPointsDataSet; }; #ifdef WIN32 diff --git a/src/VTKViewer/VTKViewer_ConvexTool.cxx b/src/VTKViewer/VTKViewer_ConvexTool.cxx index 6ba9ee187..1ecabea6e 100644 --- a/src/VTKViewer/VTKViewer_ConvexTool.cxx +++ b/src/VTKViewer/VTKViewer_ConvexTool.cxx @@ -48,6 +48,12 @@ #include #include +#ifdef _DEBUG_ +static int DEBUG_TRIA_EXECUTE = 0; +#else +static int DEBUG_TRIA_EXECUTE = 0; +#endif + namespace { typedef std::vector TConnectivities; @@ -122,7 +128,7 @@ VTKViewer_Triangulator vtkPoints *aPoints = InitPoints(); vtkIdType aNumPts = GetNbOfPoints(); - //cout<<"Triangulator - aNumPts = "<GetPoint(GetPointId(aPntId),aPntCoord); - //cout<<"\taPntId = "< TPointIds; @@ -201,8 +207,10 @@ VTKViewer_Triangulator // To get know, if the points of the trinagle were already observed bool anIsObserved = aFace2PointIds.find(aPointIds) == aFace2PointIds.end(); - //cout<<"\taFaceId = "<GetPoint(aNewPts[1],aCoord[1]); aPoints->GetPoint(aNewPts[2],aCoord[2]); - // To calculate plane normal + /* To calculate plane normal for face (aFace) + + + ^ aNormal + | + | ^ aVector01 + | / + /_________> aVector02 + + + */ vtkFloatingPointType aVector01[3] = { aCoord[1][0] - aCoord[0][0], aCoord[1][1] - aCoord[0][1], aCoord[1][2] - aCoord[0][2] }; @@ -220,6 +238,9 @@ VTKViewer_Triangulator aCoord[2][1] - aCoord[0][1], aCoord[2][2] - aCoord[0][2] }; + vtkMath::Normalize(aVector01); + vtkMath::Normalize(aVector02); + // To calculate the normal for the triangle vtkFloatingPointType aNormal[3]; vtkMath::Cross(aVector02,aVector01,aNormal); @@ -236,13 +257,72 @@ VTKViewer_Triangulator vtkFloatingPointType aPntCoord[3]; vtkIdType aPntId = *anIter; aPoints->GetPoint(aPntId,aPntCoord); + + vtkFloatingPointType aVector0Pnt[3] = { aPntCoord[0] - aCoord[0][0], + aPntCoord[1] - aCoord[0][1], + aPntCoord[2] - aCoord[0][2] }; + + + vtkMath::Normalize(aVector0Pnt); + + vtkFloatingPointType aNormalPnt[3]; + // calculate aNormalPnt + { + vtkFloatingPointType aCosPnt01 = vtkMath::Dot(aVector0Pnt,aVector01); + vtkFloatingPointType aCosPnt02 = vtkMath::Dot(aVector0Pnt,aVector02); + if(aCosPnt01<-1) + aCosPnt01 = -1; + if(aCosPnt01>1) + aCosPnt01 = 1; + if(aCosPnt02<-1) + aCosPnt02 = -1; + if(aCosPnt02>1) + aCosPnt02 = 1; + + vtkFloatingPointType aDist01,aDist02;// deflection from Pi/3 angle (equilateral triangle) + vtkFloatingPointType aAngPnt01 = fabs(acos(aCosPnt01)); + vtkFloatingPointType aAngPnt02 = fabs(acos(aCosPnt02)); + + /* check that triangle similar to equilateral triangle + AOC or COB ? + aVector0Pnt = (OC) + aVector01 = (OB) + aVector02 = (OA) + + B + ^ aVector01 C + | ^ aVector0Pnt + | _____/ + | ___/ + |/________> aVector02 + O A + */ + aDist01 = fabs(aAngPnt01-(vtkMath::Pi())/3.0); + aDist02 = fabs(aAngPnt02-(vtkMath::Pi())/3.0); + + // caculate a normal for best triangle + if(aDist01 <= aDist02) + vtkMath::Cross(aVector0Pnt,aVector01,aNormalPnt); + else + vtkMath::Cross(aVector0Pnt,aVector02,aNormalPnt); + + } + + vtkMath::Normalize(aNormalPnt); + + if(DEBUG_TRIA_EXECUTE) + cout<<"\t\taPntId = "< 0){ aNormal[0] = -aNormal[0]; aNormal[1] = -aNormal[1]; @@ -273,8 +355,10 @@ VTKViewer_Triangulator aCoord[0][2] - aCenter[2] }; vtkMath::Normalize(aVector0); - //cout<<"\t\taCenter = {"< 1.0) + vtkFloatingPointType anAngle = 0.0; + if(aCosinus >= 1.0){ aCosinus = 1.0; - if(aCosinus < -1.0) + } else if (aCosinus <= -1.0){ aCosinus = -1.0; - static vtkFloatingPointType a2Pi = 2.0 * vtkMath::Pi(); - vtkFloatingPointType anAngle = acos(aCosinus); - //cout<<"\t\t\taPntId = "<second; aConnectivities[anId] = GetConnectivity(aPntId); + if(DEBUG_TRIA_EXECUTE) cout << aPntId << ","; } + if(DEBUG_TRIA_EXECUTE) cout << endl; aPolygons.push_back(::TPolygon(aConnectivities,aCenter,aNormal)); } } } } - if(aPolygons.empty()) return true; @@ -364,15 +469,17 @@ VTKViewer_Triangulator ::TPolygon& aPolygon = aPolygons[aPolygonId]; vtkFloatingPointType* aNormal = aPolygon.myNormal; vtkFloatingPointType* anOrigin = aPolygon.myOrigin; - //cout<<"\taPolygonId = "<GetPoint(anId,aPntCoord); vtkFloatingPointType aDist = vtkPlane::Evaluate(aNormal,anOrigin,aPntCoord); - //cout<<"\t\taPntId = "<InsertNextCell(VTK_POLYGON,aNbPoints,&aConnectivities[0]); if(theStoreMapping) @@ -394,7 +507,8 @@ VTKViewer_Triangulator } } - //cout<<"\tTriangulator - Ok\n"; + if(DEBUG_TRIA_EXECUTE) cout<<"\tTriangulator - Ok\n"; + return true; }

- -g / - --gui	- Runs the Installation Wizard in the GUI mode (default option). In this - case only <xml-file> key - is taken into account. Other parameters are ignored.
- -b / - --batch -	- Runs the Installation Wizard in command-line mode.
- -f <FILE> / --file=<FILE> -	- The configuration file to be used by the Installation Wizard. - If this parameter is not used then the installation script tries to define - the Linux version and - use the corresponding xml file. For example, config_Mandrake10_1.xml - file is to be used for Linux - Mandrake 10.1. If the appropriate file is not 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 higher. If config.xml file is - also not found, the 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> -	- The target directory for SALOME platform to be installed to. If used, - this option - overrides the default target directory, defined in the configuration XML - file (usually ${HOME}/salome_<version>).
- -t <DIR> / --tmp=<DIR> -	- The directory, which is used for temporary files. If used, this option - overrides the default temporary directory, given in the configuration - xml file (usually /tmp, see here).
- -h / --help -	- Prints help information about available options.
- -v / --version	- Prints version information (Note: this is the Installation Wizard's - version number, not of SALOME platform).

Geometry preferences

SALOME Installation Wizard + Help

Installing products with the Installation Wizard

GUI mode

Batch mode

Environment files

Notes on check products + version procedure

Pick up the environment

Modifying XML configuration + file

<config> section

<path> section

<product> section

<button> section

Implementing installation + scripts for the new products

Customizing Readme page + buttons

Installing SALOME

SALOME Installation Wizard + Help

Installing products with the Installation Wizard

GUI mode

Batch mode

Environment files

Notes on check products + version procedure

Notes on check products - version procedure

Pick up the environment

Modifying gcc, tcl, etc...) the installation file

<config> section

<path> section

<product> section

<product> + section

<button> + section

Implementing installation scripts for the new products

Customizing Readme page + buttons

OCC 3D Viewer

VTK 3D Viewer