diff --git a/GEOM_version.h.in b/GEOM_version.h.in
new file mode 100644
index 000000000..4be8dc3e8
--- /dev/null
+++ b/GEOM_version.h.in
@@ -0,0 +1,34 @@
+// Copyright (C) 2005 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/
+//
+// File : GEOM_version.h
+// Author : Vadim SANDLER
+// Module : SALOME
+
+#if !defined(__GEOM_VERSION_H__)
+#define __GEOM_VERSION_H__
+
+/*
+ GEOM_VERSION is (major << 16) + (minor << 8) + patch.
+*/
+
+#define GEOM_VERSION_STR "@VERSION@"
+#define GEOM_VERSION @XVERSION@
+
+#endif // __GEOM_VERSION_H__
diff --git a/INSTALL b/INSTALL
index 7ea5b07c3..71869d64e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1 @@
-This is the version 3.2.0b1 of GEOM
-Compatible with :
- - KERNEL 3.2.0b1
- - GUI 3.2.0b1
+SALOME2 : GEOM module
diff --git a/Makefile.in b/Makefile.in
index 59fff7112..8c29352c3 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
# 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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# -* Makefile *-
#
@@ -28,7 +28,7 @@
top_srcdir=@top_srcdir@
top_builddir=.
srcdir=@srcdir@
-VPATH=.:@srcdir@:@top_srcdir@/bin:@top_srcdir@/resources:./bin:@top_srcdir@/idl
+VPATH=.:@srcdir@:@top_srcdir@/bin:./bin/salome:./resources:@top_srcdir@/resources:./bin:@top_srcdir@/idl
@COMMENCE@
@@ -201,14 +201,22 @@ BIN_SCRIPT= \
VERSION
# copy header files in common directory
-ifeq ($(HAVE_SSTREAM),yes)
- include_list=include/salome/SALOMEconfig.h
-else
- include_list=include/salome/SALOMEconfig.h include/salome/sstream
+
+include_list = include/salome/SALOMEconfig.h \
+ include/salome/GEOM_version.h
+
+ifneq ($(HAVE_SSTREAM),yes)
+ include_list += include/salome/sstream
endif
inc: idl $(include_list)
+bin: bin/salome/VERSION
+
+bin/salome/VERSION : bin/VERSION
+ -$(RM) $@
+ $(LN_S) ../../$< $@
+
include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.ref
-$(RM) $@
$(LN_S) ../../$< $@
@@ -226,6 +234,10 @@ include/salome/sstream: salome_adm/unix/sstream
-$(RM) $@
$(LN_S) ../../$< $@
+include/salome/GEOM_version.h: GEOM_version.h
+ -$(RM) $@
+ $(LN_S) ../../$< $@
+
depend: depend_idl
depend_idl:
diff --git a/adm_local/Makefile.in b/adm_local/Makefile.in
index 734bc820a..e2133b49b 100644
--- a/adm_local/Makefile.in
+++ b/adm_local/Makefile.in
@@ -15,7 +15,7 @@
# 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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# source path
top_srcdir=@top_srcdir@
diff --git a/adm_local/unix/config_files/check_GEOM.m4 b/adm_local/unix/config_files/check_GEOM.m4
index 803ca754b..c4ce644f7 100644
--- a/adm_local/unix/config_files/check_GEOM.m4
+++ b/adm_local/unix/config_files/check_GEOM.m4
@@ -9,6 +9,9 @@ AC_CHECKING(for Geom)
Geom_ok=no
+GEOM_LDFLAGS=""
+GEOM_CXXFLAGS=""
+
AC_ARG_WITH(geom,
[ --with-geom=DIR root directory path of GEOM installation ],
GEOM_DIR="$withval",GEOM_DIR="")
@@ -44,6 +47,12 @@ if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then
fi
AC_SUBST(GEOM_ROOT_DIR)
+ GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome
+ GEOM_CXXFLAGS=-I${GEOM_DIR}/include/salome
+
+ AC_SUBST(GEOM_LDFLAGS)
+ AC_SUBST(GEOM_CXXFLAGS)
+
else
AC_MSG_WARN("Cannot find compiled Geom module distribution")
fi
diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 3fca6a6d8..8805b6d6d 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -10,7 +10,7 @@ HAVE_SSTREAM=@HAVE_SSTREAM@
LIBS=@LIBS@
-LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome -Xlinker -rpath-link -Xlinker -L$(top_builddir)/lib/salome
+LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -Xlinker -rpath-link -Xlinker
# add libstdc++ to link c++ library with libtool !
LDFLAGS+= -lstdc++
@@ -51,8 +51,8 @@ PYTHONHOME = @PYTHONHOME@
PYTHON_INCLUDES = @PYTHON_INCLUDES@
PYTHON_LIBS = @PYTHON_LIBS@
PYTHON_VERSION = @PYTHON_VERSION@
-PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages
-PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome
+PYTHON_SITE = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages
+PYTHON_SITE_INSTALL = $(prefix)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome
# QT
QT_ROOT = @QT_ROOT@
@@ -99,12 +99,6 @@ HDF5_MT_LIBS=@HDF5_MT_LIBS@
OCC_INCLUDES=@CAS_CPPFLAGS@
OCC_CXXFLAGS=@CAS_CXXFLAGS@
-#OCC_KERNEL_LIBS=@CAS_KERNEL@
-#OCC_OCAF_LIBS=@CAS_OCAF@
-#OCC_VIEWER_LIBS=@CAS_VIEWER@
-#OCC_MODELER_LIBS=@CAS_MODELER@
-#OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@
-#OCC_LIBS=@CAS_LDFLAGS@
CAS_KERNEL=@CAS_KERNEL@
CAS_MATH=@CAS_MATH@
CAS_OCAF=@CAS_OCAF@
@@ -194,16 +188,25 @@ INSTALL_DATA=@INSTALL_DATA@
# create a symbolic link (or a copie ?)
LN_S=@LN_S@
+KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@
+KERNEL_SITE_DIR=@KERNEL_SITE_DIR@
+KERNEL_LDFLAGS=@KERNEL_LDFLAGS@
+KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@
+
+GUI_ROOT_DIR=@GUI_ROOT_DIR@
+GUI_LDFLAGS=@GUI_LDFLAGS@
+GUI_CXXFLAGS=@GUI_CXXFLAGS@
+
## Installation points
prefix=@prefix@
exec_prefix=@exec_prefix@
-bindir=@bindir@/salome
-libdir=@libdir@/salome
+bindir=@exec_prefix@/bin/salome
+libdir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/salome
# warning : if user give this path in configure we could have salome/salome :-(
includedir=@includedir@/salome
datadir=@datadir@/salome
idldir=${prefix}/idl/salome
-sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
+sharedpydir=@exec_prefix@/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules
incmakedir=${prefix}/salome_adm/unix
docdir=${prefix}/doc/salome
diff --git a/bin/VERSION b/bin/VERSION
deleted file mode 100755
index 8f29be47a..000000000
--- a/bin/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-THIS IS SALOME - GEOM VERSION: 3.2.0b1
diff --git a/bin/VERSION.in b/bin/VERSION.in
new file mode 100755
index 000000000..108ad2265
--- /dev/null
+++ b/bin/VERSION.in
@@ -0,0 +1 @@
+THIS IS SALOME - GEOM VERSION: @VERSION@
diff --git a/configure.in.base b/configure.in.base
index 33bb2f013..1a444a104 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -23,8 +23,10 @@ AC_CANONICAL_HOST
PACKAGE=salome
AC_SUBST(PACKAGE)
-VERSION=0.0.1
+VERSION=3.2.0
+XVERSION=0x030200
AC_SUBST(VERSION)
+AC_SUBST(XVERSION)
dnl
dnl Initialize source and build root directories
@@ -323,7 +325,7 @@ else
fi
# make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
do
# if test ! -d $rep ; then
# eval mkdir $rep
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 59e6c5962..af9e2aae5 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -15,7 +15,7 @@
# 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/
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# -* Makefile *-
@@ -38,6 +38,17 @@ docs:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done
+
+usr_docs:
+ @@SETX@; for d in $(SUBDIRS); do \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ done
+
+dev_docs:
+ @@SETX@; for d in $(SUBDIRS); do \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ done
+
clean:
@@SETX@; for d in $(SUBDIRS); do \
(cd $$d && $(MAKE) $@) || exit 1; \
diff --git a/doc/salome/GEOM_index_v3.1.0.html b/doc/salome/GEOM_index_v3.1.0.html
deleted file mode 100644
index e4488ebbc..000000000
--- a/doc/salome/GEOM_index_v3.1.0.html
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
-
-
-
-
- Geometry Module Documentation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Geometry MODULE Documentation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
GUI Documentation
-
-
-
-
-
-
-
-
-
-
-
TUI Documentation
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in
index 2af65570b..d65e5cd8f 100644
--- a/doc/salome/Makefile.in
+++ b/doc/salome/Makefile.in
@@ -1,11 +1,25 @@
-# Copyright (C) 2003 CEA/DEN, EDF R&D
+# Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# File : Makefile.in
# Author : Vasily Rusyaev (Open Cascade NN)
# Module : doc
-# $Header:
top_srcdir=@top_srcdir@
top_builddir=../..
@@ -13,33 +27,48 @@ srcdir=@srcdir@
VPATH=.:@srcdir@
SUBDIRS= tui gui
+SUBDIRSGUI= gui
+SUBDIRSTUI= tui
@COMMENCE@
-docs:
- @@SETX@; for d in $(SUBDIRS); do \
+usr_docs:
+ @@SETX@; for d in $(SUBDIRSGUI); do \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ done; \
+
+docs: usr_docs
+
+dev_docs:
+ @@SETX@; for d in $(SUBDIRSTUI); do \
(cd $$d && $(MAKE) $@) || exit 1; \
done; \
- cp -f $(srcdir)/GEOM_index_v3.1.0.html GEOM_index_v3.1.0.html
clean:
@@SETX@; for d in $(SUBDIRS); do \
- (cd $$d && $(MAKE) $@) || exit 1; \
+ if test -d $$d/GEOM; then \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ fi; \
done
distclean: clean
@@SETX@; for d in $(SUBDIRS); do \
- (cd $$d && $(MAKE) $@) || exit 1; \
+ if test -d $$d/GEOM; then \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ fi; \
done
install:
$(MAKE) docs
- (cd tui && $(MAKE) install);
- (cd gui && $(MAKE) install);
- cp -f GEOM_index_v3.1.0.html $(docdir)
+ @@SETX@; for d in $(SUBDIRS); do \
+ if test -d $$d/GEOM; then \
+ (cd $$d && $(MAKE) $@); \
+ fi; \
+ done
uninstall:
@@SETX@; for d in $(SUBDIRS); do \
- (cd $$d && $(MAKE) $@) || exit 1; \
+ if test -d $$d/GEOM; then \
+ (cd $$d && $(MAKE) $@) || exit 1; \
+ fi; \
done; \
- rm -fr $(docdir)/GEOM_index_v3.1.0.html
diff --git a/doc/salome/gui/GEOM/add_point_on_edge.htm b/doc/salome/gui/GEOM/add_point_on_edge.htm
index 4e8e4cd24..454e1b3d1 100755
--- a/doc/salome/gui/GEOM/add_point_on_edge.htm
+++ b/doc/salome/gui/GEOM/add_point_on_edge.htm
@@ -57,43 +57,48 @@ onerror = null;
-
-
+
+
Add Point on Edge
T o
-
-
+
+
Arc
T o
create an
-
-
+
+
Archimede
T o produce
diff --git a/doc/salome/gui/GEOM/basic_geometrical_objects.htm b/doc/salome/gui/GEOM/basic_geometrical_objects.htm
index 0cbed2126..b25b5cb41 100755
--- a/doc/salome/gui/GEOM/basic_geometrical_objects.htm
+++ b/doc/salome/gui/GEOM/basic_geometrical_objects.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Basic Geometrical Objects
diff --git a/doc/salome/gui/GEOM/basic_operations.htm b/doc/salome/gui/GEOM/basic_operations.htm
index 129732658..ba7a0c611 100755
--- a/doc/salome/gui/GEOM/basic_operations.htm
+++ b/doc/salome/gui/GEOM/basic_operations.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Basic Operations
diff --git a/doc/salome/gui/GEOM/blocks_operations.htm b/doc/salome/gui/GEOM/blocks_operations.htm
index dd9f31a7e..ece24133c 100755
--- a/doc/salome/gui/GEOM/blocks_operations.htm
+++ b/doc/salome/gui/GEOM/blocks_operations.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Blocks Operations
diff --git a/doc/salome/gui/GEOM/boolean_operations.htm b/doc/salome/gui/GEOM/boolean_operations.htm
index 8e40f39d1..bb2aaee73 100755
--- a/doc/salome/gui/GEOM/boolean_operations.htm
+++ b/doc/salome/gui/GEOM/boolean_operations.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Boolean Operations
diff --git a/doc/salome/gui/GEOM/box.htm b/doc/salome/gui/GEOM/box.htm
index 27267cd21..6342a165b 100755
--- a/doc/salome/gui/GEOM/box.htm
+++ b/doc/salome/gui/GEOM/box.htm
@@ -44,43 +44,48 @@ onerror = null;
-
-
+
+
Box
T o
create a Box
diff --git a/doc/salome/gui/GEOM/building_by_blocks.htm b/doc/salome/gui/GEOM/building_by_blocks.htm
index 7099303ae..7f4ea3e97 100755
--- a/doc/salome/gui/GEOM/building_by_blocks.htm
+++ b/doc/salome/gui/GEOM/building_by_blocks.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Building by Blocks
Quadrangle Face
diff --git a/doc/salome/gui/GEOM/chamfer.htm b/doc/salome/gui/GEOM/chamfer.htm
index 4b285f6ec..573ad682f 100755
--- a/doc/salome/gui/GEOM/chamfer.htm
+++ b/doc/salome/gui/GEOM/chamfer.htm
@@ -52,43 +52,48 @@ onerror = null;
-
-
+
+
Chamfer
T o produce
diff --git a/doc/salome/gui/GEOM/changing_display_parameters.htm b/doc/salome/gui/GEOM/changing_display_parameters.htm
index 3e4572e37..7106304d4 100755
--- a/doc/salome/gui/GEOM/changing_display_parameters.htm
+++ b/doc/salome/gui/GEOM/changing_display_parameters.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Viewing Geometrical Objects
diff --git a/doc/salome/gui/GEOM/check_free_boundaries.htm b/doc/salome/gui/GEOM/check_free_boundaries.htm
index 549ae0551..dae8b55ef 100755
--- a/doc/salome/gui/GEOM/check_free_boundaries.htm
+++ b/doc/salome/gui/GEOM/check_free_boundaries.htm
@@ -52,43 +52,48 @@ onerror = null;
-
-
+
+
Check Free Boundaries
T o
-
-
+
+
Check Free Faces
T o
-
-
+
+
Circle
T o create a Circle
diff --git a/doc/salome/gui/GEOM/close_contour.htm b/doc/salome/gui/GEOM/close_contour.htm
index 33d5d728e..f79f52efe 100755
--- a/doc/salome/gui/GEOM/close_contour.htm
+++ b/doc/salome/gui/GEOM/close_contour.htm
@@ -39,43 +39,48 @@ onerror = null;
-
-
+
+
Close Contour
T o produce
diff --git a/doc/salome/gui/GEOM/color.htm b/doc/salome/gui/GEOM/color.htm
index 106cea890..9fb11eff0 100755
--- a/doc/salome/gui/GEOM/color.htm
+++ b/doc/salome/gui/GEOM/color.htm
@@ -35,43 +35,48 @@ onerror = null;
-
-
+
+
Color
You can change the filling color of your object in the standard
-
-
+
+
Common
T o produce
diff --git a/doc/salome/gui/GEOM/complex_objects.htm b/doc/salome/gui/GEOM/complex_objects.htm
index 845b70981..1486576b6 100755
--- a/doc/salome/gui/GEOM/complex_objects.htm
+++ b/doc/salome/gui/GEOM/complex_objects.htm
@@ -33,43 +33,48 @@ onerror = null;
-
-
+
+
Complex Objects
diff --git a/doc/salome/gui/GEOM/compound.htm b/doc/salome/gui/GEOM/compound.htm
index 182c5e89e..245fc80ac 100755
--- a/doc/salome/gui/GEOM/compound.htm
+++ b/doc/salome/gui/GEOM/compound.htm
@@ -37,43 +37,48 @@ onerror = null;
-
-
+
+
Compound
T o create
diff --git a/doc/salome/gui/GEOM/cone.htm b/doc/salome/gui/GEOM/cone.htm
index e2d7a7323..7c41e1a56 100755
--- a/doc/salome/gui/GEOM/cone.htm
+++ b/doc/salome/gui/GEOM/cone.htm
@@ -41,43 +41,48 @@ onerror = null;
-
-
+
+
Cone
T o
create a Cone
diff --git a/doc/salome/gui/GEOM/cshdat_robohelp.htm b/doc/salome/gui/GEOM/cshdat_robohelp.htm
index afb68b6ee..5a510432b 100755
--- a/doc/salome/gui/GEOM/cshdat_robohelp.htm
+++ b/doc/salome/gui/GEOM/cshdat_robohelp.htm
@@ -1,6 +1,6 @@
-GEOM reference manual
+Geometry Module Reference Manual
diff --git a/doc/salome/gui/GEOM/cshdat_webhelp.htm b/doc/salome/gui/GEOM/cshdat_webhelp.htm
index 2d66f403c..00606ec88 100755
--- a/doc/salome/gui/GEOM/cshdat_webhelp.htm
+++ b/doc/salome/gui/GEOM/cshdat_webhelp.htm
@@ -1,6 +1,6 @@
-GEOM reference manual
+Geometry Module Reference Manual
diff --git a/doc/salome/gui/GEOM/curve.htm b/doc/salome/gui/GEOM/curve.htm
index bb7870b59..b14b7199c 100755
--- a/doc/salome/gui/GEOM/curve.htm
+++ b/doc/salome/gui/GEOM/curve.htm
@@ -44,43 +44,48 @@ onerror = null;
-
-
+
+
Curve
To create a Curve in the
-
-
+
+
Cut
T o produce
diff --git a/doc/salome/gui/GEOM/cylinder.htm b/doc/salome/gui/GEOM/cylinder.htm
index c77ef03e1..b8749b801 100755
--- a/doc/salome/gui/GEOM/cylinder.htm
+++ b/doc/salome/gui/GEOM/cylinder.htm
@@ -51,43 +51,48 @@ onerror = null;
-
-
+
+
Cylinder
T o
create a Cylinder
diff --git a/doc/salome/gui/GEOM/edge.htm b/doc/salome/gui/GEOM/edge.htm
index 68c276f14..be2c13039 100755
--- a/doc/salome/gui/GEOM/edge.htm
+++ b/doc/salome/gui/GEOM/edge.htm
@@ -37,43 +37,48 @@ onerror = null;
-
-
+
+
Edge
T o
diff --git a/doc/salome/gui/GEOM/ellipse.htm b/doc/salome/gui/GEOM/ellipse.htm
index f324583ce..97adc2593 100755
--- a/doc/salome/gui/GEOM/ellipse.htm
+++ b/doc/salome/gui/GEOM/ellipse.htm
@@ -52,43 +52,48 @@ onerror = null;
-
-
+
+
Ellipse
T o create an
-
-
+
+
Explode
To Explode
diff --git a/doc/salome/gui/GEOM/explode_on_blocks.htm b/doc/salome/gui/GEOM/explode_on_blocks.htm
index 6052589e7..64c847a2c 100755
--- a/doc/salome/gui/GEOM/explode_on_blocks.htm
+++ b/doc/salome/gui/GEOM/explode_on_blocks.htm
@@ -57,43 +57,48 @@ onerror = null;
-
-
+
+
Explode on Blocks
T o produce
diff --git a/doc/salome/gui/GEOM/extrusion.htm b/doc/salome/gui/GEOM/extrusion.htm
index a0744f2de..0b7d9f88f 100755
--- a/doc/salome/gui/GEOM/extrusion.htm
+++ b/doc/salome/gui/GEOM/extrusion.htm
@@ -40,43 +40,48 @@ onerror = null;
-
-
+
+
Extrusion
T o
generate an
-
-
+
+
Face
T o create
diff --git a/doc/salome/gui/GEOM/files/introduction_to_geom.htm b/doc/salome/gui/GEOM/files/introduction_to_geom.htm
index bdfd4b60c..c1689fa49 100755
--- a/doc/salome/gui/GEOM/files/introduction_to_geom.htm
+++ b/doc/salome/gui/GEOM/files/introduction_to_geom.htm
@@ -40,43 +40,47 @@ onerror = null;
-
-
+
+
Introduction to Geometry
Geometry module
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm
index 178a69145..093622233 100755
--- a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm
+++ b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm
@@ -56,43 +56,48 @@ onerror = null;
-
-
+
+
Using boolean operations
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm
index ea1d1af6f..ae1adaf59 100755
--- a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm
+++ b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm
@@ -37,43 +37,48 @@ onerror = null;
-
-
+
+
Importing/exporting geometrical objects
In Geometry module you
diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm
index e5b80916d..40c66d82f 100755
--- a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm
+++ b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm
@@ -72,43 +72,48 @@ onerror = null;
-
-
+
+
Using measurement tools
Measurement tools in GEOM are necessary for getting different
diff --git a/doc/salome/gui/GEOM/fillet.htm b/doc/salome/gui/GEOM/fillet.htm
index 569f96b9a..611536ba5 100755
--- a/doc/salome/gui/GEOM/fillet.htm
+++ b/doc/salome/gui/GEOM/fillet.htm
@@ -53,43 +53,48 @@ onerror = null;
-
-
+
+
Fillet
T o produce
diff --git a/doc/salome/gui/GEOM/filling.htm b/doc/salome/gui/GEOM/filling.htm
index f866124b9..46d367edf 100755
--- a/doc/salome/gui/GEOM/filling.htm
+++ b/doc/salome/gui/GEOM/filling.htm
@@ -37,43 +37,48 @@ onerror = null;
-
-
+
+
Filling
Surface with Curves
diff --git a/doc/salome/gui/GEOM/fuse.htm b/doc/salome/gui/GEOM/fuse.htm
index 1443599d6..d8eb90cdb 100755
--- a/doc/salome/gui/GEOM/fuse.htm
+++ b/doc/salome/gui/GEOM/fuse.htm
@@ -52,43 +52,48 @@ onerror = null;
-
-
+
+
Fuse
T o produce
diff --git a/doc/salome/gui/GEOM/geom.htm b/doc/salome/gui/GEOM/geom.htm
deleted file mode 100755
index 46797c73d..000000000
--- a/doc/salome/gui/GEOM/geom.htm
+++ /dev/null
@@ -1,139 +0,0 @@
-
-
-
- GEOM reference manual
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/geom.log b/doc/salome/gui/GEOM/geom.log
index e1ec71835..4b05cc3e8 100755
--- a/doc/salome/gui/GEOM/geom.log
+++ b/doc/salome/gui/GEOM/geom.log
@@ -1,5 +1,5 @@
|SourceProjectName:GEOM.hpr
-|DestinationProjectName:geom.htm
+|DestinationProjectName:index.htm
whhost.js
whmsg.js
whmozemu.js
@@ -74,63 +74,47 @@ cshdat_webhelp.htm
whcsh_home.htm
whcshdata.htm
cshdat_robohelp.htm
-wht_tab0.gif
-wht_tab1.gif
-wht_tab2.gif
-wht_tab3.gif
-wht_tab4.gif
-wht_tab5.gif
-wht_tab6.gif
-wht_tab7.gif
-wht_tab8.gif
-wht_glo_h.gif
-wht_glo_n.gif
-wht_fts_h.gif
-wht_fts_n.gif
-wht_idx_h.gif
-wht_idx_n.gif
-wht_toc_h.gif
-wht_toc_n.gif
-wht_ws.gif
-wht_ws_g.gif
-wht_logo1.gif
-wht_logo2.gif
-wht_abgw.jpg
-wht_abgi.jpg
-wht_abge.jpg
-wht_abtw.jpg
-wht_abte.jpg
-wht_abti.jpg
-wht_spac.gif
-wht_next.gif
-wht_next_g.gif
-wht_prev.gif
-wht_prev_g.gif
-wht_sync.gif
-wht_hide.gif
-wht_go.gif
-whstart.ico
-whestart.ico
-whrstart.ico
+whd_topic.xml
+whd_nvp10.htm
+whd_nvp20.htm
+whd_tabs.htm
+whd_dpns.htm
+whd_tab0.gif
+whd_tab1.gif
+whd_tab2.gif
+whd_tab3.gif
+whd_tab4.gif
+whd_tab5.gif
+whd_tab6.gif
+whd_tab7.gif
+whd_tab8.gif
+whd_toc1.gif
+whd_toc2.gif
+whd_toc3.gif
+whd_toc4.gif
+whd_show0.gif
+whd_show1.gif
+whd_show2.gif
+whd_hide0.gif
+whd_hide1.gif
+whd_hide2.gif
+whd_sync0.gif
+whd_sync1.gif
+whd_sync2.gif
+whd_prev0.gif
+whd_prev1.gif
+whd_prev2.gif
+whd_next0.gif
+whd_next1.gif
+whd_next2.gif
+whd_wbsh0.gif
+whd_wbsh1.gif
+whd_wbsh2.gif
whidhtml.htm
whfdhtml.htm
-whskin_banner.htm
-whtbar.js
-whskin_pdhtml.htm
-whskin_papplet.htm
-whskin_plist.htm
-whskin_tbars.htm
-whskin_mbars.htm
-wht_toc4.gif
-wht_toc1.gif
-wht_toc2.gif
-wht_toc3.gif
-whskin_frmset010.htm
-whst_topics.xml
-whskin_frmset01.htm
-geom_hha.hhk
-geom.hhc
-geom.hhk
+index_hha.hhk
+index.hhc
+index.hhk
add_point_on_edge.htm
arc.htm
archimede.htm
@@ -168,6 +152,7 @@ fillet.htm
filling.htm
fuse.htm
geometrical_objects.htm
+geometry.htm
glue_faces.htm
groups.htm
isos.htm
@@ -214,7 +199,7 @@ wireframe_and_shading.htm
working_plane.htm
working_with_groups.htm
ehelp.xml
-geom.glo
+index.glo
default.css
pics\image86.gif
pics\image103.gif
@@ -522,7 +507,7 @@ files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.
files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif
salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image16.gif
ehlpdhtm.js
-geom.ppf
+index.ppf
default_ns.css
whxdata\whtdata0.xml
whxdata\whftdata0.xml
@@ -592,6 +577,6 @@ whgdata\whlstf11.htm
whgdata\whlstf12.htm
whgdata\whlstf13.htm
whgdata\whlstg0.htm
-geom.htm
-geom_csh.htm
-geom_rhc.htm
+index.htm
+index_csh.htm
+index_rhc.htm
diff --git a/doc/salome/gui/GEOM/geometrical_objects.htm b/doc/salome/gui/GEOM/geometrical_objects.htm
index cc12ba287..5822ead2a 100755
--- a/doc/salome/gui/GEOM/geometrical_objects.htm
+++ b/doc/salome/gui/GEOM/geometrical_objects.htm
@@ -34,43 +34,48 @@ onerror = null;
-
-
+
+
Advanced Geometrical Objects
diff --git a/doc/salome/gui/GEOM/geometry.htm b/doc/salome/gui/GEOM/geometry.htm
new file mode 100755
index 000000000..3e2e4ceaf
--- /dev/null
+++ b/doc/salome/gui/GEOM/geometry.htm
@@ -0,0 +1,144 @@
+
+
+
+
+
+geometry
+
+
+
+
+
+
+
+
+
+
+
+
+Introduction to Geometry
+
+Geometry module
+ of SALOME is destined for:
+
+
+
+
+
+ Import and export of geometrical models in IGES,
+ BREP and STEP formats.
+
+ Construction and optimization of geometrical models
+ using a wide range of CAD
+ functions:
+
+
+
+
+
+
+
+
+
+
+
+
+ Creation of basic geometrical objects
+
+ Construction of primitives
+
+ Building shapes
+
+ Generation of complex shapes
+
+ Working with groups
+
+ Geometrical repairing of objects
+
+ Geometrical boolean operations
+
+ Geometrical transformations
+
+ Building by blocks
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html b/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html
deleted file mode 100644
index 06a37f66a..000000000
--- a/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
- Main Page
-
-
-
-
-
-
-
-
-
-
-GEOM_TestMeasures.py File Reference
-Generated on Tue Oct 18 00:47:36 2005 for SALOME - GEOM - v.2.1.0 by
-
- 1.3.7
-
-
diff --git a/doc/salome/gui/GEOM/geompy_doc/doxygen.png b/doc/salome/gui/GEOM/geompy_doc/doxygen.png
deleted file mode 100644
index 9da55f95f..000000000
Binary files a/doc/salome/gui/GEOM/geompy_doc/doxygen.png and /dev/null differ
diff --git a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.jpg b/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.jpg
deleted file mode 100644
index b1a0ce260..000000000
Binary files a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.jpg and /dev/null differ
diff --git a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map b/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map
deleted file mode 100644
index 5a14779e7..000000000
--- a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map
+++ /dev/null
@@ -1 +0,0 @@
-base referer
diff --git a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5 b/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5
deleted file mode 100644
index 1f2d2ba0e..000000000
--- a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5
+++ /dev/null
@@ -1 +0,0 @@
-0848e1ec9d428b6f7446355ed9f585a7
\ No newline at end of file
diff --git a/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html b/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html
deleted file mode 100644
index 24ab2972a..000000000
--- a/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
- Main Page
-
-
-
-
-
-
-
-
-
-
-Package GEOM_TestMeasures Module "GEOM_TestMeasures".
-More...
-
-
-Function Documentation
-
-
-
-
-
-
- TestMeasureOperations
- (
- geompy
- ,
-
-
-
-
- math
-
-
-
-
- )
-
-
-
-
-
-
-
-Generated on Tue Oct 18 00:47:37 2005 for SALOME - GEOM - v.2.1.0 by
-
- 1.3.7
-
-
diff --git a/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html b/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html
index 189eb4505..768eb3629 100644
--- a/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html
+++ b/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html
@@ -8,535 +8,600 @@
-
-
-