ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-11 16:19:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from V6_main_20120808 08Aug12

Browse Source
This commit is contained in:
vsr 2012-08-09 07:58:02 +00:00
parent 417b9b0c4d
commit 73555c78eb
1958 changed files with 124178 additions and 109755 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
GEOM_version.h.in
View File

@ -1,24 +1,25 @@
// Copyright (C) 2007-2008 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, // Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
// //
// This library is free software; you can redistribute it and/or // This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public // modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either // License as published by the Free Software Foundation; either
// version 2.1 of the License. // version 2.1 of the License.
// //
// This library is distributed in the hope that it will be useful, // This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details. // Lesser General Public License for more details.
// //
// You should have received a copy of the GNU Lesser General Public // You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software // License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
// //
// File : GEOM_version.h // File : GEOM_version.h
// Author : Vadim SANDLER // Author : Vadim SANDLER
// Module : SALOME // Module : SALOME
@ -32,5 +33,6 @@
#define GEOM_VERSION_STR "@VERSION@" #define GEOM_VERSION_STR "@VERSION@"
#define GEOM_VERSION @XVERSION@ #define GEOM_VERSION @XVERSION@
#define GEOM_DEVELOPMENT @VERSION_DEV@
#endif // __GEOM_VERSION_H__ #endif // __GEOM_VERSION_H__

40
Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Date : 28/06/2001 # Date : 28/06/2001
@ -28,18 +26,18 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
if GEOM_ENABLE_GUI if GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${GUI_ROOT_DIR}/adm_local/unix/config_files \
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
else !GEOM_ENABLE_GUI else !GEOM_ENABLE_GUI
ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \ ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
endif endif
SUBDIRS = idl adm_local resources src doc bin SUBDIRS = idl adm_local resources src bin doc
DIST_SUBDIRS = idl adm_local resources src doc bin DIST_SUBDIRS = idl adm_local resources src bin doc
DISTCLEANFILES = a.out aclocal.m4 configure DISTCLEANFILES = a.out aclocal.m4 configure local-install.sh hack_libtool adm_local/unix/config_files/config.guess adm_local/unix/config_files/config.sub adm_local/unix/config_files/depcomp adm_local/unix/config_files/install-sh adm_local/unix/config_files/libtool.m4 adm_local/unix/config_files/ltmain.sh adm_local/unix/config_files/ltoptions.m4 adm_local/unix/config_files/ltsugar.m4 adm_local/unix/config_files/ltversion.m4 adm_local/unix/config_files/lt~obsolete.m4 adm_local/unix/config_files/missing adm_local/unix/config_files/py-compile
salomeinclude_DATA = GEOM_version.h salomeinclude_DATA = GEOM_version.h

32
adm_local/Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = unix SUBDIRS = unix cmake_files

62
adm_local/cmake_files/FindGEOM.cmake Normal file
View File

@ -0,0 +1,62 @@
# 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
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
SET(GEOM_CXXFLAGS -I${GEOM_ROOT_DIR}/include/salome)
FIND_LIBRARY(AdvancedGUI AdvancedGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BasicGUI BasicGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BlocksGUI BlocksGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BooleanGUI BooleanGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BREPExport BREPExport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BREPImport BREPImport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(BuildGUI BuildGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(DisplayGUI DisplayGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(DlgRef DlgRef ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(EntityGUI EntityGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GenerationGUI GenerationGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMAlgo GEOMAlgo ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMArchimede GEOMArchimede ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMBase GEOMBase ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMbasic GEOMbasic ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMClient GEOMClient ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMEngine GEOMEngine ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMFiltersSelection GEOMFiltersSelection ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMimpl GEOMimpl ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMObject GEOMObject ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMSketcher GEOMSketcher ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOM GEOM ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOM_SupervEngine GEOM_SupervEngine ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GEOMToolsGUI GEOMToolsGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(GroupGUI GroupGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(IGESExport IGESExport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(IGESImport IGESImport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(MeasureGUI MeasureGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(NMTDS NMTDS ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(NMTTools NMTTools ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(OCC2VTK OCC2VTK ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(OperationGUI OperationGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(PrimitiveGUI PrimitiveGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(RepairGUI RepairGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(SalomeIDLGEOM SalomeIDLGEOM ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(ShHealOper ShHealOper ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(STEPExport STEPExport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(STEPImport STEPImport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(STLExport STLExport ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(TransformationGUI TransformationGUI ${GEOM_ROOT_DIR}/lib/salome)
FIND_LIBRARY(VTKExport VTKExport ${GEOM_ROOT_DIR}/lib/salome)

26
adm_local/cmake_files/Makefile.am Normal file
View File

@ -0,0 +1,26 @@
# 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
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am
admlocal_cmakedir = $(admlocaldir)/cmake_files
dist_admlocal_cmake_DATA = \
FindGEOM.cmake

30
adm_local/unix/Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
SUBDIRS = config_files SUBDIRS = config_files

34
adm_local/unix/config_files/Makefile.am
View File

@ -1,25 +1,25 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
dist_admlocalm4_DATA = \ dist_admlocalm4_DATA = \
check_GEOM.m4 check_GEOM.m4 \
check_GUI.m4 \
check_OpenCV.m4

31
adm_local/unix/config_files/check_GEOM.m4
View File

@ -1,24 +1,25 @@
dnl Copyright (C) 2007-2008 CEA/DEN, EDF R&D, OPEN CASCADE dnl Copyright (C) 2007-2012 CEA/DEN, EDF R&D, OPEN CASCADE
dnl dnl
dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, dnl Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS dnl CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
dnl dnl
dnl This library is free software; you can redistribute it and/or 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 modify it under the terms of the GNU Lesser General Public
dnl License as published by the Free Software Foundation; either dnl License as published by the Free Software Foundation; either
dnl version 2.1 of the License. dnl version 2.1 of the License.
dnl dnl
dnl This library is distributed in the hope that it will be useful, 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 but WITHOUT ANY WARRANTY; without even the implied warranty of
dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
dnl Lesser General Public License for more details. dnl Lesser General Public License for more details.
dnl dnl
dnl You should have received a copy of the GNU Lesser General Public 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 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 Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
dnl 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 dnl
# Check availability of Geom binary distribution # Check availability of Geom binary distribution
# #
# Author : Nicolas REJNERI (OPEN CASCADE, 2003) # Author : Nicolas REJNERI (OPEN CASCADE, 2003)

103
adm_local/unix/config_files/check_GUI.m4 Executable file
View File

@ -0,0 +1,103 @@
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
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
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
# Check availability of Salome binary distribution
#
# Author : Marc Tajchman (CEA, 2002)
#------------------------------------------------------------
AC_DEFUN([CHECK_GUI_MODULE],[
AC_REQUIRE([AC_LINKER_OPTIONS])dnl
LightGUI_ok=no
FullGUI_ok=no
GUI_LDFLAGS=""
GUI_CXXFLAGS=""
SALOME_GUI_DIR=""
AC_ARG_WITH(gui,
[--with-gui=DIR root directory path of SALOME GUI installation],
[],
[with_gui=auto])
if test "${with_gui}" = "no"; then
SalomeGUI_need=no
else
# define SALOME_GUI_DIR
if test "${with_gui}" = "yes" -o "${with_gui}" = "auto"; then
SalomeGUI_need="$with_gui"
AC_MSG_RESULT(try \${GUI_ROOT_DIR}: ${GUI_ROOT_DIR})
if test "x${GUI_ROOT_DIR}" != "x" ; then
# GUI_ROOT_DIR environment variable defined
SALOME_GUI_DIR=${GUI_ROOT_DIR}
else
# search Salome binaries in PATH variable
AC_PATH_PROG(TEMP, SUITApp)
if test "x${TEMP}" != "x" ; then
AC_MSG_RESULT(SUITApp was found at : ${TEMP})
SALOME_BIN_DIR=`dirname ${TEMP}`
SALOME_GUI_DIR=`cd ${SALOME_BIN_DIR}/../..; pwd`
fi
fi
else
# GUI directory defined by user
SalomeGUI_need=yes
SALOME_GUI_DIR="$with_gui"
fi
# check GUI installation
AC_CHECKING(for light GUI)
if test -f ${SALOME_GUI_DIR}/bin/salome/SUITApp ; then
LightGUI_ok=yes
AC_MSG_RESULT(Using SALOME GUI distribution in ${SALOME_GUI_DIR})
GUI_ROOT_DIR=${SALOME_GUI_DIR}
GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome
AC_CHECKING(for full GUI)
if test -f ${SALOME_GUI_DIR}/bin/salome/SALOME_Session_Server ; then
FullGUI_ok=yes
fi
else
AC_MSG_WARN("Cannot find compiled SALOME GUI distribution")
fi
AC_MSG_RESULT(for light GUI: ${LightGUI_ok})
AC_MSG_RESULT(for full GUI: ${FullGUI_ok})
fi
AC_SUBST(GUI_LDFLAGS)
AC_SUBST(GUI_CXXFLAGS)
AC_SUBST(GUI_ROOT_DIR)
])dnl
AC_DEFUN([CHECK_SALOME_GUI],[
CHECK_GUI_MODULE()
SalomeGUI_ok=${LightGUI_ok}
])dnl
AC_DEFUN([CHECK_CORBA_IN_GUI],[
CHECK_GUI_MODULE()
CORBA_IN_GUI=${FullGUI_ok}
AC_SUBST(CORBA_IN_GUI)
])dnl

98
adm_local/unix/config_files/check_OpenCV.m4 Normal file
View File

@ -0,0 +1,98 @@
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
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
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
dnl File : check_OpenCV.m4
dnl Author : Renaud NEDELEC, Open CASCADE S.A.S (renaud.nedelec@opencascade.com)
dnl
AC_DEFUN([CHECK_OPENCV],[
AC_REQUIRE([AC_PROG_CXX])dnl
AC_REQUIRE([AC_PROG_CXXCPP])dnl
AC_CHECKING([for OPENCV product])
AC_LANG_SAVE
AC_LANG_C
OPENCV_INCLUDES=""
OPENCV_LIBS=""
AC_ARG_WITH([opencv],
[ --with-opencv=DIR root directory path of OPENCV installation])
opencv_ok=no
if test "$with_opencv" != "no" ; then
if test "$with_opencv" == "yes" || test "$with_opencv" == "auto"; then
OPENCV_HOME=""
else
OPENCV_HOME="$with_opencv"
fi
if test "$OPENCV_HOME" == "" ; then
if test "x$OPENCV_INSTALL_DIR" != "x" ; then
OPENCV_HOME=$OPENCV_INSTALL_DIR
fi
fi
if test "x$OPENCV_HOME" != "x"; then
LOCAL_INCLUDES="-I$OPENCV_HOME/include -I$OPENCV_HOME/include/opencv"
LOCAL_LIBS="-L$OPENCV_HOME/lib -lopencv_core -lopencv_imgproc -lopencv_highgui -lopencv_ml -lopencv_video -lopencv_features2d -lopencv_calib3d -lopencv_objdetect -lopencv_contrib -lopencv_legacy -lopencv_flann"
CPPFLAGS_old="$CPPFLAGS"
CXXFLAGS_old="$CXXFLAGS"
CPPFLAGS="$LOCAL_INCLUDES $CPPFLAGS"
CXXFLAGS="$LOCAL_INCLUDES $CXXFLAGS"
AC_MSG_CHECKING([for OPENCV library])
LDFLAGS_old="$LDFLAGS"
LDFLAGS="-L. $LOCAL_LIBS $LDFLAGS"
LDFLAGS="$LDFLAGS_old"
opencv_ok=yes
AC_MSG_RESULT([$opencv_ok])
CPPFLAGS="$CPPFLAGS_old"
CXXFLAGS="$CXXFLAGS_old"
fi
fi
if test "x$opencv_ok" == xno ; then
AC_MSG_RESULT([for OPENCV: no])
AC_MSG_WARN([OPENCV includes or libraries are not found or are not properly installed])
AC_MSG_WARN([Use --with-opencv option to define OPENCV installation.])
else
OPENCV_INCLUDES=$LOCAL_INCLUDES
OPENCV_LIBS=$LOCAL_LIBS
AC_MSG_RESULT([for OPENCV: yes])
fi
AM_CONDITIONAL(WITH_OPENCV, [test x"$opencv_ok" = xyes])
AC_SUBST(OPENCV_INCLUDES)
AC_SUBST(OPENCV_LIBS)
AC_LANG_RESTORE
])dnl

36
adm_local/unix/make_common_starter.am
View File

@ -1,24 +1,30 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# ============================================================
# The following is to avoid PACKAGE_... env variable
# redefinition compilation warnings
# ============================================================
# #
AM_CXXFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
AM_CPPFLAGS = @KERNEL_CXXFLAGS@ -include SALOMEconfig.h
# ============================================================ # ============================================================
# This file defines the common definitions used in several # This file defines the common definitions used in several
# Makefile. This file must be included, if needed, by the file # Makefile. This file must be included, if needed, by the file

35
bin/Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Guillaume Boulant (CSSI) # Author : Guillaume Boulant (CSSI)
# Module : GEOM # Module : GEOM
@ -28,5 +26,10 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
# non-distributed files # non-distributed files
nodist_salomescript_DATA = VERSION nodist_salomescript_DATA = VERSION
# python files
dist_salomescript_PYTHON = \
addvars2notebook_GEOM.py \
geom_setenv.py
# distributed files # distributed files
dist_salomescript_SCRIPTS = dist_salomescript_SCRIPTS =

4
bin/VERSION.in
View File

@ -1 +1,3 @@
THIS IS SALOME - GEOM VERSION: @VERSION@ [SALOME GEOM] : @VERSION@
[DEVELOPMENT] : @VERSION_DEV@
[DESCRIPTION] : SALOME Geometry module

68
bin/addvars2notebook_GEOM.py Normal file
View File

@ -0,0 +1,68 @@
# 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
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
def addvars2notebook(filename, vars_and_values):
stream = open(filename)
lines = stream.readlines()
stream.close()
newlines = []
for line in lines:
if line.find("= geompy.") >= 0:
name = line.split('=')[0]
name = name.strip()
vals = line
fields = vals.split("(")
if len(fields) == 2:
begin = fields[0] + "("
vals = fields[1]
fields = vals.split(")")
if len(fields) == 2:
vals = fields[0]
end = ")" + fields[1]
vals = vals.split(',')
newline = begin
newvals = []
for i in range(len(vals)):
valname = name + "_val_%s"%(i+1)
val = vals[i]
vvv = val.strip()
try:
iii = int(vvv)
vars_and_values.append([valname, val])
val = val.replace(vvv, valname.__repr__())
except ValueError:
try:
fff = float(vvv)
vars_and_values.append([valname, val])
val = val.replace(vvv, valname.__repr__())
except ValueError:
pass
pass
newvals.append(val)
pass
newline += ','.join(newvals)
newline += end
line = newline
pass
pass
pass
newlines.append(line)
pass
content = "".join(newlines)
return content

47
bin/geom_setenv.py Normal file
View File

@ -0,0 +1,47 @@
#! /usr/bin/env python
# -*- coding: iso-8859-1 -*-
# 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
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
import os
from salome_utils import getTmpDir, generateFileName, uniteFiles
from setenv import salome_subdir
# -----------------------------------------------------------------------------
def set_env( args ):
"""Add to the PATH-variables modules specific paths"""
tmp_dir = getTmpDir()
env_dir = generateFileName( tmp_dir, prefix="env", with_port=True )
res_dir = os.path.join( os.getenv( "GEOM_ROOT_DIR" ), "share", salome_subdir, "resources", "geom" )
csf_list = ["Plugin", "GEOMDS_Resources", "ShHealing"]
for csf_file in csf_list:
uniteFiles( os.path.join( res_dir, csf_file ), os.path.join( env_dir, csf_file ) )
pass
for csf_string in csf_list:
csf_var = "CSF_" + csf_string + "Defaults"
if not os.getenv( csf_var ):
os.environ[ csf_var ] = env_dir
pass
pass

30
build_cmake
View File

@ -1,26 +1,22 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
CURRENT_DIR=`pwd` CURRENT_DIR=`pwd`
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`

20
build_cmake.bat
View File

@ -1,2 +1,20 @@
@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
@REM License as published by the Free Software Foundation; either
@REM version 2.1 of the License.
@REM
@REM This library is distributed in the hope that it will be useful,
@REM but WITHOUT ANY WARRANTY; without even the implied warranty of
@REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
@REM Lesser General Public License for more details.
@REM
@REM You should have received a copy of the GNU Lesser General Public
@REM License along with this library; if not, write to the Free Software
@REM Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
@REM
@REM See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
@REM
%PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --geom %PYTHONBIN% %KERNEL_ROOT_DIR%\salome_adm\cmake_files\am2cmake.py --geom

97
build_configure
View File

@ -1,25 +1,26 @@
#!/bin/bash #!/bin/bash
# Copyright (C) 2007-2008 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, # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# Tool for updating list of .in file for the SALOME project # Tool for updating list of .in file for the SALOME project
# and regenerating configure script # and regenerating configure script
# Author : Marc Tajchman - CEA # Author : Marc Tajchman - CEA
@ -31,7 +32,6 @@
# #
ORIG_DIR=`pwd` ORIG_DIR=`pwd`
CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"`
GEOM_WITH_GUI="yes"
######################################################################## ########################################################################
# Test if the KERNEL_ROOT_DIR is set correctly # Test if the KERNEL_ROOT_DIR is set correctly
@ -47,62 +47,23 @@ fi
# exit # exit
#fi #fi
for option
do
case $option in
-with-gui | --with-gui)
GEOM_WITH_GUI="yes"
break;;
-without-gui | --without-gui | -with-gui=no | --with-gui=no)
GEOM_WITH_GUI="no"
break;;
esac
done
######################################################################## ########################################################################
# Test if the GUI_ROOT_DIR is set correctly
if test ${GEOM_WITH_GUI} = yes; then
if test ! -d "${GUI_ROOT_DIR}"; then
echo "failed : GUI_ROOT_DIR variable is not correct !"
exit
fi
fi
cd ${CONF_DIR} cd ${CONF_DIR}
ABS_CONF_DIR=`pwd` ABS_CONF_DIR=`pwd`
####################################################################### #######################################################################
# Update configure.ac script: to set NETGENPLUGIN_WITH_GUI variable
sed -e s/GEOM_WITH_GUI=[a-z]*/GEOM_WITH_GUI=${GEOM_WITH_GUI}/g configure.ac > configure.tmp
mv -f configure.tmp configure.ac
mkdir -p salome_adm/unix/config_files
#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files/* salome_adm/unix/config_files
#cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/pythonbe.py salome_adm/unix
cp -f ${KERNEL_ROOT_DIR}/salome_adm/unix/SALOMEconfig.h.in salome_adm/unix
#cp -f ${GUI_ROOT_DIR}/adm_local/unix/config_files/* salome_adm/unix/config_files
# remove KERNEL deprecated configure files
#for deprecated in ac_cc_warnings.m4 ac_cxx_partial_specialization.m4 \
# check_mico.m4 config.guess ltmain.sh ac_cxx_bool.m4 ltconfig ac_cxx_typename.m4 \
# check_pthreads.m4 config.sub libtool.m4 ac_cxx_mutable.m4 missing
# do
# rm -f salome_adm/unix/config_files/${deprecated}
# done
# ____________________________________________________________________ # ____________________________________________________________________
# aclocal creates the aclocal.m4 file from the standard macro and the # aclocal creates the aclocal.m4 file from the standard macro and the
# custom macro embedded in the directory salome_adm/unix/config_files # custom macro embedded in the directory adm_local/unix/config_files
# and KERNEL config_files directory. # and KERNEL salome_adm/unix/config_files directory.
# output: # output:
# aclocal.m4 # aclocal.m4
# autom4te.cache (directory) # autom4te.cache (directory)
echo "====================================================== aclocal" echo "======================================================= aclocal"
if test ${GEOM_WITH_GUI} = yes; then if test -d "${GUI_ROOT_DIR}"; then
aclocal -I adm_local/unix/config_files \ aclocal -I adm_local/unix/config_files \
-I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \ -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files \
-I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1 -I ${GUI_ROOT_DIR}/adm_local/unix/config_files || exit 1
@ -117,10 +78,10 @@ fi
# version. The files are created in the directory specified with the # version. The files are created in the directory specified with the
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac).
# output: # output:
# salome_adm/unix/config_files/config.guess # adm_local/unix/config_files/config.guess
# salome_adm/unix/config_files/config.sub # adm_local/unix/config_files/config.sub
# salome_adm/unix/config_files/ltmain.sh # adm_local/unix/config_files/ltmain.sh
#echo "====================================================== libtoolize" echo "==================================================== libtoolize"
libtoolize --force --copy --automake || exit 1 libtoolize --force --copy --automake || exit 1
@ -140,11 +101,11 @@ autoconf
# AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also # AC_CONFIG_AUX_DIR(<mydir>) tag (see configure.ac). This step also
# creates the Makefile.in files from the Makefile.am files. # creates the Makefile.in files from the Makefile.am files.
# output: # output:
# salome_adm/unix/config_files/compile # adm_local/unix/config_files/compile
# salome_adm/unix/config_files/depcomp # adm_local/unix/config_files/depcomp
# salome_adm/unix/config_files/install-sh # adm_local/unix/config_files/install-sh
# salome_adm/unix/config_files/missing # adm_local/unix/config_files/missing
# salome_adm/unix/config_files/py-compile # adm_local/unix/config_files/py-compile
# Makefile.in (from Makefile.am) # Makefile.in (from Makefile.am)
echo "====================================================== automake" echo "====================================================== automake"

40
clean_configure
View File

@ -1,35 +1,41 @@
#!/bin/sh #!/bin/sh
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
rm -rf autom4te.cache aclocal.m4 configure make_config rm -rf autom4te.cache aclocal.m4 configure make_config
find . -name "*~" -print -exec rm {} \; find . -name "*~" -print -exec rm {} \;
find . -name "*.pyc" -print -exec rm {} \; find . -name "*.pyc" -print -exec rm {} \;
#exit #exit
# ==================== ON SORT AVANT # ==================== ON SORT AVANT
here=`pwd`
libdir=adm_local/unix/config_files
cd $libdir
# Files created by libtoolize
rm -f config.* depcomp install-sh l*.m4 ltmain.sh missing py-compile
# Files created by automake
rm -rf install-sh missing depcomp py-compile
cd $here
find bin -name Makefile.in | xargs rm -f find bin -name Makefile.in | xargs rm -f
find doc -name Makefile.in | xargs rm -f find doc -name Makefile.in | xargs rm -f
find idl -name Makefile.in | xargs rm -f find idl -name Makefile.in | xargs rm -f
find resources -name Makefile.in | xargs rm -f find resources -name Makefile.in | xargs rm -f
find salome_adm -name Makefile.in | xargs rm -f find adm_local -name Makefile.in | xargs rm -f
find src -name Makefile.in | xargs rm -f find src -name Makefile.in | xargs rm -f
rm -f Makefile.in rm -f Makefile.in

353
configure.ac
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# Author : Marc Tajchman (CEA) # Author : Marc Tajchman (CEA)
# Date : 28/06/2001 # Date : 28/06/2001
# Modified by : Patrick GOLDBRONN (CEA) # Modified by : Patrick GOLDBRONN (CEA)
@ -26,15 +24,17 @@
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
# Created from configure.in.base # Created from configure.in.base
# #
AC_INIT([Salome2 Project GEOM module], [5.1.0], [webmaster.salome@opencascade.com], [SalomeGEOM]) AC_INIT([Salome2 Project GEOM module], [6.5.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
AC_CONFIG_AUX_DIR(salome_adm/unix/config_files) AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([tar-pax]) AM_INIT_AUTOMAKE([tar-pax -Wno-portability])
XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'` XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
AC_SUBST(XVERSION) AC_SUBST(XVERSION)
VERSION_DEV=1
AC_SUBST(VERSION_DEV)
# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.) # set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
MODULE_NAME=geom MODULE_NAME=geom
@ -82,6 +82,7 @@ echo
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_INSTALL AC_PROG_INSTALL
AC_LOCAL_INSTALL
dnl dnl
dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
@ -108,7 +109,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
dnl full-path to the binary instead. dnl full-path to the binary instead.
case "$INSTALL" in case "$INSTALL" in
*install-sh*) *install-sh*)
INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
;; ;;
esac esac
@ -147,7 +148,15 @@ dnl testing MPICH
dnl --------------------------------------------- dnl ---------------------------------------------
dnl dnl
CHECK_MPICH dnl CHECK_MPICH
echo
echo ---------------------------------------------
echo testing MPI
echo ---------------------------------------------
echo
CHECK_MPI
echo echo
echo --------------------------------------------- echo ---------------------------------------------
@ -232,11 +241,34 @@ CORBA=adm_local/unix/$corba
fi fi
GEOM_WITH_GUI=yes echo
echo ---------------------------------------------
echo Testing GUI
echo ---------------------------------------------
echo
AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${GEOM_WITH_GUI}" = "yes"]) CHECK_GUI_MODULE
if test "${GEOM_WITH_GUI}" = "yes"; then gui_ok=no
if test "${SalomeGUI_need}" != "no" -a "${FullGUI_ok}" = "yes" ; then
gui_ok=yes
fi
AM_CONDITIONAL(GEOM_ENABLE_GUI, [test "${gui_ok}" = "yes"])
if test "${SalomeGUI_need}" == "yes"; then
if test "${FullGUI_ok}" != "yes"; then
AC_MSG_WARN(For configure GEOM module necessary full GUI!)
fi
elif test "${SalomeGUI_need}" == "auto"; then
if test "${FullGUI_ok}" != "yes"; then
AC_MSG_WARN(Full GUI not found. Build will be done without GUI!)
fi
elif test "${SalomeGUI_need}" == "no"; then
echo Build without GUI option has been chosen
fi
if test "${gui_ok}" = "yes"; then
echo echo
echo --------------------------------------------- echo ---------------------------------------------
echo testing openGL echo testing openGL
@ -252,36 +284,16 @@ if test "${GEOM_WITH_GUI}" = "yes"; then
echo echo
CHECK_QT CHECK_QT
echo
echo ---------------------------------------------
echo testing VTK
echo ---------------------------------------------
echo
CHECK_VTK
echo
echo ---------------------------------------------
echo Testing GUI
echo ---------------------------------------------
echo
CHECK_SALOME_GUI
echo
echo ---------------------------------------------
echo Testing full GUI
echo ---------------------------------------------
echo
CHECK_CORBA_IN_GUI
if test "x${CORBA_IN_GUI}" != "xyes"; then
echo "failed : For configure GEOM module necessary full GUI !"
exit
fi
fi fi
echo
echo ---------------------------------------------
echo testing VTK
echo ---------------------------------------------
echo
CHECK_VTK
echo echo
echo --------------------------------------------- echo ---------------------------------------------
echo testing HDF5 echo testing HDF5
@ -314,6 +326,24 @@ echo
CHECK_HTML_GENERATORS CHECK_HTML_GENERATORS
echo
echo ---------------------------------------------
echo testing sphinx
echo ---------------------------------------------
echo
CHECK_SPHINX
echo
echo ---------------------------------------------
echo testing Opencv
echo ---------------------------------------------
echo
CHECK_OPENCV
if test "${opencv_ok}" = "yes"; then
AC_DEFINE_UNQUOTED(WITH_OPENCV,${WITH_OPENCV})
fi
echo echo
echo --------------------------------------------- echo ---------------------------------------------
echo Testing Kernel echo Testing Kernel
@ -328,23 +358,77 @@ echo Summary
echo --------------------------------------------- echo ---------------------------------------------
echo echo
echo Configure if test "${SalomeGUI_need}" == "no"; then
echo "* Configuration options (without GUI):"
if test "${GEOM_WITH_GUI}" = "yes"; then else
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok SalomeGUI_ok" echo "* Configuration options:"
fi
if test "${GEOM_WITH_GUI}" = "no"; then
variables="cc_ok lex_yacc_ok python_ok swig_ok threads_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok Kernel_ok"
fi fi
echo
for var in $variables obligatory_vars="cc_ok lex_yacc_ok python_ok swig_ok threads_ok vtk_ok hdf5_ok omniORB_ok boost_ok occ_ok doxygen_ok graphviz_ok sphinx_ok Kernel_ok"
optional_vars="opencv_ok"
gui_vars="OpenGL_ok qt_ok gui_ok"
###
# mandatory products
###
echo "--- Mandatory products:"
missing_obligatory=no
for var in $obligatory_vars
do do
printf " %10s : " `echo \$var | sed -e "s,_ok,,"` eval toto=\$$var
eval echo \$$var if test x$toto == "x"; then toto="no" ; fi
if test x$toto == "xno"; then missing_obligatory=yes ; fi
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$$var
#fi
done
if test x$missing_obligatory == "xyes"; then
AC_MSG_ERROR([one or more obligatory product is missing])
fi
###
# gui products
###
if test "${SalomeGUI_need}" == "yes"; then
# SALOME GUI is mandatory
if test "${gui_ok}" != "yes"; then
AC_MSG_ERROR([SALOME GUI is missing])
fi
fi
if test "${SalomeGUI_need}" != "no"; then
echo "--- GUI products (optional):"
for var in $gui_vars
do
eval toto=\$$var
if test x$toto == "x"; then toto="no"; fi
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$toto
done
fi
###
# optional products
###
echo "--- Other products (optional):"
for var in $optional_vars
do
eval toto=\$$var
if test x$toto != "x"; then
printf " %10s : " `echo \$var | sed -e "s,_ok,,"`
eval echo \$$var
fi
done done
echo echo
echo "Default ORB : $DEFAULT_ORB" echo "* Default ORB : $DEFAULT_ORB"
echo echo
dnl We don t need to say when we re entering directories if we re using dnl We don t need to say when we re entering directories if we re using
@ -365,69 +449,94 @@ echo
# chmod +x ./bin/*; \ # chmod +x ./bin/*; \
#]) #])
AC_HACK_LIBTOOL
AC_CONFIG_COMMANDS([hack_libtool],[
sed -i "s%^CC=\"\(.*\)\"%hack_libtool (){ \n\
$(pwd)/hack_libtool \1 \"\$[@]\" \n\
}\n\
CC=\"hack_libtool\"%g" libtool
sed -i "s%\(\s*\)for searchdir in \$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path; do%\1searchdirs=\"\$newlib_search_path \$lib_search_path \$sys_lib_search_path \$shlib_search_path\"\n\1for searchdir in \$searchdirs; do%g" libtool
sed -i "s%\(\s*\)searchdirs=\"\$newlib_search_path \$lib_search_path \(.*\)\"%\1searchdirs=\"\$newlib_search_path \$lib_search_path\"\n\1sss_beg=\"\"\n\1sss_end=\"\2\"%g" libtool
sed -i "s%\(\s*\)\(for searchdir in \$searchdirs; do\)%\1for sss in \$searchdirs; do\n\1 if ! test -d \$sss; then continue; fi\n\1 ssss=\$(cd \$sss; pwd)\n\1 if test \"\$ssss\" != \"\" \&\& test -d \$ssss; then\n\1 case \$ssss in\n\1 /usr/lib | /usr/lib64 ) ;;\n\1 * ) sss_beg=\"\$sss_beg \$ssss\" ;;\n\1 esac\n\1 fi\n\1done\n\1searchdirs=\"\$sss_beg \$sss_end\"\n\1\2%g" libtool
],[])
# This list is initiated using autoscan and must be updated manually # This list is initiated using autoscan and must be updated manually
# when adding a new file <filename>.in to manage. When you execute # when adding a new file <filename>.in to manage. When you execute
# autoscan, the Makefile list is generated in the output file configure.scan. # autoscan, the Makefile list is generated in the output file configure.scan.
# This could be helpfull to update de configuration. # This could be helpfull to update de configuration.
AC_OUTPUT([ \ AC_OUTPUT([ \
./salome_adm/unix/SALOMEconfig.h \ adm_local/Makefile \
./adm_local/Makefile \ adm_local/cmake_files/Makefile \
./adm_local/unix/Makefile \ adm_local/unix/Makefile \
./adm_local/unix/config_files/Makefile \ adm_local/unix/config_files/Makefile \
./bin/VERSION \ bin/VERSION \
./bin/Makefile \ bin/Makefile \
./GEOM_version.h \ GEOM_version.h \
./doc/Makefile \ doc/Makefile \
./doc/salome/Makefile \ doc/docutils/Makefile \
./doc/salome/gui/Makefile \ doc/docutils/conf.py \
./doc/salome/gui/GEOM/Makefile \ doc/salome/Makefile \
./doc/salome/gui/GEOM/doxyfile \ doc/salome/gui/Makefile \
./doc/salome/gui/GEOM/doxyfile_py \ doc/salome/gui/GEOM/Makefile \
./doc/salome/gui/GEOM/doxyfile_tui \ doc/salome/gui/GEOM/doxyfile \
./doc/salome/tui/Makefile \ doc/salome/gui/GEOM/doxyfile_py \
./doc/salome/tui/doxyfile \ doc/salome/gui/GEOM/doxyfile_tui \
./src/Makefile \ doc/salome/gui/GEOM/static/header.html \
./src/ARCHIMEDE/Makefile \ doc/salome/gui/GEOM/static/header_py.html \
./src/BREPExport/Makefile \ doc/salome/tui/Makefile \
./src/BREPImport/Makefile \ doc/salome/tui/doxyfile \
./src/BasicGUI/Makefile \ doc/salome/tui/static/header.html \
./src/BlocksGUI/Makefile \ src/Makefile \
./src/BooleanGUI/Makefile \ src/AdvancedGUI/Makefile \
./src/BuildGUI/Makefile \ src/ARCHIMEDE/Makefile \
./src/DisplayGUI/Makefile \ src/BREPExport/Makefile \
./src/DlgRef/Makefile \ src/BREPImport/Makefile \
./src/EntityGUI/Makefile \ src/BasicGUI/Makefile \
./src/GEOM/Makefile \ src/BlocksGUI/Makefile \
./src/GEOMAlgo/Makefile \ src/BooleanGUI/Makefile \
./src/GEOMBase/Makefile \ src/BuildGUI/Makefile \
./src/GEOMClient/Makefile \ src/DisplayGUI/Makefile \
./src/GEOMFiltersSelection/Makefile \ src/DlgRef/Makefile \
./src/GEOMGUI/Makefile \ src/EntityGUI/Makefile \
./src/GEOMImpl/Makefile \ src/GEOM/Makefile \
./src/GEOMToolsGUI/Makefile \ src/GEOMAlgo/Makefile \
./src/GEOM_I/Makefile \ src/GEOMBase/Makefile \
./src/GEOM_I_Superv/Makefile \ src/GEOMClient/Makefile \
./src/GEOM_SWIG/Makefile \ src/GEOMFiltersSelection/Makefile \
./src/GEOM_SWIG_WITHIHM/Makefile \ src/Material/Makefile \
./src/GenerationGUI/Makefile \ src/GEOMGUI/Makefile \
./src/GroupGUI/Makefile \ src/GEOMImpl/Makefile \
./src/IGESExport/Makefile \ src/GEOMToolsGUI/Makefile \
./src/IGESImport/Makefile \ src/GEOM_I/Makefile \
./src/MeasureGUI/Makefile \ src/GEOM_I_Superv/Makefile \
./src/NMTDS/Makefile \ src/GEOM_SWIG/Makefile \
./src/NMTTools/Makefile \ src/GEOM_SWIG_WITHIHM/Makefile \
./src/OBJECT/Makefile \ src/GEOM_PY/Makefile \
./src/OperationGUI/Makefile \ src/GEOM_PY/structelem/Makefile \
./src/PrimitiveGUI/Makefile \ src/GenerationGUI/Makefile \
./src/RepairGUI/Makefile \ src/GroupGUI/Makefile \
./src/SKETCHER/Makefile \ src/IGESExport/Makefile \
./src/STEPExport/Makefile \ src/IGESImport/Makefile \
./src/STEPImport/Makefile \ src/MeasureGUI/Makefile \
./src/STLExport/Makefile \ src/NMTDS/Makefile \
./src/ShHealOper/Makefile \ src/NMTTools/Makefile \
./src/TransformationGUI/Makefile \ src/OBJECT/Makefile \
./resources/Makefile \ src/OCC2VTK/Makefile \
./resources/GEOMCatalog.xml \ src/OperationGUI/Makefile \
./idl/Makefile \ src/PrimitiveGUI/Makefile \
src/RepairGUI/Makefile \
src/SKETCHER/Makefile \
src/STEPExport/Makefile \
src/STEPImport/Makefile \
src/STLExport/Makefile \
src/ShHealOper/Makefile \
src/ShapeRecognition/Makefile \
src/TransformationGUI/Makefile \
src/VTKExport/Makefile \
resources/Makefile \
resources/GEOMCatalog.xml \
resources/SalomeApp.xml \
resources/Plugin \
idl/Makefile \
Makefile \ Makefile \
]) ])

35
doc/Makefile.am
View File

@ -1,32 +1,29 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Date : 30/11/2001 # Date : 30/11/2001
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
# $Header$
# source path
# #
SUBDIRS = salome SUBDIRS = salome docutils
#SUBDIRS = salome
usr_docs: usr_docs:
(cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs) (cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)

97
doc/docutils/Makefile.am Normal file
View File

@ -0,0 +1,97 @@
# -*- coding: iso-8859-1 -*-
# 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
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
#
# This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details.
#
# You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am
pydocdir = $(docdir)/tui/GEOM/docutils
RSTFILES = \
index.rst \
overview.rst \
docapi.rst
EXTRA_DIST += images $(RSTFILES)
SPHINXOPTS =
SOURCEDIR = $(srcdir)
SPHINXBUILD = sphinx-build
PAPEROPT_a4 = -D latex_paper_size=a4
ALLSPHINXOPTS = -d doctrees $(PAPEROPT_a4) $(SPHINXOPTS) $(SOURCEDIR)
if GEOM_ENABLE_GUI
SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib/salome:$(GUI_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(GUI_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
else !GEOM_ENABLE_GUI
SPHINX_PYTHONPATH = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(prefix)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/bin/salome:$(KERNEL_ROOT_DIR)/lib/python$(PYTHON_VERSION)/site-packages/salome:$(KERNEL_ROOT_DIR)/lib64/python$(PYTHON_VERSION)/site-packages/salome:$(OMNIORB_ROOT)/lib/python$(PYTHON_VERSION)/site-packages:$(OMNIORB_ROOT)/lib64/python$(PYTHON_VERSION)/site-packages
endif
if GEOM_ENABLE_GUI
SPHINX_LD_LIBRARY_PATH = $(GUI_ROOT_DIR)/lib/salome:$(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
else !GEOM_ENABLE_GUI
SPHINX_LD_LIBRARY_PATH = $(KERNEL_ROOT_DIR)/lib/salome:$(OMNIORB_ROOT)/lib
endif
.PHONY: latex
if SPHINX_IS_OK
html/index.html:$(RSTFILES)
mkdir -p html doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b html $(ALLSPHINXOPTS) html
@echo
@echo "Build finished. The HTML pages are in html."
else
html/index.html:
@echo "Documentation for Python package not built. Sphinx was not present at configure time."
endif
latex:
mkdir -p latex doctrees
PYTHONPATH=$(SPHINX_PYTHONPATH):${PYTHONPATH} \
LD_LIBRARY_PATH=$(SPHINX_LD_LIBRARY_PATH):${LD_LIBRARY_PATH} \
$(SPHINXBUILD) -c $(top_builddir)/doc/docutils -W -b latex $(ALLSPHINXOPTS) latex
@echo
@echo "Build finished; the LaTeX files are in latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."
install-data-local: html/index.html
test -z $(pydocdir) || mkdir -p $(DESTDIR)$(pydocdir)
if test -d "html"; then b=; else b="$(srcdir)/"; fi; \
cp -rf $$b"html"/* $(pydocdir) ; \
if test -f $$b"latex"/geompy.pdf; then cp -f $$b"latex"/geompy.pdf $(pydocdir) ; fi;
uninstall-local:
-test -d $(pydocdir) && chmod -R +w $(pydocdir) && rm -rf $(pydocdir)/*
clean-local:
-rm -rf html latex doctrees
if test -d "html"; then rm -rf html ; fi
dist-hook:
-test -d html && cp -Rp html $(distdir)

200
doc/docutils/conf.py.in Normal file
View File

@ -0,0 +1,200 @@
# -*- coding: iso-8859-1 -*-
#
# yacs documentation build configuration file, created by
# sphinx-quickstart on Fri Aug 29 09:57:25 2008.
#
# This file is execfile()d with the current directory set to its containing dir.
#
# The contents of this file are pickled, so don't put values in the namespace
# that aren't pickleable (module imports are okay, they're removed automatically).
#
# All configuration values have a default; values that are commented out
# serve to show the default.
import sys, os
# If your extensions are in another directory, add it here. If the directory
# is relative to the documentation root, use os.path.abspath to make it
# absolute, like shown here.
#sys.path.append(os.path.abspath('.'))
# General configuration
# ---------------------
# Add any Sphinx extension module names here, as strings. They can be extensions
# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
extensions = ['sphinx.ext.autodoc']
# Uncomment the following line to build the links with Python documentation
# (you might need to set http_proxy environment variable for this to work)
#extensions += ['sphinx.ext.intersphinx']
# Intersphinx mapping to add links to modules and objects in the Python
# standard library documentation
intersphinx_mapping = {'http://docs.python.org': None}
# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
# The suffix of source filenames.
source_suffix = '.rst'
# The encoding of source files.
source_encoding = 'utf-8'
# The master toctree document.
master_doc = 'index'
# General information about the project.
project = 'GEOM python packages'
copyright = '2010 EDF R&D'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
# built documents.
#
# The short X.Y version.
version = '@VERSION@'
# The full version, including alpha/beta/rc tags.
release = '@VERSION@'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
language = 'en'
# There are two options for replacing |today|: either, you set today to some
# non-false value, then it is used:
#today = ''
# Else, today_fmt is used as the format for a strftime call.
#today_fmt = '%B %d, %Y'
# List of documents that shouldn't be included in the build.
#unused_docs = []
# List of directories, relative to source directory, that shouldn't be searched
# for source files.
exclude_trees = ['.build','ref','images','CVS','.svn']
# The reST default role (used for this markup: `text`) to use for all documents.
#default_role = None
# If true, '()' will be appended to :func: etc. cross-reference text.
#add_function_parentheses = True
# If true, the current module name will be prepended to all description
# unit titles (such as .. function::).
#add_module_names = True
# If true, sectionauthor and moduleauthor directives will be shown in the
# output. They are ignored by default.
#show_authors = False
# The name of the Pygments (syntax highlighting) style to use.
pygments_style = 'sphinx'
# Options for HTML output
# -----------------------
# The theme to use for HTML and HTML Help pages. Major themes that come with
# Sphinx are currently 'default' and 'sphinxdoc'.
html_theme = 'default'
#html_theme = 'nature'
#html_theme = 'agogo'
#html_theme = 'sphinxdoc'
#html_theme = 'omadoc'
# Add any paths that contain custom themes here, relative to this directory.
#html_theme_path = ['themes']
# The name for this set of Sphinx documents. If None, it defaults to
# "<project> v<release> documentation".
#html_title = None
# A shorter title for the navigation bar. Default is the same as html_title.
#html_short_title = None
# The name of an image file (relative to this directory) to place at the top
# of the sidebar.
#html_logo = None
# The name of an image file (within the static path) to use as favicon of the
# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32
# pixels large.
#html_favicon = None
# Add any paths that contain custom static files (such as style sheets) here,
# relative to this directory. They are copied after the builtin static files,
# so a file named "default.css" will overwrite the builtin "default.css".
#html_static_path = ['_static']
# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
# using the given strftime format.
#html_last_updated_fmt = '%b %d, %Y'
# If true, SmartyPants will be used to convert quotes and dashes to
# typographically correct entities.
#html_use_smartypants = True
# Custom sidebar templates, maps document names to template names.
#html_sidebars = {}
# Additional templates that should be rendered to pages, maps page names to
# template names.
#html_additional_pages = {}
# If false, no module index is generated.
html_use_modindex = False
# If false, no index is generated.
#html_use_index = True
# If true, the index is split into individual pages for each letter.
#html_split_index = False
# If true, the reST sources are included in the HTML build as _sources/<name>.
html_copy_source = True
# If true, an OpenSearch description file will be output, and all pages will
# contain a <link> tag referring to it. The value of this option must be the
# base URL from which the finished HTML is served.
#html_use_opensearch = ''
# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml").
#html_file_suffix = ''
# Output file base name for HTML help builder.
htmlhelp_basename = 'geompydoc'
# Options for LaTeX output
# ------------------------
# The paper size ('letter' or 'a4').
latex_paper_size = 'a4'
# The font size ('10pt', '11pt' or '12pt').
latex_font_size = '10pt'
# Grouping the document tree into LaTeX files. List of tuples
# (source start file, target name, title, author, document class [howto/manual]).
latex_documents = [
('index', 'geompy.tex', 'Documentation of the GEOM python packages', 'EDF R\&D', 'manual')
]
# The name of an image file (relative to this directory) to place at the top of
# the title page.
latex_logo = '@srcdir@/../salome/tui/images/head.png'
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
#latex_use_parts = True
# Additional stuff for the LaTeX preamble.
#latex_preamble = ''
# Documents to append as an appendix to all manuals.
#latex_appendices = []
# If false, no module index is generated.
latex_use_modindex = False

52
doc/docutils/docapi.rst Normal file
View File

@ -0,0 +1,52 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Documentation of the programming interface (API)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
This section describes the python packages and modules of the
``salome.geom`` python package. The main part is generated from the
code documentation included in source python files.
:mod:`salome.geom` -- Package containing the GEOM python utilities
==================================================================
:mod:`geomtools` -- Tools to access GEOM engine and objects
-----------------------------------------------------------
.. automodule:: salome.geom.geomtools
:members:
:mod:`sketcher` -- Wrapper to help the creation of simple sketches
------------------------------------------------------------------
.. automodule:: salome.geom.sketcher
:members:
.. autoclass:: Sketcher
:members:
:mod:`structelem` -- Structural elements package
------------------------------------------------
.. automodule:: salome.geom.structelem
.. autoclass:: StructuralElementManager
:members:
.. autoclass:: StructuralElement
:members:
:mod:`structelem.parts` -- Structural element parts
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. automodule:: salome.geom.structelem.parts
:members:
:undoc-members:
:show-inheritance:
:mod:`structelem.orientation` -- Structural element orientation
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
.. automodule:: salome.geom.structelem.orientation
:members:
:undoc-members:

BIN
doc/docutils/images/salome-geom-structuralelements.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 140 KiB

11
doc/docutils/index.rst Normal file
View File

@ -0,0 +1,11 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
Documentation of the GEOM python package
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
.. toctree::
:maxdepth: 3
overview.rst
docapi.rst

75
doc/docutils/overview.rst Normal file
View File

@ -0,0 +1,75 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
General presentation of the GEOM python package
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
The GEOM python package essentially contains:
* Utility functions to handle GEOM items in Salome study (see ``geomtools.py``).
- add a shape to a study, remove from the study
- display a shape in a viewer, erase the shape from the viewers
- completly delete a shape (undisplay, unpublish, and destroy the shape)
- helper functions to manage the selection in the object browser
* Wrapping functions to help the usage of GEOM tools:
- a sketcher module to create sketches from the python API (see
``sketcher.py``)
* The visualization of structural elements: a function to create
geometrical 3D representations of mechanical models called
"structural elements" (see package ``structelem``)
The functions are distributed in the python package
``salome.geom``. The specification of the programming interface of
this package is detailled in the part :doc:`Documentation of the
programming interface (API)</docapi>` of this documentation.
.. note::
The main package ``salome`` contains other sub-packages that are
distributed with the other SALOME modules. For example, the KERNEL
module provides the python package ``salome.kernel`` and SMESH the
package ``salome.smesh``.
Visualization of structural elements (package ``structelem``)
-------------------------------------------------------------
The usage of the visualization of structural elements can be
appreciated with this set of instructions:
.. code-block:: python
from salome.geom.structelem import TEST_StructuralElement
TEST_StructuralElement()
This creates the geometrical objects displayed in the study below:
.. image:: /images/salome-geom-structuralelements.png
:align: center
Manipulate GEOM object in the study (module ``geomtools``)
----------------------------------------------------------
The usage of the ``geomtools`` module can be appreciated with this set
of instructions:
.. code-block:: python
from salome.geom.geomtools import TEST_createAndDeleteShape
TEST_createAndDeleteShape()
This test executes the following procedure:
* Create, publish, and display a cylinder
* Create, publish, and display a sphere
* Create a box, publish it in a folder "boxset", and display it with a
"pink" color.
* Erase the sphere from the viewer (the sphere still exists in the study)
* Delete the cylinder (the cylinder is no longer displayed and does
not exist any more, neither in the study nor the GEOM componet.
At the end of the execution of this test, you should have in the
SALOME session:
* the box, in a dedicated folder of the study, and displayed in the
viewer
* the sphere, in the standard place of the study, and not displayed

30
doc/salome/Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# -* Makefile *- # -* Makefile *-
# Author : Patrick GOLDBRONN (CEA) # Author : Patrick GOLDBRONN (CEA)
# Date : 30/11/2001 # Date : 30/11/2001

66
doc/salome/gui/GEOM/Makefile.am
View File

@ -1,24 +1,22 @@
# Copyright (C) 2007-2008 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, # This library is free software; you can redistribute it and/or
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either
# version 2.1 of the License.
# #
# This library is free software; you can redistribute it and/or # This library is distributed in the hope that it will be useful,
# modify it under the terms of the GNU Lesser General Public # but WITHOUT ANY WARRANTY; without even the implied warranty of
# License as published by the Free Software Foundation; either # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# version 2.1 of the License. # Lesser General Public License for more details.
# #
# This library is distributed in the hope that it will be useful, # You should have received a copy of the GNU Lesser General Public
# but WITHOUT ANY WARRANTY; without even the implied warranty of # License along with this library; if not, write to the Free Software
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
# File : Makefile.in # File : Makefile.in
# Author : Vasily Rusyaev (Open Cascade NN) # Author : Vasily Rusyaev (Open Cascade NN)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
@ -26,15 +24,16 @@
# #
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
EXTRA_DIST += images input static EXTRA_DIST += images input static/footer.html static/doxygen.css static/SALOME_BOA_PA.pdf
usr_docs: doxyfile_tui doxyfile_py doxyfile guidocdir = $(docdir)/gui/GEOM
guidoc_DATA = images/head.png static/SALOME_BOA_PA.pdf
usr_docs: doxyfile_tui doxyfile_py doxyfile
echo "===========================================" ; \ echo "===========================================" ; \
echo "Replacing geompyDC by geompy" ; \ echo "Replacing geompyDC by geompy" ; \
echo "===========================================" ; \ echo "===========================================" ; \
sed -e "/class geompyDC/d" -e "s/^ *#/#/g" -e "s/^ *def /def /g" \ $(KERNEL_ROOT_DIR)/bin/salome/prepare_generating_doc.py geompy.py $(top_srcdir)/src/GEOM_SWIG/geompyDC.py geompy ; \
-e "s/geompyDC/geompy/g" $(top_srcdir)/src/GEOM_SWIG/geompyDC.py > \
$(top_builddir)/src/GEOM_SWIG/geompy.py ; \
echo "===========================================" ; \ echo "===========================================" ; \
echo "Generating examples documentation" ; \ echo "Generating examples documentation" ; \
echo "===========================================" ; \ echo "===========================================" ; \
@ -46,30 +45,33 @@ usr_docs: doxyfile_tui doxyfile_py doxyfile
echo "===========================================" ; \ echo "===========================================" ; \
echo "Generating GUI documentation" ; \ echo "Generating GUI documentation" ; \
echo "===========================================" ; \ echo "===========================================" ; \
$(DOXYGEN) doxyfile ; \ $(DOXYGEN) doxyfile ; \
rm -f $(top_builddir)/src/GEOM_SWIG/geompy.py rm -f ./geompy.py
docs: usr_docs docs: usr_docs
clean-local: clean-local:
@for filen in `find . -maxdepth 1` ; do \ @for filen in `find . -maxdepth 1` ; do \
case $${filen} in \ case $${filen} in \
./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;; \ ./Makefile* | ./doxyfile* | ./images | ./input | ./static ) ;; \
. | .. ) ;; \ . | .. | ./CVS ) ;; \
*) echo "Removing $${filen}" ; rm -rf $${filen} ;; \ *) echo "Removing $${filen}" ; rm -rf $${filen} ;; \
esac ; \ esac ; \
done ; done ;
install-data-local: usr_docs install-data-local: usr_docs
$(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM @if [ -e index.html ]; then \
@for filen in `find . -maxdepth 1` ; do \ $(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM ; \
for filen in `find . -maxdepth 1` ; do \
case $${filen} in \ case $${filen} in \
./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;; \ ./Makefile* | ./doxyfile* ) ;; \
./doxyfile.bak | ./doxyfile_py.bak | ./doxyfile_tui.bak ) ;; \ . | .. | ./static ) ;; \
. | .. ) ;; \
*) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;; \ *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;; \
esac ; \ esac ; \
done ; done ; \
cp -rp $(srcdir)/images/head.png $(DESTDIR)$(docdir)/gui/GEOM/geompy_doc ; \
fi
uninstall-local: uninstall-local:
rm -rf $(DESTDIR)$(docdir)/gui/GEOM rm -rf $(DESTDIR)$(docdir)/gui/GEOM

49
doc/salome/gui/GEOM/doxyfile.in
View File

@ -1,29 +1,29 @@
# Copyright (C) 2007-2008 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, # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = "Geometry Module Reference Manual v.@VERSION@" PROJECT_NAME = "SALOME Geometry User's Guide"
OUTPUT_DIRECTORY = . OUTPUT_DIRECTORY = .
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
@ -40,6 +40,7 @@ WARNINGS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = @srcdir@/input INPUT = @srcdir@/input
FILE_PATTERNS = *.doc FILE_PATTERNS = *.doc
EXCLUDE_PATTERNS = creating_adv_obj.doc
EXCLUDE = EXCLUDE =
IMAGE_PATH = @srcdir@/images IMAGE_PATH = @srcdir@/images
EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG
@ -49,14 +50,20 @@ EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_HTML = YES GENERATE_HTML = YES
HTML_OUTPUT = . HTML_OUTPUT = .
HTML_HEADER = @srcdir@/static/header.html HTML_HEADER = @builddir@/static/header.html
HTML_FOOTER = @srcdir@/static/footer.html HTML_FOOTER = @srcdir@/static/footer.html
#HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_STYLESHEET = @srcdir@/static/doxygen.css
TOC_EXPAND = YES TOC_EXPAND = YES
DISABLE_INDEX = NO DISABLE_INDEX = NO
GENERATE_TREEVIEW = YES GENERATE_TREEVIEW = YES
SEARCHENGINE = YES
TREEVIEW_WIDTH = 300 TREEVIEW_WIDTH = 300
#---------------------------------------------------------------------------
#SORT related options
#---------------------------------------------------------------------------
SORT_GROUP_NAMES = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#LaTeX related option #LaTeX related option
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -69,6 +76,8 @@ GENERATE_RTF = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#External reference options #External reference options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
TAGFILES = geompy_doc.tag=geompy_doc TAGFILES = geompy_doc.tag=../GEOM/geompy_doc #rnv: 07.04.2011 Workaround for the doxygen 1.7.3:
#because it wrongly defines location of the html files for search.
ALLEXTERNALS = NO ALLEXTERNALS = NO
SEARCHENGINE = YES

45
doc/salome/gui/GEOM/doxyfile_py.in
View File

@ -1,35 +1,35 @@
# Copyright (C) 2007-2008 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, # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = "Geometry Module Reference Manual v.@VERSION@" PROJECT_NAME = "SALOME Geometry User's Guide"
OUTPUT_DIRECTORY = . OUTPUT_DIRECTORY = .
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
USE_WINDOWS_ENCODING = NO USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = NO REPEAT_BRIEF = YES
ALWAYS_DETAILED_SEC = YES ALWAYS_DETAILED_SEC = YES
INLINE_INHERITED_MEMB = YES INLINE_INHERITED_MEMB = YES
FULL_PATH_NAMES = NO FULL_PATH_NAMES = NO
@ -99,8 +99,8 @@ EXAMPLE_RECURSIVE = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
#Input related options #Input related options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
INPUT = @top_builddir@/src/GEOM_SWIG INPUT = . @top_srcdir@/idl
FILE_PATTERNS = geompy.py FILE_PATTERNS = geompy.py GEOM_Gen.idl
IMAGE_PATH = @srcdir@/images IMAGE_PATH = @srcdir@/images
EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG
RECURSIVE = NO RECURSIVE = NO
@ -110,11 +110,11 @@ RECURSIVE = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_HTML = YES GENERATE_HTML = YES
HTML_OUTPUT = geompy_doc HTML_OUTPUT = geompy_doc
HTML_HEADER = @srcdir@/static/header.html HTML_HEADER = @builddir@/static/header_py.html
HTML_FOOTER = @srcdir@/static/footer.html HTML_FOOTER = @srcdir@/static/footer.html
#HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_STYLESHEET = @srcdir@/static/doxygen.css
TOC_EXPAND = YES TOC_EXPAND = YES
DISABLE_INDEX = YES DISABLE_INDEX = NO
GENERATE_TREEVIEW = NO GENERATE_TREEVIEW = NO
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -159,3 +159,4 @@ DOT_CLEANUP = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_TAGFILE = geompy_doc.tag GENERATE_TAGFILE = geompy_doc.tag
TAGFILES = tui_examples.tag=.. TAGFILES = tui_examples.tag=..
SEARCHENGINE = YES

39
doc/salome/gui/GEOM/doxyfile_tui.in
View File

@ -1,29 +1,29 @@
# Copyright (C) 2007-2008 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, # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
# #
# This library is free software; you can redistribute it and/or # This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public # modify it under the terms of the GNU Lesser General Public
# License as published by the Free Software Foundation; either # License as published by the Free Software Foundation; either
# version 2.1 of the License. # version 2.1 of the License.
# #
# This library is distributed in the hope that it will be useful, # This library is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
# Lesser General Public License for more details. # Lesser General Public License for more details.
# #
# You should have received a copy of the GNU Lesser General Public # You should have received a copy of the GNU Lesser General Public
# License along with this library; if not, write to the Free Software # License along with this library; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
# #
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
# #
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# Project related configuration options # Project related configuration options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
PROJECT_NAME = "Geometry Module Reference Manual v.@VERSION@" PROJECT_NAME = "SALOME Geometry User's Guide"
OUTPUT_DIRECTORY = . OUTPUT_DIRECTORY = .
CREATE_SUBDIRS = NO CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English OUTPUT_LANGUAGE = English
@ -48,12 +48,12 @@ EXAMPLE_PATH = @top_srcdir@/src/GEOM_SWIG
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_HTML = YES GENERATE_HTML = YES
HTML_OUTPUT = . HTML_OUTPUT = .
HTML_HEADER = @srcdir@/static/header.html HTML_HEADER = @builddir@/static/header.html
HTML_FOOTER = @srcdir@/static/footer.html HTML_FOOTER = @srcdir@/static/footer.html
#HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_STYLESHEET = @srcdir@/static/doxygen.css
TOC_EXPAND = YES TOC_EXPAND = YES
DISABLE_INDEX = NO DISABLE_INDEX = NO
GENERATE_TREEVIEW = YES GENERATE_TREEVIEW = NO
TREEVIEW_WIDTH = 300 TREEVIEW_WIDTH = 300
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
@ -70,3 +70,4 @@ GENERATE_RTF = NO
#External reference options #External reference options
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
GENERATE_TAGFILE = tui_examples.tag GENERATE_TAGFILE = tui_examples.tag
SEARCHENGINE = YES

BIN
doc/salome/gui/GEOM/images/arc_icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 527 B

BIN
doc/salome/gui/GEOM/images/archimede.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/salome/gui/GEOM/images/bool1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/salome/gui/GEOM/images/bool2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/salome/gui/GEOM/images/bool3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 12 KiB

BIN
doc/salome/gui/GEOM/images/box3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/salome/gui/GEOM/images/chamfer1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/GEOM/images/chamfer2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 31 KiB

BIN
doc/salome/gui/GEOM/images/chamfer3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
doc/salome/gui/GEOM/images/chamfer4.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 30 KiB

BIN
doc/salome/gui/GEOM/images/change_direction.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 544 B

BIN
doc/salome/gui/GEOM/images/compound2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
doc/salome/gui/GEOM/images/contour_detect_snapshot.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.9 KiB

BIN
doc/salome/gui/GEOM/images/contour_detection_example2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 537 KiB

BIN
doc/salome/gui/GEOM/images/curve.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
doc/salome/gui/GEOM/images/curve1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
doc/salome/gui/GEOM/images/curve2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/GEOM/images/curve3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/GEOM/images/curve4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
doc/salome/gui/GEOM/images/custom_point_marker.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
doc/salome/gui/GEOM/images/deflection_0001.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

BIN
doc/salome/gui/GEOM/images/deflection_001.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
doc/salome/gui/GEOM/images/dialog.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 9.6 KiB

BIN
doc/salome/gui/GEOM/images/divided_disk.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

BIN
doc/salome/gui/GEOM/images/divided_disk_PntVecR_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
doc/salome/gui/GEOM/images/divided_disk_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
doc/salome/gui/GEOM/images/dividedcylinder.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
doc/salome/gui/GEOM/images/dividedcylinder_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
doc/salome/gui/GEOM/images/draft.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 669 B

BIN
doc/salome/gui/GEOM/images/edge1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
doc/salome/gui/GEOM/images/edge2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
doc/salome/gui/GEOM/images/edge3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
doc/salome/gui/GEOM/images/editgroup.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
doc/salome/gui/GEOM/images/ellipse.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/salome/gui/GEOM/images/extruded_boss.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 839 B

BIN
doc/salome/gui/GEOM/images/extruded_boss_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/salome/gui/GEOM/images/extruded_boss_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.1 KiB

BIN
doc/salome/gui/GEOM/images/extruded_cut.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 778 B

BIN
doc/salome/gui/GEOM/images/extruded_cut_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 28 KiB

BIN
doc/salome/gui/GEOM/images/extruded_cut_example.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.2 KiB

BIN
doc/salome/gui/GEOM/images/extrusion1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
doc/salome/gui/GEOM/images/extrusion2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
doc/salome/gui/GEOM/images/extrusion3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
doc/salome/gui/GEOM/images/face1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 20 KiB

BIN
doc/salome/gui/GEOM/images/face2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 21 KiB

BIN
doc/salome/gui/GEOM/images/feature_detect.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

BIN
doc/salome/gui/GEOM/images/feature_detection_dlg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
doc/salome/gui/GEOM/images/feature_detection_dlg2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 18 KiB

BIN
doc/salome/gui/GEOM/images/feature_detection_dlg3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/salome/gui/GEOM/images/fillet1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
doc/salome/gui/GEOM/images/fillet1d_1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.5 KiB

BIN
doc/salome/gui/GEOM/images/fillet1d_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
doc/salome/gui/GEOM/images/fillet2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/salome/gui/GEOM/images/fillet2d_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 11 KiB

BIN
doc/salome/gui/GEOM/images/fillet3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 27 KiB

BIN
doc/salome/gui/GEOM/images/filling.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 14 KiB

BIN
doc/salome/gui/GEOM/images/front1.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
doc/salome/gui/GEOM/images/front2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

BIN
doc/salome/gui/GEOM/images/fuse.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
doc/salome/gui/GEOM/images/fuse_collinear_edges.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 19 KiB

BIN
doc/salome/gui/GEOM/images/geomcreategroup.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 33 KiB

BIN
doc/salome/gui/GEOM/images/geomscreen.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 86 KiB

BIN
doc/salome/gui/GEOM/images/get_in_place_lost_part.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
doc/salome/gui/GEOM/images/glue2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
doc/salome/gui/GEOM/images/glue4.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 22 KiB

BIN
doc/salome/gui/GEOM/images/glue5.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

BIN
doc/salome/gui/GEOM/images/glue7.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

BIN
doc/salome/gui/GEOM/images/glue8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

Some files were not shown because too many files have changed in this diff Show More