Implement 'make dist' and 'make distcheck' steps support

Makefile.am

@@ -26,17 +26,26 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
+if GEOM_ENABLE_GUI
+  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
+else !GEOM_ENABLE_GUI
+  ACLOCAL_AMFLAGS = -I adm_local/unix/config_files \
+                    -I ${KERNEL_ROOT_DIR}/salome_adm/unix/config_files
+endif
+
 SUBDIRS = idl adm_local resources src doc bin
 
 DIST_SUBDIRS = idl adm_local resources src doc bin 
 
 DISTCLEANFILES = a.out aclocal.m4 configure
 
-salomeinclude_DATA=GEOM_version.h
+salomeinclude_DATA = GEOM_version.h
 
-EXTRA_DIST+= \
+EXTRA_DIST +=		\
-	build_configure \
+	build_configure	\
-	clean_configure \
+	clean_configure	\
 	LICENCE
 
 dist-hook:
@@ -45,7 +54,7 @@ dist-hook:
 usr_docs:
 	(cd doc && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
 
-docs:usr_docs
+docs: usr_docs
 
 dev_docs:
 	(cd doc && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

adm_local/Makefile.am

@@ -16,4 +16,7 @@
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # 
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
 SUBDIRS = unix

adm_local/unix/config_files/Makefile.am

@@ -16,6 +16,7 @@
 # 
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 # 
+
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 dist_admlocalm4_DATA =	\

adm_local/unix/make_common_starter.am

@@ -7,16 +7,18 @@
 #
 
 # Standard directory for installation
-salomeincludedir   = $(includedir)/@PACKAGE@
+salomeincludedir   = $(includedir)/salome
-libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@
+libdir             = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome
-bindir             = $(prefix)/bin/@PACKAGE@
+bindir             = $(prefix)/bin/salome
 salomescriptdir    = $(bindir)
+salomepythondir    = $(pythondir)/salome
+salomepyexecdir    = $(pyexecdir)/salome
 
 # Directory for installing idl files
-salomeidldir       = $(prefix)/idl/@PACKAGE@
+salomeidldir       = $(prefix)/idl/salome
 
 # Directory for installing resource files
-salomeresdir       = $(prefix)/share/@PACKAGE@/resources/@MODULE_NAME@
+salomeresdir       = $(prefix)/share/salome/resources/@MODULE_NAME@
 
 # Directories for installing admin files
 admlocaldir        = $(prefix)/adm_local
@@ -24,31 +26,39 @@ admlocalunixdir    = $(admlocaldir)/unix
 admlocalm4dir      = $(admlocaldir)/unix/config_files
 
 # Shared modules installation directory
-sharedpkgpythondir = $(pkgpythondir)/shared_modules
+sharedpkgpythondir = $(salomepythondir)/shared_modules
 
 # Documentation directory
-docdir             = $(datadir)/doc/@PACKAGE@
+docdir             = $(datadir)/doc/salome
 
 # common rules
 
-# moc-files generation
+# meta object implementation files generation (moc)
 %_moc.cxx: %.h
 	$(MOC) $< -o $@
 
-# qm-files generation
+# translation (*.qm) files generation (lrelease)
 %.qm: %.ts
 	$(LRELEASE) $< -qm $@
 
-# uic-files generation
+# resource files generation (qrcc)
+qrc_%.cxx: %.qrc
+	$(QRCC) $< -o $@ -name $(*F)
+
+# qt forms files generation (uic)
 ui_%.h: %.ui
 	$(UIC) -o $@ $<
 
-EXTRA_DIST=$(MOC_FILES:%_moc.cxx=%.h) $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.po)
+# extra distributed files
+EXTRA_DIST = $(MOC_FILES:%_moc.cxx=%.h) $(QRC_FILES:qrc_%.cxx=%.qrc) \
+             $(UIC_FILES:ui_%.h=%.ui) $(nodist_salomeres_DATA:%.qm=%.ts)
 
+# customize clean operation
 mostlyclean-local:
 	rm -f @builddir@/*_moc.cxx
 	rm -f @builddir@/*.qm
 	rm -f @builddir@/ui_*.h
+	rm -f @builddir@/qrc_*.cxx
 
 # tests
 tests: unittest

bin/Makefile.am

@@ -23,13 +23,8 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-#
+# non-distributed files 
-# ===============================================================
+nodist_salomescript_DATA = VERSION
-# Files to be installed
-# ===============================================================
-#
 
-# These files are data, module or lib files
+# distributed files
-nodist_salomescript_DATA= VERSION
+dist_salomescript_SCRIPTS =
-
-EXTRA_DIST+= VERSION.in

clean_configure

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+rm -rf autom4te.cache aclocal.m4 configure make_config
+find . -name "*~" -print -exec rm {} \;
+find . -name "*.pyc" -print -exec rm {} \;
+#exit
+# ==================== ON SORT AVANT
+
+find bin -name Makefile.in | xargs rm -f
+find doc -name Makefile.in | xargs rm -f
+find idl -name Makefile.in | xargs rm -f
+find resources -name Makefile.in | xargs rm -f
+find salome_adm -name Makefile.in | xargs rm -f
+find src -name Makefile.in | xargs rm -f
+rm -f Makefile.in

configure.ac

@@ -9,11 +9,12 @@
 #
 
 
-AC_INIT([Salome2 Project GEOM module], [5.0.0], [webmaster.salome@opencascade.com], [salome])
+AC_INIT([Salome2 Project GEOM module], [5.0.0], [webmaster.salome@opencascade.com], [SalomeGEOM])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([tar-pax])
+
 
 XVERSION=`echo $VERSION | awk -F. '{printf("0x%02x%02x%02x",$1,$2,$3)}'`
 AC_SUBST(XVERSION)
@@ -337,20 +338,15 @@ else
    AC_SUBST(SETX) SETX="set -x"
 fi
 
-dnl copy shells and utilities contained in the bin directory
-dnl excluding .in files (treated in AC-OUTPUT below) and CVS
-dnl directory
-
-
 echo
 echo ---------------------------------------------
 echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
+#AC_OUTPUT_COMMANDS([ \
-  chmod +x ./bin/*; \
+#  chmod +x ./bin/*; \
-])
+#])
 
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
@@ -367,12 +363,12 @@ AC_OUTPUT([ \
   ./doc/Makefile \
   ./doc/salome/Makefile \
   ./doc/salome/gui/Makefile \
+  ./doc/salome/gui/GEOM/Makefile \
   ./doc/salome/gui/GEOM/doxyfile \
   ./doc/salome/gui/GEOM/doxyfile_py \
   ./doc/salome/gui/GEOM/doxyfile_tui \
   ./doc/salome/tui/Makefile \
-  ./doc/salome/tui/GEOM/doxyfile \
+  ./doc/salome/tui/doxyfile \
-  ./doc/salome/tui/GEOM/sources/static/tree.js \
   ./src/Makefile \
   ./src/ARCHIMEDE/Makefile \
   ./src/BREPExport/Makefile \
@@ -401,7 +397,6 @@ AC_OUTPUT([ \
   ./src/IGESExport/Makefile \
   ./src/IGESImport/Makefile \
   ./src/MeasureGUI/Makefile \
-  ./src/NMTAlgo/Makefile \
   ./src/NMTDS/Makefile \
   ./src/NMTTools/Makefile \
   ./src/OBJECT/Makefile \

doc/Makefile.am

@@ -22,9 +22,17 @@
 #
 # Author : Patrick GOLDBRONN (CEA)
 # 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
+
+usr_docs:
+	(cd salome && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
+
+docs: usr_docs
+
+dev_docs:
+	(cd salome && $(MAKE) $(AM_MAKEFLAGS) dev_docs)

doc/salome/Makefile.am

@@ -25,9 +25,9 @@
 # $Header:
 #
 
-SUBDIRS= tui gui
+SUBDIRS = tui gui
-SUBDIRSTUI= tui
+SUBDIRSTUI = tui
-SUBDIRSGUI= gui
+SUBDIRSGUI = gui
 
 usr_docs:
 	@@SETX@; for d in $(SUBDIRSGUI); do 	\

doc/salome/gui/GEOM/Makefile.am

@@ -0,0 +1,74 @@
+#  Copyright (C) 2005  CEA/DEN, EDF R&D, OPEN CASCADE, PRINCIPIA R&D
+#
+#  This library is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU Lesser General Public
+#  License as published by the Free Software Foundation; either
+#  version 2.1 of the License.
+#
+#  This library is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#  Lesser General Public License for more details.
+#
+#  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)
+#  Modified by : Alexander BORODIN (OCN) - autotools usage
+#  Module : doc
+
+include $(top_srcdir)/adm_local/unix/make_common_starter.am
+
+EXTRA_DIST += images input static
+
+usr_docs: doxyfile_tui doxyfile_py doxyfile 
+	@echo "===========================================" ;			\
+	echo "Generating examples documentation" ;				\
+	echo "===========================================" ;			\
+	$(DOXYGEN) doxyfile_tui ;						\
+	echo "===========================================" ;			\
+	echo "Generating Python interface documentation";			\
+	echo "===========================================" ;			\
+	$(DOXYGEN) doxyfile_py ;						\
+	echo "===========================================" ;			\
+	echo "Replacing geompyDC by geompy" ;					\
+	echo "===========================================" ;			\
+	files=`find geompy_doc -type f` ;					\
+	for filen in $${files} ; do						\
+	  sed -e "s/\<geompyDC\>/geompy/g" -e "s/geompy\.geompy/geompy/g"	\
+	      -e "s/geompy::geompy/geompy/g" $${filen} > $${filen}_ ;		\
+	  mv -f $${filen}_ $${filen} ;						\
+	done ;									\
+	echo "===========================================" ;			\
+	echo "Generating GUI documentation" ;					\
+	echo "===========================================" ;			\
+	$(DOXYGEN) doxyfile ;
+
+docs: usr_docs
+
+clean-local:
+	@for filen in `find .` ; do						\
+	  case $${filen} in							\
+	    ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;;	\
+	    . | .. ) ;;								\
+	    *) echo "Removing $${filen}" ; rm -rf $${filen} ;;			\
+	  esac ;								\
+	done ;
+
+install-data-local: usr_docs
+	$(INSTALL) -d $(DESTDIR)$(docdir)/gui/GEOM
+	@for filen in `find .` ; do								\
+	  case $${filen} in									\
+	    ./Makefile | ./doxyfile | ./doxyfile_py | ./doxyfile_tui ) ;;			\
+	    ./doxyfile.bak | ./doxyfile_py.bak | ./doxyfile_tui.bak ) ;;			\
+	    . | .. ) ;;										\
+	    *) echo "Installing $${filen}" ; cp -rp $${filen} $(DESTDIR)$(docdir)/gui/GEOM ;;	\
+	  esac ;										\
+	done ;
+
+uninstall-local:
+	rm -rf $(DESTDIR)$(docdir)/gui/GEOM

doc/salome/gui/GEOM/doxyfile.in

@@ -2,7 +2,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
-OUTPUT_DIRECTORY  = ./
+OUTPUT_DIRECTORY  = .
 CREATE_SUBDIRS	  = NO
 OUTPUT_LANGUAGE   = English
 TAB_SIZE          = 5
@@ -26,7 +26,7 @@ EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
 #HTML related options
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
-HTML_OUTPUT       = ./
+HTML_OUTPUT       = .
 HTML_HEADER       = @srcdir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
 #HTML_STYLESHEET  = @srcdir@/static/doxygen.css
@@ -48,5 +48,5 @@ GENERATE_RTF      = NO
 #---------------------------------------------------------------------------
 #External reference options
 #---------------------------------------------------------------------------
-TAGFILES          = geompy_doc.tag=./geompy_doc
+TAGFILES          = geompy_doc.tag=geompy_doc
 ALLEXTERNALS      = NO

doc/salome/gui/GEOM/doxyfile_py.in

@@ -1,10 +1,10 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
+PROJECT_NAME           = "Geometry Module Reference Manual v.@VERSION@"
-OUTPUT_DIRECTORY  = ./
+OUTPUT_DIRECTORY       = .
-CREATE_SUBDIRS	  = NO
+CREATE_SUBDIRS	       = NO
-OUTPUT_LANGUAGE   = English
+OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
 BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = NO
@@ -66,8 +66,8 @@ VERBATIM_HEADERS       = YES
 #---------------------------------------------------------------------------
 # configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
-QUIET             = NO
+QUIET                  = NO
-WARNINGS          = YES
+WARNINGS               = YES
 WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
@@ -87,7 +87,7 @@ RECURSIVE         = NO
 #HTML related options
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
-HTML_OUTPUT       = ./geompy_doc
+HTML_OUTPUT       = geompy_doc
 HTML_HEADER       = @srcdir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
 #HTML_STYLESHEET  = @srcdir@/static/doxygen.css
@@ -108,24 +108,17 @@ GENERATE_RTF      = NO
 #---------------------------------------------------------------------------
 # Configuration options related to the dot tool   
 #---------------------------------------------------------------------------
-#CLASS_DIAGRAMS         = YES
 CLASS_DIAGRAMS         = NO
 HIDE_UNDOC_RELATIONS   = NO
-#HAVE_DOT               = YES
 HAVE_DOT               = NO
-#CLASS_GRAPH            = YES
 CLASS_GRAPH            = NO
 COLLABORATION_GRAPH    = NO
 GROUP_GRAPHS           = NO
 UML_LOOK               = NO
-#TEMPLATE_RELATIONS     = YES
-#INCLUDE_GRAPH          = YES
 TEMPLATE_RELATIONS     = NO
 INCLUDE_GRAPH          = NO
 INCLUDED_BY_GRAPH      = NO
 CALL_GRAPH             = NO
-#GRAPHICAL_HIERARCHY    = YES
-#DIRECTORY_GRAPH        = YES
 GRAPHICAL_HIERARCHY    = NO
 DIRECTORY_GRAPH        = NO
 DOT_IMAGE_FORMAT       = jpg
@@ -143,4 +136,4 @@ DOT_CLEANUP            = YES
 #External reference options
 #---------------------------------------------------------------------------
 GENERATE_TAGFILE  = geompy_doc.tag
-TAGFILES          = tui_examples.tag=./..
+TAGFILES          = tui_examples.tag=..

doc/salome/gui/GEOM/doxyfile_tui.in

@@ -2,7 +2,7 @@
 # Project related configuration options
 #---------------------------------------------------------------------------
 PROJECT_NAME      = "Geometry Module Reference Manual v.@VERSION@"
-OUTPUT_DIRECTORY  = ./
+OUTPUT_DIRECTORY  = .
 CREATE_SUBDIRS	  = NO
 OUTPUT_LANGUAGE   = English
 TAB_SIZE          = 5
@@ -25,7 +25,7 @@ EXAMPLE_PATH      = @top_srcdir@/src/GEOM_SWIG
 #HTML related options
 #---------------------------------------------------------------------------
 GENERATE_HTML     = YES
-HTML_OUTPUT       = ./
+HTML_OUTPUT       = .
 HTML_HEADER       = @srcdir@/static/header.html
 HTML_FOOTER       = @srcdir@/static/footer.html
 #HTML_STYLESHEET  = @srcdir@/static/doxygen.css

doc/salome/gui/Makefile.am

@@ -14,62 +14,20 @@
 #  License along with this library; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#  File   : Makefile.in
+
-#  Author : Vasily Rusyaev (Open Cascade NN)
+# -* Makefile *- 
+#
+# Author : Patrick GOLDBRONN (CEA)
+# Date : 30/11/2001
 #  Modified by : Alexander BORODIN (OCN) - autotools usage
-#  Module : doc
+# $Header:
-
-include $(top_srcdir)/adm_local/unix/make_common_starter.am
-
-EXTRA_DIST+=GEOM
-
-doxygen=@DOXYGEN@
-
-# Below command replaces "geompyDC" by "geompy" except cases
-# "sgeompyDC", "1geompyDC" and "egeompyDC" (these sequences
-# can be found in file names and must not be replaces):
-#
-# sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp;
 #
+
+SUBDIRS = GEOM
+
 usr_docs:
-	cd ./GEOM; \
+	(cd GEOM && $(MAKE) $(AM_MAKEFLAGS) usr_docs)
-	echo "Running doxygen in directory: "`pwd`; \
-	$(doxygen) ./doxyfile_tui; \
-	echo "Processing geompyDC.py file: "; \
-	$(doxygen) ./doxyfile_py; \
-	cd ./geompy_doc; \
-	filesl=`find .`; \
-	for filen in $${filesl}; do \
-	  sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp1; \
-	  sed 's/geompy\.geompy/geompy/g' ./tmp1 > ./tmp; \
-	  rm -f tmp1; \
-	  sed 's/geompy::geompy/geompy/g' ./tmp > ./tmp1; \
-	  rm -f tmp; \
-	  mv -f tmp1 $${filen}; \
-	done; \
-	cd ..; \
-	echo "Running doxygen in directory: "`pwd`; \
-	$(doxygen) ./doxyfile;
 
 docs: usr_docs
-
-clean-local:
-	rm -fr `ls | grep -v "Makefile"`
-	rm -fr GEOM
-
-install-data-local: usr_docs
-	mkdir -p $(docdir)/gui
-	cp -rf GEOM $(docdir)/gui
-	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
-
-uninstall-local:
-	rm -rf $(docdir)/gui/GEOM
-
-docguidir=$(docdir)/gui/GEOM
-
-nodist_docgui_DATA= GEOM/doxyfile
-nodist_docgui_DATA+= GEOM/doxyfile_py
-EXTRA_DIST+= GEOM/doxyfile.in
-EXTRA_DIST+= GEOM/doxyfile_py.in

doc/salome/tui/GEOM/HTML/GEOM_Gen.html

@@ -1,802 +0,0 @@
-<HTML><b>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Object</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetEntry (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetEntry (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetStudyID (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyID (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetType (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetType (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>shape_type  GetShapeType (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeType (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetName ( in string theName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetName ( theName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetName (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetName (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetStudyEntry ( in string theEntry )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetStudyEntry ( theEntry )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetStudyEntry (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyEntry (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetDependency (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetDependency (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetLastDependency (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetLastDependency (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  getShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = getShape (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>TMPFile  GetShapeStream (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeStream (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsMainShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = IsMainShape (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfLong  GetSubShapeIndices (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetSubShapeIndices (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetMainShape (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetMainShape (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsDone (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = IsDone (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void SetErrorCode ( in string theErrorID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>SetErrorCode ( theErrorID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetErrorCode (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetErrorCode (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetStudyID (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStudyID (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void StartOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>StartOperation (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void FinishOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>FinishOperation (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void AbortOperation (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>AbortOperation (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBasicOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointXYZ ( in double theX, in double theY, in double theZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointXYZ ( theX, theY, theZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointWithReference ( in GEOM_Object theReference, in double theX, in double theY, in double theZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointWithReference ( theReference, theX, theY, theZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePointOnCurve ( in GEOM_Object theRefCurve, in double theParameter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePointOnCurve ( theRefCurve, theParameter )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeVectorDXDYDZ ( in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeVectorDXDYDZ ( theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeVectorTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeVectorTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeLineTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeLineTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlaneThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlaneThreePnt ( thePnt1, thePnt2, thePnt3, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlanePntVec ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlanePntVec ( thePnt, theVec, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePlaneFace ( in GEOM_Object theFace, in double theTrimSize )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePlaneFace ( theFace, theTrimSize )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMarker ( in double theOX, in double theOY, in double theOZ, in double theXDX, in double theXDY, in double theXDZ, in double theYDX, in double theYDY, in double theYDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMarker ( theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ITransformOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateTwoPoints ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateTwoPoints ( theObject, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateTwoPointsCopy ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateTwoPointsCopy ( theObject, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateDXDYDZ ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateDXDYDZ ( theObject, theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateDXDYDZCopy ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateDXDYDZCopy ( theObject, theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateVector ( in GEOM_Object theObject, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateVector ( theObject, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  TranslateVectorCopy ( in GEOM_Object theObject, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = TranslateVectorCopy ( theObject, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiTranslate1D ( in GEOM_Object theObject, in GEOM_Object theVector, in double theStep, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiTranslate1D ( theObject, theVector, theStep, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiTranslate2D ( in GEOM_Object theObject, in GEOM_Object theVector1, in double theStep1, in long theNbTimes1, in GEOM_Object theVector2, in double theStep2, in long theNbTimes2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiTranslate2D ( theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Rotate ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Rotate ( theObject, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  RotateCopy ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = RotateCopy ( theObject, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiRotate1D ( in GEOM_Object theObject, in GEOM_Object theAxis, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiRotate1D ( theObject, theAxis, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MultiRotate2D ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle, in long theNbTimes1, in double theStep, in long theNbTimes2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MultiRotate2D ( theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPlane ( in GEOM_Object theObject, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPlane ( theObject, thePlane )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPlaneCopy ( in GEOM_Object theObject, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPlaneCopy ( theObject, thePlane )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorAxis ( in GEOM_Object theObject, in GEOM_Object theAxis )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorAxis ( theObject, theAxis )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorAxisCopy ( in GEOM_Object theObject, in GEOM_Object theAxis )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorAxisCopy ( theObject, theAxis )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPoint ( in GEOM_Object theObject, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPoint ( theObject, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MirrorPointCopy ( in GEOM_Object theObject, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MirrorPointCopy ( theObject, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  OffsetShape ( in GEOM_Object theObject, in double theOffset )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = OffsetShape ( theObject, theOffset )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  OffsetShapeCopy ( in GEOM_Object theObject, in double theOffset )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = OffsetShapeCopy ( theObject, theOffset )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ScaleShape ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ScaleShape ( theObject, thePoint, theFactor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ScaleShapeCopy ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ScaleShapeCopy ( theObject, thePoint, theFactor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  PositionShape ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = PositionShape ( theObject, theStartLCS, theEndLCS )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  PositionShapeCopy ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = PositionShapeCopy ( theObject, theStartLCS, theEndLCS )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_I3DPrimOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoxDXDYDZ ( in double theDX, in double theDY, in double theDZ )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoxDXDYDZ ( theDX, theDY, theDZ )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoxTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoxTwoPnt ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCylinderRH ( in double theR, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCylinderRH ( theR, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCylinderPntVecRH ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCylinderPntVecRH ( thePnt, theAxis, theR, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeConeR1R2H ( in double theR1, in double theR2, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeConeR1R2H ( theR1, theR2, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeConePntVecR1R2H ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR1, in double theR2, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeConePntVecR1R2H ( thePnt, theAxis, theR1, theR2, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeTorusRR ( in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeTorusRR ( theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeTorusPntVecRR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeTorusPntVecRR ( thePnt, theVec, theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSphereR ( in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSphereR ( theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSpherePntR ( in GEOM_Object thePnt, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSpherePntR ( thePnt, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePrismVecH ( in GEOM_Object theBase, in GEOM_Object theVec, in double theH )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePrismVecH ( theBase, theVec, theH )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePrismTwoPnt ( in GEOM_Object theBase, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePrismTwoPnt ( theBase, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePipe ( in GEOM_Object theBase, in GEOM_Object thePath )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePipe ( theBase, thePath )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeRevolutionAxisAngle ( in GEOM_Object theBase, in GEOM_Object theAxis, in double theAngle )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeRevolutionAxisAngle ( theBase, theAxis, theAngle )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilling ( in GEOM_Object theShape, in long theMinDeg, in long theMaxDeg, in double theTol2D, in double theTol3D, in long theNbIter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilling ( theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IShapesOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeEdge ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeEdge ( thePnt1, thePnt2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeWire ( in ListOfGO theEdgesAndWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeWire ( theEdgesAndWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFace ( in GEOM_Object theWire, in boolean isPlanarWanted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFace ( theWire, isPlanarWanted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFaceWires ( in ListOfGO theWires, in boolean isPlanarWanted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFaceWires ( theWires, isPlanarWanted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeShell ( in ListOfGO theFacesAndShells )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeShell ( theFacesAndShells )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSolidShell ( in GEOM_Object theShell )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSolidShell ( theShell )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSolidShells ( in ListOfGO theShells )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSolidShells ( theShells )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCompound ( in ListOfGO theShapes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCompound ( theShapes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeGlueFaces ( in GEOM_Object theShape, in double theTolerance )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeGlueFaces ( theShape, theTolerance )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  MakeExplode ( in GEOM_Object theShape, in long theShapeType, in boolean isSorted )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeExplode ( theShape, theShapeType, isSorted )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  NumberOfFaces ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = NumberOfFaces ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  NumberOfEdges ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = NumberOfEdges ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ChangeOrientation ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ChangeOrientation ( theShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBlocksOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceFourVertices ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in GEOM_Object thePnt4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceFourVertices ( thePnt1, thePnt2, thePnt3, thePnt4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceFourEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2, in GEOM_Object theEdge3, in GEOM_Object theEdge4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceFourEdges ( theEdge1, theEdge2, theEdge3, theEdge4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeQuadFaceTwoEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeQuadFaceTwoEdges ( theEdge1, theEdge2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHexaSolidSixFaces ( in GEOM_Object theFace1, in GEOM_Object theFace2, in GEOM_Object theFace3, in GEOM_Object theFace4, in GEOM_Object theFace5, in GEOM_Object theFace6 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHexaSolidSixFaces ( theFace1, theFace2, theFace3, theFace4, theFace5, theFace6 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHexaSolidTwoFaces ( in GEOM_Object theFace1, in GEOM_Object theFace2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHexaSolidTwoFaces ( theFace1, theFace2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetEdge ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetEdge ( theShape, thePoint1, thePoint2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByPoints ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2, in GEOM_Object thePoint3, in GEOM_Object thePoint4 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByPoints ( theShape, thePoint1, thePoint2, thePoint3, thePoint4 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByEdges ( in GEOM_Object theShape, in GEOM_Object theEdge1, in GEOM_Object theEdge2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByEdges ( theShape, theEdge1, theEdge2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetOppositeFace ( in GEOM_Object theBlock, in GEOM_Object theFace )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetOppositeFace ( theBlock, theFace )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceNearPoint ( in GEOM_Object theShape, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceNearPoint ( theShape, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetFaceByNormale ( in GEOM_Object theBlock, in GEOM_Object theVector )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetFaceByNormale ( theBlock, theVector )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  IsCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces, out long theNbBlocks )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theNbBlocks ] = IsCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  ExplodeCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ExplodeCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetBlockNearPoint ( in GEOM_Object theCompound, in GEOM_Object thePoint )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlockNearPoint ( theCompound, thePoint )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetBlockByParts ( in GEOM_Object theCompound, in ListOfGO theParts )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlockByParts ( theCompound, theParts )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfGO  GetBlocksByParts ( in GEOM_Object theCompound, in ListOfGO theParts )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetBlocksByParts ( theCompound, theParts )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMultiTransformation1D ( in GEOM_Object theBlock, in long theDirFace1, in long theDirFace2, in long theNbTimes )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMultiTransformation1D ( theBlock, theDirFace1, theDirFace2, theNbTimes )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeMultiTransformation2D ( in GEOM_Object theBlock, in long theDirFace1U, in long theDirFace2U, in long theNbTimesU, in long theDirFace1V, in long theDirFace2V, in long theNbTimesV )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeMultiTransformation2D ( theBlock, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IBooleanOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeBoolean ( in GEOM_Object theShape1, in GEOM_Object theShape2, in long theOperation )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeBoolean ( theShape1, theShape2, theOperation )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePartition ( in ListOfGO theShapes, in ListOfGO theTools, in ListOfGO theKeepInside, in ListOfGO theRemoveInside, in short theLimit, in boolean theRemoveWebs, in ListOfLong theMaterials )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePartition ( theShapes, theTools, theKeepInside, theRemoveInside, theLimit, theRemoveWebs, theMaterials )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeHalfPartition ( in GEOM_Object theShape, in GEOM_Object thePlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeHalfPartition ( theShape, thePlane )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ICurvesOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCirclePntVecR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCirclePntVecR ( thePnt, theVec, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCircleThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCircleThreePnt ( thePnt1, thePnt2, thePnt3 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeEllipse ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeEllipse ( thePnt, theVec, theRMajor, theRMinor )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeArc ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeArc ( thePnt1, thePnt2, thePnt3 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakePolyline ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakePolyline ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSplineBezier ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSplineBezier ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSplineInterpolation ( in ListOfGO thePoints )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSplineInterpolation ( thePoints )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeSketcher ( in string theCommand, in ListOfDouble theWorkingPlane )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeSketcher ( theCommand, theWorkingPlane )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_ILocalOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletAll ( in GEOM_Object theShape, in double theR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletAll ( theShape, theR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletEdges ( in GEOM_Object theShape, in double theR, in ListOfLong theEdges )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletEdges ( theShape, theR, theEdges )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeFilletFaces ( in GEOM_Object theShape, in double theR, in ListOfLong theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeFilletFaces ( theShape, theR, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferAll ( in GEOM_Object theShape, in double theD )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferAll ( theShape, theD )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferEdge ( in GEOM_Object theShape, in double theD1, in double theD2, in long theFace1, in long theFace2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferEdge ( theShape, theD1, theD2, theFace1, theFace2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeChamferFaces ( in GEOM_Object theShape, in double theD1, in double theD2, in ListOfLong theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeChamferFaces ( theShape, theD1, theD2, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeArchimede ( in GEOM_Object theShape, in double theWeight, in double theWaterDensity, in double theMeshDeflection )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeArchimede ( theShape, theWeight, theWaterDensity, theMeshDeflection )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetSubShapeIndex ( in GEOM_Object theShape, in GEOM_Object theSubShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetSubShapeIndex ( theShape, theSubShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IHealingOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  ProcessShape ( in GEOM_Object theShapes, in string_array theOperators, in string_array theParameters, in string_array theValues )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = ProcessShape ( theShapes, theOperators, theParameters, theValues )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetShapeProcessParameters ( out string_array theOperators, out string_array theParameters, out string_array theValues )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theOperators, theParameters, theValues ] = GetShapeProcessParameters (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  SuppressFaces ( in GEOM_Object theObject, in short_array theFaces )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = SuppressFaces ( theObject, theFaces )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  CloseContour ( in GEOM_Object theObject, in short_array theWires, in boolean isCommonVertex )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = CloseContour ( theObject, theWires, isCommonVertex )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  RemoveIntWires ( in GEOM_Object theObject, in short_array theWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = RemoveIntWires ( theObject, theWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  FillHoles ( in GEOM_Object theObject, in short_array theWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = FillHoles ( theObject, theWires )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Sew ( in GEOM_Object theObject, in double theTolerance )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Sew ( theObject, theTolerance )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  DivideEdge ( in GEOM_Object theObject, in short theEdgeIndex, in double theValue, in boolean isByParameter )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = DivideEdge ( theObject, theEdgeIndex, theValue, isByParameter )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  GetFreeBoundary ( in GEOM_Object theObject, out ListOfGO theClosedWires, out ListOfGO theOpenWires )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theClosedWires, theOpenWires ] = GetFreeBoundary ( theObject )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IInsertOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  MakeCopy ( in GEOM_Object theOriginal )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = MakeCopy ( theOriginal )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Export ( in GEOM_Object theObject, in string theFileName, in string theFormatName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Export ( theObject, theFileName, theFormatName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  Import ( in string theFileName, in string theFormatName )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Import ( theFileName, theFormatName )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void ImportTranslators ( out string_array theFormats, out string_array thePatterns )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theFormats, thePatterns ] = ImportTranslators (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void ExportTranslators ( out string_array theFormats, out string_array thePatterns )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theFormats, thePatterns ] = ExportTranslators (  )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IMeasureOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetBasicProperties ( in GEOM_Object theShape, out double theLength, out double theSurfArea, out double theVolume )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ theLength, theSurfArea, theVolume ] = GetBasicProperties ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetCentreOfMass ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetCentreOfMass ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetInertia ( in GEOM_Object theShape, out double I11, out double I12, out double I13, out double I21, out double I22, out double I23, out double I31, out double I32, out double I33, out double Ix, out double Iy, out double Iz )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ I11, I12, I13, I21, I22, I23, I31, I32, I33, Ix, Iy, Iz ] = GetInertia ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetBoundingBox ( in GEOM_Object theShape, out double Xmin, out double Xmax, out double Ymin, out double Ymax, out double Zmin, out double Zmax )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ Xmin, Xmax, Ymin, Ymax, Zmin, Zmax ] = GetBoundingBox ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void GetTolerance ( in GEOM_Object theShape, out double FaceMin, out double FaceMax, out double EdgeMin, out double EdgeMax, out double VertMin, out double VertMax )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ FaceMin, FaceMax, EdgeMin, EdgeMax, VertMin, VertMax ] = GetTolerance ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>boolean  CheckShape ( in GEOM_Object theShape, out string theDescription )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  theDescription ] = CheckShape ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  WhatIs ( in GEOM_Object theShape )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = WhatIs ( theShape )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>double  GetMinDistance ( in GEOM_Object theShape1, in GEOM_Object theShape2, out double X1, out double Y1, out double Z1, out double X2, out double Y2, out double Z2 )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ return_value,  X1, Y1, Z1, X2, Y2, Z2 ] = GetMinDistance ( theShape1, theShape2 )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void PointCoordinates ( in GEOM_Object theShape, out double X, out double Y, out double Z )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>[ X, Y, Z ] = PointCoordinates ( theShape )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_IGroupOperations</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  CreateGroup ( in GEOM_Object theMainShape, in long theShapeType )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = CreateGroup ( theMainShape, theShapeType )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void AddObject ( in GEOM_Object theGroup, in long theSubShapeId )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>AddObject ( theGroup, theSubShapeId )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void RemoveObject ( in GEOM_Object theGroup, in long theSubShapeId )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>RemoveObject ( theGroup, theSubShapeId )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>long  GetType ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetType ( theGroup )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetMainShape ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetMainShape ( theGroup )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>ListOfLong  GetObjects ( in GEOM_Object theGroup )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetObjects ( theGroup )</b></div></td>
-</tr>
-</table><br>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Gen</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Undo ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Undo ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void Redo ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>Redo ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>SObject  AddInStudy ( in Study theStudy, in GEOM_Object theObject, in string theName, in GEOM_Object theFather )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = AddInStudy ( theStudy, theObject, theName, theFather )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBasicOperations  GetIBasicOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBasicOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ITransformOperations  GetITransformOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetITransformOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_I3DPrimOperations  GetI3DPrimOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetI3DPrimOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IShapesOperations  GetIShapesOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIShapesOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBooleanOperations  GetIBooleanOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBooleanOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ICurvesOperations  GetICurvesOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetICurvesOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_ILocalOperations  GetILocalOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetILocalOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IHealingOperations  GetIHealingOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIHealingOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IInsertOperations  GetIInsertOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIInsertOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IMeasureOperations  GetIMeasureOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIMeasureOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IBlocksOperations  GetIBlocksOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIBlocksOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_IGroupOperations  GetIGroupOperations ( in long theStudyID )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIGroupOperations ( theStudyID )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>void RemoveObject ( in GEOM_Object theObject )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>RemoveObject ( theObject )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetObject ( in long theStudyID, in string theEntry )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetObject ( theStudyID, theEntry )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  AddSubShape ( in GEOM_Object theMainShape, in ListOfLong theIndices )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = AddSubShape ( theMainShape, theIndices )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Object  GetIORFromString ( in string theIOR )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetIORFromString ( theIOR )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>string  GetStringFromIOR ( in GEOM_Object theObject )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetStringFromIOR ( theObject )</b></div></td>
-</tr>
-</table><br>
-</b></HTML>

doc/salome/tui/GEOM/HTML/GEOM_Shape.html

@@ -1,18 +0,0 @@
-<HTML><b>
-<table width="100%" BORDER>
-<tr bgcolor="#FFFFCC">
-<td colspan="11"><font size="+3"><b><div align="center"><i>interface GEOM_Shape</i></div></b></font></td>
-</tr>
-<td width="50%" bgcolor= "lightgreen" ><font size="+2"><div align="center"><b><i>IDL file</i></b></div></font></td>
-<td width="50%" bgcolor= "lightgreen"><font size="+2"><div align="center"><b><i>Python</i></b></div></font></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>TMPFile  GetShapeStream (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = GetShapeStream (  )</b></div></td>
-</tr>
-<tr>
-<td bgcolor= "lightgreen"><div align="center"><b>GEOM_Gen  Engine (  )</b></div></td>
-<td bgcolor= "lightgreen"><div align="center"><b>return_value = Engine (  )</b></div></td>
-</tr>
-</table><br>
-</b></HTML>

doc/salome/tui/GEOM/doxyfile_py.in

@@ -1,242 +0,0 @@
-# Doxyfile 1.4.6
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
-PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../
-CREATE_SUBDIRS         = NO
-OUTPUT_LANGUAGE        = English
-USE_WINDOWS_ENCODING   = NO
-BRIEF_MEMBER_DESC      = YES
-REPEAT_BRIEF           = NO
-ABBREVIATE_BRIEF       = 
-ALWAYS_DETAILED_SEC    = YES
-INLINE_INHERITED_MEMB  = YES
-FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
-		         ../../../build/salome
-STRIP_FROM_INC_PATH    = 
-SHORT_NAMES            = NO
-JAVADOC_AUTOBRIEF      = YES
-MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
-INHERIT_DOCS           = YES
-SEPARATE_MEMBER_PAGES  = NO
-TAB_SIZE               = 5
-ALIASES                = 
-OPTIMIZE_OUTPUT_FOR_C  = YES
-OPTIMIZE_OUTPUT_JAVA   = YES
-BUILTIN_STL_SUPPORT    = NO
-DISTRIBUTE_GROUP_DOC   = NO
-SUBGROUPING            = YES
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-EXTRACT_ALL            = YES
-EXTRACT_PRIVATE        = YES
-EXTRACT_STATIC         = YES
-EXTRACT_LOCAL_CLASSES  = YES
-EXTRACT_LOCAL_METHODS  = NO
-HIDE_UNDOC_MEMBERS     = NO
-HIDE_UNDOC_CLASSES     = NO
-HIDE_FRIEND_COMPOUNDS  = NO
-HIDE_IN_BODY_DOCS      = NO
-INTERNAL_DOCS          = YES
-CASE_SENSE_NAMES       = YES
-HIDE_SCOPE_NAMES       = NO
-SHOW_INCLUDE_FILES     = YES
-INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = NO
-SORT_BRIEF_DOCS        = NO
-SORT_BY_SCOPE_NAME     = NO
-GENERATE_TODOLIST      = YES
-GENERATE_TESTLIST      = YES
-GENERATE_BUGLIST       = YES
-GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS       = 
-MAX_INITIALIZER_LINES  = 25
-SHOW_USED_FILES        = NO
-SHOW_DIRECTORIES       = NO
-FILE_VERSION_FILTER    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-QUIET                  = NO
-WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = YES
-WARN_IF_DOC_ERROR      = YES
-WARN_NO_PARAMDOC       = NO
-WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = log.txt
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
-		         ../../../share/salome/idl \
-			 ../../../build/salome/bin
-FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
-RECURSIVE              = YES
-EXCLUDE                = 
-EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       = 
-EXAMPLE_PATH           = 
-EXAMPLE_PATTERNS       = 
-EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = sources/
-INPUT_FILTER           = 
-FILTER_PATTERNS        = 
-FILTER_SOURCE_FILES    = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-SOURCE_BROWSER         = NO
-INLINE_SOURCES         = NO
-STRIP_CODE_COMMENTS    = YES
-REFERENCED_BY_RELATION = NO
-REFERENCES_RELATION    = YES
-USE_HTAGS              = NO
-VERBATIM_HEADERS       = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-ALPHABETICAL_INDEX     = YES
-COLS_IN_ALPHA_INDEX    = 3
-IGNORE_PREFIX          = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-GENERATE_HTML          = YES
-HTML_OUTPUT            = GEOM
-HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = sources/myheader.html
-HTML_FOOTER            = sources/footer.html
-HTML_STYLESHEET        = sources/static/doxygen.css
-HTML_ALIGN_MEMBERS     = YES
-GENERATE_HTMLHELP      = NO
-CHM_FILE               = 
-HHC_LOCATION           = 
-GENERATE_CHI           = NO
-BINARY_TOC             = YES
-TOC_EXPAND             = YES
-DISABLE_INDEX          = NO
-ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
-TREEVIEW_WIDTH         = 250
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-GENERATE_LATEX         = NO
-LATEX_OUTPUT           = latex
-LATEX_CMD_NAME         = latex
-MAKEINDEX_CMD_NAME     = makeindex
-COMPACT_LATEX          = NO
-PAPER_TYPE             = a4wide
-EXTRA_PACKAGES         = 
-LATEX_HEADER           = 
-PDF_HYPERLINKS         = NO
-USE_PDFLATEX           = NO
-LATEX_BATCHMODE        = NO
-LATEX_HIDE_INDICES     = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-GENERATE_RTF           = NO
-RTF_OUTPUT             = rtf
-COMPACT_RTF            = NO
-RTF_HYPERLINKS         = NO
-RTF_STYLESHEET_FILE    = 
-RTF_EXTENSIONS_FILE    = 
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-GENERATE_MAN           = NO
-MAN_OUTPUT             = man
-MAN_EXTENSION          = .3
-MAN_LINKS              = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-GENERATE_XML           = NO
-XML_OUTPUT             = xml
-XML_SCHEMA             = 
-XML_DTD                = 
-XML_PROGRAMLISTING     = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-GENERATE_AUTOGEN_DEF   = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-GENERATE_PERLMOD       = NO
-PERLMOD_LATEX          = NO
-PERLMOD_PRETTY         = YES
-PERLMOD_MAKEVAR_PREFIX = 
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor   
-#---------------------------------------------------------------------------
-ENABLE_PREPROCESSING   = YES
-MACRO_EXPANSION        = NO
-EXPAND_ONLY_PREDEF     = NO
-SEARCH_INCLUDES        = YES
-INCLUDE_PATH           = 
-INCLUDE_FILE_PATTERNS  = 
-PREDEFINED             = 
-EXPAND_AS_DEFINED      = 
-SKIP_FUNCTION_MACROS   = NO
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references   
-#---------------------------------------------------------------------------
-TAGFILES               = 
-GENERATE_TAGFILE       = 
-ALLEXTERNALS           = NO
-EXTERNAL_GROUPS        = YES
-PERL_PATH              = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool   
-#---------------------------------------------------------------------------
-CLASS_DIAGRAMS         = YES
-HIDE_UNDOC_RELATIONS   = NO
-HAVE_DOT               = YES
-CLASS_GRAPH            = YES
-COLLABORATION_GRAPH    = NO
-GROUP_GRAPHS           = NO
-UML_LOOK               = NO
-TEMPLATE_RELATIONS     = YES
-INCLUDE_GRAPH          = YES
-INCLUDED_BY_GRAPH      = NO
-CALL_GRAPH             = NO
-GRAPHICAL_HIERARCHY    = YES
-DIRECTORY_GRAPH        = YES
-DOT_IMAGE_FORMAT       = jpg
-DOT_PATH               = 
-DOTFILE_DIRS           = 
-MAX_DOT_GRAPH_WIDTH    = 1024
-MAX_DOT_GRAPH_HEIGHT   = 1200
-MAX_DOT_GRAPH_DEPTH    = 0
-DOT_TRANSPARENT        = NO
-DOT_MULTI_TARGETS      = NO
-GENERATE_LEGEND        = NO
-DOT_CLEANUP            = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine   
-#---------------------------------------------------------------------------
-SEARCHENGINE           = NO

doc/salome/tui/GEOM/sources/myheader_py2.html

@@ -1,24 +0,0 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-   <title>Main Page</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-&nbsp;
-<center><table WIDTH="96%" >
-<tr>
-<td><a href="http://www.opencascade.com"><img src="../sources/logocorp.gif" BORDER=0 height=46 width=122></a></td>
-
-
-<td>
-<div align=right><a href="http://www.opencascade.org/SALOME/"><img src="../sources/application.gif" BORDER=0 height=46 width=108></a></div>
-</td>
-</tr>
-</table></center>
-
-
-</body>
-</html>

doc/salome/tui/GEOM/sources/static/page2.html

@@ -1,43 +0,0 @@
-<!DOCTYPE doctype PUBLIC "-//w3c//dtd html 4.0 transitional//en">
-<html>
-<head>
-    
-  <meta http-equiv="Content-Type"
- content="text/html; charset=iso-8859-1">
-    
-  <meta name="GENERATOR"
- content="Mozilla/4.73 [en] (WinNT; I) [Netscape]">
-  <title>Main Page</title>
-     
-  <link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-  <body>
- &nbsp; 
-<center>
-<table width="96%">
- <tbody>
-    <tr>
- <td><a href="http://www.opencascade.com"><img
- src="sources/logocorp.gif" border="0" height="46" width="122">
-      </a></td>
-   <td> 
-      <div align="right"><a href="http://www.opencascade.org/SALOME/"><img
- src="sources/application.gif" border="0" height="46" width="108">
-      </a></div>
- </td>
- </tr>
- 
-  </tbody>
-</table>
-</center>
-   <!-- Generated by Doxygen 1.3-rc2 --> 
-<ul>
- <li><b>SALOME GEOMETRY module</b>
-    <ul>
- <li><a href="HTML/GEOM_Gen.html">Mapping of GEOM_Gen functions</a></li>
-    </ul>
- </li>
-</ul>
- <br>
-</body>
-</html>

doc/salome/tui/GEOM/sources/static/tree.js.in

@@ -1,59 +0,0 @@
-foldersTree = gFld("<b>SALOME v.@VERSION@ </b>", "", "")
-     insDoc(foldersTree, gLnk("Main Page", "", "main.html"))
-
-aux1 = insFld(foldersTree, gFld("TUI Reference Guide", ""))
-  aux2 = insFld(aux1, gFld("Modules", ""))
-    aux3 = insFld(aux2, gFld("SALOME GEOMETRY module", ""))
-/*!             insDoc(aux3, gLnk("Overview", "", "overview_Geometry.html"))*/
-      aux4 = insFld(aux3, gFld("Packages", "")) 		
-               insDoc(aux4, gLnk("GEOM", "", "namespaceGEOM.html"))
-/*!             insDoc(aux3, gLnk("Examples", "", "examples_GEOM.html"))
-*/
-
-/*! Data structures
-*/
-         insDoc(aux1, gLnk("Data Structures", "", "annotated.html"))
-
-/*!    insDoc(aux1, gLnk("GEOM::GEOM_Gen", "", "interfaceGEOM_1_1GEOM__Gen.html"))
-       insDoc(aux1, gLnk("GEOM::GEOM_Shape", "", "interfaceGEOM_1_1GEOM__Shape.html"))
-*/
-         insDoc(aux1, gLnk("Class Hierarchy", "", "hierarchy.html"))
-
-/*!    
-    aux3 = insFld(aux2, gFld("GEOM::GEOM_Gen", "", "interfaceGEOM_1_1GEOM__Gen.html"))
-    aux3 = insFld(aux2, gFld("GEOM::GEOM_Shape", "", "interfaceGEOM_1_1GEOM__Shape.html"))
-    aux3 = insFld(aux2, gFld("GEOM::AxisStruct", "", "structGEOM_1_1AxisStruct.html"))
-    aux3 = insFld(aux2, gFld("GEOM::DirStruct", "", "structGEOM_1_1DirStruct.html"))
-    aux3 = insFld(aux2, gFld("GEOM::PointStruct", "", "structGEOM_1_1PointStruct.html"))
-*/
-         insDoc(aux1, gLnk("Class methods list", "", "functions.html"))
-/*!
-aux1 = insFld(foldersTree, gFld("Namespace List", "", "namespaces.html"))
-       insDoc(aux1, gLnk("GEOM", "", "namespaceGEOM.html"))
-*/
-         insDoc(aux1, gLnk("Namespace Members", "", "namespacemembers.html"))
-
-         insDoc(aux1, gLnk("File List", "", "files.html"))
-      
-/*!
-      
-       insDoc(aux1, gLnk("GEOM_Gen.idl", "", "GEOM__Gen_8idl.html"))
-       insDoc(aux1, gLnk("GEOM_Shape.idl", "", "GEOM__Shape_8idl.html"))
-*/
-
-aux1 = insFld(foldersTree, gFld("IDL/Python mapping", ""))
-         insDoc(aux1, gLnk("Mapping of GEOMETRY IDL definitions to Python language", "", "page2.html"))
-
-/*!aux1 = insFld(foldersTree, gFld("Python Commands", "", "geompy_doc/main.html"))
-         insDoc(aux1, gLnk("Package geompy", "", "geompy_doc/namespacegeompy.html"))
-         insDoc(aux1, gLnk("Namespace Members", "", "geompy_doc/namespacemembers.html"))
-         insDoc(aux1, gLnk("File geompy.py", "", "geompy_doc/geompy_8py.html"))
-*/
-
-aux1 = insFld(foldersTree, gFld("Python Commands", "", "geompy_doc/main.html"))
-         insDoc(aux1, gLnk("Package List", "", "geompy_doc/namespaces.html"))
-         insDoc(aux1, gLnk("Namespace Members", "", "geompy_doc/namespacemembers.html"))
-         insDoc(aux1, gLnk("File List", "", "geompy_doc/files.html"))
-
-/*!  insDoc(foldersTree, gLnk("Graphical Class Hierarchy", "", "inherits.html"))
-*/

doc/salome/tui/GEOM/sources/static/treeview.js

@@ -1,505 +0,0 @@
-//**************************************************************** 
-// You are free to copy the "Folder-Tree" script as long as you  
-// keep this copyright notice: 
-// Script found in: http://www.geocities.com/Paris/LeftBank/2178/ 
-// Author: Marcelino Alves Martins (martins@hks.com) December '97. 
-//**************************************************************** 
- 
-//Log of changes: 
-//       17 Feb 98 - Fix initialization flashing problem with Netscape
-//       
-//       27 Jan 98 - Root folder starts open; support for USETEXTLINKS; 
-//                   make the ftien4 a js file 
-//       
-// DvH:  Dec 2000 -  Made some minor changes to support external 
-//                   references
- 
-// Definition of class Folder 
-// ***************************************************************** 
- 
-function Folder(folderDescription, tagName, hreference) //constructor 
-{ 
-  //constant data 
-  this.desc = folderDescription 
-  this.tagName = tagName
-  this.hreference = hreference 
-  this.id = -1   
-  this.navObj = 0  
-  this.iconImg = 0  
-  this.nodeImg = 0  
-  this.isLastNode = 0 
- 
-  //dynamic data 
-  this.isOpen = true 
-  this.iconSrc = "ftv2folderopen.png"   
-  this.children = new Array 
-  this.nChildren = 0 
- 
-  //methods 
-  this.initialize = initializeFolder 
-  this.setState = setStateFolder 
-  this.addChild = addChild 
-  this.createIndex = createEntryIndex 
-  this.hide = hideFolder 
-  this.display = display 
-  this.renderOb = drawFolder 
-  this.totalHeight = totalHeight 
-  this.subEntries = folderSubEntries 
-  this.outputLink = outputFolderLink 
-} 
- 
-function setStateFolder(isOpen) 
-{ 
-  var subEntries 
-  var totalHeight 
-  var fIt = 0 
-  var i=0 
- 
-  if (isOpen == this.isOpen) 
-    return 
- 
-  if (browserVersion == 2)  
-  { 
-    totalHeight = 0 
-    for (i=0; i < this.nChildren; i++) 
-      totalHeight = totalHeight + this.children[i].navObj.clip.height 
-      subEntries = this.subEntries() 
-    if (this.isOpen) 
-      totalHeight = 0 - totalHeight 
-    for (fIt = this.id + subEntries + 1; fIt < nEntries; fIt++) 
-      indexOfEntries[fIt].navObj.moveBy(0, totalHeight) 
-  }  
-  this.isOpen = isOpen 
-  propagateChangesInState(this) 
-} 
- 
-function propagateChangesInState(folder) 
-{   
-  var i=0 
- 
-  if (folder.isOpen) 
-  { 
-    if (folder.nodeImg) 
-      if (folder.isLastNode) 
-        folder.nodeImg.src = "ftv2mlastnode.png" 
-      else 
-	  folder.nodeImg.src = "ftv2mnode.png" 
-    folder.iconImg.src = "ftv2folderopen.png" 
-    for (i=0; i<folder.nChildren; i++) 
-      folder.children[i].display() 
-  } 
-  else 
-  { 
-    if (folder.nodeImg) 
-      if (folder.isLastNode) 
-        folder.nodeImg.src = "ftv2plastnode.png" 
-      else 
-	  folder.nodeImg.src = "ftv2pnode.png" 
-    folder.iconImg.src = "ftv2folderclosed.png" 
-    for (i=0; i<folder.nChildren; i++) 
-      folder.children[i].hide() 
-  }  
-} 
- 
-function hideFolder() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) { 
-    if (this.navObj.style.display == "none") 
-      return 
-    this.navObj.style.display = "none" 
-  } else { 
-    if (this.navObj.visibility == "hidden") 
-      return 
-    this.navObj.visibility = "hidden" 
-  } 
-   
-  this.setState(0) 
-} 
- 
-function initializeFolder(level, lastNode, leftSide) 
-{ 
-var j=0 
-var i=0 
-var numberOfFolders 
-var numberOfDocs 
-var nc 
-      
-  nc = this.nChildren 
-   
-  this.createIndex() 
- 
-  var auxEv = "" 
- 
-  if (browserVersion > 0) 
-    auxEv = "<a href='javascript:clickOnNode("+this.id+")'>" 
-  else 
-    auxEv = "<a>" 
- 
-  if (level>0) 
-    if (lastNode) //the last 'brother' in the children array 
-    { 
-      this.renderOb(leftSide + auxEv + "<img name='nodeIcon" + this.id + "' src='ftv2mlastnode.png' width=16 height=22 border=0></a>") 
-//    leftSide = leftSide + "<img src='ftv2blank.png' width=16 height=22>"  
-      this.isLastNode = 1 
-    } 
-    else 
-    { 
-      this.renderOb(leftSide + auxEv + "<img name='nodeIcon" + this.id + "' src='ftv2mnode.png' width=16 height=22 border=0></a>") 
-      leftSide = leftSide + "<img src='ftv2vertline.png' width=16 height=22>" 
-      this.isLastNode = 0 
-    } 
-  else 
-    this.renderOb("") 
-   
-  if (nc > 0) 
-  { 
-    level = level + 1 
-    for (i=0 ; i < this.nChildren; i++)  
-    { 
-      if (i == this.nChildren-1) 
-        this.children[i].initialize(level, 1, leftSide) 
-      else 
-        this.children[i].initialize(level, 0, leftSide) 
-      } 
-  } 
-} 
- 
-function drawFolder(leftSide) 
-{ 
-  if (browserVersion == 2) { 
-    if (!doc.yPos) 
-      doc.yPos=8 
-    doc.write("<layer id='folder" + this.id + "' top=" + doc.yPos + " visibility=hidden>") 
-  } 
-  if (browserVersion == 3) 
-  {
-    doc.write("<div id='folder" + this.id + "' style='visibility:hide;'>") 
-  }
-   
-  doc.write("\n<table ") 
-  if (browserVersion == 1) 
-    doc.write(" id='folder" + this.id + "' style='position:block;' ") 
-  doc.write(" border=0 cellspacing=0 cellpadding=0>") 
-  doc.write("\n<tr><td>") 
-  doc.write(leftSide) 
-  this.outputLink() 
-  doc.write("<img name='folderIcon" + this.id + "' ") 
-  doc.write("src='" + this.iconSrc+"' border=0></a>") 
-  doc.write("</td>\n<td valign=middle nowrap>") 
-  if (USETEXTLINKS) 
-  { 
-    this.outputLink() 
-    doc.write(this.desc + "</a>") 
-  } 
-  else 
-    doc.write(this.desc)
-
-/*! 
-  if (this.tagName!="")
-  {
-    doc.write(" [external]")
-  }
-*/
-  doc.write("</td>")  
-  doc.write("\n</table>\n") 
-   
-  if (browserVersion == 2) { 
-    doc.write("</layer>") 
-  } 
-  if (browserVersion == 3) { 
-    doc.write("</div>") 
-  } 
- 
-  if (browserVersion == 1) { 
-    this.navObj = doc.all["folder"+this.id] 
-    this.iconImg = doc.all["folderIcon"+this.id] 
-    this.nodeImg = doc.all["nodeIcon"+this.id] 
-  } else if (browserVersion == 2) { 
-    this.navObj = doc.layers["folder"+this.id] 
-    this.iconImg = this.navObj.document.images["folderIcon"+this.id] 
-    this.nodeImg = this.navObj.document.images["nodeIcon"+this.id] 
-    doc.yPos=doc.yPos+this.navObj.clip.height 
-  } else if (browserVersion == 3) {
-    this.navObj = doc.getElementById("folder"+this.id)
-    this.iconImg = doc.images.namedItem("folderIcon"+this.id)
-    this.nodeImg = doc.images.namedItem("nodeIcon"+this.id)
-  }
-} 
- 
-function outputFolderLink() 
-{ 
-  if (this.hreference) 
-  { 
-    doc.write("<a ")
-    if (this.tagName)
-    {
-      doc.write("doxygen='" + this.tagName + "' ");
-    }
-    doc.write("href='" + this.hreference + "' TARGET=\"basefrm\" ") 
-    if (browserVersion > 0) 
-      doc.write("onClick='javascript:clickOnFolder("+this.id+")'") 
-    doc.write(">") 
-  } 
-  else 
-    doc.write("<a>") 
-} 
- 
-function addChild(childNode) 
-{ 
-  this.children[this.nChildren] = childNode 
-  this.nChildren++ 
-  return childNode 
-} 
- 
-function folderSubEntries() 
-{ 
-  var i = 0 
-  var se = this.nChildren 
- 
-  for (i=0; i < this.nChildren; i++){ 
-    if (this.children[i].children) //is a folder 
-      se = se + this.children[i].subEntries() 
-  } 
- 
-  return se 
-} 
- 
- 
-// Definition of class Item (a document or link inside a Folder) 
-// ************************************************************* 
- 
-function Item(itemDescription, tagName, itemLink) // Constructor 
-{ 
-  // constant data 
-  this.desc = itemDescription 
-  this.tagName = tagName
-  this.link = itemLink 
-  this.id = -1 //initialized in initalize() 
-  this.navObj = 0 //initialized in render() 
-  this.iconImg = 0 //initialized in render() 
-  this.iconSrc = "ftv2doc.png" 
- 
-  // methods 
-  this.initialize = initializeItem 
-  this.createIndex = createEntryIndex 
-  this.hide = hideItem 
-  this.display = display 
-  this.renderOb = drawItem 
-  this.totalHeight = totalHeight 
-} 
- 
-function hideItem() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) { 
-    if (this.navObj.style.display == "none") 
-      return 
-    this.navObj.style.display = "none" 
-  } else { 
-    if (this.navObj.visibility == "hidden") 
-      return 
-    this.navObj.visibility = "hidden" 
-  }     
-} 
- 
-function initializeItem(level, lastNode, leftSide) 
-{  
-  this.createIndex() 
- 
-  if (level>0) 
-    if (lastNode) //the last 'brother' in the children array 
-    { 
-      this.renderOb(leftSide + "<img src='ftv2lastnode.png' width=16 height=22>") 
-      leftSide = leftSide + "<img src='ftv2blank.png' width=16 height=22>"  
-    } 
-    else 
-    { 
-      this.renderOb(leftSide + "<img src='ftv2node.png' width=16 height=22>") 
-      leftSide = leftSide + "<img src='ftv2vertline.png' width=16 height=22>" 
-    } 
-  else 
-    this.renderOb("")   
-} 
- 
-function drawItem(leftSide) 
-{ 
-  if (browserVersion == 2) 
-    doc.write("<layer id='item" + this.id + "' top=" + doc.yPos + " visibility=hidden>") 
-  if (browserVersion == 3) 
-    doc.write("<div id='item" + this.id + "' style='display:block;'>") 
-     
-  doc.write("\n<table ") 
-  if (browserVersion == 1) 
-    doc.write(" id='item" + this.id + "' style='position:block;' ") 
-  doc.write(" border=0 cellspacing=0 cellpadding=0>\n") 
-  doc.write("<tr><td>") 
-  doc.write(leftSide) 
-  if (this.link!="")
-  {
-    doc.write("<a href=" + this.link + ">") 
-  }
-  doc.write("<img id='itemIcon"+this.id+"' ") 
-  doc.write("src='"+this.iconSrc+"' border=0>") 
-  if (this.link!="")
-  {
-    doc.write("</a>")
-  } 
-  doc.write("</td>\n<td valign=middle nowrap>") 
-  if (USETEXTLINKS && this.link!="") 
-    doc.write("<a href=" + this.link + ">" + this.desc + "</a>") 
-  else 
-    doc.write(this.desc) 
-/*!
-  if (this.tagName!="")
-  {
-    doc.write(" [external]");
-  }
-*/
-  doc.write("\n</table>\n") 
-   
-  if (browserVersion == 2) 
-    doc.write("</layer>") 
-  if (browserVersion == 3) 
-    doc.write("</div>")
- 
-  if (browserVersion == 1) { 
-    this.navObj = doc.all["item"+this.id] 
-    this.iconImg = doc.all["itemIcon"+this.id] 
-  } else if (browserVersion == 2) { 
-    this.navObj = doc.layers["item"+this.id] 
-    this.iconImg = this.navObj.document.images["itemIcon"+this.id] 
-    doc.yPos=doc.yPos+this.navObj.clip.height 
-  } else if (browserVersion == 3) {
-    this.navObj = doc.getElementById("item"+this.id)
-    this.iconImg = doc.images.namedItem("itemIcon"+this.id)
-  }
-} 
- 
- 
-// Methods common to both objects (pseudo-inheritance) 
-// ******************************************************** 
- 
-function display() 
-{ 
-  if (browserVersion == 1 || browserVersion == 3) 
-    this.navObj.style.display = "block" 
-  else 
-    this.navObj.visibility = "show" 
-} 
- 
-function createEntryIndex() 
-{ 
-  this.id = nEntries 
-  indexOfEntries[nEntries] = this 
-  nEntries++ 
-} 
- 
-// total height of subEntries open 
-function totalHeight() //used with browserVersion == 2 
-{ 
-  var h = this.navObj.clip.height 
-  var i = 0 
-   
-  if (this.isOpen) //is a folder and _is_ open 
-    for (i=0 ; i < this.nChildren; i++)  
-      h = h + this.children[i].totalHeight() 
- 
-  return h 
-} 
- 
- 
-// Events 
-// ********************************************************* 
- 
-function clickOnFolder(folderId) 
-{ 
-  var clicked = indexOfEntries[folderId] 
- 
-  if (!clicked.isOpen) 
-    clickOnNode(folderId) 
- 
-  return  
- 
-  if (clicked.isSelected) 
-    return 
-} 
- 
-function clickOnNode(folderId) 
-{ 
-  var clickedFolder = 0 
-  var state = 0 
- 
-  clickedFolder = indexOfEntries[folderId] 
-  state = clickedFolder.isOpen 
- 
-  clickedFolder.setState(!state) //open<->close  
-} 
- 
-function initializeDocument() 
-{ 
-  doc = document;
-  if (doc.all) 
-    browserVersion = 1 //IE4   
-  else 
-    if (doc.layers) 
-      browserVersion = 2 //NS4 
-    else if(navigator.userAgent.toLowerCase().indexOf('gecko') != -1)
-        browserVersion = 3 //mozilla
-      else 
-        browserVersion = 0 //other 
-
-  foldersTree.initialize(0, 1, "") 
-  foldersTree.display()
-  
-  if (browserVersion > 0) 
-  { 
-    if(browserVersion != 3)
-      doc.write("<layer top="+indexOfEntries[nEntries-1].navObj.top+">&nbsp;</layer>") 
- 
-    // close the whole tree 
-    clickOnNode(0) 
-    // open the root folder 
-    clickOnNode(0) 
-  } 
-} 
- 
-// Auxiliary Functions for Folder-Treee backward compatibility 
-// ********************************************************* 
- 
-function gFld(description, tagName, hreference) 
-{ 
-  folder = new Folder(description, tagName, hreference) 
-  return folder 
-} 
- 
-function gLnk(description, tagName, linkData) 
-{ 
-  fullLink = "" 
- 
-  if (linkData!="")
-  {
-    fullLink = "'"+linkData+"' target=\"basefrm\"" 
-  } 
- 
-  linkItem = new Item(description, tagName, fullLink)   
-  return linkItem 
-} 
- 
-function insFld(parentFolder, childFolder) 
-{ 
-  return parentFolder.addChild(childFolder) 
-} 
- 
-function insDoc(parentFolder, document) 
-{ 
-  parentFolder.addChild(document) 
-} 
- 
-// Global variables 
-// **************** 
- 
-USETEXTLINKS = 1
-indexOfEntries = new Array 
-nEntries = 0 
-doc = document 
-browserVersion = 0 
-selectedFolder=0

doc/salome/tui/Makefile.am

@@ -22,36 +22,20 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-EXTRA_DIST+=GEOM
+EXTRA_DIST += images static
 
-dev_docs:
+dev_docs: doxyfile
-	cp -fr $(srcdir)/GEOM ./INPUT; \
+	echo "Running doxygen in directory: "`pwd`; \
-	cp -f ./GEOM/doxyfile ./INPUT; \
+	$(DOXYGEN) $<;
-	cd INPUT; \
-	sed 's|../../../share/salome|$(top_srcdir)|' ./doxyfile > ./doxyfile1; \
-	sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \
-	mv -f doxyfile2 doxyfile1; \
-	echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \
-	if( test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \
-	  sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \
-	  mv -f doxyfile2 doxyfile1; \
-	  $(DOXYGEN) -u ./doxyfile1; \
-	else \
-	  sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \
-	  mv -f doxyfile2 doxyfile1; \
-	fi; \
-	if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \
-	  sed -e 's|BUILTIN_STL_SUPPORT    = NO|BUILTIN_STL_SUPPORT    = YES|' ./doxyfile1 > ./doxyfile2; \
-	  mv -f doxyfile2 doxyfile1; \
-	fi; \
-	mv -f doxyfile1 doxyfile; \
-	echo "Running doxygen in directory:"`pwd`; \
-	$(DOXYGEN) ./doxyfile; \
-	cd ../; \
-	cp -fr $(srcdir)/GEOM/sources/ GEOM/ ; \
-	rm -fr INPUT
 
-doctuidir=$(docdir)/tui/GEOM
+clean-local:
+	-rm -fr GEOM doxygen.bak
 
-nodist_doctui_DATA= GEOM/doxyfile
+install-data-local:
-EXTRA_DIST+= GEOM/doxyfile.in
+	if test -d GEOM; then \
+	  $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \
+	  cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \
+	fi;
+
+uninstall-local:
+	rm -rf $(docdir)/tui/GEOM

doc/salome/tui/doxyfile.in

@@ -3,9 +3,9 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME - GEOM - v.@VERSION@"
+PROJECT_NAME           = "Geometry Module Programming Guide v.@VERSION@"
 PROJECT_NUMBER         = 
-OUTPUT_DIRECTORY       = ../
+OUTPUT_DIRECTORY       = GEOM
 CREATE_SUBDIRS         = NO
 OUTPUT_LANGUAGE        = English
 USE_WINDOWS_ENCODING   = NO
@@ -15,8 +15,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = ../../../share/salome \
+STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
-		         ../../../build/salome
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -28,7 +27,7 @@ TAB_SIZE               = 5
 ALIASES                = 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 OPTIMIZE_OUTPUT_JAVA   = YES
-BUILTIN_STL_SUPPORT    = NO
+BUILTIN_STL_SUPPORT    = @DOXYGEN_SUPPORT_STL@
 DISTRIBUTE_GROUP_DOC   = NO
 SUBGROUPING            = YES
 
@@ -71,14 +70,16 @@ WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
-WARN_LOGFILE           = log.txt
+WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = ../../../share/salome/src \
+INPUT                  = @top_srcdir@/src \
-		         ../../../share/salome/idl
+			 @top_srcdir@/bin \
-FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here
+			 @top_srcdir@/idl \
+			 @top_builddir@/bin
+FILE_PATTERNS          = *.idl *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
@@ -86,7 +87,7 @@ EXCLUDE_PATTERNS       =
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = sources/
+IMAGE_PATH             = @srcdir@/images
 INPUT_FILTER           = 
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = YES
@@ -113,11 +114,11 @@ IGNORE_PREFIX          =
 # configuration options related to the HTML output
 #---------------------------------------------------------------------------
 GENERATE_HTML          = YES
-HTML_OUTPUT            = GEOM
+HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = sources/myheader.html
+HTML_HEADER            = @srcdir@/static/myheader.html
-HTML_FOOTER            = sources/footer.html
+HTML_FOOTER            = @srcdir@/static/footer.html
-HTML_STYLESHEET        = sources/static/doxygen.css
+HTML_STYLESHEET        = @srcdir@/static/doxygen.css
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 

idl/Makefile.am

@@ -26,45 +26,33 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-BASEIDL_FILES= GEOM_Gen.idl GEOM_Superv.idl
+BASEIDL_FILES = GEOM_Gen.idl GEOM_Superv.idl
-
-EXTRA_DIST+= $(BASEIDL_FILES)
 
 # This variable defines the files to be installed
-salomeidl_DATA = $(BASEIDL_FILES)
+dist_salomeidl_DATA = $(BASEIDL_FILES)
 
 # GUI idl common library
 lib_LTLIBRARIES = libSalomeIDLGEOM.la
 
 # Sources built from idl files
-nodist_libSalomeIDLGEOM_la_SOURCES= GEOM_GenSK.cc GEOM_SupervSK.cc
+nodist_libSalomeIDLGEOM_la_SOURCES = GEOM_GenSK.cc GEOM_SupervSK.cc
 
 # header files must be exported: other modules have to use this library
-nodist_salomeinclude_HEADERS= $(BASEIDL_FILES:%.idl=%.hh)
+nodist_salomeinclude_HEADERS = $(BASEIDL_FILES:%.idl=%.hh)
 
-libSalomeIDLGEOM_la_CPPFLAGS =\
+libSalomeIDLGEOM_la_CPPFLAGS =			\
-	-I$(top_builddir)/salome_adm/unix \
+	-I$(top_builddir)/salome_adm/unix	\
-	-I$(top_builddir)/idl \
+	-I$(top_builddir)/idl			\
 	@CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@
 libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0
-libSalomeIDLGEOM_la_LIBADD  = \
+libSalomeIDLGEOM_la_LIBADD  = $(STDLIB) @CORBA_LIBS@ $(KERNEL_LDFLAGS) -lSalomeIDLKernel
-	$(STDLIB) \
-	@CORBA_LIBS@ \
-	$(KERNEL_LDFLAGS) -lSalomeIDLKernel
 
 # These variables defines the building process of CORBA files
 OMNIORB_IDL         = @OMNIORB_IDL@
 OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@
 OMNIORB_IDLPYFLAGS  = @OMNIORB_IDLPYFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome 
-IDLCXXFLAGS = \
+IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(top_builddir)/salome_adm/unix
-	-bcxx \
+IDLPYFLAGS  = @IDLPYFLAGS@ -I$(KERNEL_ROOT_DIR)/idl/salome
-	@IDLCXXFLAGS@ \
-	-I$(top_builddir)/idl/salome \
-	-I$(KERNEL_ROOT_DIR)/idl/salome \
-	-I$(top_builddir)/salome_adm/unix
-IDLPYFLAGS  = \
-	@IDLPYFLAGS@ \
-	-I$(KERNEL_ROOT_DIR)/idl/salome
 
 # potential problem on parallel make on the following - multiple outputs
 SUFFIXES = .idl .hh SK.cc
@@ -74,14 +62,14 @@ SUFFIXES = .idl .hh SK.cc
 	$(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $<
 
 install-exec-local: $(BASEIDL_FILES:%=$(top_srcdir)/idl/%)
-	$(INSTALL) -d  $(pkgpythondir)
+	$(INSTALL) -d  $(DESTDIR)$(salomepythondir)
 	ls $^ | while read file; do \
-	  $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \
+	  $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(salomepythondir) $$file ; \
 	done
 
 # uninstall-local removes too much, but it works in distcheck
 uninstall-local:
-	rm -rf $(pkgpythondir)/*
+	rm -rf $(DESTDIR)$(salomepythondir)/*
 
 mostlyclean-local:
 	-rm -f *.hh *.cc .depidl

resources/Makefile.am

@@ -27,183 +27,186 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-dist_salomeres_DATA = \
+dist_salomeres_DATA =		\
-GEOM_en.xml \
+GEOM_en.xml			\
-GEOM_fr.xml \
+GEOM_fr.xml			\
-GEOM.config \
+GEOM.config			\
-SalomeApp.xml \
+SalomeApp.xml			\
-Plugin \
+Plugin				\
-GEOMDS_Resources \
+GEOMDS_Resources		\
-ImportExport \
+ImportExport			\
-ShHealing \
+ShHealing			\
-angle.png \
+angle.png			\
-arc.png \
+arc.png				\
-archimede.png \
+archimede.png			\
-axisinertia.png \
+axisinertia.png			\
-basicproperties.png \
+basicproperties.png		\
-bounding.png \
+bounding.png			\
-box.png \
+box.png				\
-box2points.png \
+box2points.png			\
-boxdxyz.png \
+boxdxyz.png			\
-build_compound.png \
+build_compound.png		\
-build_edge.png \
+build_edge.png			\
-build_face.png \
+build_face.png			\
-build_shell.png \
+build_shell.png			\
-build_solid.png \
+build_solid.png			\
-build_wire.png \
+build_wire.png			\
-centergravity.png \
+centergravity.png		\
-chamfer.png \
+chamfer.png			\
-chamferall.png \
+chamferall.png			\
-chamferedge.png \
+chamferedge.png			\
-chamferface.png \
+chamferface.png			\
-chamferedgefromface.png \
+chamferedgefromface.png		\
-change_orientation.png \
+change_orientation.png		\
-check.png \
+check.png			\
-circle.png \
+circle.png			\
-circlepointvector.png \
+circlepointvector.png		\
-circle3points.png \
+circle3points.png		\
-circlecenter2pnts.png \
+circlecenter2pnts.png		\
-common.png \
+common.png			\
-cone.png \
+cone.png			\
-conedxyz.png \
+conedxyz.png			\
-conepointvector.png \
+conepointvector.png		\
-cut.png \
+cut.png				\
-cylinder.png \
+cylinder.png			\
-cylinderdxyz.png \
+cylinderdxyz.png		\
-cylinderpointvector.png \
+cylinderpointvector.png		\
-delete.png \
+delete.png			\
-disk.png \
+disk.png			\
-disk3points.png \
+disk3points.png			\
-disk_pntvecr.png \
+disk_pntvecr.png		\
-disk_r.png \
+disk_r.png			\
-display.png \
+display.png			\
-displayonly.png \
+displayonly.png			\
-displayall.png \
+displayall.png			\
-erase.png \
+erase.png			\
-eraseall.png \
+eraseall.png			\
-face_hw.png \
+face_hw.png			\
-face_vechw.png \
+face_vechw.png			\
-fillet.png \
+fillet.png			\
-filletall.png \
+filletall.png			\
-filletedge.png \
+filletedge.png			\
-filletface.png \
+filletface.png			\
-filling.png \
+filling.png			\
-fuse.png \
+fuse.png			\
-geometry.png \
+geometry.png			\
-line.png \
+line.png			\
-line2points.png \
+line2points.png			\
-line2faces.png \
+line2faces.png			\
-mindist.png \
+mindist.png			\
-mirrorPoint.png \
+mirrorPoint.png			\
-mirrorAxe.png \
+mirrorAxe.png			\
-mirrorPlane.png \
+mirrorPlane.png			\
-ModuleGeom.png \
+ModuleGeom.png			\
-multirotation.png \
+multirotation.png		\
-multirotationdouble.png \
+multirotationdouble.png		\
-multirotationsimple.png \
+multirotationsimple.png		\
-multitranslation.png \
+multitranslation.png		\
-multitranslationdouble.png \
+multitranslationdouble.png	\
-multitranslationsimple.png \
+multitranslationsimple.png	\
-normale.png \
+normale.png			\
-offset.png \
+offset.png			\
-partition.png \
+partition.png			\
-partitionkeep.png \
+partitionkeep.png		\
-partitionplane.png \
+partitionplane.png		\
-pipe.png \
+pipe.png			\
-plane.png \
+plane.png			\
-planeWorking.png \
+planeWorking.png		\
-plane3points.png \
+plane3points.png		\
-planeface.png \
+planeface.png			\
-planepointvector.png \
+planepointvector.png		\
-planeworkingface.png \
+planeworkingface.png		\
-planeworkingvector.png \
+planeworkingvector.png		\
-planeworkingorigin.png \
+planeworkingorigin.png		\
-point2.png \
+point2.png			\
-pointonedge.png \
+pointonedge.png			\
-pointonface.png \
+pointonface.png			\
-point_line_intersection.png \
+point_line_intersection.png	\
-polyline.png \
+polyline.png			\
-prism.png \
+prism.png			\
-prism2.png \
+prism2.png			\
-prism3.png \
+prism3.png			\
-revol.png \
+revol.png			\
-rotate.png \
+rotate.png			\
-rotatepnt.png \
+rotatepnt.png			\
-scale.png \
+scale.png			\
-scale_along_axes.png \
+scale_along_axes.png		\
-section.png \
+section.png			\
-select1.png \
+select1.png			\
-sewing.png \
+sewing.png			\
-shading.png \
+shading.png			\
-shapesonshape.png \
+shapesonshape.png		\
-sketch.png \
+sketch.png			\
-sphere.png \
+sphere.png			\
-spheredxyz.png \
+spheredxyz.png			\
-spherepoint.png \
+spherepoint.png			\
-subshape.png \
+subshape.png			\
-supressHolesOnFaceShell.png \
+supressHolesOnFaceShell.png	\
-supressface.png \
+supressface.png			\
-supresshole.png \
+supresshole.png			\
-tolerance.png \
+tolerance.png			\
-torus.png \
+torus.png			\
-torusdxyz.png \
+torusdxyz.png			\
-toruspointvector.png \
+toruspointvector.png		\
-translationDxyz.png \
+translationDxyz.png		\
-translationPoints.png \
+translationPoints.png		\
-translationVector.png \
+translationVector.png		\
-tree_compound.png \
+tree_compound.png		\
-tree_compsolid.png \
+tree_compsolid.png		\
-tree_edge.png \
+tree_edge.png			\
-tree_face.png \
+tree_face.png			\
-tree_shape.png \
+tree_shape.png			\
-tree_shell.png \
+tree_shell.png			\
-tree_solid.png \
+tree_solid.png			\
-tree_vertex.png \
+tree_vertex.png			\
-tree_wire.png \
+tree_wire.png			\
-tree_group_vertex.png \
+tree_group_vertex.png		\
-tree_group_edge.png \
+tree_group_edge.png		\
-tree_group_face.png \
+tree_group_face.png		\
-tree_group_solid.png \
+tree_group_solid.png		\
-tree_lcs.png \
+tree_lcs.png			\
-vector.png \
+vector.png			\
-vector2points.png \
+vector2points.png		\
-vectordxyz.png \
+vectordxyz.png			\
-whatis.png \
+whatis.png			\
-ellipse.png \
+ellipse.png			\
-ellipsepointvector.png \
+ellipsepointvector.png		\
-bezier.png \
+bezier.png			\
-interpol.png \
+interpol.png			\
-spline.png \
+spline.png			\
-closecontour.png \
+closecontour.png		\
-suppressintwires.png \
+suppressintwires.png		\
-marker.png \
+marker.png			\
-marker2.png \
+marker2.png			\
-marker3.png \
+marker3.png			\
-position.png \
+position.png			\
-position2.png \
+position2.png			\
-free_bound.png \
+free_bound.png			\
-point_coord.png \
+point_coord.png			\
-point3.png \
+point3.png			\
-shapeprocess.png \
+shapeprocess.png		\
-block_2f.png \
+block_2f.png			\
-block_6f.png \
+block_6f.png			\
-block_face_2e.png \
+block_face_2e.png		\
-block_face_4e.png \
+block_face_4e.png		\
-block_face_4v.png \
+block_face_4v.png		\
-block_multitrsf_double.png \
+block_multitrsf_double.png	\
-block_multitrsf_simple.png \
+block_multitrsf_simple.png	\
-tree_block.png \
+tree_block.png			\
-subblock.png \
+subblock.png			\
-group_new.png \
+group_new.png			\
-group_edit.png \
+group_edit.png			\
-glue.png \
+glue.png			\
-check_blocks_compound.png \
+check_blocks_compound.png	\
-free_faces.png \
+free_faces.png			\
-propagate.png \
+propagate.png			\
-redo.png \
+redo.png			\
-undo.png \
+undo.png			\
-arccenter.png \
+arccenter.png			\
-glue2.png \
+glue2.png			\
-remove_extra_edges.png
+remove_extra_edges.png		\
+coordsys.png			\
+translation.png
 
-nodist_salomeres_DATA = GEOMCatalog.xml
+# VSR: little trick to avoid putting if GEOMCatalog.xml to the distribution archive
+nodist_salomeres_SCRIPTS = GEOMCatalog.xml

src/ARCHIMEDE/Makefile.am

@@ -29,7 +29,7 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =	\
 	Archimede_VolumeSection.hxx
 
 # Libraries targets
@@ -37,17 +37,18 @@ salomeinclude_HEADERS = \
 lib_LTLIBRARIES = libGEOMArchimede.la
 
 # sources files
-dist_libGEOMArchimede_la_SOURCES = \
+dist_libGEOMArchimede_la_SOURCES =	\
 	Archimede_VolumeSection.cxx
 
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMArchimede_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libGEOMArchimede_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libGEOMArchimede_la_LDFLAGS  = \
+libGEOMArchimede_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(CAS_KERNEL) \
+	$(CAS_KERNEL)				\
-	$(CAS_MODELER) -lTKMesh \
+	$(CAS_MODELER) -lTKMesh			\
 	$(STDLIB)

src/BREPExport/Makefile.am

@@ -30,15 +30,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libBREPExport.la
 
 # Sources files
-dist_libBREPExport_la_SOURCES = \
+dist_libBREPExport_la_SOURCES =	\
 	BREPExport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libBREPExport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libBREPExport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libBREPExport_la_LDFLAGS  = \
+libBREPExport_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKBRep

src/BREPImport/Makefile.am

@@ -30,15 +30,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libBREPImport.la
 
 # Sources files
-dist_libBREPImport_la_SOURCES = \
+dist_libBREPImport_la_SOURCES =	\
 	BREPImport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libBREPImport_la_CPPFLAGS = \
+
-	$(KERNEL_CXXFLAGS) \
+libBREPImport_la_CPPFLAGS =	\
+	$(KERNEL_CXXFLAGS)	\
 	$(CAS_CPPFLAGS)
 
-libBREPImport_la_LDFLAGS  = \
+libBREPImport_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(CAS_LDPATH) -lTKBRep \
+	$(CAS_LDPATH) -lTKBRep			\
 	$(STDLIB)

src/BasicGUI/Makefile.am

@@ -25,13 +25,9 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = 
 
-# Libraries targets
-lib_LTLIBRARIES = libBasicGUI.la
 
-# Sources files
+salomeinclude_HEADERS =			\
-dist_libBasicGUI_la_SOURCES =		\
 	BasicGUI.h			\
 	BasicGUI_ArcDlg.h		\
 	BasicGUI_CircleDlg.h		\
@@ -42,8 +38,14 @@ dist_libBasicGUI_la_SOURCES =		\
 	BasicGUI_PlaneDlg.h		\
 	BasicGUI_PointDlg.h		\
 	BasicGUI_VectorDlg.h		\
-	BasicGUI_WorkingPlaneDlg.h	\
+	BasicGUI_WorkingPlaneDlg.h
-					\
+
+# Libraries targets
+
+lib_LTLIBRARIES = libBasicGUI.la
+
+# Sources files
+dist_libBasicGUI_la_SOURCES =		\
 	BasicGUI.cxx			\
 	BasicGUI_PointDlg.cxx		\
 	BasicGUI_LineDlg.cxx		\
@@ -68,14 +70,10 @@ MOC_FILES =					\
 	BasicGUI_CurveDlg_moc.cxx		\
 	BasicGUI_MarkerDlg_moc.cxx
 
-nodist_libBasicGUI_la_SOURCES = \
+nodist_libBasicGUI_la_SOURCES =			\
 	$(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Exception.idl SALOME_Component.idl
+# additional information to compile and link file
-
-# LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
 
 libBasicGUI_la_CPPFLAGS =			\
 	$(QT_INCLUDES)				\

src/BlocksGUI/Makefile.am

@@ -25,20 +25,20 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-# header files 
+# Headers files
+salomeinclude_HEADERS =			\
+	BlocksGUI.h			\
+	BlocksGUI_QuadFaceDlg.h		\
+	BlocksGUI_BlockDlg.h		\
+	BlocksGUI_ExplodeDlg.h		\
+	BlocksGUI_PropagateDlg.h	\
+	BlocksGUI_TrsfDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBlocksGUI.la 
 
 # Sources files
 dist_libBlocksGUI_la_SOURCES =		\
-	BlocksGUI.h			\
-	BlocksGUI_QuadFaceDlg.h		\
-	BlocksGUI_BlockDlg.h		\
-	BlocksGUI_ExplodeDlg.h		\
-	BlocksGUI_PropagateDlg.h	\
-	BlocksGUI_TrsfDlg.h		\
-					\
 	BlocksGUI.cxx			\
 	BlocksGUI_QuadFaceDlg.cxx	\
 	BlocksGUI_BlockDlg.cxx		\
@@ -46,23 +46,19 @@ dist_libBlocksGUI_la_SOURCES =		\
 	BlocksGUI_PropagateDlg.cxx	\
 	BlocksGUI_TrsfDlg.cxx
 
-MOC_FILES = \
+MOC_FILES =				\
 	BlocksGUI_QuadFaceDlg_moc.cxx	\
 	BlocksGUI_BlockDlg_moc.cxx	\
 	BlocksGUI_ExplodeDlg_moc.cxx	\
 	BlocksGUI_PropagateDlg_moc.cxx	\
 	BlocksGUI_TrsfDlg_moc.cxx
 
-nodist_libBlocksGUI_la_SOURCES = \
+nodist_libBlocksGUI_la_SOURCES =	\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
 
-#LIB_SERVER_IDL =  
+libBlocksGUI_la_CPPFLAGS =			\
-
-# additionnal information to compil and link file
-
-libBlocksGUI_la_CPPFLAGS = \
 	$(QT_INCLUDES)				\
 	$(VTK_INCLUDES)				\
 	$(CAS_CPPFLAGS)				\
@@ -83,7 +79,7 @@ libBlocksGUI_la_CPPFLAGS = \
 	-I$(top_builddir)/idl			\
 	-I$(top_builddir)/salome_adm/unix
 
-libBlocksGUI_la_LDFLAGS  = \
+libBlocksGUI_la_LDFLAGS  =					\
 	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../DlgRef/libDlgRef.la					\
 	../GEOMBase/libGEOMBase.la				\

src/BooleanGUI/Makefile.am

@@ -27,6 +27,9 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
+salomeinclude_HEADERS =		\
+	BooleanGUI.h		\
+	BooleanGUI_Dialog.h
 
 # Libraries targets
 lib_LTLIBRARIES = libBooleanGUI.la 
@@ -39,19 +42,15 @@ dist_libBooleanGUI_la_SOURCES =	\
 	BooleanGUI.cxx		\
 	BooleanGUI_Dialog.cxx
 
-MOC_FILES = \
+MOC_FILES =				\
 	BooleanGUI_Dialog_moc.cxx
 
-nodist_libBooleanGUI_la_SOURCES= \
+nodist_libBooleanGUI_la_SOURCES =	\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
 
-#LIB_SERVER_IDL =  
+libBooleanGUI_la_CPPFLAGS =			\
-
-# additionnal information to compil and link file
-
-libBooleanGUI_la_CPPFLAGS = \
 	$(QT_INCLUDES)				\
 	$(VTK_INCLUDES)				\
 	$(CAS_CPPFLAGS)				\
@@ -72,5 +71,5 @@ libBooleanGUI_la_CPPFLAGS = \
 	-I$(top_builddir)/idl			\
 	-I$(top_builddir)/salome_adm/unix
 
-libBooleanGUI_la_LDFLAGS  = \
+libBooleanGUI_la_LDFLAGS  =		\
 	../GEOMBase/libGEOMBase.la

src/BuildGUI/Makefile.am

@@ -27,21 +27,20 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =		\
-
-# Libraries targets
-lib_LTLIBRARIES = libBuildGUI.la 
-
-# Sources files
-dist_libBuildGUI_la_SOURCES =	\
 	BuildGUI.h		\
 	BuildGUI_EdgeDlg.h	\
 	BuildGUI_WireDlg.h	\
 	BuildGUI_FaceDlg.h	\
 	BuildGUI_ShellDlg.h	\
 	BuildGUI_SolidDlg.h	\
-	BuildGUI_CompoundDlg.h	\
+	BuildGUI_CompoundDlg.h
-				\
+
+# Libraries targets
+lib_LTLIBRARIES = libBuildGUI.la 
+
+# Sources files
+dist_libBuildGUI_la_SOURCES =	\
 	BuildGUI.cxx		\
 	BuildGUI_EdgeDlg.cxx	\
 	BuildGUI_WireDlg.cxx	\
@@ -50,7 +49,7 @@ dist_libBuildGUI_la_SOURCES =	\
 	BuildGUI_SolidDlg.cxx	\
 	BuildGUI_CompoundDlg.cxx
 
-MOC_FILES = \
+MOC_FILES =				\
 	BuildGUI_EdgeDlg_moc.cxx	\
 	BuildGUI_WireDlg_moc.cxx	\
 	BuildGUI_FaceDlg_moc.cxx	\
@@ -58,16 +57,12 @@ MOC_FILES = \
 	BuildGUI_SolidDlg_moc.cxx	\
 	BuildGUI_CompoundDlg_moc.cxx
 
-nodist_libBuildGUI_la_SOURCES = \
+nodist_libBuildGUI_la_SOURCES =		\
 	$(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
 
-# LIB_SERVER_IDL =  
+libBuildGUI_la_CPPFLAGS =			\
-
-# additionnal information to compil and link file
-
-libBuildGUI_la_CPPFLAGS = \
 	$(QT_INCLUDES)				\
 	$(VTK_INCLUDES)				\
 	$(CAS_CPPFLAGS)				\
@@ -88,6 +83,6 @@ libBuildGUI_la_CPPFLAGS = \
 	-I$(top_builddir)/src/DlgRef		\
 	-I$(top_builddir)/salome_adm/unix
 
-libBuildGUI_la_LDFLAGS = \
+libBuildGUI_la_LDFLAGS =					\
-	../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../GEOMBase/libGEOMBase.la

src/DisplayGUI/Makefile.am

@@ -27,7 +27,8 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =	\
+	DisplayGUI.h
 
 # Libraries targets
 lib_LTLIBRARIES = libDisplayGUI.la
@@ -36,11 +37,7 @@ dist_libDisplayGUI_la_SOURCES = \
 	DisplayGUI.h		\
 	DisplayGUI.cxx
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
 
 libDisplayGUI_la_CPPFLAGS =		\
 	$(QT_INCLUDES)			\

src/DlgRef/Makefile.am

@@ -34,10 +34,10 @@ dist_libDlgRef_la_SOURCES = 	\
 	DlgRef.h		\
 	DlgRef.cxx
 
-MOC_FILES = \
+MOC_FILES =			\
 	DlgRef_moc.cxx
 
-UIC_FILES = \
+UIC_FILES =					\
 	ui_DlgRef_1List1Spin1Btn_QTD.h		\
 	ui_DlgRef_1Sel1Check1List_QTD.h		\
 	ui_DlgRef_1Sel1Check1Sel_QTD.h		\
@@ -92,15 +92,11 @@ nodist_libDlgRef_la_SOURCES =	\
 	$(UIC_FILES)
 
 # additional information to compile and link file
-libDlgRef_la_CPPFLAGS = \
+
-	$(QT_INCLUDES) \
+libDlgRef_la_CPPFLAGS =		\
+	$(QT_INCLUDES)		\
 	$(GUI_CXXFLAGS)
 
-#	$(KERNEL_CXXFLAGS) \
+libDlgRef_la_LDFLAGS  =		\
-#	$(GUI_CXXFLAGS)
+	$(STDLIB)		\
-
-libDlgRef_la_LDFLAGS  = \
-	$(STDLIB) \
 	$(QT_MT_LIBS) 
-
-#	$(GUI_LDFLAGS)

src/EntityGUI/Makefile.am

@@ -30,14 +30,13 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libEntityGUI.la
 
 # header files
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =			\
-
-dist_libEntityGUI_la_SOURCES = 		\
 	EntityGUI.h			\
 	EntityGUI_Widgets.h		\
 	EntityGUI_SketcherDlg.h		\
-	EntityGUI_SubShapeDlg.h		\
+	EntityGUI_SubShapeDlg.h	
-					\
+
+dist_libEntityGUI_la_SOURCES = 		\
 	EntityGUI.cxx			\
 	EntityGUI_Widgets.cxx		\
 	EntityGUI_SketcherDlg.cxx	\
@@ -48,10 +47,10 @@ MOC_FILES =				\
 	EntityGUI_SketcherDlg_moc.cxx	\
 	EntityGUI_SubShapeDlg_moc.cxx
 
-nodist_libEntityGUI_la_SOURCES = \
+nodist_libEntityGUI_la_SOURCES =	\
 	 $(MOC_FILES)
 
-UIC_FILES = \
+UIC_FILES =				\
 	ui_EntityGUI_1Sel_QTD.h		\
 	ui_EntityGUI_1Spin_QTD.h	\
 	ui_EntityGUI_2Spin_QTD.h	\
@@ -64,11 +63,7 @@ UIC_FILES = \
 
 BUILT_SOURCES = $(UIC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
-
-# LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libEntityGUI_la_CPPFLAGS =			\
 	$(QT_INCLUDES)				\
@@ -92,7 +87,7 @@ libEntityGUI_la_CPPFLAGS =			\
 	-I$(top_builddir)/idl			\
 	-I$(top_builddir)/salome_adm/unix
 
-libEntityGUI_la_LDFLAGS  = \
+libEntityGUI_la_LDFLAGS  =					\
 	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../GEOMBase/libGEOMBase.la				\
 	../SKETCHER/libGEOMSketcher.la				\

src/GEOM/Makefile.am

@@ -30,55 +30,52 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libGEOMbasic.la
 
-dist_libGEOMbasic_la_SOURCES = \
+dist_libGEOMbasic_la_SOURCES =		\
-	GEOM_Application.cxx \
+	GEOM_Application.cxx		\
-	GEOM_Engine.cxx \
+	GEOM_Engine.cxx			\
-	GEOM_Function.cxx \
+	GEOM_Function.cxx		\
-	GEOM_Object.cxx \
+	GEOM_Object.cxx			\
-	GEOM_IOperations.cxx \
+	GEOM_IOperations.cxx		\
-	GEOM_Solver.cxx \
+	GEOM_Solver.cxx			\
-	GEOM_SubShapeDriver.cxx \
+	GEOM_SubShapeDriver.cxx		\
-	GEOM_PythonDump.cxx \
+	GEOM_PythonDump.cxx		\
-	GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \
+	GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx		\
-	GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \
+	GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx	\
 	GEOM_DataMapOfAsciiStringTransient_0.cxx
 
-#LIB_CLIENT_IDL = 
-#LIB_SERVER_IDL = 
-
-# Executables targets
-#BIN =
-#BIN_SRC =
-#BIN_CLIENT_IDL = 
-#BIN_SERVER_IDL = 
-
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =			\
-	GEOM_Application.hxx \
+	GEOM_Application.hxx		\
-	Handle_GEOM_Application.hxx \
+	GEOM_Application.ixx		\
-	GEOM_Engine.hxx \
+	GEOM_Application.jxx		\
-	GEOM_Function.hxx \
+	Handle_GEOM_Application.hxx	\
-	GEOM_Object.hxx \
+	GEOM_Engine.hxx			\
-	GEOM_IOperations.hxx \
+	GEOM_Function.hxx		\
-	GEOM_ISubShape.hxx \
+	GEOM_Object.hxx			\
-	GEOM_Solver.hxx \
+	GEOM_SubShapeDriver.hxx		\
-	GEOM_PythonDump.hxx \
+	GEOM_IOperations.hxx		\
-	GEOM_DataMapOfAsciiStringTransient.hxx \
+	GEOM_ISubShape.hxx		\
+	GEOM_Solver.hxx			\
+	GEOM_PythonDump.hxx		\
+	GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx		\
+	GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx		\
+	GEOM_DataMapOfAsciiStringTransient.hxx				\
 	Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMbasic_la_CPPFLAGS = \
+
-	$(CORBA_CXXFLAGS) \
+libGEOMbasic_la_CPPFLAGS =	\
-        $(CORBA_INCLUDES) \
+	$(CORBA_CXXFLAGS)	\
-	$(CAS_CPPFLAGS) \
+        $(CORBA_INCLUDES)	\
-	$(KERNEL_CXXFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	$(BOOST_CPPFLAGS) \
+	$(KERNEL_CXXFLAGS)	\
-	-I$(top_builddir)/idl \
+	$(BOOST_CPPFLAGS)	\
+	-I$(top_builddir)/idl	\
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOMbasic_la_LDFLAGS  = \
+libGEOMbasic_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
-	$(CAS_LDPATH) -lTKXSBase \
+	$(CAS_LDPATH) -lTKXSBase		\
-	$(CAS_OCAF) \
+	$(CAS_OCAF)				\
 	$(CAS_OCAFVIS) 

src/GEOMAlgo/Makefile.am

@@ -30,219 +30,363 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # Libraries targets
-lib_LTLIBRARIES =  libGEOMAlgo.la
+lib_LTLIBRARIES = libGEOMAlgo.la
 
-dist_libGEOMAlgo_la_SOURCES = \
+dist_libGEOMAlgo_la_SOURCES =			\
-	BlockFix.cxx \
+	BlockFix.cxx				\
-	BlockFix_BlockFixAPI.cxx \
+	BlockFix_BlockFixAPI.cxx		\
-	BlockFix_CheckTool.cxx \
+	BlockFix_CheckTool.cxx			\
-	BlockFix_PeriodicSurfaceModifier.cxx \
+	BlockFix_PeriodicSurfaceModifier.cxx	\
-	BlockFix_SphereSpaceModifier.cxx \
+	BlockFix_SphereSpaceModifier.cxx	\
-	BlockFix_UnionEdges.cxx \
+	BlockFix_UnionEdges.cxx			\
-	BlockFix_UnionFaces.cxx \
+	BlockFix_UnionFaces.cxx			\
-	GEOMAlgo_Algo.cxx \
+	GEOMAlgo_Algo.cxx			\
-	GEOMAlgo_Builder_0.cxx \
+	GEOMAlgo_Builder_0.cxx			\
-	GEOMAlgo_Builder_1.cxx \
+	GEOMAlgo_Builder_1.cxx			\
-	GEOMAlgo_Builder_2.cxx \
+	GEOMAlgo_Builder_2.cxx			\
-	GEOMAlgo_Builder_3.cxx \
+	GEOMAlgo_Builder_3.cxx			\
-	GEOMAlgo_Builder_4.cxx \
+	GEOMAlgo_Builder_4.cxx			\
-	GEOMAlgo_BuilderArea.cxx \
+	GEOMAlgo_BuilderArea.cxx		\
-	GEOMAlgo_Builder.cxx \
+	GEOMAlgo_Builder.cxx			\
-	GEOMAlgo_BuilderFace.cxx \
+	GEOMAlgo_BuilderFace.cxx		\
-	GEOMAlgo_BuilderShape.cxx \
+	GEOMAlgo_BuilderShape.cxx		\
-	GEOMAlgo_BuilderSolid.cxx \
+	GEOMAlgo_BuilderSolid.cxx		\
-	GEOMAlgo_BuilderTools.cxx \
+	GEOMAlgo_BuilderTools.cxx		\
-	GEOMAlgo_ClsfBox.cxx \
+	GEOMAlgo_ClsfBox.cxx			\
-	GEOMAlgo_Clsf.cxx \
+	GEOMAlgo_Clsf.cxx			\
-	GEOMAlgo_ClsfSurf.cxx \
+	GEOMAlgo_ClsfSurf.cxx			\
-	GEOMAlgo_CoupleOfShapes.cxx \
+	GEOMAlgo_CoupleOfShapes.cxx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx	\
-	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx		\
-	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx		\
-	GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx		\
-	GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx			\
-	GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx		\
-	GEOMAlgo_DataMapOfPassKeyInteger_0.cxx \
+	GEOMAlgo_DataMapOfPassKeyInteger_0.cxx	\
-	GEOMAlgo_DataMapOfRealListOfShape_0.cxx \
+	GEOMAlgo_DataMapOfRealListOfShape_0.cxx	\
-	GEOMAlgo_DataMapOfShapeReal_0.cxx \
+	GEOMAlgo_DataMapOfShapeReal_0.cxx	\
-	GEOMAlgo_DataMapOfShapeShapeSet_0.cxx \
+	GEOMAlgo_DataMapOfShapeShapeSet_0.cxx	\
-	GEOMAlgo_FinderShapeOn1.cxx \
+	GEOMAlgo_FinderShapeOn1.cxx		\
-	GEOMAlgo_FinderShapeOn2.cxx \
+	GEOMAlgo_FinderShapeOn2.cxx		\
-	GEOMAlgo_FinderShapeOn.cxx \
+	GEOMAlgo_FinderShapeOn.cxx		\
-	GEOMAlgo_FinderShapeOnQuad.cxx \
+	GEOMAlgo_FinderShapeOnQuad.cxx		\
-	GEOMAlgo_GlueAnalyser.cxx \
+	GEOMAlgo_GlueAnalyser.cxx		\
-	GEOMAlgo_Gluer.cxx \
+	GEOMAlgo_Gluer.cxx			\
-	GEOMAlgo_Gluer1.cxx \
+	GEOMAlgo_Gluer1.cxx			\
-	GEOMAlgo_HAlgo.cxx \
+	GEOMAlgo_HAlgo.cxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx		\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx	\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx	\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx	\
-	GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx \
+	GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx			\
-	GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx \
+	GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx		\
-	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx \
+	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx		\
-	GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx \
+	GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx				\
-	GEOMAlgo_IndexedDataMapOfShapeState_0.cxx \
+	GEOMAlgo_IndexedDataMapOfShapeState_0.cxx			\
-	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx \
+	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx		\
-	GEOMAlgo_ListIteratorOfListOfPnt_0.cxx \
+	GEOMAlgo_ListIteratorOfListOfPnt_0.cxx				\
-	GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx \
+	GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx			\
-	GEOMAlgo_ListNodeOfListOfPnt_0.cxx \
+	GEOMAlgo_ListNodeOfListOfPnt_0.cxx	\
-	GEOMAlgo_ListOfCoupleOfShapes_0.cxx \
+	GEOMAlgo_ListOfCoupleOfShapes_0.cxx	\
-	GEOMAlgo_ListOfPnt_0.cxx \
+	GEOMAlgo_ListOfPnt_0.cxx		\
-	GEOMAlgo_PassKey.cxx \
+	GEOMAlgo_PassKey.cxx			\
-	GEOMAlgo_PassKeyMapHasher.cxx \
+	GEOMAlgo_PassKeyMapHasher.cxx		\
-	GEOMAlgo_PassKeyShape.cxx \
+	GEOMAlgo_PassKeyShape.cxx		\
-	GEOMAlgo_PassKeyShapeMapHasher.cxx \
+	GEOMAlgo_PassKeyShapeMapHasher.cxx	\
-	GEOMAlgo_ShapeAlgo.cxx \
+	GEOMAlgo_ShapeAlgo.cxx			\
-	GEOMAlgo_ShapeSet.cxx \
+	GEOMAlgo_ShapeSet.cxx			\
-	GEOMAlgo_ShapeSolid.cxx \
+	GEOMAlgo_ShapeSolid.cxx			\
-	GEOMAlgo_ShellSolid.cxx \
+	GEOMAlgo_ShellSolid.cxx			\
-	GEOMAlgo_SolidSolid.cxx \
+	GEOMAlgo_SolidSolid.cxx			\
-	GEOMAlgo_Splitter.cxx \
+	GEOMAlgo_Splitter.cxx			\
-	GEOMAlgo_StateCollector.cxx \
+	GEOMAlgo_StateCollector.cxx		\
-	GEOMAlgo_SurfaceTools.cxx \
+	GEOMAlgo_SurfaceTools.cxx		\
-	GEOMAlgo_Tools3D.cxx \
+	GEOMAlgo_Tools3D.cxx			\
-	GEOMAlgo_Tools.cxx \
+	GEOMAlgo_Tools.cxx			\
-	GEOMAlgo_VertexSolid.cxx \
+	GEOMAlgo_VertexSolid.cxx		\
-	GEOMAlgo_WESCorrector.cxx \
+	GEOMAlgo_WESCorrector.cxx		\
-	GEOMAlgo_WireEdgeSet.cxx \
+	GEOMAlgo_WireEdgeSet.cxx		\
-	GEOMAlgo_WireSolid.cxx \
+	GEOMAlgo_WireSolid.cxx			\
-	GEOMAlgo_WireSplitter.cxx \
+	GEOMAlgo_WireSplitter.cxx		\
-	GEOMAlgo_ClsfSolid.cxx \
+	GEOMAlgo_ClsfSolid.cxx			\
-	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx			\
-	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx		\
-	GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx \
+	GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx				\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx	\
-	GEOMAlgo_ShapeInfoFiller_1.cxx \
+	GEOMAlgo_ShapeInfoFiller_1.cxx						\
-	GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx \
+	GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx				\
-	GEOMAlgo_ShapeInfo.cxx \
+	GEOMAlgo_ShapeInfo.cxx							\
 	GEOMAlgo_ShapeInfoFiller.cxx
 
 # header files
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =					\
-	BlockFix_BlockFixAPI.hxx \
+	BlockFix.hxx					\
-	BlockFix_BlockFixAPI.lxx \
+	BlockFix.ixx					\
-	BlockFix_CheckTool.hxx \
+	BlockFix.jxx					\
-	Handle_BlockFix_BlockFixAPI.hxx \
+	BlockFix_BlockFixAPI.hxx			\
-	GEOMAlgo_Algo.hxx \
+	BlockFix_BlockFixAPI.ixx			\
-	GEOMAlgo_BuilderArea.hxx \
+	BlockFix_BlockFixAPI.jxx			\
-	GEOMAlgo_BuilderFace.hxx \
+	BlockFix_BlockFixAPI.lxx			\
-	GEOMAlgo_Builder.hxx \
+	BlockFix_CheckTool.hxx				\
-	GEOMAlgo_BuilderShape.hxx \
+	BlockFix_CheckTool.ixx				\
-	GEOMAlgo_BuilderSolid.hxx \
+	BlockFix_CheckTool.jxx				\
-	GEOMAlgo_BuilderTools.hxx \
+	BlockFix_PeriodicSurfaceModifier.hxx		\
-	GEOMAlgo_ClsfBox.hxx \
+	BlockFix_PeriodicSurfaceModifier.ixx		\
-	GEOMAlgo_Clsf.hxx \
+	BlockFix_PeriodicSurfaceModifier.jxx		\
-	GEOMAlgo_ClsfSurf.hxx \
+	BlockFix_SphereSpaceModifier.hxx		\
-	GEOMAlgo_CoupleOfShapes.hxx \
+	BlockFix_SphereSpaceModifier.ixx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx \
+	BlockFix_SphereSpaceModifier.jxx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx \
+	BlockFix_UnionEdges.hxx				\
-	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx \
+	BlockFix_UnionEdges.ixx				\
-	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx \
+	BlockFix_UnionEdges.jxx				\
-	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \
+	BlockFix_UnionFaces.hxx				\
-	GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \
+	BlockFix_UnionFaces.ixx				\
-	GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \
+	BlockFix_UnionFaces.jxx				\
-	GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \
+	Handle_BlockFix_BlockFixAPI.hxx 		\
-	GEOMAlgo_DataMapOfPassKeyInteger.hxx \
+	Handle_BlockFix_SphereSpaceModifier.hxx		\
-	GEOMAlgo_DataMapOfRealListOfShape.hxx \
+	Handle_BlockFix_PeriodicSurfaceModifier.hxx	\
-	GEOMAlgo_DataMapOfShapeReal.hxx \
+	GEOMAlgo_Algo.hxx				\
-	GEOMAlgo_DataMapOfShapeShapeSet.hxx \
+	GEOMAlgo_Algo.ixx				\
-	GEOMAlgo_FinderShapeOn1.hxx \
+	GEOMAlgo_Algo.jxx				\
-	GEOMAlgo_FinderShapeOn2.hxx \
+	GEOMAlgo_BuilderArea.hxx			\
-	GEOMAlgo_FinderShapeOn.hxx \
+	GEOMAlgo_BuilderArea.ixx			\
-	GEOMAlgo_FinderShapeOnQuad.hxx \
+	GEOMAlgo_BuilderArea.jxx			\
-	GEOMAlgo_GlueAnalyser.hxx \
+	GEOMAlgo_BuilderFace.hxx			\
-	GEOMAlgo_Gluer.hxx \
+	GEOMAlgo_BuilderFace.ixx			\
-	GEOMAlgo_Gluer.ixx \
+	GEOMAlgo_BuilderFace.jxx			\
-	GEOMAlgo_Gluer.jxx \
+	GEOMAlgo_Builder.hxx				\
-	GEOMAlgo_Gluer1.hxx \
+	GEOMAlgo_Builder.ixx				\
-	GEOMAlgo_Gluer1.ixx \
+	GEOMAlgo_Builder.jxx				\
-	GEOMAlgo_Gluer1.jxx \
+	GEOMAlgo_BuilderShape.hxx			\
-	GEOMAlgo_HAlgo.hxx \
+	GEOMAlgo_BuilderShape.ixx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \
+	GEOMAlgo_BuilderShape.jxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \
+	GEOMAlgo_BuilderSolid.hxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \
+	GEOMAlgo_BuilderSolid.ixx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \
+	GEOMAlgo_BuilderSolid.jxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \
+	GEOMAlgo_BuilderTools.hxx			\
-	GEOMAlgo_IndexedDataMapOfIntegerShape.hxx \
+	GEOMAlgo_BuilderTools.ixx			\
-	GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx \
+	GEOMAlgo_BuilderTools.jxx			\
-	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx \
+	GEOMAlgo_ClsfBox.hxx				\
-	GEOMAlgo_IndexedDataMapOfShapeBox.hxx \
+	GEOMAlgo_ClsfBox.ixx				\
-	GEOMAlgo_IndexedDataMapOfShapeState.hxx \
+	GEOMAlgo_ClsfBox.jxx				\
-	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx \
+	GEOMAlgo_Clsf.hxx				\
-	GEOMAlgo_ListIteratorOfListOfPnt.hxx \
+	GEOMAlgo_Clsf.ixx				\
-	GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \
+	GEOMAlgo_Clsf.jxx				\
-	GEOMAlgo_ListNodeOfListOfPnt.hxx \
+	GEOMAlgo_ClsfSurf.hxx				\
-	GEOMAlgo_ListOfCoupleOfShapes.hxx \
+	GEOMAlgo_ClsfSurf.ixx				\
-	GEOMAlgo_ListOfPnt.hxx \
+	GEOMAlgo_ClsfSurf.jxx				\
-	GEOMAlgo_PassKey.hxx \
+	GEOMAlgo_CoupleOfShapes.hxx			\
-	GEOMAlgo_PassKeyMapHasher.hxx \
+	GEOMAlgo_CoupleOfShapes.ixx			\
-	GEOMAlgo_PassKeyShape.hxx \
+	GEOMAlgo_CoupleOfShapes.jxx			\
-	GEOMAlgo_PassKeyShapeMapHasher.hxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx	\
-	GEOMAlgo_PWireEdgeSet.hxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx	\
-	GEOMAlgo_ShapeAlgo.hxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx	\
-	GEOMAlgo_ShapeSet.hxx \
+	GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx	\
-	GEOMAlgo_ShapeSolid.hxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx	\
-	GEOMAlgo_ShellSolid.hxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx	\
-	GEOMAlgo_SolidSolid.hxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx		\
-	GEOMAlgo_Splitter.hxx \
+	GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx	\
-	GEOMAlgo_StateCollector.hxx \
+	GEOMAlgo_DataMapOfPassKeyInteger.hxx	\
-	GEOMAlgo_State.hxx \
+	GEOMAlgo_DataMapOfRealListOfShape.hxx	\
-	GEOMAlgo_SurfaceTools.hxx \
+	GEOMAlgo_DataMapOfShapeReal.hxx		\
-	GEOMAlgo_Tools3D.hxx \
+	GEOMAlgo_DataMapOfShapeShapeSet.hxx	\
-	GEOMAlgo_Tools.hxx \
+	GEOMAlgo_FinderShapeOn1.ixx		\
-	GEOMAlgo_VertexSolid.hxx \
+	GEOMAlgo_FinderShapeOn1.hxx		\
-	GEOMAlgo_WESCorrector.hxx \
+	GEOMAlgo_FinderShapeOn1.jxx		\
-	GEOMAlgo_WireEdgeSet.hxx \
+	GEOMAlgo_FinderShapeOn2.hxx		\
-	GEOMAlgo_WireSolid.hxx \
+	GEOMAlgo_FinderShapeOn2.ixx		\
-	GEOMAlgo_WireSplitter.hxx \
+	GEOMAlgo_FinderShapeOn2.jxx		\
-	Handle_GEOMAlgo_ClsfBox.hxx \
+	GEOMAlgo_FinderShapeOn.hxx		\
-	Handle_GEOMAlgo_Clsf.hxx \
+	GEOMAlgo_FinderShapeOn.ixx		\
-	Handle_GEOMAlgo_ClsfSurf.hxx \
+	GEOMAlgo_FinderShapeOn.jxx		\
-	Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \
+	GEOMAlgo_FinderShapeOnQuad.hxx		\
-	Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \
+	GEOMAlgo_GlueAnalyser.hxx		\
-	Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \
+	GEOMAlgo_GlueAnalyser.ixx		\
-	Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \
+	GEOMAlgo_GlueAnalyser.jxx		\
-	Handle_GEOMAlgo_HAlgo.hxx \
+	GEOMAlgo_Gluer.hxx			\
-	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \
+	GEOMAlgo_Gluer.ixx			\
-	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \
+	GEOMAlgo_Gluer.jxx			\
-	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \
+	GEOMAlgo_Gluer1.hxx			\
-	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \
+	GEOMAlgo_Gluer1.ixx			\
-	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \
+	GEOMAlgo_Gluer1.jxx			\
-	Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \
+	GEOMAlgo_HAlgo.hxx			\
-	Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx
+	GEOMAlgo_HAlgo.ixx			\
-	GEOMAlgo_ClsfSolid.hxx \
+	GEOMAlgo_HAlgo.jxx			\
-	GEOMAlgo_ClsfSolid.ixx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx			\
-	GEOMAlgo_ClsfSolid.jxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx		\
-	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx	\
-	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx			\
-	GEOMAlgo_DataMapOfPassKeyShapeShape.hxx \
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx			\
-	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx \
+	GEOMAlgo_IndexedDataMapOfIntegerShape.hxx					\
-	GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx \
+	GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx					\
-	GEOMAlgo_KindOfBounds.hxx \
+	GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx				\
-	GEOMAlgo_KindOfClosed.hxx \
+	GEOMAlgo_IndexedDataMapOfShapeBox.hxx						\
-	GEOMAlgo_KindOfName.hxx \
+	GEOMAlgo_IndexedDataMapOfShapeState.hxx						\
-	GEOMAlgo_KindOfShape.hxx \
+	GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx					\
-	GEOMAlgo_ShapeInfo.hxx \
+	GEOMAlgo_ListIteratorOfListOfPnt.hxx						\
-	GEOMAlgo_ShapeInfo.ixx \
+	GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx					\
-	GEOMAlgo_ShapeInfo.jxx \
+	GEOMAlgo_ListNodeOfListOfPnt.hxx	\
-	GEOMAlgo_ShapeInfoFiller.hxx \
+	GEOMAlgo_ListOfCoupleOfShapes.hxx	\
-	GEOMAlgo_ShapeInfoFiller.ixx \
+	GEOMAlgo_ListOfPnt.hxx			\
-	GEOMAlgo_ShapeInfoFiller.jxx \
+	GEOMAlgo_PassKey.hxx			\
-	Handle_GEOMAlgo_ClsfSolid.hxx \
+	GEOMAlgo_PassKey.ixx			\
-	Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx \
+	GEOMAlgo_PassKey.jxx			\
+	GEOMAlgo_PassKeyMapHasher.hxx		\
+	GEOMAlgo_PassKeyMapHasher.ixx		\
+	GEOMAlgo_PassKeyMapHasher.jxx		\
+	GEOMAlgo_PassKeyShape.hxx		\
+	GEOMAlgo_PassKeyShape.ixx		\
+	GEOMAlgo_PassKeyShape.jxx		\
+	GEOMAlgo_PassKeyShapeMapHasher.hxx	\
+	GEOMAlgo_PassKeyShapeMapHasher.ixx	\
+	GEOMAlgo_PassKeyShapeMapHasher.jxx	\
+	GEOMAlgo_PWireEdgeSet.hxx		\
+	GEOMAlgo_ShapeAlgo.hxx			\
+	GEOMAlgo_ShapeAlgo.ixx			\
+	GEOMAlgo_ShapeAlgo.jxx			\
+	GEOMAlgo_ShapeSet.hxx			\
+	GEOMAlgo_ShapeSet.ixx			\
+	GEOMAlgo_ShapeSet.jxx			\
+	GEOMAlgo_ShapeSolid.hxx			\
+	GEOMAlgo_ShapeSolid.ixx			\
+	GEOMAlgo_ShapeSolid.jxx			\
+	GEOMAlgo_ShellSolid.hxx			\
+	GEOMAlgo_ShellSolid.ixx			\
+	GEOMAlgo_ShellSolid.jxx			\
+	GEOMAlgo_SolidSolid.hxx			\
+	GEOMAlgo_SolidSolid.ixx			\
+	GEOMAlgo_SolidSolid.jxx			\
+	GEOMAlgo_Splitter.hxx			\
+	GEOMAlgo_Splitter.ixx			\
+	GEOMAlgo_Splitter.jxx			\
+	GEOMAlgo_StateCollector.hxx		\
+	GEOMAlgo_StateCollector.ixx		\
+	GEOMAlgo_StateCollector.jxx		\
+	GEOMAlgo_State.hxx			\
+	GEOMAlgo_SurfaceTools.hxx		\
+	GEOMAlgo_SurfaceTools.ixx		\
+	GEOMAlgo_SurfaceTools.jxx		\
+	GEOMAlgo_Tools3D.hxx			\
+	GEOMAlgo_Tools3D.ixx			\
+	GEOMAlgo_Tools3D.jxx			\
+	GEOMAlgo_Tools.hxx			\
+	GEOMAlgo_Tools.ixx			\
+	GEOMAlgo_Tools.jxx			\
+	GEOMAlgo_VertexSolid.hxx		\
+	GEOMAlgo_VertexSolid.ixx		\
+	GEOMAlgo_VertexSolid.jxx		\
+	GEOMAlgo_WESCorrector.hxx		\
+	GEOMAlgo_WESCorrector.ixx		\
+	GEOMAlgo_WESCorrector.jxx		\
+	GEOMAlgo_WireEdgeSet.hxx		\
+	GEOMAlgo_WireEdgeSet.ixx		\
+	GEOMAlgo_WireEdgeSet.jxx		\
+	GEOMAlgo_WireSolid.hxx			\
+	GEOMAlgo_WireSolid.ixx			\
+	GEOMAlgo_WireSolid.jxx			\
+	GEOMAlgo_WireSplitter.hxx		\
+	GEOMAlgo_WireSplitter.ixx		\
+	GEOMAlgo_WireSplitter.jxx		\
+	Handle_GEOMAlgo_ClsfBox.hxx		\
+	Handle_GEOMAlgo_Clsf.hxx		\
+	Handle_GEOMAlgo_ClsfSurf.hxx		\
+	Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx			\
+	Handle_GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx			\
+	Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx				\
+	Handle_GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx				\
+	Handle_GEOMAlgo_HAlgo.hxx							\
+	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx		\
+	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx	\
+	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx	\
+	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx		\
+	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx		\
+	Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx				\
+	Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx						\
+	GEOMAlgo_ClsfSolid.hxx								\
+	GEOMAlgo_ClsfSolid.ixx								\
+	GEOMAlgo_ClsfSolid.jxx								\
+	GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape.hxx			\
+	GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx				\
+	GEOMAlgo_DataMapOfPassKeyShapeShape.hxx						\
+	GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx			\
+	GEOMAlgo_IndexedDataMapOfShapeShapeInfo.hxx					\
+	GEOMAlgo_KindOfBounds.hxx		\
+	GEOMAlgo_KindOfClosed.hxx		\
+	GEOMAlgo_KindOfName.hxx			\
+	GEOMAlgo_KindOfShape.hxx		\
+	GEOMAlgo_ShapeInfo.hxx			\
+	GEOMAlgo_ShapeInfo.ixx			\
+	GEOMAlgo_ShapeInfo.jxx			\
+	GEOMAlgo_ShapeInfoFiller.hxx		\
+	GEOMAlgo_ShapeInfoFiller.ixx		\
+	GEOMAlgo_ShapeInfoFiller.jxx		\
+	Handle_GEOMAlgo_ClsfSolid.hxx		\
+	Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape.hxx			\
 	Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo.hxx
 
-libGEOMAlgo_la_CPPFLAGS = \
+libGEOMAlgo_la_CPPFLAGS =	\
-	$(CAS_CPPFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	$(KERNEL_CXXFLAGS) \
+	$(KERNEL_CXXFLAGS)	\
-	-I$(srcdir)/../NMTDS \
+	-I$(srcdir)/../NMTDS	\
 	-I$(srcdir)/../NMTTools
 
-libGEOMAlgo_la_LDFLAGS  = \
+libGEOMAlgo_la_LDFLAGS  =		\
-	../NMTTools/libNMTTools.la \
+	../NMTTools/libNMTTools.la	\
-	$(STDLIB) \
+	$(STDLIB)			\
 	$(CAS_LDPATH) -lTKBO -lTKShHealing -lTKBool -lTKMesh
+
+# extra distributed files
+CDL_FILES =					\
+	BlockFix.cdl				\
+	BlockFix_BlockFixAPI.cdl		\
+	BlockFix_CheckTool.cdl			\
+	BlockFix_PeriodicSurfaceModifier.cdl	\
+	BlockFix_SphereSpaceModifier.cdl	\
+	BlockFix_UnionEdges.cdl			\
+	BlockFix_UnionFaces.cdl			\
+	GEOMAlgo.cdl				\
+	GEOMAlgo_Algo.cdl			\
+	GEOMAlgo_Builder.cdl			\
+	GEOMAlgo_BuilderArea.cdl		\
+	GEOMAlgo_BuilderFace.cdl		\
+	GEOMAlgo_BuilderShape.cdl		\
+	GEOMAlgo_BuilderSolid.cdl		\
+	GEOMAlgo_BuilderTools.cdl		\
+	GEOMAlgo_Clsf.cdl			\
+	GEOMAlgo_ClsfBox.cdl			\
+	GEOMAlgo_ClsfSolid.cdl			\
+	GEOMAlgo_ClsfSurf.cdl			\
+	GEOMAlgo_CoupleOfShapes.cdl		\
+	GEOMAlgo_FinderShapeOn.cdl		\
+	GEOMAlgo_FinderShapeOn1.cdl		\
+	GEOMAlgo_FinderShapeOn2.cdl		\
+	GEOMAlgo_GlueAnalyser.cdl		\
+	GEOMAlgo_Gluer.cdl			\
+	GEOMAlgo_Gluer1.cdl			\
+	GEOMAlgo_HAlgo.cdl			\
+	GEOMAlgo_PassKey.cdl			\
+	GEOMAlgo_PassKeyMapHasher.cdl		\
+	GEOMAlgo_PassKeyShape.cdl		\
+	GEOMAlgo_PassKeyShapeMapHasher.cdl	\
+	GEOMAlgo_ShapeAlgo.cdl			\
+	GEOMAlgo_ShapeInfo.cdl			\
+	GEOMAlgo_ShapeInfoFiller.cdl		\
+	GEOMAlgo_ShapeSet.cdl			\
+	GEOMAlgo_ShapeSolid.cdl			\
+	GEOMAlgo_ShellSolid.cdl			\
+	GEOMAlgo_SolidSolid.cdl			\
+	GEOMAlgo_Splitter.cdl			\
+	GEOMAlgo_StateCollector.cdl		\
+	GEOMAlgo_SurfaceTools.cdl		\
+	GEOMAlgo_Tools.cdl			\
+	GEOMAlgo_Tools3D.cdl			\
+	GEOMAlgo_VertexSolid.cdl		\
+	GEOMAlgo_WESCorrector.cdl		\
+	GEOMAlgo_WireEdgeSet.cdl		\
+	GEOMAlgo_WireSolid.cdl			\
+	GEOMAlgo_WireSplitter.cdl
+
+EXTRA_DIST += $(CDL_FILES)

src/GEOMBase/Makefile.am

@@ -46,19 +46,10 @@ dist_libGEOMBase_la_SOURCES =		\
 MOC_FILES =				\
 	GEOMBase_Skeleton_moc.cxx
 
-nodist_libGEOMBase_la_SOURCES = \
+nodist_libGEOMBase_la_SOURCES =	\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl \
+# additional information to compile and link file
-#		 SALOMEDS.idl \
-#		 SALOMEDS_Attributes.idl \
-#                 SALOME_GenericObj.idl \
-#		 SALOME_Component.idl \
-#		 GEOM_Gen.idl
-
-#LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
 
 libGEOMBase_la_CPPFLAGS =		\
 	$(QT_INCLUDES)			\

src/GEOMClient/Makefile.am

@@ -30,30 +30,30 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =	\
-		GEOM_Client.hxx
+	GEOM_Client.hxx
-
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMClient.la
 
 # Sources files
-dist_libGEOMClient_la_SOURCES = \
+dist_libGEOMClient_la_SOURCES =	\
 		GEOM_Client.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMClient_la_CPPFLAGS = \
+
-	$(CORBA_CXXFLAGS) \
+libGEOMClient_la_CPPFLAGS =	\
-        $(CORBA_INCLUDES) \
+	$(CORBA_CXXFLAGS)	\
-	$(CAS_CPPFLAGS) \
+        $(CORBA_INCLUDES)	\
-	$(KERNEL_CXXFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	-I$(top_builddir)/idl \
+	$(KERNEL_CXXFLAGS)	\
+	-I$(top_builddir)/idl	\
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOMClient_la_LDFLAGS  = \
+libGEOMClient_la_LDFLAGS  =				\
-	../../idl/libSalomeIDLGEOM.la \
+	../../idl/libSalomeIDLGEOM.la			\
-	../GEOM/libGEOMbasic.la \
+	../GEOM/libGEOMbasic.la				\
-	$(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \
+	$(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil	\
 	$(CAS_TKTopAlgo)
 
 # \

src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx

@@ -1,107 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_EdgeFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_EdgeFilter_HeaderFile
-#define _GEOM_EdgeFilter_HeaderFile
-
-#ifndef _Handle_GEOM_EdgeFilter_HeaderFile
-#include "Handle_GEOM_EdgeFilter.hxx"
-#endif
-
-#include "GEOM_ShapeTypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <StdSelect_TypeOfEdge.hxx>
-
-class GEOM_EdgeFilter : public GEOM_ShapeTypeFilter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_EdgeFilter( const StdSelect_TypeOfEdge Edge );
-Standard_EXPORT ~GEOM_EdgeFilter();
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_EdgeFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
- // Fields PROTECTED
- //
-StdSelect_TypeOfEdge  myKind;
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif

src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx

@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_EdgeFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_EdgeFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_EdgeFilter::~GEOM_EdgeFilter() {}
- 
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_EdgeFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_EdgeFilter",
-			                                 sizeof(GEOM_EdgeFilter),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_EdgeFilter) Handle(GEOM_EdgeFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_EdgeFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_EdgeFilter))) {
-       _anOtherObject = Handle(GEOM_EdgeFilter)((Handle(GEOM_EdgeFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_EdgeFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_EdgeFilter) ; 
-}
-Standard_Boolean GEOM_EdgeFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_EdgeFilter) == AType || GEOM_ShapeTypeFilter::IsKind(AType)); 
-}
-Handle_GEOM_EdgeFilter::~Handle_GEOM_EdgeFilter() {}
-

src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx

@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_EdgeFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_EdgeFilter_HeaderFile
-#include "GEOM_EdgeFilter.hxx"
-#endif

src/GEOMFiltersSelection/GEOM_FaceFilter.hxx

@@ -1,110 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_FaceFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_FaceFilter_HeaderFile
-#define _GEOM_FaceFilter_HeaderFile
-
-#ifndef _Handle_GEOM_FaceFilter_HeaderFile
-#include "Handle_GEOM_FaceFilter.hxx"
-#endif
-
-#include "GEOM_ShapeTypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <StdSelect_TypeOfFace.hxx>
-
-class GEOM_FaceFilter : public GEOM_ShapeTypeFilter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_FaceFilter( const StdSelect_TypeOfFace Face );
-Standard_EXPORT ~GEOM_FaceFilter();
-
-
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_FaceFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
-
- // Fields PROTECTED
- //
-StdSelect_TypeOfFace  myKind;
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif

src/GEOMFiltersSelection/GEOM_FaceFilter.ixx

@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_FaceFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_FaceFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_FaceFilter::~GEOM_FaceFilter() {}
- 
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_FaceFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(GEOM_ShapeTypeFilter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_FaceFilter",
-			                                 sizeof(GEOM_FaceFilter),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_FaceFilter) Handle(GEOM_FaceFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_FaceFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_FaceFilter))) {
-       _anOtherObject = Handle(GEOM_FaceFilter)((Handle(GEOM_FaceFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_FaceFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_FaceFilter) ; 
-}
-Standard_Boolean GEOM_FaceFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_FaceFilter) == AType || GEOM_ShapeTypeFilter::IsKind(AType)); 
-}
-Handle_GEOM_FaceFilter::~Handle_GEOM_FaceFilter() {}
-

src/GEOMFiltersSelection/GEOM_FaceFilter.jxx

@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_FaceFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_FaceFilter_HeaderFile
-#include "GEOM_FaceFilter.hxx"
-#endif

src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx

@@ -1,103 +0,0 @@
-//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
-//
-//  Copyright (C) 2003  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   : GEOM_LogicalFilter.hxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef _GEOM_LogicalFilter_HeaderFile
-#define _GEOM_LogicalFilter_HeaderFile
-
-#include "SALOME_Filter.hxx"
-
-#include <Standard_DefineHandle.hxx>
-#include <NCollection_StdBase.hxx>
-#include <NCollection_DefineList.hxx>
-
-DEFINE_STANDARD_HANDLE( GEOM_LogicalFilter, SALOME_Filter )
-
-DEFINE_BASECOLLECTION( GEOM_FilterColl, Handle(SALOME_Filter) )
-DEFINE_LIST( GEOM_ListOfFilter, GEOM_FilterColl, Handle(SALOME_Filter) )
-
-
-/*
-  Class       : GEOM_LogicalFilter
-  Description : Filter for combaining several filters with logical operation (OR or AND)
-*/
-
-class GEOM_LogicalFilter : public SALOME_Filter
-{
-public:
-
-  enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
-
-public:
-
-                              GEOM_LogicalFilter( const GEOM_ListOfFilter&, const int  );
-                              GEOM_LogicalFilter( const Handle(SALOME_Filter)&, const int );
-
-
-  virtual                     ~GEOM_LogicalFilter();
-  virtual                     Standard_Boolean IsOk( const Handle(SALOME_InteractiveObject)& ) const;
-
-  void                        SetFilters( const GEOM_ListOfFilter& );
-  void                        SetLogOp( const int );
-  const GEOM_ListOfFilter&    GetFilters() const;
-  int                         GetLogOp() const;
-
-private:
-
-  GEOM_ListOfFilter           myFilters;
-  int                         myLogOp;
-
-public:
-  DEFINE_STANDARD_RTTI( GEOM_LogicalFilter )
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx

@@ -1,102 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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   : GEOM_PreviewFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_PreviewFilter_HeaderFile
-#define _GEOM_PreviewFilter_HeaderFile
-
-#ifndef _Handle_GEOM_PreviewFilter_HeaderFile
-#include "Handle_GEOM_PreviewFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_Filter.hxx"
-
-// IDL Headers
-
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-
-class GEOM_PreviewFilter : public SALOME_Filter {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOM_PreviewFilter();
-Standard_EXPORT ~GEOM_PreviewFilter();
-
-Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_PreviewFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- // 
-
-
- // Fields PROTECTED
- //
-
-private: 
-
- // Methods PRIVATE
- // 
-
-
- // Fields PRIVATE
- //
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif

src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx

@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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   : GEOM_PreviewFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_PreviewFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_PreviewFilter::~GEOM_PreviewFilter() {}
- 
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_PreviewFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_Filter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_Filter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_PreviewFilter",
-			                                 sizeof(GEOM_PreviewFilter),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_PreviewFilter) Handle(GEOM_PreviewFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_PreviewFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_PreviewFilter))) {
-       _anOtherObject = Handle(GEOM_PreviewFilter)((Handle(GEOM_PreviewFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_PreviewFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_PreviewFilter) ; 
-}
-Standard_Boolean GEOM_PreviewFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_PreviewFilter) == AType || SALOME_Filter::IsKind(AType)); 
-}
-Handle_GEOM_PreviewFilter::~Handle_GEOM_PreviewFilter() {}
-

src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx

@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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   : GEOM_PreviewFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_PreviewFilter_HeaderFile
-#include "GEOM_PreviewFilter.hxx"
-#endif

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx

@@ -1,168 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_ShapeTypeFilter.cxx
-//  Author : Nicolas REJNERI
-//  Module : GEOM
-//  $Header$
-
-#include <Standard_Stream.hxx>
-
-#include "GEOM_ShapeTypeFilter.ixx"
-#include "SALOME_InteractiveObject.hxx"
-#include "GEOM_Client.hxx"
-#include "QAD_Application.h"
-#include "QAD_Desktop.h"
-#include "utilities.h"
-
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-// function : getShape()
-// purpose  : returns a TopoDS_Shape stored in GEOM_Object
-//=======================================================================
-static bool getShape( const GEOM::GEOM_Object_ptr& theObject, TopoDS_Shape& theShape )
-{
-  if ( !CORBA::is_nil( theObject ) )
-  {
-    static GEOM::GEOM_Gen_var myGeom;
-    if(CORBA::is_nil(myGeom) {
-      Engines::Component_var comp = QAD_Application::getDesktop()->getEngine( "FactoryServer", "GEOM" );
-      myGeom = GEOM::GEOM_Gen::_narrow( comp );
-    }
-    TopoDS_Shape aTopoDSShape = GEOM_Client().GetShape( myGeom, theObject );
-        
-    if ( !aTopoDSShape.IsNull() )
-    {
-      theShape = aTopoDSShape;
-       return true;
-    }
-  }
-  return false;
-}
-
-//=======================================================================
-// function : ConvertIOinGEOMObject()
-// purpose  :
-//=======================================================================
-static GEOM::GEOM_Object_ptr convertIOinGEOMObject(
-  const Handle(SALOME_InteractiveObject)& theIO, Standard_Boolean& theResult )
-{
-  theResult = Standard_False;
-  GEOM::GEOM_Object_var aReturnObject;
-  if ( !theIO.IsNull() )
-  {
-    const char* anEntry = theIO->getEntry();
-    SALOMEDS::SObject_var aSObj =
-      QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument()->FindObjectID( anEntry );
-    if ( !CORBA::is_nil( aSObj ) )
-    {
-      aReturnObject = GEOM::GEOM_Object::_narrow( aSObj->GetObject() );
-      theResult = !CORBA::is_nil( aReturnObject );
-    }
-  }
-  return aReturnObject._retn();
-}
-
-//=======================================================================
-// function : ShapeTypeFilter
-// purpose  : 
-//=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
-                                            const bool theIsAll ) 
-{
-  myIsAll = theIsAll;
-  myShapeTypes.Add( theShapeType );
-  myTypeFilter = new SALOME_TypeFilter( "GEOM" );
-}
-
-//=======================================================================
-// function : ShapeTypeFilter
-// purpose  : 
-//=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
-                                            const bool theIsAll ) 
-{
-  myIsAll = theIsAll;
-  myShapeTypes = theShapeTypes;
-  myTypeFilter = new SALOME_TypeFilter( "GEOM" );
-}
-
-//=======================================================================
-// function : IsOk
-// purpose  : 
-//=======================================================================
-Standard_Boolean GEOM_ShapeTypeFilter::IsOk(
-  const Handle(SALOME_InteractiveObject)& anObj ) const 
-{
-  if ( !myTypeFilter->IsOk(anObj) ) 
-    return Standard_False;
-
-  Standard_Boolean aResult = Standard_False;
-  GEOM::GEOM_Object_ptr aGeomObj = convertIOinGEOMObject( anObj, aResult );
-  if ( !CORBA::is_nil( aGeomObj ) && aResult && aGeomObj->IsShape() )
-  {
-    if ( myIsAll )
-      return true;
-    TopoDS_Shape aShape;
-    if ( getShape( aGeomObj, aShape ) )
-    {
-      if ( myShapeTypes.Contains( aShape.ShapeType() ) )
-        return IsShapeOk( aShape );
-    }
-  }
-  return Standard_False;
-}
-
-//=======================================================================
-// function : IsShapeOk
-// purpose  : 
-//=======================================================================
-Standard_Boolean GEOM_ShapeTypeFilter::IsShapeOk( const TopoDS_Shape& ) const
-{
-  return Standard_True;
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx

@@ -1,110 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_ShapeTypeFilter.hxx
-//  Module : GEOM
-
-#ifndef _GEOM_ShapeTypeFilter_HeaderFile
-#define _GEOM_ShapeTypeFilter_HeaderFile
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-#include "SALOME_InteractiveObject.hxx"
-#include "SALOME_Filter.hxx"
-#include "SALOME_TypeFilter.hxx"
-
-// IDL Headers
-#include <SALOMEconfig.h>
-#include CORBA_SERVER_HEADER(GEOM_Gen)
-#include CORBA_SERVER_HEADER(SALOMEDS_Attributes)
-
-// Open CASCADE Includes
-#include <Standard.hxx>
-#include <TopAbs.hxx>
-#include <TopoDS_Shape.hxx>
-#include <TColStd_MapOfInteger.hxx>
-
-class GEOM_ShapeTypeFilter : public SALOME_Filter
-{
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
- // Methods PUBLIC
- //
-Standard_EXPORT GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
-                                      const bool theIsAll = false );
-Standard_EXPORT GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
-                                      const bool theIsAll = false );
-Standard_EXPORT ~GEOM_ShapeTypeFilter();
-
-Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
-
-
- // Type management
- //
- Standard_EXPORT friend Handle_Standard_Type& GEOM_ShapeTypeFilter_Type_();
- Standard_EXPORT const Handle(Standard_Type)& DynamicType() const;
- Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)&) const;
-
-protected:
-
- // Methods PROTECTED
- //
- Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
-
-
- // Fields PROTECTED
- //
-TColStd_MapOfInteger myShapeTypes;
-Handle(SALOME_TypeFilter) myTypeFilter;
-
-private: 
-
- bool myIsAll;
-
-
-};
-
-
-
-
-
-// other inline functions and methods (like "C++: function call" methods)
-//
-
-
-#endif

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx

@@ -1,83 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_ShapeTypeFilter.ixx
-//  Module : GEOM
-
-#include "GEOM_ShapeTypeFilter.jxx"
-
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-GEOM_ShapeTypeFilter::~GEOM_ShapeTypeFilter() {}
- 
-
-
-Standard_EXPORT Handle_Standard_Type& GEOM_ShapeTypeFilter_Type_()
-{
-
-    static Handle_Standard_Type aType1 = STANDARD_TYPE(SALOME_Filter);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(SALOME_Filter);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOM_ShapeTypeFilter",
-			                                 sizeof(GEOM_ShapeTypeFilter),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
-
-  return _aType;
-}
-
-
-// DownCast method
-//   allow safe downcasting
-//
-const Handle(GEOM_ShapeTypeFilter) Handle(GEOM_ShapeTypeFilter)::DownCast(const Handle(Standard_Transient)& AnObject) 
-{
-  Handle(GEOM_ShapeTypeFilter) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOM_ShapeTypeFilter))) {
-       _anOtherObject = Handle(GEOM_ShapeTypeFilter)((Handle(GEOM_ShapeTypeFilter)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-const Handle(Standard_Type)& GEOM_ShapeTypeFilter::DynamicType() const 
-{ 
-  return STANDARD_TYPE(GEOM_ShapeTypeFilter) ; 
-}
-Standard_Boolean GEOM_ShapeTypeFilter::IsKind(const Handle(Standard_Type)& AType) const 
-{ 
-  return (STANDARD_TYPE(GEOM_ShapeTypeFilter) == AType || SALOME_Filter::IsKind(AType)); 
-}
-Handle_GEOM_ShapeTypeFilter::~Handle_GEOM_ShapeTypeFilter() {}
-

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx

@@ -1,29 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : GEOM_ShapeTypeFilter.jxx
-//  Module : GEOM
-
-#ifndef _GEOM_ShapeTypeFilter_HeaderFile
-#include "GEOM_ShapeTypeFilter.hxx"
-#endif

src/GEOMFiltersSelection/GEOM_TypeFilter.hxx

@@ -1,90 +0,0 @@
-//  GEOM GEOMGUI : Implementation of selection filters for GEOM module
-//
-//  Copyright (C) 2003  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   : GEOM_TypeFilter.hxx
-//  Author : Sergey LITONIN
-//  Module : GEOM
-
-#ifndef _GEOM_TypeFilter_HeaderFile
-#define _GEOM_TypeFilter_HeaderFile
-
-#include "SALOME_TypeFilter.hxx"
-
-#include <Standard_DefineHandle.hxx>
-
-DEFINE_STANDARD_HANDLE( GEOM_TypeFilter, SALOME_TypeFilter )
-
-/*
-  Class       : GEOM_TypeFilter
-  Description : Filter for verifyimg type of geom object ( GEOM_POINT, GEOM_MARKER  and so on )
-*/
-
-class GEOM_TypeFilter : public SALOME_TypeFilter
-{
-
-public:
-
-                              GEOM_TypeFilter( const int  );
-
-
-  virtual                     ~GEOM_TypeFilter();
-  virtual                     Standard_Boolean IsOk( const Handle(SALOME_InteractiveObject)& ) const;
-
-  void                        SetType( const int );
-  int                         GetType() const;
-
-private:
-
-  int                         myType;
-
-public:
-  DEFINE_STANDARD_RTTI( GEOM_TypeFilter )
-};
-
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx

@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : Handle_GEOM_EdgeFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_EdgeFilter_HeaderFile
-#define _Handle_GEOM_EdgeFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(GEOM_ShapeTypeFilter);
-class GEOM_EdgeFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_EdgeFilter);
-
-class Handle(GEOM_EdgeFilter) : public Handle(GEOM_ShapeTypeFilter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_EdgeFilter)():Handle(GEOM_ShapeTypeFilter)() {} 
-    Handle(GEOM_EdgeFilter)(const Handle(GEOM_EdgeFilter)& aHandle) : Handle(GEOM_ShapeTypeFilter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_EdgeFilter)(const GEOM_EdgeFilter* anItem) : Handle(GEOM_ShapeTypeFilter)((GEOM_ShapeTypeFilter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_EdgeFilter)& operator=(const Handle(GEOM_EdgeFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_EdgeFilter)& operator=(const GEOM_EdgeFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_EdgeFilter* operator->() 
-     {
-      return (GEOM_EdgeFilter *)ControlAccess();
-     }
-
-    GEOM_EdgeFilter* operator->() const 
-     {
-      return (GEOM_EdgeFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_EdgeFilter)();
- 
-   Standard_EXPORT static const Handle(GEOM_EdgeFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif

src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx

@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : Handle_GEOM_FaceFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_FaceFilter_HeaderFile
-#define _Handle_GEOM_FaceFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#include "Handle_GEOM_ShapeTypeFilter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(GEOM_ShapeTypeFilter);
-class GEOM_FaceFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_FaceFilter);
-
-class Handle(GEOM_FaceFilter) : public Handle(GEOM_ShapeTypeFilter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_FaceFilter)():Handle(GEOM_ShapeTypeFilter)() {} 
-    Handle(GEOM_FaceFilter)(const Handle(GEOM_FaceFilter)& aHandle) : Handle(GEOM_ShapeTypeFilter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_FaceFilter)(const GEOM_FaceFilter* anItem) : Handle(GEOM_ShapeTypeFilter)((GEOM_ShapeTypeFilter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_FaceFilter)& operator=(const Handle(GEOM_FaceFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_FaceFilter)& operator=(const GEOM_FaceFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_FaceFilter* operator->() 
-     {
-      return (GEOM_FaceFilter *)ControlAccess();
-     }
-
-    GEOM_FaceFilter* operator->() const 
-     {
-      return (GEOM_FaceFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_FaceFilter)();
- 
-   Standard_EXPORT static const Handle(GEOM_FaceFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif

src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx

@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2004  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   : Handle_GEOM_PreviewFilter
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_PreviewFilter_HeaderFile
-#define _Handle_GEOM_PreviewFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_SALOME_Filter_HeaderFile
-#include "Handle_SALOME_Filter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(SALOME_Filter);
-class GEOM_PreviewFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_PreviewFilter);
-
-class Handle(GEOM_PreviewFilter) : public Handle(SALOME_Filter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_PreviewFilter)():Handle(SALOME_Filter)() {} 
-    Handle(GEOM_PreviewFilter)(const Handle(GEOM_PreviewFilter)& aHandle) : Handle(SALOME_Filter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_PreviewFilter)(const GEOM_PreviewFilter* anItem) : Handle(SALOME_Filter)((SALOME_Filter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_PreviewFilter)& operator=(const Handle(GEOM_PreviewFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_PreviewFilter)& operator=(const GEOM_PreviewFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_PreviewFilter* operator->() 
-     {
-      return (GEOM_PreviewFilter *)ControlAccess();
-     }
-
-    GEOM_PreviewFilter* operator->() const 
-     {
-      return (GEOM_PreviewFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_PreviewFilter)();
- 
-   Standard_EXPORT static const Handle(GEOM_PreviewFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif

src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx

@@ -1,100 +0,0 @@
-//  GEOM GEOMFiltersSelection : filter selector for the viewer
-//
-//  Copyright (C) 2003  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   : Handle_GEOM_ShapeTypeFilter.hxx
-//  Module : GEOM
-
-#ifndef _Handle_GEOM_ShapeTypeFilter_HeaderFile
-#define _Handle_GEOM_ShapeTypeFilter_HeaderFile
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Handle_SALOME_Filter_HeaderFile
-#include "Handle_SALOME_Filter.hxx"
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(SALOME_Filter);
-class GEOM_ShapeTypeFilter;
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOM_ShapeTypeFilter);
-
-class Handle(GEOM_ShapeTypeFilter) : public Handle(SALOME_Filter) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-//    inline void  operator delete(void *anAddress, size_t size) 
-//      { 
-//        if (anAddress) Standard::Free((Standard_Address&)anAddress,size); 
-//      }
-    Handle(GEOM_ShapeTypeFilter)():Handle(SALOME_Filter)() {} 
-    Handle(GEOM_ShapeTypeFilter)(const Handle(GEOM_ShapeTypeFilter)& aHandle) : Handle(SALOME_Filter)(aHandle) 
-     {
-     }
-
-    Handle(GEOM_ShapeTypeFilter)(const GEOM_ShapeTypeFilter* anItem) : Handle(SALOME_Filter)((SALOME_Filter *)anItem) 
-     {
-     }
-
-    Handle(GEOM_ShapeTypeFilter)& operator=(const Handle(GEOM_ShapeTypeFilter)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOM_ShapeTypeFilter)& operator=(const GEOM_ShapeTypeFilter* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOM_ShapeTypeFilter* operator->() 
-     {
-      return (GEOM_ShapeTypeFilter *)ControlAccess();
-     }
-
-    GEOM_ShapeTypeFilter* operator->() const 
-     {
-      return (GEOM_ShapeTypeFilter *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOM_ShapeTypeFilter)();
- 
-   Standard_EXPORT static const Handle(GEOM_ShapeTypeFilter) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-#endif

src/GEOMFiltersSelection/Makefile.am

@@ -46,15 +46,13 @@ dist_libGEOMFiltersSelection_la_SOURCES = \
 	GEOM_EdgeFilter.cxx		\
 	GEOM_FaceFilter.cxx		\
 	GEOM_TypeFilter.cxx		\
-        GEOM_PreviewFilter.cxx		\
+	GEOM_PreviewFilter.cxx		\
 	GEOM_LogicalFilter.cxx		\
 	GEOM_OCCFilter.cxx		\
 	GEOM_CompoundFilter.cxx
 
-# LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
 
-
-# additionnal information to compil and link file
 libGEOMFiltersSelection_la_CPPFLAGS =	\
 	$(QT_INCLUDES)			\
 	$(CAS_CPPFLAGS)			\

src/GEOMGUI/Makefile.am

@@ -48,11 +48,10 @@ dist_libGEOM_la_SOURCES =	\
 	GEOMGUI_Selection.cxx	\
 	GeometryGUI_Swig.cxx
 
-MOC_FILES = \
+MOC_FILES =			\
 	GeometryGUI_moc.cxx
 
-
+nodist_libGEOM_la_SOURCES =	\
-nodist_libGEOM_la_SOURCES = \
 	$(MOC_FILES)
 
 # resources files
@@ -61,16 +60,7 @@ nodist_salomeres_DATA =	\
 	GEOM_msg_en.qm	\
 	GEOM_msg_fr.qm
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl \
+# additional information to compile and link file
-#		 SALOMEDS.idl \
-#		 SALOMEDS_Attributes.idl \
-#		 SALOME_GenericObj.idl \
-#		 SALOME_Component.idl \
-#		 GEOM_Gen.idl
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libGEOM_la_CPPFLAGS =				\
 	$(QT_INCLUDES)				\
@@ -89,7 +79,7 @@ libGEOM_la_CPPFLAGS =				\
 	-I$(top_builddir)/idl			\
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOM_la_LDFLAGS = \
+libGEOM_la_LDFLAGS =						\
 	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../GEOMClient/libGEOMClient.la				\
 	../OBJECT/libGEOMObject.la				\

src/GEOMImpl/GEOMImpl_Template.cxx

@@ -1,107 +0,0 @@
-// 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
-//
-
-#include <Standard_Stream.hxx>
-
-#include <GEOMImpl_Template.hxx>
-#include <GEOM_Function.hxx>
-#include <TopoDS_Shape.hxx>
-
-//=======================================================================
-//function : GetID
-//purpose  :
-//======================================================================= 
-const Standard_GUID& GEOMImpl_Template::GetID()
-{
-  static Standard_GUID aTemplate("Insert the correct GUID here");
-  return aTemplate; 
-}
-
-
-//=======================================================================
-//function : GEOMImpl_Template
-//purpose  : 
-//=======================================================================
-
-GEOMImpl_Template::GEOMImpl_Template() 
-{
-}
-
-//=======================================================================
-//function : Execute
-//purpose  :
-//======================================================================= 
-Standard_Integer GEOMImpl_Template::Execute(TFunction_Logbook& log) const
-{
-  if (Label().IsNull()) return 0;
-  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); 
-  if(aFunction.IsNull()) return 0;
-  
-  //Add implemetation here
-  
-  log.SetTouched(Label());
-  return 1;    
-}
-
-
-//=======================================================================
-//function :  GEOMImpl_Template_Type_
-//purpose  :
-//======================================================================= 
-Standard_EXPORT Handle_Standard_Type& GEOMImpl_Template_Type_()
-{
-
-  static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
-  static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
-  static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
-  if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
-
-  static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
-  static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_Template",
-			                                 sizeof(GEOMImpl_Template),
-			                                 1,
-			                                 (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
-
-  return _aType;
-}
-
-//=======================================================================
-//function : DownCast
-//purpose  :
-//======================================================================= 
-
-const Handle(GEOMImpl_Template) Handle(GEOMImpl_Template)::DownCast(const Handle(Standard_Transient)& AnObject)
-{
-  Handle(GEOMImpl_Template) _anOtherObject;
-
-  if (!AnObject.IsNull()) {
-     if (AnObject->IsKind(STANDARD_TYPE(GEOMImpl_Template))) {
-       _anOtherObject = Handle(GEOMImpl_Template)((Handle(GEOMImpl_Template)&)AnObject);
-     }
-  }
-
-  return _anOtherObject ;
-}
-
-

src/GEOMImpl/GEOMImpl_Template.hxx

@@ -1,158 +0,0 @@
-// 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   : GEOMImpl_Template.hxx
-//  Module : GEOMImpl
-
-#ifndef _GEOMImpl_Template_HeaderFile
-#define _GEOMImpl_Template_HeaderFile
-
-#ifndef _TColStd_SequenceOfExtendedString_HeaderFile
-#include <TColStd_SequenceOfExtendedString.hxx>
-#endif
-#ifndef _Standard_TypeMismatch_HeaderFile
-#include <Standard_TypeMismatch.hxx>
-#endif
-
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-
-#ifndef _Standard_Macro_HeaderFile
-#include <Standard_Macro.hxx>
-#endif
-#ifndef _Standard_HeaderFile
-#include <Standard.hxx>
-#endif
-#ifndef _Standard_GUID_HeaderFile
-#include <Standard_GUID.hxx>
-#endif 
-
-#ifndef _Handle_TFunction_Driver_HeaderFile
-#include <Handle_TFunction_Driver.hxx>
-#endif
-
-class Standard_Transient;
-class Handle_Standard_Type;
-class Handle(TFunction_Driver);
-class GEOMImpl_Template;
-
-Standard_EXPORT Handle_Standard_Type& STANDARD_TYPE(GEOMImpl_Template);
-
-class Handle(GEOMImpl_Template) : public Handle(TFunction_Driver) {
-  public:
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-
-    Handle(GEOMImpl_Template)():Handle(TFunction_Driver)() {} 
-    Handle(GEOMImpl_Template)(const Handle(GEOMImpl_Template)& aHandle) : Handle(TFunction_Driver)(aHandle) 
-     {
-     }
-
-    Handle(GEOMImpl_Template)(const GEOMImpl_Template* anItem) : Handle(TFunction_Driver)((TFunction_Driver *)anItem) 
-     {
-     }
-
-    Handle(GEOMImpl_Template)& operator=(const Handle(GEOMImpl_Template)& aHandle)
-     {
-      Assign(aHandle.Access());
-      return *this;
-     }
-
-    Handle(GEOMImpl_Template)& operator=(const GEOMImpl_Template* anItem)
-     {
-      Assign((Standard_Transient *)anItem);
-      return *this;
-     }
-
-    GEOMImpl_Template* operator->() 
-     {
-      return (GEOMImpl_Template *)ControlAccess();
-     }
-
-    GEOMImpl_Template* operator->() const 
-     {
-      return (GEOMImpl_Template *)ControlAccess();
-     }
-
-   Standard_EXPORT ~Handle(GEOMImpl_Template)() {};
- 
-   Standard_EXPORT static const Handle(GEOMImpl_Template) DownCast(const Handle(Standard_Transient)& AnObject);
-};
-
-#ifndef _TFunction_Driver_HeaderFile
-#include <TFunction_Driver.hxx>
-#endif
-#ifndef _TFunction_Logbook_HeaderFile
-#include <TFunction_Logbook.hxx>
-#endif
-#ifndef _Standard_CString_HeaderFile
-#include <Standard_CString.hxx>
-#endif
-
-class TColStd_SequenceOfExtendedString;
-
-
-class GEOMImpl_Template : public TFunction_Driver {
-
-public:
-
-    inline void* operator new(size_t,void* anAddress) 
-      {
-        return anAddress;
-      }
-    inline void* operator new(size_t size) 
-      { 
-        return Standard::Allocate(size); 
-      }
-    inline void  operator delete(void *anAddress) 
-      { 
-        if (anAddress) Standard::Free((Standard_Address&)anAddress); 
-      }
-
- // Methods PUBLIC
- // 
-Standard_EXPORT GEOMImpl_Template();
-Standard_EXPORT virtual  Standard_Integer Execute(TFunction_Logbook& log) const; 
-Standard_EXPORT virtual void Validate(TFunction_Logbook&) const {}
-Standard_EXPORT Standard_Boolean MustExecute(const TFunction_Logbook&) const { return Standard_True; }
-Standard_EXPORT static const Standard_GUID& GetID();
-Standard_EXPORT ~GEOMImpl_Template() {};
-
-
- // Type management
- //
-Standard_EXPORT friend Handle_Standard_Type& GEOMImpl_Template_Type_();
-Standard_EXPORT const Handle(Standard_Type)& DynamicType() const  { return STANDARD_TYPE(GEOMImpl_Template) ; }
-Standard_EXPORT Standard_Boolean IsKind(const Handle(Standard_Type)& AType) const { return (STANDARD_TYPE(GEOMImpl_Template) == AType || TFunction_Driver::IsKind(AType)); } 
-
-
-};
-
-#endif

src/GEOMImpl/Makefile.am

@@ -32,105 +32,196 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGEOMimpl.la
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =				\
-	GEOMImpl_Gen.hxx \
+	GEOMImpl_Gen.hxx			\
-	GEOMImpl_IBasicOperations.hxx \
+	GEOMImpl_IBasicOperations.hxx		\
-	GEOMImpl_ITransformOperations.hxx \
+	GEOMImpl_ITransformOperations.hxx	\
-	GEOMImpl_IHealingOperations.hxx \
+	GEOMImpl_IHealingOperations.hxx		\
-	GEOMImpl_I3DPrimOperations.hxx \
+	GEOMImpl_I3DPrimOperations.hxx		\
-	GEOMImpl_IShapesOperations.hxx \
+	GEOMImpl_IShapesOperations.hxx		\
-	GEOMImpl_IBlocksOperations.hxx \
+	GEOMImpl_IBlocksOperations.hxx		\
-	GEOMImpl_IBooleanOperations.hxx \
+	GEOMImpl_IBooleanOperations.hxx		\
-	GEOMImpl_ICurvesOperations.hxx \
+	GEOMImpl_ICurvesOperations.hxx		\
-	GEOMImpl_ILocalOperations.hxx \
+	GEOMImpl_ILocalOperations.hxx		\
-	GEOMImpl_IInsertOperations.hxx \
+	GEOMImpl_IInsertOperations.hxx		\
-	GEOMImpl_IMeasureOperations.hxx \
+	GEOMImpl_IMeasureOperations.hxx		\
-	GEOMImpl_IGroupOperations.hxx \
+	GEOMImpl_IGroupOperations.hxx		\
-	GEOMImpl_CopyDriver.hxx \
+	GEOMImpl_IGlue.hxx			\
-	GEOMImpl_Types.hxx \
+	GEOMImpl_Gen.hxx			\
+	GEOMImpl_PointDriver.hxx		\
+	GEOMImpl_IPoint.hxx			\
+	GEOMImpl_IPolyline.hxx			\
+	GEOMImpl_ICircle.hxx			\
+	GEOMImpl_ISpline.hxx			\
+	GEOMImpl_IEllipse.hxx			\
+	GEOMImpl_IFillet.hxx			\
+	GEOMImpl_IChamfer.hxx			\
+	GEOMImpl_ICopy.hxx			\
+	GEOMImpl_IArchimede.hxx			\
+	GEOMImpl_IArc.hxx			\
+	GEOMImpl_ISketcher.hxx			\
+	GEOMImpl_IVector.hxx			\
+	GEOMImpl_IDisk.hxx			\
+	GEOMImpl_IFace.hxx			\
+	GEOMImpl_ILine.hxx			\
+	GEOMImpl_IPlane.hxx			\
+	GEOMImpl_IMarker.hxx			\
+	GEOMImpl_ITranslate.hxx			\
+	GEOMImpl_IMirror.hxx			\
+	GEOMImpl_IOffset.hxx			\
+	GEOMImpl_IScale.hxx			\
+	GEOMImpl_IRotate.hxx			\
+	GEOMImpl_IPosition.hxx			\
+	GEOMImpl_IHealing.hxx			\
+	GEOMImpl_IImportExport.hxx		\
+	GEOMImpl_IBox.hxx			\
+	GEOMImpl_IBlocks.hxx			\
+	GEOMImpl_IBlockTrsf.hxx			\
+	GEOMImpl_IBoolean.hxx			\
+	GEOMImpl_ICylinder.hxx			\
+	GEOMImpl_ICone.hxx			\
+	GEOMImpl_ISphere.hxx			\
+	GEOMImpl_ITorus.hxx			\
+	GEOMImpl_IPrism.hxx			\
+	GEOMImpl_IPipe.hxx			\
+	GEOMImpl_IRevolution.hxx		\
+	GEOMImpl_IMeasure.hxx			\
+	GEOMImpl_IShapes.hxx			\
+	GEOMImpl_IFilling.hxx			\
+	GEOMImpl_IThruSections.hxx		\
+	GEOMImpl_IPartition.hxx			\
+	GEOMImpl_IPipeDiffSect.hxx		\
+	GEOMImpl_IPipeShellSect.hxx		\
+	GEOMImpl_VectorDriver.hxx		\
+	GEOMImpl_LineDriver.hxx			\
+	GEOMImpl_DiskDriver.hxx			\
+	GEOMImpl_FaceDriver.hxx			\
+	GEOMImpl_PlaneDriver.hxx		\
+	GEOMImpl_MarkerDriver.hxx		\
+	GEOMImpl_TranslateDriver.hxx		\
+	GEOMImpl_MirrorDriver.hxx		\
+	GEOMImpl_OffsetDriver.hxx		\
+	GEOMImpl_ScaleDriver.hxx		\
+	GEOMImpl_PositionDriver.hxx		\
+	GEOMImpl_BoxDriver.hxx			\
+	GEOMImpl_ConeDriver.hxx			\
+	GEOMImpl_CylinderDriver.hxx		\
+	GEOMImpl_SphereDriver.hxx		\
+	GEOMImpl_TorusDriver.hxx		\
+	GEOMImpl_PrismDriver.hxx		\
+	GEOMImpl_PipeDriver.hxx			\
+	GEOMImpl_ThruSectionsDriver.hxx		\
+	GEOMImpl_RevolutionDriver.hxx		\
+	GEOMImpl_ShapeDriver.hxx		\
+	GEOMImpl_BlockDriver.hxx		\
+	GEOMImpl_Block6Explorer.hxx		\
+	GEOMImpl_MeasureDriver.hxx		\
+	GEOMImpl_PolylineDriver.hxx		\
+	GEOMImpl_CircleDriver.hxx		\
+	GEOMImpl_EllipseDriver.hxx		\
+	GEOMImpl_ArcDriver.hxx			\
+	GEOMImpl_SplineDriver.hxx		\
+	GEOMImpl_SketcherDriver.hxx		\
+	GEOMImpl_FilletDriver.hxx		\
+	GEOMImpl_ChamferDriver.hxx		\
+	GEOMImpl_BooleanDriver.hxx		\
+	GEOMImpl_PartitionDriver.hxx		\
+	GEOMImpl_CopyDriver.hxx			\
+	GEOMImpl_ExportDriver.hxx		\
+	GEOMImpl_ImportDriver.hxx		\
+	GEOMImpl_RotateDriver.hxx		\
+	GEOMImpl_ArchimedeDriver.hxx		\
+	GEOMImpl_HealingDriver.hxx		\
+	GEOMImpl_FillingDriver.hxx		\
+	GEOMImpl_GlueDriver.hxx			\
+	GEOMImpl_CopyDriver.hxx			\
+	GEOMImpl_Types.hxx			\
 	GEOM_GEOMImpl.hxx
 
-dist_libGEOMimpl_la_SOURCES = \
+dist_libGEOMimpl_la_SOURCES =			\
-	GEOMImpl_IBasicOperations.cxx \
+	GEOMImpl_IBasicOperations.cxx		\
-	GEOMImpl_ITransformOperations.cxx \
+	GEOMImpl_ITransformOperations.cxx	\
-        GEOMImpl_IHealingOperations.cxx \
+	GEOMImpl_IHealingOperations.cxx		\
-	GEOMImpl_I3DPrimOperations.cxx \
+	GEOMImpl_I3DPrimOperations.cxx		\
-	GEOMImpl_IShapesOperations.cxx \
+	GEOMImpl_IShapesOperations.cxx		\
-	GEOMImpl_IBlocksOperations.cxx \
+	GEOMImpl_IBlocksOperations.cxx		\
-	GEOMImpl_IBooleanOperations.cxx \
+	GEOMImpl_IBooleanOperations.cxx		\
-	GEOMImpl_ICurvesOperations.cxx \
+	GEOMImpl_ICurvesOperations.cxx		\
-	GEOMImpl_ILocalOperations.cxx \
+	GEOMImpl_ILocalOperations.cxx		\
-	GEOMImpl_IInsertOperations.cxx \
+	GEOMImpl_IInsertOperations.cxx		\
-	GEOMImpl_IMeasureOperations.cxx \
+	GEOMImpl_IMeasureOperations.cxx		\
-	GEOMImpl_IGroupOperations.cxx \
+	GEOMImpl_IGroupOperations.cxx		\
-	GEOMImpl_Gen.cxx \
+	GEOMImpl_Gen.cxx			\
-	GEOMImpl_PointDriver.cxx \
+	GEOMImpl_PointDriver.cxx		\
-	GEOMImpl_VectorDriver.cxx \
+	GEOMImpl_VectorDriver.cxx		\
-	GEOMImpl_LineDriver.cxx \
+	GEOMImpl_LineDriver.cxx			\
-	GEOMImpl_PlaneDriver.cxx \
+	GEOMImpl_PlaneDriver.cxx		\
-	GEOMImpl_MarkerDriver.cxx \
+	GEOMImpl_MarkerDriver.cxx		\
-	GEOMImpl_TranslateDriver.cxx \
+	GEOMImpl_TranslateDriver.cxx		\
-	GEOMImpl_MirrorDriver.cxx \
+	GEOMImpl_MirrorDriver.cxx		\
-	GEOMImpl_OffsetDriver.cxx \
+	GEOMImpl_OffsetDriver.cxx		\
-	GEOMImpl_ScaleDriver.cxx \
+	GEOMImpl_ScaleDriver.cxx		\
-	GEOMImpl_PositionDriver.cxx \
+	GEOMImpl_PositionDriver.cxx		\
-	GEOMImpl_BoxDriver.cxx \
+	GEOMImpl_BoxDriver.cxx			\
-	GEOMImpl_FaceDriver.cxx \
+	GEOMImpl_FaceDriver.cxx			\
-	GEOMImpl_DiskDriver.cxx \
+	GEOMImpl_DiskDriver.cxx			\
-	GEOMImpl_ConeDriver.cxx \
+	GEOMImpl_ConeDriver.cxx			\
-	GEOMImpl_CylinderDriver.cxx \
+	GEOMImpl_CylinderDriver.cxx		\
-	GEOMImpl_SphereDriver.cxx \
+	GEOMImpl_SphereDriver.cxx		\
-	GEOMImpl_TorusDriver.cxx \
+	GEOMImpl_TorusDriver.cxx		\
-	GEOMImpl_PrismDriver.cxx \
+	GEOMImpl_PrismDriver.cxx		\
-	GEOMImpl_PipeDriver.cxx \
+	GEOMImpl_PipeDriver.cxx			\
-	GEOMImpl_ThruSectionsDriver.cxx \
+	GEOMImpl_ThruSectionsDriver.cxx		\
-	GEOMImpl_RevolutionDriver.cxx \
+	GEOMImpl_RevolutionDriver.cxx		\
-	GEOMImpl_ShapeDriver.cxx \
+	GEOMImpl_ShapeDriver.cxx		\
-	GEOMImpl_BlockDriver.cxx \
+	GEOMImpl_BlockDriver.cxx		\
-	GEOMImpl_Block6Explorer.cxx \
+	GEOMImpl_Block6Explorer.cxx		\
-	GEOMImpl_MeasureDriver.cxx \
+	GEOMImpl_MeasureDriver.cxx		\
-	GEOMImpl_PolylineDriver.cxx \
+	GEOMImpl_PolylineDriver.cxx		\
-	GEOMImpl_CircleDriver.cxx \
+	GEOMImpl_CircleDriver.cxx		\
-	GEOMImpl_EllipseDriver.cxx \
+	GEOMImpl_EllipseDriver.cxx		\
-	GEOMImpl_ArcDriver.cxx \
+	GEOMImpl_ArcDriver.cxx			\
-	GEOMImpl_SplineDriver.cxx \
+	GEOMImpl_SplineDriver.cxx		\
-	GEOMImpl_SketcherDriver.cxx \
+	GEOMImpl_SketcherDriver.cxx		\
-	GEOMImpl_FilletDriver.cxx \
+	GEOMImpl_FilletDriver.cxx		\
-	GEOMImpl_ChamferDriver.cxx \
+	GEOMImpl_ChamferDriver.cxx		\
-	GEOMImpl_BooleanDriver.cxx \
+	GEOMImpl_BooleanDriver.cxx		\
-	GEOMImpl_PartitionDriver.cxx \
+	GEOMImpl_PartitionDriver.cxx		\
-	GEOMImpl_CopyDriver.cxx \
+	GEOMImpl_CopyDriver.cxx			\
-	GEOMImpl_ExportDriver.cxx \
+	GEOMImpl_ExportDriver.cxx		\
-	GEOMImpl_ImportDriver.cxx \
+	GEOMImpl_ImportDriver.cxx		\
-	GEOMImpl_RotateDriver.cxx \
+	GEOMImpl_RotateDriver.cxx		\
-	GEOMImpl_ArchimedeDriver.cxx \
+	GEOMImpl_ArchimedeDriver.cxx		\
-	GEOMImpl_HealingDriver.cxx \
+	GEOMImpl_HealingDriver.cxx		\
-	GEOMImpl_FillingDriver.cxx \
+	GEOMImpl_FillingDriver.cxx		\
 	GEOMImpl_GlueDriver.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMimpl_la_CPPFLAGS = \
+
-	$(CORBA_CXXFLAGS) \
+libGEOMimpl_la_CPPFLAGS =		\
-        $(CORBA_INCLUDES) \
+	$(CORBA_CXXFLAGS)		\
-	$(CAS_CPPFLAGS) \
+        $(CORBA_INCLUDES)		\
-	$(KERNEL_CXXFLAGS) \
+	$(CAS_CPPFLAGS)			\
-	$(BOOST_CPPFLAGS) \
+	$(KERNEL_CXXFLAGS)		\
-	-I$(srcdir)/../ShHealOper \
+	$(BOOST_CPPFLAGS)		\
-	-I$(srcdir)/../NMTTools \
+	-I$(srcdir)/../ShHealOper	\
-	-I$(srcdir)/../GEOM \
+	-I$(srcdir)/../NMTTools		\
-	-I$(srcdir)/../GEOMAlgo \
+	-I$(srcdir)/../GEOM		\
-	-I$(srcdir)/../SKETCHER \
+	-I$(srcdir)/../GEOMAlgo		\
-	-I$(srcdir)/../ARCHIMEDE \
+	-I$(srcdir)/../SKETCHER		\
-	-I$(top_builddir)/idl \
+	-I$(srcdir)/../ARCHIMEDE	\
+	-I$(top_builddir)/idl		\
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOMimpl_la_LDFLAGS  = \
+libGEOMimpl_la_LDFLAGS  =			\
-	../GEOM/libGEOMbasic.la \
+	../GEOM/libGEOMbasic.la			\
-	../GEOMAlgo/libGEOMAlgo.la \
+	../GEOMAlgo/libGEOMAlgo.la		\
-	../ShHealOper/libShHealOper.la \
+	../ShHealOper/libShHealOper.la		\
-	../ARCHIMEDE/libGEOMArchimede.la \
+	../ARCHIMEDE/libGEOMArchimede.la	\
-	../SKETCHER/libGEOMSketcher.la \
+	../SKETCHER/libGEOMSketcher.la		\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset
 
+# extra dist files
+EXTRA_DIST += GUID.txt

src/GEOMToolsGUI/Makefile.am

@@ -28,15 +28,15 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGEOMToolsGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =				\
-
+	GEOMToolsGUI.h                          \
-dist_libGEOMToolsGUI_la_SOURCES =		\
 	GEOM_ToolsGUI.hxx			\
-	GEOMToolsGUI.h				\
 	GEOMToolsGUI_NbIsosDlg.h		\
 	GEOMToolsGUI_TransparencyDlg.h		\
 	GEOMToolsGUI_DeleteDlg.h		\
-						\
+	GEOMToolsGUI_NbIsosDlg.h
+
+dist_libGEOMToolsGUI_la_SOURCES =		\
 	GEOMToolsGUI.cxx			\
 	GEOMToolsGUI_1.cxx			\
 	GEOMToolsGUI_TransparencyDlg.cxx	\
@@ -51,14 +51,8 @@ MOC_FILES = 					\
 nodist_libGEOMToolsGUI_la_SOURCES =		\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \
+# additional information to compile and link file
-#		 SALOME_GenericObj.idl \
-#		 SALOME_Exception.idl \
-#		 SALOME_Component.idl
 
-#LIB_SERVER_IDL = 
-
-# additionnal information to compile and link file
 libGEOMToolsGUI_la_CPPFLAGS =		\
 	$(QT_INCLUDES)			\
 	$(VTK_INCLUDES)			\

src/GEOM_I/Makefile.am

@@ -33,66 +33,67 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGEOMEngine.la
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =			\
-	GEOM_Object_i.hh \
+	GEOM_Object_i.hh		\
-        GEOM_IOperations_i.hh \
+        GEOM_IOperations_i.hh		\
-        GEOM_IBasicOperations_i.hh \
+        GEOM_IBasicOperations_i.hh	\
-	GEOM_IHealingOperations_i.hh \
+	GEOM_IHealingOperations_i.hh	\
-        GEOM_I3DPrimOperations_i.hh \
+        GEOM_I3DPrimOperations_i.hh	\
-	GEOM_IShapesOperations_i.hh \
+	GEOM_IShapesOperations_i.hh	\
-	GEOM_IBlocksOperations_i.hh \
+	GEOM_IBlocksOperations_i.hh	\
-	GEOM_IBooleanOperations_i.hh \
+	GEOM_IBooleanOperations_i.hh	\
-	GEOM_ICurvesOperations_i.hh \
+	GEOM_ICurvesOperations_i.hh	\
-	GEOM_ILocalOperations_i.hh \
+	GEOM_ILocalOperations_i.hh	\
-	GEOM_IInsertOperations_i.hh \
+	GEOM_IInsertOperations_i.hh	\
-	GEOM_ITransformOperations_i.hh \
+	GEOM_ITransformOperations_i.hh	\
-	GEOM_IMeasureOperations_i.hh \
+	GEOM_IMeasureOperations_i.hh	\
-	GEOM_IGroupOperations_i.hh \
+	GEOM_IGroupOperations_i.hh	\
-	GEOM_Gen_i.hh \
+	GEOM_Gen_i.hh			\
 	GEOM_GEOM_I.hxx
 
-dist_libGEOMEngine_la_SOURCES = \
+dist_libGEOMEngine_la_SOURCES =		\
-	GEOM_Object_i.cc \
+	GEOM_Object_i.cc		\
-	GEOM_IOperations_i.cc \
+	GEOM_IOperations_i.cc		\
-	GEOM_IBasicOperations_i.cc \
+	GEOM_IBasicOperations_i.cc	\
-        GEOM_IHealingOperations_i.cc \
+        GEOM_IHealingOperations_i.cc	\
-	GEOM_I3DPrimOperations_i.cc \
+	GEOM_I3DPrimOperations_i.cc	\
-	GEOM_IShapesOperations_i.cc \
+	GEOM_IShapesOperations_i.cc	\
-	GEOM_IBlocksOperations_i.cc \
+	GEOM_IBlocksOperations_i.cc	\
-	GEOM_IBooleanOperations_i.cc \
+	GEOM_IBooleanOperations_i.cc	\
-	GEOM_ICurvesOperations_i.cc \
+	GEOM_ICurvesOperations_i.cc	\
-	GEOM_ILocalOperations_i.cc \
+	GEOM_ILocalOperations_i.cc	\
-	GEOM_IInsertOperations_i.cc \
+	GEOM_IInsertOperations_i.cc	\
-	GEOM_ITransformOperations_i.cc \
+	GEOM_ITransformOperations_i.cc	\
-	GEOM_IMeasureOperations_i.cc \
+	GEOM_IMeasureOperations_i.cc	\
-	GEOM_IGroupOperations_i.cc \
+	GEOM_IGroupOperations_i.cc	\
-	GEOM_Gen_i.cc \
+	GEOM_Gen_i.cc			\
 	GEOM_DumpPython.cc
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMEngine_la_CPPFLAGS = \
+
-	$(CORBA_CXXFLAGS) \
+libGEOMEngine_la_CPPFLAGS =		\
-	$(CORBA_INCLUDES) \
+	$(CORBA_CXXFLAGS)		\
-	$(CAS_CPPFLAGS) \
+	$(CORBA_INCLUDES)		\
-	$(BOOST_CPPFLAGS) \
+	$(CAS_CPPFLAGS)			\
-	$(KERNEL_CXXFLAGS) \
+	$(BOOST_CPPFLAGS)		\
-	-I$(srcdir)/../SKETCHER \
+	$(KERNEL_CXXFLAGS)		\
-	-I$(srcdir)/../ARCHIMEDE \
+	-I$(srcdir)/../SKETCHER		\
-	-I$(srcdir)/../GEOMImpl \
+	-I$(srcdir)/../ARCHIMEDE	\
-	-I$(srcdir)/../GEOMAlgo \
+	-I$(srcdir)/../GEOMImpl		\
-	-I$(srcdir)/../GEOM \
+	-I$(srcdir)/../GEOMAlgo		\
-	-I$(top_builddir)/idl \
+	-I$(srcdir)/../GEOM		\
+	-I$(top_builddir)/idl		\
 	-I$(top_builddir)/salome_adm/unix
 
 
-libGEOMEngine_la_LDFLAGS  = \
+libGEOMEngine_la_LDFLAGS  =			\
-	../../idl/libSalomeIDLGEOM.la \
+	../../idl/libSalomeIDLGEOM.la		\
-	../ARCHIMEDE/libGEOMArchimede.la \
+	../ARCHIMEDE/libGEOMArchimede.la	\
-	../GEOMImpl/libGEOMimpl.la \
+	../GEOMImpl/libGEOMimpl.la		\
-	../SKETCHER/libGEOMSketcher.la \
+	../SKETCHER/libGEOMSketcher.la		\
-	../GEOM/libGEOMbasic.la \
+	../GEOM/libGEOMbasic.la			\
-	$(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \
+	$(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS	\
-	$(CAS_DATAEXCHANGE) \
+	$(CAS_DATAEXCHANGE)			\
 	$(CAS_LDPATH) -lTKFillet -lTKOffset
 
 # \

src/GEOM_I_Superv/Makefile.am

@@ -32,7 +32,9 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS = \
+	GEOM_Superv_i.hh \
+	GEOM_List_i.hh
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOM_SupervEngine.la
@@ -40,28 +42,26 @@ lib_LTLIBRARIES = libGEOM_SupervEngine.la
 dist_libGEOM_SupervEngine_la_SOURCES = \
 	GEOM_Superv_i.cc
 
-#LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl \
+# additional information to compile and link file
-#                 SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl
 
-# additionnal information to compil and link file
+libGEOM_SupervEngine_la_CPPFLAGS =	\
-libGEOM_SupervEngine_la_CPPFLAGS = \
+	$(CAS_CPPFLAGS)			\
-	$(CAS_CPPFLAGS) \
+	$(QT_INCLUDES)			\
-	$(QT_INCLUDES) \
+	$(KERNEL_CXXFLAGS)		\
-	$(KERNEL_CXXFLAGS) \
+	$(BOOST_CPPFLAGS)		\
-	$(BOOST_CPPFLAGS) \
+	$(CORBA_CXXFLAGS)		\
-	$(CORBA_CXXFLAGS) \
+	$(CORBA_INCLUDES)		\
-	$(CORBA_INCLUDES) \
+	-I$(srcdir)/../GEOMGUI		\
-	-I$(srcdir)/../GEOMGUI \
+	-I$(srcdir)/../GEOMBase		\
-	-I$(srcdir)/../GEOMBase \
+	-I$(srcdir)/../GEOMClient	\
-	-I$(srcdir)/../GEOMClient \
+	-I$(srcdir)/../GEOMImpl		\
-	-I$(srcdir)/../GEOMImpl \
+	-I$(srcdir)/../GEOM		\
-	-I$(srcdir)/../GEOM \
+	-I$(srcdir)/../GEOM_I		\
-	-I$(srcdir)/../GEOM_I \
+	-I$(srcdir)/../GEOMAlgo		\
-	-I$(srcdir)/../GEOMAlgo \
+	-I$(top_builddir)/idl		\
-	-I$(top_builddir)/idl \
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOM_SupervEngine_la_LDFLAGS  = \
+libGEOM_SupervEngine_la_LDFLAGS  =	\
-	$(CORBA_LIBS) \
+	$(CORBA_LIBS)			\
 	$(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \
 	$(STDLIB)

src/GEOM_SWIG/Makefile.am

@@ -32,51 +32,46 @@
 
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
-
-EXPORT_SHAREDPYSCRIPTS=\
-	GEOM_shared_modules.py
-
-#
 # ===============================================================
 # Files to be installed
 # ===============================================================
 #
 
 # Scripts to be installed.
-dist_salomescript_DATA= \
+dist_salomescript_DATA =		\
-	geompy.py \
+	geompy.py			\
-	geompyDC.py \
+	geompyDC.py			\
-	batchmode_geompy.py \
+	batchmode_geompy.py		\
-	GEOM_Spanner.py \
+	GEOM_Spanner.py			\
-	GEOM_blocks.py \
+	GEOM_blocks.py			\
-	GEOM_example.py \
+	GEOM_example.py			\
-	GEOM_example2.py \
+	GEOM_example2.py		\
-	GEOM_example3.py \
+	GEOM_example3.py		\
-	GEOM_example4.py \
+	GEOM_example4.py		\
-	GEOM_example5.py \
+	GEOM_example5.py		\
-	GEOM_example6.py \
+	GEOM_example6.py		\
-	GEOM_moteur.py \
+	GEOM_moteur.py			\
-	GEOM_TestAll.py  \
+	GEOM_TestAll.py			\
-	GEOM_TestOthers.py \
+	GEOM_TestOthers.py		\
-	GEOM_TestHealing.py \
+	GEOM_TestHealing.py		\
-	GEOM_TestMeasures.py \
+	GEOM_TestMeasures.py		\
-	GEOM_usinggeom.py  \
+	GEOM_usinggeom.py		\
-	GEOM_Partition1.py \
+	GEOM_Partition1.py		\
-	GEOM_Partition2.py \
+	GEOM_Partition2.py		\
-	GEOM_Partition3.py \
+	GEOM_Partition3.py		\
-	GEOM_Partition4.py \
+	GEOM_Partition4.py		\
-	GEOM_Partition5.py \
+	GEOM_Partition5.py		\
-	GEOM_cyl2complementary.py \
+	GEOM_cyl2complementary.py	\
-	GEOM_shellSolid.py \
+	GEOM_shellSolid.py		\
-	GEOM_tube_geom.py \
+	GEOM_tube_geom.py		\
-	GEOM_tube_geom_gg2.py \
+	GEOM_tube_geom_gg2.py		\
-	GEOM_Nut.py \
+	GEOM_Nut.py			\
-	GEOM_Sketcher.py \
+	GEOM_Sketcher.py		\
-	PAL_MESH_019_020_geometry.py \
+	PAL_MESH_019_020_geometry.py	\
-	PAL_MESH_028_geometry.py \
+	PAL_MESH_028_geometry.py	\
-	PAL_MESH_030_geometry.py \
+	PAL_MESH_030_geometry.py	\
-	PAL_MESH_033_geometry.py \
+	PAL_MESH_033_geometry.py	\
 	PAL_MESH_035_geometry.py
 
-sharedpkgpython_PYTHON = \
+sharedpkgpython_PYTHON =		\
 	GEOM_shared_modules.py

src/GEOM_SWIG_WITHIHM/Makefile.am

@@ -49,66 +49,47 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 #                          +              |
 #                          dependant libs |
 #
-# The file libSALOME_Swigcmodule.py will be installed in
+# The file libGEOM_Swig.py will be installed to the
-# <prefix>/lib/python<version>/site-package/salome.
+# <prefix>/bin/salome directory.
-# The library will be installed in the same place.
+# The library _libGEOM_Swig.so will be installed to the 
+# <prefix>/lib/python<version>/site-package/salome directory.
 #
 
-# this option puts it to dist
+SWIG_FLAGS    = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../GEOMGUI
-#BUILT_SOURCES = swig_wrap.cpp
-
-SWIG_FLAGS    = \
-	@SWIG_FLAGS@ \
-	-I$(srcdir) \
-	-I$(srcdir)/../GEOMGUI
-
 SWIG_SOURCES  = libGEOM_Swig.i
 
-# Libraries targets
+nodist_salomepython_DATA        = libGEOM_Swig.py
-lib_LTLIBRARIES = libGEOM_Swigcmodule.la
-
-nodist_pkgpython_DATA = libGEOM_Swig.py
 libGEOM_Swig.py: swig_wrap.cpp
 
-libGEOM_Swigcmodule_la_SOURCES = \
+# Libraries targets
-	$(BUILT_SOURCES) \
+lib_LTLIBRARIES                 = _libGEOM_Swig.la
-	$(SWIG_SOURCES)
+_libGEOM_Swig_la_SOURCES        = $(SWIG_SOURCES)
+nodist__libGEOM_Swig_la_SOURCES = swig_wrap.cpp
+salomeinclude_HEADERS           = $(SWIG_SOURCES)
 
-nodist_libGEOM_Swigcmodule_la_SOURCES = swig_wrap.cpp
+_libGEOM_Swig_la_CPPFLAGS =		\
-
+	$(QT_INCLUDES)			\
-#LIB_CLIENT_IDL = SALOMEDS.idl \
+	$(PYTHON_INCLUDES)		\
-#                 SALOMEDS_Attributes.idl \
+	$(CAS_CPPFLAGS)			\
-#		 SALOME_Exception.idl \
+	$(VTK_INCLUDES)			\
-#		 GEOM_Gen.idl \
+	$(OGL_INCLUDES)			\
-#		 SALOME_Component.idl \
+	$(KERNEL_CXXFLAGS)		\
-#		 SALOME_GenericObj.idl
+	$(GUI_CXXFLAGS)			\
-
+	$(CORBA_CXXFLAGS)		\
-libGEOM_Swigcmodule_la_CPPFLAGS = \
+	$(CORBA_INCLUDES)		\
-	$(QT_INCLUDES) \
+	-I$(srcdir)/../GEOMGUI		\
-	$(PYTHON_INCLUDES) \
+	-I$(top_builddir)/idl		\
-	$(CAS_CPPFLAGS) \
-	$(VTK_INCLUDES) \
-	$(OGL_INCLUDES) \
-	$(KERNEL_CXXFLAGS) \
-	$(GUI_CXXFLAGS) \
-	$(CORBA_CXXFLAGS) \
-	$(CORBA_INCLUDES) \
-	-I$(srcdir)/../GEOMGUI \
-	-I$(top_builddir)/idl \
 	-I$(top_builddir)/salome_adm/unix
 
-libGEOM_Swigcmodule_la_LDFLAGS = \
+_libGEOM_Swig_la_LDFLAGS = -module
-	../GEOMGUI/libGEOM.la
+_libGEOM_Swig_la_LIBADD  =		\
-
+	../GEOMGUI/libGEOM.la		\
-
-libGEOM_Swigcmodule_la_LIBADD  = \
 	$(PYTHON_LIBS)
 
 swig_wrap.cpp : $(SWIG_SOURCES)
 	$(SWIG) $(SWIG_FLAGS) -o $@ $<
 
-CLEANFILES = \
+CLEANFILES = swig_wrap.cpp libGEOM_Swig.py
-	swig_wrap.cpp
 
 #
 # ===============================================================
@@ -116,12 +97,8 @@ CLEANFILES = \
 # ===============================================================
 #
 
-# Scripts to be installed.
+# Scripts to be installed (distributed)
-dist_salomescript_DATA= \
+dist_salomescript_DATA =
-	libGEOM_Swig.py
 
-install-exec-hook:\
+# Scripts to be installed (non-distributed)
-	$(libdir)/_libGEOM_Swig.so
+nodist_salomescript_DATA =
-
-$(libdir)/_libGEOM_Swig.so:
-	( cd $(libdir); ln -sf libGEOM_Swigcmodule.so _libGEOM_Swig.so; )

src/GenerationGUI/Makefile.am

@@ -30,7 +30,12 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGenerationGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =			\
+	GenerationGUI.h			\
+	GenerationGUI_PrismDlg.h	\
+	GenerationGUI_RevolDlg.h	\
+	GenerationGUI_FillingDlg.h	\
+	GenerationGUI_PipeDlg.h
 
 dist_libGenerationGUI_la_SOURCES =	\
 	GenerationGUI.h			\
@@ -51,14 +56,10 @@ MOC_FILES = 					\
 	GenerationGUI_FillingDlg_moc.cxx	\
 	GenerationGUI_PipeDlg_moc.cxx
 
-nodist_libGenerationGUI_la_SOURCES = \
+nodist_libGenerationGUI_la_SOURCES =	\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libGenerationGUI_la_CPPFLAGS =			\
 	$(QT_INCLUDES)				\

src/GroupGUI/Makefile.am

@@ -30,7 +30,9 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 lib_LTLIBRARIES = libGroupGUI.la
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =		\
+	GroupGUI.h		\
+	GroupGUI_GroupDlg.h
 
 dist_libGroupGUI_la_SOURCES =	\
 	GroupGUI.h		\
@@ -45,11 +47,7 @@ MOC_FILES =			\
 nodist_libGroupGUI_la_SOURCES =	\
 	$(MOC_FILES)
 
-# LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
-
-# LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libGroupGUI_la_CPPFLAGS =			\
 	$(QT_INCLUDES)				\

src/IGESExport/Makefile.am

@@ -29,15 +29,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 # Libraries targets
 lib_LTLIBRARIES = libIGESExport.la
 
-dist_libIGESExport_la_SOURCES = \
+dist_libIGESExport_la_SOURCES =	\
 	IGESExport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libIGESExport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libIGESExport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libIGESExport_la_LDFLAGS  = \
+libIGESExport_la_LDFLAGS  =	\
-	$(STDLIB) \
+	$(STDLIB)		\
-	$(CAS_LDPATH) -lTKIGES \
+	$(CAS_LDPATH) -lTKIGES	\
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace

src/IGESImport/Makefile.am

@@ -29,15 +29,16 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 # Libraries targets
 lib_LTLIBRARIES = libIGESImport.la
 
-dist_libIGESImport_la_SOURCES = \
+dist_libIGESImport_la_SOURCES =	\
 	IGESImport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libIGESImport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libIGESImport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libIGESImport_la_LDFLAGS  = \
+libIGESImport_la_LDFLAGS  =	\
-	$(STDLIB) \
+	$(STDLIB)		\
-	$(CAS_LDPATH) -lTKIGES \
+	$(CAS_LDPATH) -lTKIGES	\
 	$(KERNEL_LDFLAGS) -lSALOMELocalTrace

src/Makefile.am

@@ -22,8 +22,27 @@
 # Package : src (source files directory)
 #
 
-SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport BREPImport IGESExport IGESImport STEPExport STEPImport STLExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG
+SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport	\
+          BREPImport IGESExport IGESImport STEPExport STEPImport	\
+          STLExport ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv	\
+          GEOM_SWIG
 
 if GEOM_ENABLE_GUI
-  SUBDIRS+= OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
+  SUBDIRS += OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI	\
+             DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI BuildGUI	\
+             BooleanGUI TransformationGUI OperationGUI RepairGUI MeasureGUI	\
+             GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
 endif
+
+DIST_SUBDIRS = ARCHIMEDE NMTDS NMTTools GEOMAlgo SKETCHER GEOM BREPExport	\
+               BREPImport IGESExport IGESImport STEPExport STEPImport STLExport \
+               ShHealOper GEOMImpl GEOM_I GEOMClient GEOM_I_Superv GEOM_SWIG	\
+               OBJECT DlgRef GEOMFiltersSelection GEOMGUI GEOMBase GEOMToolsGUI	\
+               DisplayGUI BasicGUI PrimitiveGUI GenerationGUI EntityGUI		\
+               BuildGUI BooleanGUI TransformationGUI OperationGUI RepairGUI	\
+               MeasureGUI GroupGUI BlocksGUI GEOM_SWIG_WITHIHM
+
+#######################################
+# Not used packages are listed below
+#######################################
+# GEOMDS NMTAlgo PARTITION

src/MeasureGUI/Makefile.am

@@ -27,12 +27,7 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =				\
-
-# Libraries targets
-lib_LTLIBRARIES = libMeasureGUI.la
-
-dist_libMeasureGUI_la_SOURCES =			\
 	MeasureGUI.h				\
 	MeasureGUI_Widgets.h			\
 	MeasureGUI_Skeleton.h			\
@@ -47,8 +42,12 @@ dist_libMeasureGUI_la_SOURCES =			\
 	MeasureGUI_WhatisDlg.h			\
 	MeasureGUI_CheckShapeDlg.h		\
 	MeasureGUI_CheckCompoundOfBlocksDlg.h	\
-	MeasureGUI_PointDlg.h			\
+	MeasureGUI_PointDlg.h
-						\
+
+# Libraries targets
+lib_LTLIBRARIES = libMeasureGUI.la
+
+dist_libMeasureGUI_la_SOURCES =			\
 	MeasureGUI.cxx				\
 	MeasureGUI_Widgets.cxx			\
 	MeasureGUI_Skeleton.cxx			\
@@ -81,7 +80,7 @@ MOC_FILES = 						\
 	MeasureGUI_CheckCompoundOfBlocksDlg_moc.cxx	\
 	MeasureGUI_PointDlg_moc.cxx
 
-nodist_libMeasureGUI_la_SOURCES = \
+nodist_libMeasureGUI_la_SOURCES =			\
 	$(MOC_FILES)
 
 UIC_FILES =						\
@@ -97,11 +96,7 @@ UIC_FILES =						\
 
 BUILT_SOURCES = $(UIC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libMeasureGUI_la_CPPFLAGS =		\
 	$(QT_INCLUDES)			\
@@ -124,6 +119,6 @@ libMeasureGUI_la_CPPFLAGS =		\
 	-I$(top_builddir)/idl		\
 	-I$(top_builddir)/salome_adm/unix
 
-libMeasureGUI_la_LDFLAGS  = \
+libMeasureGUI_la_LDFLAGS  =		\
 	../GEOMBase/libGEOMBase.la
 

src/NMTAlgo/Makefile.am

@@ -30,34 +30,49 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =		\
-	NMTAlgo_Splitter1.hxx \
+	NMTAlgo_Splitter1.hxx	\
-	NMTAlgo_Splitter.hxx \
+	NMTAlgo_Splitter1.ixx	\
-	NMTAlgo_Builder.hxx \
+	NMTAlgo_Splitter1.jxx	\
-	NMTAlgo_Algo.hxx
+	NMTAlgo_Splitter.hxx	\
+	NMTAlgo_Splitter.ixx	\
+	NMTAlgo_Splitter.jxx	\
+	NMTAlgo_Builder.hxx	\
+	NMTAlgo_Builder.ixx	\
+	NMTAlgo_Builder.jxx	\
+	NMTAlgo_Algo.hxx	\
+	NMTAlgo_Algo.ixx	\
+	NMTAlgo_Algo.jxx	\
+	NMTAlgo_Loop3d.hxx	\
+	NMTAlgo_Loop3d.ixx	\
+	NMTAlgo_Loop3d.jxx	\
+	NMTAlgo_Tools.hxx	\
+	NMTAlgo_Tools.ixx	\
+	NMTAlgo_Tools.jxx
 
 # Libraries targets
 lib_LTLIBRARIES = libNMTAlgo.la
 
-dist_libNMTAlgo_la_SOURCES = \
+dist_libNMTAlgo_la_SOURCES =	\
-	NMTAlgo_Algo.cxx \
+	NMTAlgo_Algo.cxx	\
-	NMTAlgo_Builder.cxx \
+	NMTAlgo_Builder.cxx	\
-	NMTAlgo_Loop3d.cxx \
+	NMTAlgo_Loop3d.cxx	\
-	NMTAlgo_Splitter.cxx \
+	NMTAlgo_Splitter.cxx	\
-	NMTAlgo_Splitter1.cxx \
+	NMTAlgo_Splitter1.cxx	\
-	NMTAlgo_Splitter_1.cxx \
+	NMTAlgo_Splitter_1.cxx	\
-	NMTAlgo_Splitter_2.cxx \
+	NMTAlgo_Splitter_2.cxx	\
 	NMTAlgo_Tools.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libNMTAlgo_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libNMTAlgo_la_CPPFLAGS =	\
-	$(KERNEL_CXXFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	-I$(srcdir)/../NMTDS \
+	$(KERNEL_CXXFLAGS)	\
+	-I$(srcdir)/../NMTDS	\
 	-I$(srcdir)/../NMTTools
 
-libNMTAlgo_la_LDFLAGS  = \
+libNMTAlgo_la_LDFLAGS  =		\
-	$(STDLIB) \
+	$(STDLIB)			\
-	$(CAS_LDPATH) -lTKBool -lTKBO \
+	$(CAS_LDPATH) -lTKBool -lTKBO	\
-	$(KERNEL_LDFLAGS) \
+	$(KERNEL_LDFLAGS)		\
 	../NMTTools/libNMTTools.la

src/NMTDS/Makefile.am

@@ -51,10 +51,18 @@ salomeinclude_HEADERS = \
 	NMTDS_IndexedDataMapOfIntegerShape.hxx \
 	NMTDS_IndexedDataMapOfShapeBox.hxx \
 	NMTDS_IndexRange.hxx \
+	NMTDS_IndexRange.ixx \
+	NMTDS_IndexRange.jxx \
 	NMTDS_InterfPool.hxx \
+	NMTDS_InterfPool.ixx \
+	NMTDS_InterfPool.jxx \
 	NMTDS_InterfType.hxx \
 	NMTDS_Iterator.hxx \
+	NMTDS_Iterator.ixx \
+	NMTDS_Iterator.jxx \
 	NMTDS_IteratorCheckerSI.hxx \
+	NMTDS_IteratorCheckerSI.ixx \
+	NMTDS_IteratorCheckerSI.jxx \
 	NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx \
 	NMTDS_ListIteratorOfListOfPassKeyBoolean.hxx \
 	NMTDS_ListIteratorOfListOfPassKey.hxx \
@@ -69,17 +77,31 @@ salomeinclude_HEADERS = \
 	NMTDS_MapOfPassKeyBoolean.hxx  \
 	NMTDS_MapOfPassKey.hxx \
 	NMTDS_PassKeyBoolean.hxx \
+	NMTDS_PassKeyBoolean.ixx \
+	NMTDS_PassKeyBoolean.jxx \
 	NMTDS_PInterfPool.hxx \
 	NMTDS_PIterator.hxx \
 	NMTDS_PassKey.hxx \
+	NMTDS_PassKey.ixx \
+	NMTDS_PassKey.jxx \
 	NMTDS_PassKeyMapHasher.hxx \
+	NMTDS_PassKeyMapHasher.ixx \
+	NMTDS_PassKeyMapHasher.jxx \
 	NMTDS_PassKeyShape.hxx \
+	NMTDS_PassKeyShape.ixx \
+	NMTDS_PassKeyShape.jxx \
 	NMTDS_PassKeyShapeMapHasher.hxx \
+	NMTDS_PassKeyShapeMapHasher.ixx \
+	NMTDS_PassKeyShapeMapHasher.jxx \
 	NMTDS_PShapesDataStructure.hxx \
 	NMTDS_ShapesDataStructure.hxx \
+	NMTDS_ShapesDataStructure.ixx \
+	NMTDS_ShapesDataStructure.jxx \
 	NMTDS_StdMapNodeOfMapOfPassKeyBoolean.hxx \
 	NMTDS_StdMapNodeOfMapOfPassKey.hxx \
 	NMTDS_Tools.hxx \
+	NMTDS_Tools.ixx \
+	NMTDS_Tools.jxx \
 	NMTDS_BoxBndTree.hxx
 
 # Libraries targets
@@ -124,12 +146,29 @@ dist_libNMTDS_la_SOURCES = \
 	NMTDS_Tools.cxx \
 	NMTDS_BoxBndTree.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libNMTDS_la_CPPFLAGS = \
+libNMTDS_la_CPPFLAGS =		\
-	$(CAS_CPPFLAGS) \
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libNMTDS_la_LDFLAGS  = \
+libNMTDS_la_LDFLAGS  =		\
-	$(STDLIB) \
+	$(STDLIB)		\
 	$(CAS_LDPATH) -lTKBool -lTKBO
+
+# extra dist files
+CDL_FILES =				\
+	NMTDS.cdl			\
+	NMTDS_IndexRange.cdl		\
+	NMTDS_InterfPool.cdl		\
+	NMTDS_Iterator.cdl		\
+	NMTDS_IteratorCheckerSI.cdl	\
+	NMTDS_PassKey.cdl		\
+	NMTDS_PassKeyBoolean.cdl	\
+	NMTDS_PassKeyMapHasher.cdl	\
+	NMTDS_PassKeyShape.cdl		\
+	NMTDS_PassKeyShapeMapHasher.cdl	\
+	NMTDS_ShapesDataStructure.cdl	\
+	NMTDS_Tools.cdl
+
+EXTRA_DIST += $(CDL_FILES)

src/NMTTools/Makefile.am

@@ -39,11 +39,21 @@ salomeinclude_HEADERS = \
 	Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx \
 	Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx \
 	NMTTools_CheckerSI.hxx \
+	NMTTools_CheckerSI.ixx \
+	NMTTools_CheckerSI.jxx \
 	NMTTools_CommonBlockAPI.hxx \
+	NMTTools_CommonBlockAPI.ixx \
+	NMTTools_CommonBlockAPI.jxx \
 	NMTTools_CommonBlock.hxx \
+	NMTTools_CommonBlock.ixx \
+	NMTTools_CommonBlock.jxx \
 	NMTTools_CommonBlockPool.hxx \
 	NMTTools_CoupleOfShape.hxx \
+	NMTTools_CoupleOfShape.ixx \
+	NMTTools_CoupleOfShape.jxx \
 	NMTTools_DEProcessor.hxx \
+	NMTTools_DEProcessor.ixx \
+	NMTTools_DEProcessor.jxx \
 	NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx \
 	NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx \
 	NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx \
@@ -51,6 +61,8 @@ salomeinclude_HEADERS = \
 	NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx \
 	NMTTools_IndexedDataMapOfShapePaveBlock.hxx \
 	NMTTools_IteratorOfCoupleOfShape.hxx \
+	NMTTools_IteratorOfCoupleOfShape.ixx \
+	NMTTools_IteratorOfCoupleOfShape.jxx \
 	NMTTools_ListIteratorOfListOfCommonBlock.hxx \
 	NMTTools_ListIteratorOfListOfCoupleOfShape.hxx \
 	NMTTools_ListNodeOfListOfCommonBlock.hxx \
@@ -58,8 +70,12 @@ salomeinclude_HEADERS = \
 	NMTTools_ListOfCommonBlock.hxx \
 	NMTTools_ListOfCoupleOfShape.hxx \
 	NMTTools_PaveFiller.hxx \
+	NMTTools_PaveFiller.ixx \
+	NMTTools_PaveFiller.jxx \
 	NMTTools_PPaveFiller.hxx \
 	NMTTools_Tools.hxx \
+	NMTTools_Tools.ixx \
+	NMTTools_Tools.jxx \
 	Handle_NMTTools_DataMapNodeOfDataMapOfIntegerListOfPaveBlock.hxx \
 	Handle_NMTTools_StdMapNodeOfMapOfPaveBlock.hxx \
 	NMTTools_DataMapIteratorOfDataMapOfIntegerListOfPaveBlock.hxx \
@@ -112,15 +128,43 @@ dist_libNMTTools_la_SOURCES = \
 	NMTTools_MapOfPaveBlock_0.cxx \
 	NMTTools_StdMapNodeOfMapOfPaveBlock_0.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libNMTTools_la_CPPFLAGS = \
+libNMTTools_la_CPPFLAGS =	\
-	$(CAS_CPPFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	$(KERNEL_CXXFLAGS) \
+	$(KERNEL_CXXFLAGS)	\
 	-I$(srcdir)/../NMTDS
 
-libNMTTools_la_LDFLAGS  = \
+libNMTTools_la_LDFLAGS  =		\
-	../NMTDS/libNMTDS.la \
+	../NMTDS/libNMTDS.la		\
-	$(STDLIB) \
+	$(STDLIB)			\
-	$(CAS_LDPATH) -lTKBool -lTKBO \
+	$(CAS_LDPATH) -lTKBool -lTKBO	\
 	$(KERNEL_LDFLAGS)
+
+CDL_FILES =					\
+	NMTTools.cdl				\
+	NMTTools_CheckerSI.cdl			\
+	NMTTools_CommonBlock.cdl		\
+	NMTTools_CommonBlockAPI.cdl		\
+	NMTTools_CoupleOfShape.cdl		\
+	NMTTools_DEProcessor.cdl		\
+	NMTTools_IteratorOfCoupleOfShape.cdl	\
+	NMTTools_PaveFiller.cdl			\
+	NMTTools_Tools.cdl
+
+EXTRA_DIST += $(CDL_FILES)
+
+########################################
+# Non-used (obsolete?) files
+########################################
+# NMTTools_PCurveMaker.cdl
+# NMTTools_PCurveMaker.cxx
+# NMTTools_PCurveMaker.hxx
+# NMTTools_PCurveMaker.ixx
+# NMTTools_PCurveMaker.jxx
+# NMTTools_PDSFiller.hxx
+# NMTTools_DSFiller.cdl
+# NMTTools_DSFiller.cxx
+# NMTTools_DSFiller.hxx
+# NMTTools_DSFiller.ixx
+# NMTTools_DSFiller.jxx

src/OBJECT/Makefile.am

@@ -29,57 +29,62 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =				\
-	GEOM_Actor.h \
+	GEOM_Actor.h				\
-	GEOM_AssemblyBuilder.h \
+	GEOM_AssemblyBuilder.h			\
-	GEOM_AISShape.hxx \
+	GEOM_AISShape.hxx			\
-	Handle_GEOM_AISShape.hxx \
+	GEOM_AISShape.ixx			\
-	GEOM_InteractiveObject.hxx \
+	GEOM_AISShape.jxx			\
-	Handle_GEOM_InteractiveObject.hxx \
+	Handle_GEOM_AISShape.hxx		\
-	GEOM_AISTrihedron.hxx \
+	GEOM_InteractiveObject.hxx		\
-	GEOM_VTKTrihedron.hxx \
+	GEOM_InteractiveObject.ixx		\
-	GEOM_AISVector.hxx \
+	GEOM_InteractiveObject.jxx		\
-	GEOM_OBJECT_defs.hxx \
+	Handle_GEOM_InteractiveObject.hxx	\
-	GEOM_SmartPtr.h \
+	GEOM_AISTrihedron.hxx			\
-	GEOM_DeviceActor.h \
+	GEOM_VTKTrihedron.hxx			\
-	GEOM_EdgeSource.h \
+	GEOM_AISVector.hxx			\
-	GEOM_FaceSource.h \
+	GEOM_OBJECT_defs.hxx			\
-	GEOM_ShadingFace.h \
+	GEOM_OCCReader.h			\
-	GEOM_VertexSource.h \
+	GEOM_SmartPtr.h				\
+	GEOM_DeviceActor.h			\
+	GEOM_EdgeSource.h			\
+	GEOM_FaceSource.h			\
+	GEOM_ShadingFace.h			\
+	GEOM_VertexSource.h			\
 	GEOM_WireframeFace.h
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMObject.la
 
-dist_libGEOMObject_la_SOURCES = \
+dist_libGEOMObject_la_SOURCES =		\
-	GEOM_Actor.cxx \
+	GEOM_Actor.cxx			\
-	GEOM_OCCReader.cxx \
+	GEOM_OCCReader.cxx		\
-	GEOM_AssemblyBuilder.cxx \
+	GEOM_AssemblyBuilder.cxx	\
-	GEOM_AISShape.cxx \
+	GEOM_AISShape.cxx		\
-	GEOM_InteractiveObject.cxx \
+	GEOM_InteractiveObject.cxx	\
-	GEOM_AISTrihedron.cxx \
+	GEOM_AISTrihedron.cxx		\
-	GEOM_VTKTrihedron.cxx \
+	GEOM_VTKTrihedron.cxx		\
-	GEOM_AISVector.cxx \
+	GEOM_AISVector.cxx		\
-	GEOM_DeviceActor.cxx \
+	GEOM_DeviceActor.cxx		\
-	GEOM_EdgeSource.cxx \
+	GEOM_EdgeSource.cxx		\
-	GEOM_FaceSource.cxx \
+	GEOM_FaceSource.cxx		\
-	GEOM_ShadingFace.cxx \
+	GEOM_ShadingFace.cxx		\
-	GEOM_VertexSource.cxx \
+	GEOM_VertexSource.cxx		\
 	GEOM_WireframeFace.cxx
 
 
-libGEOMObject_la_CPPFLAGS = \
+libGEOMObject_la_CPPFLAGS =	\
-	$(CORBA_CXXFLAGS) \
+	$(CORBA_CXXFLAGS)	\
-	$(CORBA_INCLUDES) \
+	$(CORBA_INCLUDES)	\
-	$(QT_INCLUDES) \
+	$(QT_INCLUDES)		\
-	$(PYTHON_INCLUDES) \
+	$(PYTHON_INCLUDES)	\
-	$(CAS_CPPFLAGS) \
+	$(CAS_CPPFLAGS)		\
-	$(VTK_INCLUDES) \
+	$(VTK_INCLUDES)		\
-	$(KERNEL_CXXFLAGS) \
+	$(KERNEL_CXXFLAGS)	\
 	$(GUI_CXXFLAGS) 
 	
-libGEOMObject_la_LDFLAGS  = \
+libGEOMObject_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS)  -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS)  -lSALOMELocalTrace	\
 	$(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject
 #	$(CORBA_LIBS) \
 #	$(STDLIB) \

src/OperationGUI/Makefile.am

@@ -27,20 +27,19 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =				\
+	OperationGUI.h				\
+	OperationGUI_ArchimedeDlg.h		\
+	OperationGUI_PartitionDlg.h		\
+	OperationGUI_FilletDlg.h		\
+	OperationGUI_ChamferDlg.h		\
+	OperationGUI_GetShapesOnShapeDlg.h	\
+	OperationGUI_ClippingDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libOperationGUI.la
 
-dist_libOperationGUI_la_SOURCES = \
+dist_libOperationGUI_la_SOURCES =		\
-	OperationGUI.h				\
-	OperationGUI_ArchimedeDlg.h		\
-	OperationGUI_PartitionDlg.h		\
-	OperationGUI_GetShapesOnShapeDlg.h	\
-	OperationGUI_FilletDlg.h		\
-	OperationGUI_ChamferDlg.h		\
-	OperationGUI_ClippingDlg.h		\
-						\
 	OperationGUI.cxx			\
 	OperationGUI_ArchimedeDlg.cxx		\
 	OperationGUI_PartitionDlg.cxx		\
@@ -49,7 +48,7 @@ dist_libOperationGUI_la_SOURCES = \
 	OperationGUI_ChamferDlg.cxx		\
 	OperationGUI_ClippingDlg.cxx
 
-MOC_FILES = \
+MOC_FILES =					\
 	OperationGUI_ArchimedeDlg_moc.cxx	\
 	OperationGUI_PartitionDlg_moc.cxx	\
 	OperationGUI_GetShapesOnShapeDlg_moc.cxx\
@@ -57,14 +56,10 @@ MOC_FILES = \
 	OperationGUI_ChamferDlg_moc.cxx		\
 	OperationGUI_ClippingDlg_moc.cxx
 
-nodist_libOperationGUI_la_SOURCES = \
+nodist_libOperationGUI_la_SOURCES =		\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libOperationGUI_la_CPPFLAGS =		\
 	$(QT_INCLUDES)			\
@@ -90,3 +85,9 @@ libOperationGUI_la_CPPFLAGS =		\
 libOperationGUI_la_LDFLAGS =		\
 	../GEOMBase/libGEOMBase.la	\
 	$(CAS_LDPATH) -lTKFillet
+
+###############################
+# Obsolete files ?
+###############################
+# OperationGUI_MaterialDlg.h
+# OperationGUI_MaterialDlg.cxx

src/PrimitiveGUI/Makefile.am

@@ -25,7 +25,13 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =			\
+	PrimitiveGUI.h			\
+	PrimitiveGUI_BoxDlg.h		\
+	PrimitiveGUI_CylinderDlg.h	\
+	PrimitiveGUI_SphereDlg.h	\
+	PrimitiveGUI_TorusDlg.h		\
+	PrimitiveGUI_ConeDlg.h		
 
 # Libraries targets
 lib_LTLIBRARIES = libPrimitiveGUI.la
@@ -58,14 +64,10 @@ MOC_FILES =					\
 	PrimitiveGUI_FaceDlg_moc.cxx		\
 	PrimitiveGUI_DiskDlg_moc.cxx
 
-nodist_libPrimitiveGUI_la_SOURCES = \
+nodist_libPrimitiveGUI_la_SOURCES =	\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL =  
-
-# additionnal information to compil and link file
 
 libPrimitiveGUI_la_CPPFLAGS =			\
 	$(QT_INCLUDES) 				\

src/RepairGUI/Makefile.am

@@ -27,7 +27,20 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =				\
+	RepairGUI.h				\
+	RepairGUI_SewingDlg.h			\
+	RepairGUI_SuppressFacesDlg.h		\
+	RepairGUI_ShapeProcessDlg.h		\
+	RepairGUI_CloseContourDlg.h		\
+	RepairGUI_RemoveIntWiresDlg.h		\
+	RepairGUI_RemoveHolesDlg.h		\
+	RepairGUI_DivideEdgeDlg.h		\
+	RepairGUI_FreeBoundDlg.h		\
+	RepairGUI_FreeFacesDlg.h		\
+	RepairGUI_ChangeOrientationDlg.h	\
+	RepairGUI_GlueDlg.h			\
+	RepairGUI_RemoveExtraEdgesDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libRepairGUI.la
@@ -61,7 +74,7 @@ dist_libRepairGUI_la_SOURCES =			\
 	RepairGUI_GlueDlg.cxx			\
 	RepairGUI_RemoveExtraEdgesDlg.cxx
 
-MOC_FILES = \
+MOC_FILES = 					\
 	RepairGUI_SewingDlg_moc.cxx		\
 	RepairGUI_SuppressFacesDlg_moc.cxx	\
 	RepairGUI_ShapeProcessDlg_moc.cxx	\
@@ -75,16 +88,12 @@ MOC_FILES = \
 	RepairGUI_GlueDlg_moc.cxx     		\
 	RepairGUI_RemoveExtraEdgesDlg_moc.cxx
 
-nodist_libRepairGUI_la_SOURCES = \
+nodist_libRepairGUI_la_SOURCES =		\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_Exception.idl SALOME_GenericObj.idl SALOME_Component.idl
+# additional information to compile and link file
 
-#LIB_SERVER_IDL =  
+libRepairGUI_la_CPPFLAGS =			\
-
-# additionnal information to compil and link file
-
-libRepairGUI_la_CPPFLAGS = \
 	$(QT_INCLUDES)				\
 	$(VTK_INCLUDES)				\
 	$(CAS_CPPFLAGS)				\

src/SKETCHER/Makefile.am

@@ -31,22 +31,23 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =		\
 	Sketcher_Profile.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libGEOMSketcher.la
 
-dist_libGEOMSketcher_la_SOURCES = \
+dist_libGEOMSketcher_la_SOURCES =	\
 	Sketcher_Profile.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libGEOMSketcher_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libGEOMSketcher_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libGEOMSketcher_la_LDFLAGS  = \
+libGEOMSketcher_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
-	$(CAS_KERNEL) \
+	$(CAS_KERNEL)				\
 	$(CAS_MODELER)

src/STEPExport/Makefile.am

@@ -32,15 +32,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTEPExport.la
 
-dist_libSTEPExport_la_SOURCES = \
+dist_libSTEPExport_la_SOURCES =	\
 	STEPExport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libSTEPExport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libSTEPExport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libSTEPExport_la_LDFLAGS  = \
+libSTEPExport_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKSTEP

src/STEPImport/Makefile.am

@@ -32,15 +32,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTEPImport.la
 
-dist_libSTEPImport_la_SOURCES = \
+dist_libSTEPImport_la_SOURCES =	\
 	STEPImport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libSTEPImport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libSTEPImport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libSTEPImport_la_LDFLAGS  = \
+libSTEPImport_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKSTEP

src/STLExport/Makefile.am

@@ -27,15 +27,16 @@ salomeinclude_HEADERS =
 # Libraries targets
 lib_LTLIBRARIES = libSTLExport.la
 
-dist_libSTLExport_la_SOURCES = \
+dist_libSTLExport_la_SOURCES =	\
 	STLExport.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
-libSTLExport_la_CPPFLAGS = \
+
-	$(CAS_CPPFLAGS) \
+libSTLExport_la_CPPFLAGS =	\
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libSTLExport_la_LDFLAGS  = \
+libSTLExport_la_LDFLAGS  =			\
-	$(KERNEL_LDFLAGS) -lSALOMELocalTrace \
+	$(KERNEL_LDFLAGS) -lSALOMELocalTrace	\
-	$(STDLIB) \
+	$(STDLIB)				\
 	$(CAS_LDPATH) -lTKSTL

src/ShHealOper/Makefile.am

@@ -30,45 +30,45 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS = \
+salomeinclude_HEADERS =				\
-	ShHealOper_CloseContour.hxx \
+	ShHealOper_CloseContour.hxx		\
-	ShHealOper_EdgeDivide.hxx \
+	ShHealOper_EdgeDivide.hxx		\
-	ShHealOper_FillHoles.hxx \
+	ShHealOper_FillHoles.hxx		\
-	ShHealOper_RemoveFace.hxx \
+	ShHealOper_RemoveFace.hxx		\
-	ShHealOper_RemoveInternalWires.hxx \
+	ShHealOper_RemoveInternalWires.hxx	\
-	ShHealOper_Sewing.hxx \
+	ShHealOper_Sewing.hxx			\
-	ShHealOper_ShapeProcess.hxx \
+	ShHealOper_ShapeProcess.hxx		\
-	ShHealOper_SpiltCurve2d.hxx \
+	ShHealOper_SpiltCurve2d.hxx		\
-	ShHealOper_SplitCurve2d.hxx \
+	ShHealOper_SplitCurve2d.hxx		\
-	ShHealOper_SplitCurve3d.hxx \
+	ShHealOper_SplitCurve3d.hxx		\
-	ShHealOper_ChangeOrientation.hxx \
+	ShHealOper_ChangeOrientation.hxx	\
 	ShHealOper_Tool.hxx
 
 # Libraries targets
 lib_LTLIBRARIES = libShHealOper.la
 
-dist_libShHealOper_la_SOURCES = \
+dist_libShHealOper_la_SOURCES =			\
-	ShHealOper_CloseContour.cxx \
+	ShHealOper_CloseContour.cxx		\
-	ShHealOper_EdgeDivide.cxx \
+	ShHealOper_EdgeDivide.cxx		\
-	ShHealOper_FillHoles.cxx \
+	ShHealOper_FillHoles.cxx		\
-	ShHealOper_RemoveFace.cxx \
+	ShHealOper_RemoveFace.cxx		\
-	ShHealOper_RemoveInternalWires.cxx \
+	ShHealOper_RemoveInternalWires.cxx	\
-	ShHealOper_Sewing.cxx \
+	ShHealOper_Sewing.cxx			\
-	ShHealOper_ShapeProcess.cxx \
+	ShHealOper_ShapeProcess.cxx		\
-	ShHealOper_SplitCurve2d.cxx \
+	ShHealOper_SplitCurve2d.cxx		\
-	ShHealOper_SplitCurve3d.cxx \
+	ShHealOper_SplitCurve3d.cxx		\
-	ShHealOper_ChangeOrientation.cxx \
+	ShHealOper_ChangeOrientation.cxx	\
 	ShHealOper_Tool.cxx
 
-# additionnal information to compil and link file
+# additional information to compile and link file
 
-libShHealOper_la_CPPFLAGS = \
+libShHealOper_la_CPPFLAGS =	\
-	$(CAS_CPPFLAGS) \
+	$(CAS_CPPFLAGS)		\
 	$(KERNEL_CXXFLAGS)
 
-libShHealOper_la_LDFLAGS  = \
+libShHealOper_la_LDFLAGS  =	\
-	$(STDLIB) \
+	$(STDLIB)		\
-	$(CAS_KERNEL) \
+	$(CAS_KERNEL)		\
-	$(CAS_MATH) \
+	$(CAS_MATH)		\
-	$(CAS_TKTopAlgo) \
+	$(CAS_TKTopAlgo)	\
 	$(CAS_LDPATH) -lTKBool -lTKShHealing -lTKLCAF

src/TransformationGUI/Makefile.am

@@ -27,7 +27,16 @@
 include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 # header files 
-salomeinclude_HEADERS =
+salomeinclude_HEADERS =					\
+	TransformationGUI.h				\
+	TransformationGUI_MultiTranslationDlg.h		\
+	TransformationGUI_MultiRotationDlg.h		\
+	TransformationGUI_TranslationDlg.h		\
+	TransformationGUI_RotationDlg.h			\
+	TransformationGUI_MirrorDlg.h			\
+	TransformationGUI_ScaleDlg.h			\
+	TransformationGUI_OffsetDlg.h			\
+	TransformationGUI_PositionDlg.h
 
 # Libraries targets
 lib_LTLIBRARIES = libTransformationGUI.la
@@ -53,7 +62,7 @@ dist_libTransformationGUI_la_SOURCES =			\
 	TransformationGUI_OffsetDlg.cxx			\
 	TransformationGUI_PositionDlg.cxx
 
-MOC_FILES = \
+MOC_FILES =						\
 	TransformationGUI_MultiTranslationDlg_moc.cxx	\
 	TransformationGUI_MultiRotationDlg_moc.cxx	\
 	TransformationGUI_TranslationDlg_moc.cxx	\
@@ -63,14 +72,10 @@ MOC_FILES = \
 	TransformationGUI_OffsetDlg_moc.cxx		\
 	TransformationGUI_PositionDlg_moc.cxx
 
-nodist_libTransformationGUI_la_SOURCES = \
+nodist_libTransformationGUI_la_SOURCES =		\
 	$(MOC_FILES)
 
-#LIB_CLIENT_IDL = SALOME_GenericObj.idl SALOME_Component.idl SALOME_Exception.idl
+# additional information to compile and link file
-
-#LIB_SERVER_IDL = 
-
-# additionnal information to compil and link file
 
 libTransformationGUI_la_CPPFLAGS =		\
 	$(QT_INCLUDES)				\
@@ -93,6 +98,6 @@ libTransformationGUI_la_CPPFLAGS =		\
 	-I$(top_builddir)/idl			\
 	-I$(top_builddir)/salome_adm/unix
 
-libTransformationGUI_la_LDFLAGS  = \
+libTransformationGUI_la_LDFLAGS  =				\
-	../GEOMFiltersSelection/libGEOMFiltersSelection.la \
+	../GEOMFiltersSelection/libGEOMFiltersSelection.la	\
 	../GEOMBase/libGEOMBase.la