From 57714d4c358d337d6d11ab08dcac22dd98a7913d Mon Sep 17 00:00:00 2001 From: vsr Date: Fri, 12 Sep 2008 04:39:53 +0000 Subject: [PATCH] Implement 'make dist' and 'make distcheck' steps support --- Makefile.am | 19 +- adm_local/Makefile.am | 3 + adm_local/unix/config_files/Makefile.am | 1 + adm_local/unix/make_common_starter.am | 32 +- bin/Makefile.am | 13 +- clean_configure | 15 + configure.ac | 21 +- doc/Makefile.am | 12 +- doc/salome/Makefile.am | 6 +- doc/salome/gui/GEOM/Makefile.am | 74 ++ doc/salome/gui/GEOM/doxyfile.in | 6 +- doc/salome/gui/GEOM/doxyfile_py.in | 23 +- doc/salome/gui/GEOM/doxyfile_tui.in | 4 +- doc/salome/gui/Makefile.am | 62 +- doc/salome/tui/GEOM/HTML/GEOM_Gen.html | 802 ------------------ doc/salome/tui/GEOM/HTML/GEOM_Shape.html | 18 - doc/salome/tui/GEOM/doxyfile_py.in | 242 ------ .../tui/GEOM/sources/Application-About.png | Bin 19226 -> 0 bytes .../tui/GEOM/sources/Application-About1.jpg | Bin 14327 -> 0 bytes doc/salome/tui/GEOM/sources/application.gif | Bin 2602 -> 0 bytes doc/salome/tui/GEOM/sources/application.jpg | Bin 792 -> 0 bytes doc/salome/tui/GEOM/sources/bg_salome.gif | Bin 17293 -> 0 bytes doc/salome/tui/GEOM/sources/logocorp.gif | Bin 1792 -> 0 bytes doc/salome/tui/GEOM/sources/myheader_py2.html | 24 - doc/salome/tui/GEOM/sources/static/page2.html | 43 - doc/salome/tui/GEOM/sources/static/tree.js.in | 59 -- .../tui/GEOM/sources/static/treeview.js | 505 ----------- doc/salome/tui/Makefile.am | 44 +- doc/salome/tui/{GEOM => }/doxyfile.in | 29 +- .../tui/{GEOM/sources => images}/occ.gif | Bin .../tui/{GEOM/sources => }/static/doxygen.css | 0 .../tui/{GEOM/sources => static}/footer.html | 0 .../{GEOM/sources => static}/myheader.html | 0 idl/Makefile.am | 38 +- resources/Makefile.am | 361 ++++---- src/ARCHIMEDE/Makefile.am | 19 +- src/BREPExport/Makefile.am | 15 +- src/BREPImport/Makefile.am | 15 +- src/BasicGUI/Makefile.am | 24 +- src/BlocksGUI/Makefile.am | 30 +- src/BooleanGUI/Makefile.am | 17 +- src/BuildGUI/Makefile.am | 33 +- src/DisplayGUI/Makefile.am | 9 +- src/DlgRef/Makefile.am | 18 +- src/EntityGUI/Makefile.am | 21 +- src/GEOM/Makefile.am | 85 +- src/GEOMAlgo/Makefile.am | 558 +++++++----- src/GEOMBase/Makefile.am | 13 +- src/GEOMClient/Makefile.am | 30 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx | 107 --- src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx | 83 -- src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx | 29 - src/GEOMFiltersSelection/GEOM_FaceFilter.hxx | 110 --- src/GEOMFiltersSelection/GEOM_FaceFilter.ixx | 83 -- src/GEOMFiltersSelection/GEOM_FaceFilter.jxx | 29 - .../GEOM_LogicalFilter.hxx | 103 --- .../GEOM_PreviewFilter.hxx | 102 --- .../GEOM_PreviewFilter.ixx | 83 -- .../GEOM_PreviewFilter.jxx | 29 - .../GEOM_ShapeTypeFilter.cxx | 168 ---- .../GEOM_ShapeTypeFilter.hxx | 110 --- .../GEOM_ShapeTypeFilter.ixx | 83 -- .../GEOM_ShapeTypeFilter.jxx | 29 - src/GEOMFiltersSelection/GEOM_TypeFilter.hxx | 90 -- .../Handle_GEOM_EdgeFilter.hxx | 100 --- .../Handle_GEOM_FaceFilter.hxx | 100 --- .../Handle_GEOM_PreviewFilter.hxx | 100 --- .../Handle_GEOM_ShapeTypeFilter.hxx | 100 --- src/GEOMFiltersSelection/Makefile.am | 6 +- src/GEOMGUI/Makefile.am | 18 +- src/GEOMImpl/GEOMImpl_Template.cxx | 107 --- src/GEOMImpl/GEOMImpl_Template.hxx | 158 ---- src/GEOMImpl/Makefile.am | 279 ++++-- src/GEOMToolsGUI/Makefile.am | 18 +- src/GEOM_I/Makefile.am | 107 +-- src/GEOM_I_Superv/Makefile.am | 42 +- src/GEOM_SWIG/Makefile.am | 73 +- src/GEOM_SWIG_WITHIHM/Makefile.am | 87 +- src/GenerationGUI/Makefile.am | 15 +- src/GroupGUI/Makefile.am | 10 +- src/IGESExport/Makefile.am | 15 +- src/IGESImport/Makefile.am | 15 +- src/Makefile.am | 23 +- src/MeasureGUI/Makefile.am | 25 +- src/NMTAlgo/Makefile.am | 59 +- src/NMTDS/Makefile.am | 49 +- src/NMTTools/Makefile.am | 60 +- src/OBJECT/Makefile.am | 87 +- src/OperationGUI/Makefile.am | 33 +- src/PrimitiveGUI/Makefile.am | 16 +- src/RepairGUI/Makefile.am | 27 +- src/SKETCHER/Makefile.am | 19 +- src/STEPExport/Makefile.am | 15 +- src/STEPImport/Makefile.am | 15 +- src/STLExport/Makefile.am | 15 +- src/ShHealOper/Makefile.am | 62 +- src/TransformationGUI/Makefile.am | 25 +- 97 files changed, 1599 insertions(+), 4862 deletions(-) create mode 100755 clean_configure create mode 100755 doc/salome/gui/GEOM/Makefile.am delete mode 100644 doc/salome/tui/GEOM/HTML/GEOM_Gen.html delete mode 100644 doc/salome/tui/GEOM/HTML/GEOM_Shape.html delete mode 100755 doc/salome/tui/GEOM/doxyfile_py.in delete mode 100755 doc/salome/tui/GEOM/sources/Application-About.png delete mode 100755 doc/salome/tui/GEOM/sources/Application-About1.jpg delete mode 100644 doc/salome/tui/GEOM/sources/application.gif delete mode 100755 doc/salome/tui/GEOM/sources/application.jpg delete mode 100755 doc/salome/tui/GEOM/sources/bg_salome.gif delete mode 100755 doc/salome/tui/GEOM/sources/logocorp.gif delete mode 100755 doc/salome/tui/GEOM/sources/myheader_py2.html delete mode 100755 doc/salome/tui/GEOM/sources/static/page2.html delete mode 100755 doc/salome/tui/GEOM/sources/static/tree.js.in delete mode 100644 doc/salome/tui/GEOM/sources/static/treeview.js rename doc/salome/tui/{GEOM => }/doxyfile.in (92%) rename doc/salome/tui/{GEOM/sources => images}/occ.gif (100%) rename doc/salome/tui/{GEOM/sources => }/static/doxygen.css (100%) rename doc/salome/tui/{GEOM/sources => static}/footer.html (100%) rename doc/salome/tui/{GEOM/sources => static}/myheader.html (100%) delete mode 100644 src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx delete mode 100644 src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx delete mode 100644 src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx delete mode 100644 src/GEOMFiltersSelection/GEOM_FaceFilter.hxx delete mode 100644 src/GEOMFiltersSelection/GEOM_FaceFilter.ixx delete mode 100644 src/GEOMFiltersSelection/GEOM_FaceFilter.jxx delete mode 100644 src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx delete mode 100644 src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx delete mode 100644 src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx delete mode 100644 src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx delete mode 100644 src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx delete mode 100644 src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx delete mode 100644 src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx delete mode 100644 src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx delete mode 100644 src/GEOMFiltersSelection/GEOM_TypeFilter.hxx delete mode 100644 src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx delete mode 100644 src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx delete mode 100644 src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx delete mode 100644 src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx delete mode 100644 src/GEOMImpl/GEOMImpl_Template.cxx delete mode 100644 src/GEOMImpl/GEOMImpl_Template.hxx diff --git a/Makefile.am b/Makefile.am index b92e7ddb0..3add34d40 100644 --- a/Makefile.am +++ b/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+= \ - build_configure \ - clean_configure \ +EXTRA_DIST += \ + build_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) diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6fc..b2d96e987 100644 --- a/adm_local/Makefile.am +++ b/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 diff --git a/adm_local/unix/config_files/Makefile.am b/adm_local/unix/config_files/Makefile.am index 2417c990b..554e922ad 100644 --- a/adm_local/unix/config_files/Makefile.am +++ b/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 = \ diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index 356939e88..c8f973454 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -7,16 +7,18 @@ # # Standard directory for installation -salomeincludedir = $(includedir)/@PACKAGE@ -libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/@PACKAGE@ -bindir = $(prefix)/bin/@PACKAGE@ +salomeincludedir = $(includedir)/salome +libdir = $(prefix)/lib@LIB_LOCATION_SUFFIX@/salome +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 diff --git a/bin/Makefile.am b/bin/Makefile.am index e7f7da1ce..1ec5e588a 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -23,13 +23,8 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -# -# =============================================================== -# Files to be installed -# =============================================================== -# - -# These files are data, module or lib files -nodist_salomescript_DATA= VERSION +# non-distributed files +nodist_salomescript_DATA = VERSION -EXTRA_DIST+= VERSION.in +# distributed files +dist_salomescript_SCRIPTS = diff --git a/clean_configure b/clean_configure new file mode 100755 index 000000000..be0b5427f --- /dev/null +++ b/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 diff --git a/configure.ac b/configure.ac index 89c723bb7..1550dc1df 100644 --- a/configure.ac +++ b/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([ \ - chmod +x ./bin/*; \ -]) +#AC_OUTPUT_COMMANDS([ \ +# chmod +x ./bin/*; \ +#]) # This list is initiated using autoscan and must be updated manually # when adding a new file .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/GEOM/sources/static/tree.js \ + ./doc/salome/tui/doxyfile \ ./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 \ diff --git a/doc/Makefile.am b/doc/Makefile.am index dcbc00f24..cc43f5a28 100644 --- a/doc/Makefile.am +++ b/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) diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am index 43c97dd62..f0187400f 100644 --- a/doc/salome/Makefile.am +++ b/doc/salome/Makefile.am @@ -25,9 +25,9 @@ # $Header: # -SUBDIRS= tui gui -SUBDIRSTUI= tui -SUBDIRSGUI= gui +SUBDIRS = tui gui +SUBDIRSTUI = tui +SUBDIRSGUI = gui usr_docs: @@SETX@; for d in $(SUBDIRSGUI); do \ diff --git a/doc/salome/gui/GEOM/Makefile.am b/doc/salome/gui/GEOM/Makefile.am new file mode 100755 index 000000000..97b9e3dcf --- /dev/null +++ b/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/\/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 diff --git a/doc/salome/gui/GEOM/doxyfile.in b/doc/salome/gui/GEOM/doxyfile.in index 2aa344fd9..2545e2cf6 100755 --- a/doc/salome/gui/GEOM/doxyfile.in +++ b/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 diff --git a/doc/salome/gui/GEOM/doxyfile_py.in b/doc/salome/gui/GEOM/doxyfile_py.in index 26ae2c4db..2dcd49341 100755 --- a/doc/salome/gui/GEOM/doxyfile_py.in +++ b/doc/salome/gui/GEOM/doxyfile_py.in @@ -1,10 +1,10 @@ #--------------------------------------------------------------------------- # Project related configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "Geometry Module Reference Manual v.@VERSION@" -OUTPUT_DIRECTORY = ./ -CREATE_SUBDIRS = NO -OUTPUT_LANGUAGE = English +PROJECT_NAME = "Geometry Module Reference Manual v.@VERSION@" +OUTPUT_DIRECTORY = . +CREATE_SUBDIRS = NO +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 -WARNINGS = YES +QUIET = NO +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=.. diff --git a/doc/salome/gui/GEOM/doxyfile_tui.in b/doc/salome/gui/GEOM/doxyfile_tui.in index 90133c080..880acf8cf 100755 --- a/doc/salome/gui/GEOM/doxyfile_tui.in +++ b/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 diff --git a/doc/salome/gui/Makefile.am b/doc/salome/gui/Makefile.am index dc15d1047..6fd638da5 100644 --- a/doc/salome/gui/Makefile.am +++ b/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) -# Modified by : Alexander BORODIN (OCN) - autotools usage -# Module : doc - -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): +# -* Makefile *- # -# sed 's/\([^s1e]\)geompyDC\|^geompyDC/\1geompy/g' $${filen} > ./tmp; +# Author : Patrick GOLDBRONN (CEA) +# Date : 30/11/2001 +# Modified by : Alexander BORODIN (OCN) - autotools usage +# $Header: # -usr_docs: - cd ./GEOM; \ - 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 {} \; +SUBDIRS = GEOM -uninstall-local: - rm -rf $(docdir)/gui/GEOM - -docguidir=$(docdir)/gui/GEOM +usr_docs: + (cd GEOM && $(MAKE) $(AM_MAKEFLAGS) usr_docs) -nodist_docgui_DATA= GEOM/doxyfile -nodist_docgui_DATA+= GEOM/doxyfile_py -EXTRA_DIST+= GEOM/doxyfile.in -EXTRA_DIST+= GEOM/doxyfile_py.in +docs: usr_docs diff --git a/doc/salome/tui/GEOM/HTML/GEOM_Gen.html b/doc/salome/tui/GEOM/HTML/GEOM_Gen.html deleted file mode 100644 index 507db794d..000000000 --- a/doc/salome/tui/GEOM/HTML/GEOM_Gen.html +++ /dev/null @@ -1,802 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_Object
IDL file
Python
string GetEntry ( )
return_value = GetEntry ( )
long GetStudyID ( )
return_value = GetStudyID ( )
long GetType ( )
return_value = GetType ( )
shape_type GetShapeType ( )
return_value = GetShapeType ( )
void SetName ( in string theName )
SetName ( theName )
string GetName ( )
return_value = GetName ( )
void SetStudyEntry ( in string theEntry )
SetStudyEntry ( theEntry )
string GetStudyEntry ( )
return_value = GetStudyEntry ( )
ListOfGO GetDependency ( )
return_value = GetDependency ( )
ListOfGO GetLastDependency ( )
return_value = GetLastDependency ( )
long getShape ( )
return_value = getShape ( )
TMPFile GetShapeStream ( )
return_value = GetShapeStream ( )
boolean IsMainShape ( )
return_value = IsMainShape ( )
ListOfLong GetSubShapeIndices ( )
return_value = GetSubShapeIndices ( )
GEOM_Object GetMainShape ( )
return_value = GetMainShape ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IOperations
IDL file
Python
boolean IsDone ( )
return_value = IsDone ( )
void SetErrorCode ( in string theErrorID )
SetErrorCode ( theErrorID )
string GetErrorCode ( )
return_value = GetErrorCode ( )
long GetStudyID ( )
return_value = GetStudyID ( )
void StartOperation ( )
StartOperation ( )
void FinishOperation ( )
FinishOperation ( )
void AbortOperation ( )
AbortOperation ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IBasicOperations
IDL file
Python
GEOM_Object MakePointXYZ ( in double theX, in double theY, in double theZ )
return_value = MakePointXYZ ( theX, theY, theZ )
GEOM_Object MakePointWithReference ( in GEOM_Object theReference, in double theX, in double theY, in double theZ )
return_value = MakePointWithReference ( theReference, theX, theY, theZ )
GEOM_Object MakePointOnCurve ( in GEOM_Object theRefCurve, in double theParameter )
return_value = MakePointOnCurve ( theRefCurve, theParameter )
GEOM_Object MakeVectorDXDYDZ ( in double theDX, in double theDY, in double theDZ )
return_value = MakeVectorDXDYDZ ( theDX, theDY, theDZ )
GEOM_Object MakeVectorTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )
return_value = MakeVectorTwoPnt ( thePnt1, thePnt2 )
GEOM_Object MakeLineTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )
return_value = MakeLineTwoPnt ( thePnt1, thePnt2 )
GEOM_Object MakePlaneThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in double theTrimSize )
return_value = MakePlaneThreePnt ( thePnt1, thePnt2, thePnt3, theTrimSize )
GEOM_Object MakePlanePntVec ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theTrimSize )
return_value = MakePlanePntVec ( thePnt, theVec, theTrimSize )
GEOM_Object MakePlaneFace ( in GEOM_Object theFace, in double theTrimSize )
return_value = MakePlaneFace ( theFace, theTrimSize )
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 )
return_value = MakeMarker ( theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_ITransformOperations
IDL file
Python
GEOM_Object TranslateTwoPoints ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )
return_value = TranslateTwoPoints ( theObject, thePoint1, thePoint2 )
GEOM_Object TranslateTwoPointsCopy ( in GEOM_Object theObject, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )
return_value = TranslateTwoPointsCopy ( theObject, thePoint1, thePoint2 )
GEOM_Object TranslateDXDYDZ ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )
return_value = TranslateDXDYDZ ( theObject, theDX, theDY, theDZ )
GEOM_Object TranslateDXDYDZCopy ( in GEOM_Object theObject, in double theDX, in double theDY, in double theDZ )
return_value = TranslateDXDYDZCopy ( theObject, theDX, theDY, theDZ )
GEOM_Object TranslateVector ( in GEOM_Object theObject, in GEOM_Object theVector )
return_value = TranslateVector ( theObject, theVector )
GEOM_Object TranslateVectorCopy ( in GEOM_Object theObject, in GEOM_Object theVector )
return_value = TranslateVectorCopy ( theObject, theVector )
GEOM_Object MultiTranslate1D ( in GEOM_Object theObject, in GEOM_Object theVector, in double theStep, in long theNbTimes )
return_value = MultiTranslate1D ( theObject, theVector, theStep, theNbTimes )
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 )
return_value = MultiTranslate2D ( theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2 )
GEOM_Object Rotate ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )
return_value = Rotate ( theObject, theAxis, theAngle )
GEOM_Object RotateCopy ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle )
return_value = RotateCopy ( theObject, theAxis, theAngle )
GEOM_Object MultiRotate1D ( in GEOM_Object theObject, in GEOM_Object theAxis, in long theNbTimes )
return_value = MultiRotate1D ( theObject, theAxis, theNbTimes )
GEOM_Object MultiRotate2D ( in GEOM_Object theObject, in GEOM_Object theAxis, in double theAngle, in long theNbTimes1, in double theStep, in long theNbTimes2 )
return_value = MultiRotate2D ( theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2 )
GEOM_Object MirrorPlane ( in GEOM_Object theObject, in GEOM_Object thePlane )
return_value = MirrorPlane ( theObject, thePlane )
GEOM_Object MirrorPlaneCopy ( in GEOM_Object theObject, in GEOM_Object thePlane )
return_value = MirrorPlaneCopy ( theObject, thePlane )
GEOM_Object MirrorAxis ( in GEOM_Object theObject, in GEOM_Object theAxis )
return_value = MirrorAxis ( theObject, theAxis )
GEOM_Object MirrorAxisCopy ( in GEOM_Object theObject, in GEOM_Object theAxis )
return_value = MirrorAxisCopy ( theObject, theAxis )
GEOM_Object MirrorPoint ( in GEOM_Object theObject, in GEOM_Object thePoint )
return_value = MirrorPoint ( theObject, thePoint )
GEOM_Object MirrorPointCopy ( in GEOM_Object theObject, in GEOM_Object thePoint )
return_value = MirrorPointCopy ( theObject, thePoint )
GEOM_Object OffsetShape ( in GEOM_Object theObject, in double theOffset )
return_value = OffsetShape ( theObject, theOffset )
GEOM_Object OffsetShapeCopy ( in GEOM_Object theObject, in double theOffset )
return_value = OffsetShapeCopy ( theObject, theOffset )
GEOM_Object ScaleShape ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )
return_value = ScaleShape ( theObject, thePoint, theFactor )
GEOM_Object ScaleShapeCopy ( in GEOM_Object theObject, in GEOM_Object thePoint, in double theFactor )
return_value = ScaleShapeCopy ( theObject, thePoint, theFactor )
GEOM_Object PositionShape ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )
return_value = PositionShape ( theObject, theStartLCS, theEndLCS )
GEOM_Object PositionShapeCopy ( in GEOM_Object theObject, in GEOM_Object theStartLCS, in GEOM_Object theEndLCS )
return_value = PositionShapeCopy ( theObject, theStartLCS, theEndLCS )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_I3DPrimOperations
IDL file
Python
GEOM_Object MakeBoxDXDYDZ ( in double theDX, in double theDY, in double theDZ )
return_value = MakeBoxDXDYDZ ( theDX, theDY, theDZ )
GEOM_Object MakeBoxTwoPnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )
return_value = MakeBoxTwoPnt ( thePnt1, thePnt2 )
GEOM_Object MakeCylinderRH ( in double theR, in double theH )
return_value = MakeCylinderRH ( theR, theH )
GEOM_Object MakeCylinderPntVecRH ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR, in double theH )
return_value = MakeCylinderPntVecRH ( thePnt, theAxis, theR, theH )
GEOM_Object MakeConeR1R2H ( in double theR1, in double theR2, in double theH )
return_value = MakeConeR1R2H ( theR1, theR2, theH )
GEOM_Object MakeConePntVecR1R2H ( in GEOM_Object thePnt, in GEOM_Object theAxis, in double theR1, in double theR2, in double theH )
return_value = MakeConePntVecR1R2H ( thePnt, theAxis, theR1, theR2, theH )
GEOM_Object MakeTorusRR ( in double theRMajor, in double theRMinor )
return_value = MakeTorusRR ( theRMajor, theRMinor )
GEOM_Object MakeTorusPntVecRR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )
return_value = MakeTorusPntVecRR ( thePnt, theVec, theRMajor, theRMinor )
GEOM_Object MakeSphereR ( in double theR )
return_value = MakeSphereR ( theR )
GEOM_Object MakeSpherePntR ( in GEOM_Object thePnt, in double theR )
return_value = MakeSpherePntR ( thePnt, theR )
GEOM_Object MakePrismVecH ( in GEOM_Object theBase, in GEOM_Object theVec, in double theH )
return_value = MakePrismVecH ( theBase, theVec, theH )
GEOM_Object MakePrismTwoPnt ( in GEOM_Object theBase, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )
return_value = MakePrismTwoPnt ( theBase, thePoint1, thePoint2 )
GEOM_Object MakePipe ( in GEOM_Object theBase, in GEOM_Object thePath )
return_value = MakePipe ( theBase, thePath )
GEOM_Object MakeRevolutionAxisAngle ( in GEOM_Object theBase, in GEOM_Object theAxis, in double theAngle )
return_value = MakeRevolutionAxisAngle ( theBase, theAxis, theAngle )
GEOM_Object MakeFilling ( in GEOM_Object theShape, in long theMinDeg, in long theMaxDeg, in double theTol2D, in double theTol3D, in long theNbIter )
return_value = MakeFilling ( theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IShapesOperations
IDL file
Python
GEOM_Object MakeEdge ( in GEOM_Object thePnt1, in GEOM_Object thePnt2 )
return_value = MakeEdge ( thePnt1, thePnt2 )
GEOM_Object MakeWire ( in ListOfGO theEdgesAndWires )
return_value = MakeWire ( theEdgesAndWires )
GEOM_Object MakeFace ( in GEOM_Object theWire, in boolean isPlanarWanted )
return_value = MakeFace ( theWire, isPlanarWanted )
GEOM_Object MakeFaceWires ( in ListOfGO theWires, in boolean isPlanarWanted )
return_value = MakeFaceWires ( theWires, isPlanarWanted )
GEOM_Object MakeShell ( in ListOfGO theFacesAndShells )
return_value = MakeShell ( theFacesAndShells )
GEOM_Object MakeSolidShell ( in GEOM_Object theShell )
return_value = MakeSolidShell ( theShell )
GEOM_Object MakeSolidShells ( in ListOfGO theShells )
return_value = MakeSolidShells ( theShells )
GEOM_Object MakeCompound ( in ListOfGO theShapes )
return_value = MakeCompound ( theShapes )
GEOM_Object MakeGlueFaces ( in GEOM_Object theShape, in double theTolerance )
return_value = MakeGlueFaces ( theShape, theTolerance )
ListOfGO MakeExplode ( in GEOM_Object theShape, in long theShapeType, in boolean isSorted )
return_value = MakeExplode ( theShape, theShapeType, isSorted )
long NumberOfFaces ( in GEOM_Object theShape )
return_value = NumberOfFaces ( theShape )
long NumberOfEdges ( in GEOM_Object theShape )
return_value = NumberOfEdges ( theShape )
GEOM_Object ChangeOrientation ( in GEOM_Object theShape )
return_value = ChangeOrientation ( theShape )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IBlocksOperations
IDL file
Python
GEOM_Object MakeQuadFaceFourVertices ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3, in GEOM_Object thePnt4 )
return_value = MakeQuadFaceFourVertices ( thePnt1, thePnt2, thePnt3, thePnt4 )
GEOM_Object MakeQuadFaceFourEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2, in GEOM_Object theEdge3, in GEOM_Object theEdge4 )
return_value = MakeQuadFaceFourEdges ( theEdge1, theEdge2, theEdge3, theEdge4 )
GEOM_Object MakeQuadFaceTwoEdges ( in GEOM_Object theEdge1, in GEOM_Object theEdge2 )
return_value = MakeQuadFaceTwoEdges ( theEdge1, theEdge2 )
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 )
return_value = MakeHexaSolidSixFaces ( theFace1, theFace2, theFace3, theFace4, theFace5, theFace6 )
GEOM_Object MakeHexaSolidTwoFaces ( in GEOM_Object theFace1, in GEOM_Object theFace2 )
return_value = MakeHexaSolidTwoFaces ( theFace1, theFace2 )
GEOM_Object GetEdge ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2 )
return_value = GetEdge ( theShape, thePoint1, thePoint2 )
GEOM_Object GetFaceByPoints ( in GEOM_Object theShape, in GEOM_Object thePoint1, in GEOM_Object thePoint2, in GEOM_Object thePoint3, in GEOM_Object thePoint4 )
return_value = GetFaceByPoints ( theShape, thePoint1, thePoint2, thePoint3, thePoint4 )
GEOM_Object GetFaceByEdges ( in GEOM_Object theShape, in GEOM_Object theEdge1, in GEOM_Object theEdge2 )
return_value = GetFaceByEdges ( theShape, theEdge1, theEdge2 )
GEOM_Object GetOppositeFace ( in GEOM_Object theBlock, in GEOM_Object theFace )
return_value = GetOppositeFace ( theBlock, theFace )
GEOM_Object GetFaceNearPoint ( in GEOM_Object theShape, in GEOM_Object thePoint )
return_value = GetFaceNearPoint ( theShape, thePoint )
GEOM_Object GetFaceByNormale ( in GEOM_Object theBlock, in GEOM_Object theVector )
return_value = GetFaceByNormale ( theBlock, theVector )
boolean IsCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces, out long theNbBlocks )
[ return_value, theNbBlocks ] = IsCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )
ListOfGO ExplodeCompoundOfBlocks ( in GEOM_Object theCompound, in long theMinNbFaces, in long theMaxNbFaces )
return_value = ExplodeCompoundOfBlocks ( theCompound, theMinNbFaces, theMaxNbFaces )
GEOM_Object GetBlockNearPoint ( in GEOM_Object theCompound, in GEOM_Object thePoint )
return_value = GetBlockNearPoint ( theCompound, thePoint )
GEOM_Object GetBlockByParts ( in GEOM_Object theCompound, in ListOfGO theParts )
return_value = GetBlockByParts ( theCompound, theParts )
ListOfGO GetBlocksByParts ( in GEOM_Object theCompound, in ListOfGO theParts )
return_value = GetBlocksByParts ( theCompound, theParts )
GEOM_Object MakeMultiTransformation1D ( in GEOM_Object theBlock, in long theDirFace1, in long theDirFace2, in long theNbTimes )
return_value = MakeMultiTransformation1D ( theBlock, theDirFace1, theDirFace2, theNbTimes )
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 )
return_value = MakeMultiTransformation2D ( theBlock, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV )

- - - - - - - - - - - - - - - - - - - -
interface GEOM_IBooleanOperations
IDL file
Python
GEOM_Object MakeBoolean ( in GEOM_Object theShape1, in GEOM_Object theShape2, in long theOperation )
return_value = MakeBoolean ( theShape1, theShape2, theOperation )
GEOM_Object MakePartition ( in ListOfGO theShapes, in ListOfGO theTools, in ListOfGO theKeepInside, in ListOfGO theRemoveInside, in short theLimit, in boolean theRemoveWebs, in ListOfLong theMaterials )
return_value = MakePartition ( theShapes, theTools, theKeepInside, theRemoveInside, theLimit, theRemoveWebs, theMaterials )
GEOM_Object MakeHalfPartition ( in GEOM_Object theShape, in GEOM_Object thePlane )
return_value = MakeHalfPartition ( theShape, thePlane )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_ICurvesOperations
IDL file
Python
GEOM_Object MakeCirclePntVecR ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theR )
return_value = MakeCirclePntVecR ( thePnt, theVec, theR )
GEOM_Object MakeCircleThreePnt ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )
return_value = MakeCircleThreePnt ( thePnt1, thePnt2, thePnt3 )
GEOM_Object MakeEllipse ( in GEOM_Object thePnt, in GEOM_Object theVec, in double theRMajor, in double theRMinor )
return_value = MakeEllipse ( thePnt, theVec, theRMajor, theRMinor )
GEOM_Object MakeArc ( in GEOM_Object thePnt1, in GEOM_Object thePnt2, in GEOM_Object thePnt3 )
return_value = MakeArc ( thePnt1, thePnt2, thePnt3 )
GEOM_Object MakePolyline ( in ListOfGO thePoints )
return_value = MakePolyline ( thePoints )
GEOM_Object MakeSplineBezier ( in ListOfGO thePoints )
return_value = MakeSplineBezier ( thePoints )
GEOM_Object MakeSplineInterpolation ( in ListOfGO thePoints )
return_value = MakeSplineInterpolation ( thePoints )
GEOM_Object MakeSketcher ( in string theCommand, in ListOfDouble theWorkingPlane )
return_value = MakeSketcher ( theCommand, theWorkingPlane )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_ILocalOperations
IDL file
Python
GEOM_Object MakeFilletAll ( in GEOM_Object theShape, in double theR )
return_value = MakeFilletAll ( theShape, theR )
GEOM_Object MakeFilletEdges ( in GEOM_Object theShape, in double theR, in ListOfLong theEdges )
return_value = MakeFilletEdges ( theShape, theR, theEdges )
GEOM_Object MakeFilletFaces ( in GEOM_Object theShape, in double theR, in ListOfLong theFaces )
return_value = MakeFilletFaces ( theShape, theR, theFaces )
GEOM_Object MakeChamferAll ( in GEOM_Object theShape, in double theD )
return_value = MakeChamferAll ( theShape, theD )
GEOM_Object MakeChamferEdge ( in GEOM_Object theShape, in double theD1, in double theD2, in long theFace1, in long theFace2 )
return_value = MakeChamferEdge ( theShape, theD1, theD2, theFace1, theFace2 )
GEOM_Object MakeChamferFaces ( in GEOM_Object theShape, in double theD1, in double theD2, in ListOfLong theFaces )
return_value = MakeChamferFaces ( theShape, theD1, theD2, theFaces )
GEOM_Object MakeArchimede ( in GEOM_Object theShape, in double theWeight, in double theWaterDensity, in double theMeshDeflection )
return_value = MakeArchimede ( theShape, theWeight, theWaterDensity, theMeshDeflection )
long GetSubShapeIndex ( in GEOM_Object theShape, in GEOM_Object theSubShape )
return_value = GetSubShapeIndex ( theShape, theSubShape )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IHealingOperations
IDL file
Python
GEOM_Object ProcessShape ( in GEOM_Object theShapes, in string_array theOperators, in string_array theParameters, in string_array theValues )
return_value = ProcessShape ( theShapes, theOperators, theParameters, theValues )
void GetShapeProcessParameters ( out string_array theOperators, out string_array theParameters, out string_array theValues )
[ theOperators, theParameters, theValues ] = GetShapeProcessParameters ( )
GEOM_Object SuppressFaces ( in GEOM_Object theObject, in short_array theFaces )
return_value = SuppressFaces ( theObject, theFaces )
GEOM_Object CloseContour ( in GEOM_Object theObject, in short_array theWires, in boolean isCommonVertex )
return_value = CloseContour ( theObject, theWires, isCommonVertex )
GEOM_Object RemoveIntWires ( in GEOM_Object theObject, in short_array theWires )
return_value = RemoveIntWires ( theObject, theWires )
GEOM_Object FillHoles ( in GEOM_Object theObject, in short_array theWires )
return_value = FillHoles ( theObject, theWires )
GEOM_Object Sew ( in GEOM_Object theObject, in double theTolerance )
return_value = Sew ( theObject, theTolerance )
GEOM_Object DivideEdge ( in GEOM_Object theObject, in short theEdgeIndex, in double theValue, in boolean isByParameter )
return_value = DivideEdge ( theObject, theEdgeIndex, theValue, isByParameter )
boolean GetFreeBoundary ( in GEOM_Object theObject, out ListOfGO theClosedWires, out ListOfGO theOpenWires )
[ return_value, theClosedWires, theOpenWires ] = GetFreeBoundary ( theObject )

- - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IInsertOperations
IDL file
Python
GEOM_Object MakeCopy ( in GEOM_Object theOriginal )
return_value = MakeCopy ( theOriginal )
void Export ( in GEOM_Object theObject, in string theFileName, in string theFormatName )
Export ( theObject, theFileName, theFormatName )
GEOM_Object Import ( in string theFileName, in string theFormatName )
return_value = Import ( theFileName, theFormatName )
void ImportTranslators ( out string_array theFormats, out string_array thePatterns )
[ theFormats, thePatterns ] = ImportTranslators ( )
void ExportTranslators ( out string_array theFormats, out string_array thePatterns )
[ theFormats, thePatterns ] = ExportTranslators ( )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IMeasureOperations
IDL file
Python
void GetBasicProperties ( in GEOM_Object theShape, out double theLength, out double theSurfArea, out double theVolume )
[ theLength, theSurfArea, theVolume ] = GetBasicProperties ( theShape )
GEOM_Object GetCentreOfMass ( in GEOM_Object theShape )
return_value = GetCentreOfMass ( theShape )
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 )
[ I11, I12, I13, I21, I22, I23, I31, I32, I33, Ix, Iy, Iz ] = GetInertia ( theShape )
void GetBoundingBox ( in GEOM_Object theShape, out double Xmin, out double Xmax, out double Ymin, out double Ymax, out double Zmin, out double Zmax )
[ Xmin, Xmax, Ymin, Ymax, Zmin, Zmax ] = GetBoundingBox ( theShape )
void GetTolerance ( in GEOM_Object theShape, out double FaceMin, out double FaceMax, out double EdgeMin, out double EdgeMax, out double VertMin, out double VertMax )
[ FaceMin, FaceMax, EdgeMin, EdgeMax, VertMin, VertMax ] = GetTolerance ( theShape )
boolean CheckShape ( in GEOM_Object theShape, out string theDescription )
[ return_value, theDescription ] = CheckShape ( theShape )
string WhatIs ( in GEOM_Object theShape )
return_value = WhatIs ( theShape )
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 )
[ return_value, X1, Y1, Z1, X2, Y2, Z2 ] = GetMinDistance ( theShape1, theShape2 )
void PointCoordinates ( in GEOM_Object theShape, out double X, out double Y, out double Z )
[ X, Y, Z ] = PointCoordinates ( theShape )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_IGroupOperations
IDL file
Python
GEOM_Object CreateGroup ( in GEOM_Object theMainShape, in long theShapeType )
return_value = CreateGroup ( theMainShape, theShapeType )
void AddObject ( in GEOM_Object theGroup, in long theSubShapeId )
AddObject ( theGroup, theSubShapeId )
void RemoveObject ( in GEOM_Object theGroup, in long theSubShapeId )
RemoveObject ( theGroup, theSubShapeId )
long GetType ( in GEOM_Object theGroup )
return_value = GetType ( theGroup )
GEOM_Object GetMainShape ( in GEOM_Object theGroup )
return_value = GetMainShape ( theGroup )
ListOfLong GetObjects ( in GEOM_Object theGroup )
return_value = GetObjects ( theGroup )

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
interface GEOM_Gen
IDL file
Python
void Undo ( in long theStudyID )
Undo ( theStudyID )
void Redo ( in long theStudyID )
Redo ( theStudyID )
SObject AddInStudy ( in Study theStudy, in GEOM_Object theObject, in string theName, in GEOM_Object theFather )
return_value = AddInStudy ( theStudy, theObject, theName, theFather )
GEOM_IBasicOperations GetIBasicOperations ( in long theStudyID )
return_value = GetIBasicOperations ( theStudyID )
GEOM_ITransformOperations GetITransformOperations ( in long theStudyID )
return_value = GetITransformOperations ( theStudyID )
GEOM_I3DPrimOperations GetI3DPrimOperations ( in long theStudyID )
return_value = GetI3DPrimOperations ( theStudyID )
GEOM_IShapesOperations GetIShapesOperations ( in long theStudyID )
return_value = GetIShapesOperations ( theStudyID )
GEOM_IBooleanOperations GetIBooleanOperations ( in long theStudyID )
return_value = GetIBooleanOperations ( theStudyID )
GEOM_ICurvesOperations GetICurvesOperations ( in long theStudyID )
return_value = GetICurvesOperations ( theStudyID )
GEOM_ILocalOperations GetILocalOperations ( in long theStudyID )
return_value = GetILocalOperations ( theStudyID )
GEOM_IHealingOperations GetIHealingOperations ( in long theStudyID )
return_value = GetIHealingOperations ( theStudyID )
GEOM_IInsertOperations GetIInsertOperations ( in long theStudyID )
return_value = GetIInsertOperations ( theStudyID )
GEOM_IMeasureOperations GetIMeasureOperations ( in long theStudyID )
return_value = GetIMeasureOperations ( theStudyID )
GEOM_IBlocksOperations GetIBlocksOperations ( in long theStudyID )
return_value = GetIBlocksOperations ( theStudyID )
GEOM_IGroupOperations GetIGroupOperations ( in long theStudyID )
return_value = GetIGroupOperations ( theStudyID )
void RemoveObject ( in GEOM_Object theObject )
RemoveObject ( theObject )
GEOM_Object GetObject ( in long theStudyID, in string theEntry )
return_value = GetObject ( theStudyID, theEntry )
GEOM_Object AddSubShape ( in GEOM_Object theMainShape, in ListOfLong theIndices )
return_value = AddSubShape ( theMainShape, theIndices )
GEOM_Object GetIORFromString ( in string theIOR )
return_value = GetIORFromString ( theIOR )
string GetStringFromIOR ( in GEOM_Object theObject )
return_value = GetStringFromIOR ( theObject )

- diff --git a/doc/salome/tui/GEOM/HTML/GEOM_Shape.html b/doc/salome/tui/GEOM/HTML/GEOM_Shape.html deleted file mode 100644 index bfee3cd70..000000000 --- a/doc/salome/tui/GEOM/HTML/GEOM_Shape.html +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - -
interface GEOM_Shape
IDL file
Python
TMPFile GetShapeStream ( )
return_value = GetShapeStream ( )
GEOM_Gen Engine ( )
return_value = Engine ( )

- diff --git a/doc/salome/tui/GEOM/doxyfile_py.in b/doc/salome/tui/GEOM/doxyfile_py.in deleted file mode 100755 index 9d4d118db..000000000 --- a/doc/salome/tui/GEOM/doxyfile_py.in +++ /dev/null @@ -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 diff --git a/doc/salome/tui/GEOM/sources/Application-About.png b/doc/salome/tui/GEOM/sources/Application-About.png deleted file mode 100755 index 7b58330d50856e28562e8f9ed80dae72d6e6dda3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19226 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

5r3>=?gKv-6#gF2kVYm^Euk4pDx%bDo{L~m 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 Ao&W#< diff --git a/doc/salome/tui/GEOM/sources/application.gif b/doc/salome/tui/GEOM/sources/application.gif deleted file mode 100644 index 0b05d5c18ee88779d283508781836e2b151f606f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2602 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 diff --git a/doc/salome/tui/GEOM/sources/bg_salome.gif b/doc/salome/tui/GEOM/sources/bg_salome.gif deleted file mode 100755 index 429489c691d274d2af69108c574491a022e78824..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17293 zcmWh!hc_FJ_pQBxgosd75MqnbqNPT}ZYB2KYPM#JE;J#;icRgkH$_n^HWhodwTsfC z+R{&3zwht;0q>mm&bjBk`|f?Z`eEFvNThr>lhMa9I#5D0|0xVVIb zgruaTl$4aTw6u(jjI6AzoSYmIiIkU@S5Qz;R8&+_Qo4Eb=B-<|l$DiLR8&+|Rd3(E zedo>{H8nMLb@jVgML=?(Xj4;ql^R4<9~y z^vK`eKOi6=FfcGEC@45MI3y(G@#Du&o;(Q+4Gjwm3l9%}`t<3uXV0ELfBxddilaom# zQc6lnYHDg)T3UK~dPYV@W@ctqR#tX)c1}*t>({Syb93|Z^78ZZ3knJf3k!>iii(Si zOG-*gOH0ej%F4^jD=I1~D=Vw2s;aB2Yieq0YisN3>gwz38yXrK8ylONnwp!NTUuIL zTU*=O+S=RO-@JL#(b3V_+1b_A_4e)C?(XiMo}S*`-gocb_4W1j_xBGB3=9qq4h;>F z$>ibT;gOM%(b3Vdv9a;-@rj9v$;rv7sj2Dd>G$v7&&lp-m6g@i)wQ*?_4V}+A3l8i`0>-HPa7K>o12?kTU*=P+dDfuySux4dwZWh zf8O8UKR7rzJUsmJ<;&60(ed%|*RNl{efxHDa&mfldUkg9{rmUx^Yb4+e*FCT^VhFm z7Z(?omzTeP|Nig4|Ni{>^Y`!HfB*hnU0q52KLY+A3mS}9*Pbx#=$vpj*mnmX=cM~^ z%h>(UctD;}r;oc~qAb&yJi!E}9Rq}8jXLL??2Pi^8M>E@kF*^^7Vi9=Ep$GCYK}?n>0i`_vjjf-{0`jtYcZ{ zXxQR!9f0MK4Vd%y8C-GMx2NsV=bKV9mft>+qu8%*)PXMbZ6{veO{(_^|MBIO-?l^b z+y9-2(Ist)=ZOP3lj*>Fialvu^ zG~dLttnND|-iY3JO=h{wEVPFs->`&pM=E3V=J@9^#(`mC0NZD~LPm0svEm8umU)hN z?Pkwm5YqZ1c{j1`S*%GGb;!O+_CRjcrjAehrKn@TbXZ~D+YPU*{I=kg3K^%H9mI%N z|AYi{UNi5D<_1Que#*1{ie=H0`P;l{^j7dnj1R zT05*^Ca?0>buEwEYj=8&`;_^a)7DB2+(Xq?*B(aKYK$_48ns07h;BsX#MvIpE_u`> zOOu()lVw^w(eZNNsY{Q-qv~oN*-^D0t1Wy@TqK#WV{ClM^M43%+%wh+iS~gVEt6*Z z(;W}wh3b-}G}HJ`l6E^GloC8};bNF~U0!s4BW}>)md}gV5hq}T|Q~(xcGo-X%o|o$`l5mg4dL!+!$YMo$K*N4u zYD#dmw;NX*Qz=0?hK@nfth)>)7rEZX&B(>BsBH!A~eD}zLe z48&sus*oelK}$KGz*>`fYGmslDQdK?Sckyp0pN$2Tb032CcoeWWajOyIO5WICqWiI zQ|bPXie$~dO3|iUHN~j%(7I@cj?LyBAp$-?Ix-{^Q9oVy?B>(y+zALj8>!Z9Ly9C~gC56f^$?&SIbk;cu2p_TSZeP6Z0YipvCSPQX4oe?~@N zic3d>>>9ivIt1huDJwuEv$$K7+R{SRJE!)Z!ohVcfIzAzV;%-be7F+f5U?O0YO;fh z2ojl`&@y;%q%|?psFK`O#%%ap(WMeuKS#=&`D0?jNlWOt>|6}~tJ`ZvniY1WcG4e#L_Sn#&NJhZS zLk$Hv^3^QOiH?K)TC|Dy5tG-X4djo&1*@Jk$H*)|Bcjyd!k;*nA$ks&Y5WkKC6t6 zZnWOjLN2FT4C;3-{|5_`_jcdH;*|o9kxa;y3>@chYsyc<%k9P~+Fuwu#`($=8r0xZJ(44JR;~U64BNs*6hI@-os;$IaNekHKxpqIA#b86v3D; zy4mf5lb$q_B5yZFpqrJ|sBkaSo}Y*LnTk)u2N1(@^fY-oPcYu8gNBz5*KOiLb{B3S zN40*P84@X97M94~+8Wyp&(&z<8 z&BJwHB%b%M$Qmk){wiex`BZeUR_Ky-f;)cfJcR5?F$GdrFo0rjC?-E~tdKQ0l$CY(lb-pV=KR@_ zo#4*m3=}T7A*Y! zLRMdLF?S`bD?cF2f-ge;`*V7u;*a^$(;saa&woC;`uoy?3*w4)+w@4mgq);U1-F}V z20Um=c@Vt=+CNoYrRK>|h%lx#3p({+L_7$>XgzLMdmzLT9v$)ABGM~Zg|;&C#T++( zWrW~`PNz~791+=oQ|Kz=CVOzwWZCNpheNdaJEFPS33t2E*eNY#HWxIg#OU_u6B-)f zwqfWSv}~sZ&UaBX{@lk9;d^fsX0rdv6pD+cx!dT5C=UeK?E4r%eV?7`kTU`!<&D)v zq%JKGy?u`&PH&R0`J+*HX)QhJWBemwF(x3cP3M>hTuivKoZ8jr80rdOWR{ClfPbMW zL8$^0vaC(r{77i_5jEvTJS4Vh_8wG|z|6pj@8^FRDM!c21tD=l0}zloRsAUL4h@bh z7mzqfHgZH)45`B!suUFojNdU~pOrip;`8bEy45eUd#XHOiad@)%C*M(C<>^Jup9>i zG%N1Iw{*LaGP)ynqOHMXN?^v4t0YIL8@+VACYYWg_+j>cQwvrTz!Qm$cmC|V!O3ku z@IquCBr$C0261lbzbS+f=h9O8Mh{gy(`YPJ7fl5{*t)@h4UfuXk)<*7e-+wZ6xsz7 zopRw6{Lb5>Wf@w0+wW8`TuiwSq`;AyNY~8!(*w43wX5WLYA3L(?$hMKQgpX{R*4hI z2P?WhlVW+kWqY$siDSV2VWx1c8+wacaYh;SCS6v)A0`k6WY**h4N<0v48>y%rcxj` zx6{+1Vqh$wN`W7f%5(f(p9dy{5mmJ36hSo0!`+fHhm@8h?>yR8#$)8&Fd#`+3CNb7 zU=!>j3%#HOY(~oR9o*oU6_X*L`Ki$ENWPNqkYBs$EriEPCHkSW0`Mk@;B1(>2k;R# z#2$oP{*ly~#re=hBtR(q)4A@bD^Mj$_!S94`Kjk~D#%5NE&X}3wG}O+r#~71?1^yV zy2VLr5j#V&J=GEYo}zF}d5)e#ZJ4I}dEes7ks#+`s~R`gv}oiJqiE#-kLu zg)A7h_>VPJdlc<#geCvudN3mdMkzcvTGHX}zefhTaw84NgPtQA77kHzfn4N?jw~ zcrnuur<;#u30_FbrDc;A2RR6^2m`zz%fPMqCrlH%sAP4#Eew>ng`z+_7%dtC_$rn3 zo7PW^O4xK!v-5)Y3HR-OkfZnyj+_kij}#FZcew`Za!NE`486P$J;YE`Ru2QBpdDf} z1nFjD)E6PTk6G?++q%uOe7SmT|FkH_zL<}7j{ixC1DeS_{2U~hQue<6`ji!)1SdMI z>xMDXhMU>*hr0$-jMw#9JEK#<>Ok`cE_%2*aJ`T+LY42tg-4VV8dQvbim@6o0rWWC z8^m#=mxEt&$-Zv`|B`q9PY9A#{6GmT+}0rPaPllF_`KT9NK54(`zfj>1$r7X)Qs0HTC3`3;|FF=&kz0Pp~eVn9I9&2C{) zHdIu?FTP>=+fl-NY$7}m?brd0r~y|_ER1MQ^;Dh2Wyl5Arf{LDRHw@o2h!||wz&7) z&Dr+|6ErI9x*j>L(1g>6!Y!Di zJK12^snPF$dyHzNC>bOLgDH8b-MfxlJ5bk(4E+e_df6{*(x%~|`J8K+ixh11Gt#QB z3BHZtql5|^Y$EO8|D!;u4AinC{Yb-rlGowtH2ao!5m*kAQ0s|<2d$#vW58zc-RA*9 zhMvW*SGbK2kezRl7IC10CY5Ao%V!fxDUtk|*!$0Dq0b@(CuoHAo9`Q?z-|d4Ftftq zzl24bGmWo`aDHdOvZugOI{%SKpnK_~cRzTG)_uPScLc<90*08iJgfdUbk}NsU^J6OiKn3WoL*^xcH#6 z_HHvo9F(ZiBL8kM#&(wF-8Ddc%JVQAp|6!sKul1%SD?6%249+l!5!CB+wy!+NEmHk z!jR~-@ApcT-whcn%~b4@J;2tw0^GWFs|U$%;$-?u4<$BT2q-lDz73))J^-Lb%0sQrszXgHBwZVu!?P# z5Hw#O$M**`FVRQa6v~;(?Juq@KWB5B1QfC`TTGG4dLz#i@W6&_(!uOl6qHABMUM|E z@BdbQ8rP8Ks?sEqomQHem!@LHggs-1>br#2Qe}w2GK@iW#yU}ADO2+!2G&d-H2vut zf709KrxUFtT>__<n;)0h%#9? zk@;n@`6ben)`$HYIAiVLV~xi-qG2$b{nMP2c`oUtP?^I#T4=rK5IHB8d@-xBZOtWTZ3eD@C^Lb@z{W@M|5*{jCpBF3Avu4$50&_1dD~(;3BC-TrIE+rGWhwr}`M zH@RrA>3N&b!$khsO@8JrA%_&lY%6%&7I*K~<=mFV>DCgL;NM6Nn1GV7!}cS2L6DSj zUwbN)SG7M4GK4D@k1-OYzB`(#9wbi;;x!g(-ceZEp#tnOVT^>ecE^Kvb4a`KB3Qdb zIfu*L*qt4L?C34|$7?-CR$q;DKi+^y2zjY$U5^ICg(J;8XYCD?9k0B-k(?sNZhEG{ z<*+6=JBd3|MjO{#=Jqq4kgpggQ=ZT}xwwrcsly@!5K;MMvV&zgi3(0OtH<+5Jd>ih zLXb=+QJzMgInpE{meB`2}d@hu46H0UC3=#w-rqz3NK)qiz!+5N< zPdzoBKSO6QqwTlTQ9=A6+lMCUv()l1^AP(gxG5S6HQh9a`x%_Q6%*0pX4COFnKQK< zmlqNEuEF&@4z56LBi&7l^{Ie8ljfz|3i_48T?S%r(_C6h?gCdSutLT1%J;z4>$C%BdE~^ebqO! zdaVI2YTyIGD%$ELQiQOPUMkM=V^T72`?ZU_B^1mm^6(*iRjtKsvM)+t74FHtOG-Vn zsKC9b@L=N;pq_$#|bci&+K14RYwkGh;qXIYZLy$wB9-Is*Q+V+O-=D15{ zl5N_6TR9iR%^~|PRJ7eiO>w<_ODL1%{zM7tRhO^1k&2I{oNY5uCarA3vfi=x@$M{- zyk(soEavbxJ`gc$&G2$FCB0_3$(1EwcWXiEZ~#Xa>IFZ!LVtC_i zRMnK#SOf|iOG(ct9kA)}(9sF^hb-BL&M_-w1@F%lb>NsdpEU_KIK9OMO1IA}>1S$l z)6a!i36i7C{X)z~6}c^K+ZE5Ml?=JBKK995UYDFW*>dW7OTEUCIFV65-IjGG^i)c` zq0S{BY^d!I_s|kU2xtxN(`J%p&wUS2%T@F~nUCkz-k~AF@twNtb;W-kxXV_+1C;Nc+|+ z!^TSWOP3=7R$l1n0*+QJ1u$1jZXM?MXD)jf7}X|Q+}0NXhlr0?6hvr^3g(HPS1RSD z6zeG*OJK#J&V_HQ1WSXnE7iA^XLVEx>shJ_8Tq$${>OM%ce$OSkB2+iP1`V!0>%0d#M_`9lEC@3UFpN?udwPsw;G{Xz8$>| z<~cKhWHNNiP$caI3{&236(^A?B|dP}2M^NJ7tVIM<2_aEIZz8ta(Eke>*EWRYH^2X zn2*H2S^1z$htS)5WPp29)zU6u?xEzi!MVH^k^Zc?<`rV@r<}h#i&UjW)7vq)yIRgn zzoXk1P}$({#2eN9-)E%OZjW(8WyerXJ!ozG0e%RO zEnJhi5Z#oKMMi9on$JVD4l3hXIisQW4Bir%1+&kxDmO*;+#7SueEf>>{`ESL-M+XJ z&z1JBD#@am1i8UyKBiY}Wp#Y62$)}LwfjhE_1d_(P|teVbn~6KCae99+0aR+TIq6b zlInlt>HKm9Z|^vOyhO=bv^P8VuGygsvLbV*@iq~)HK8zx`(4%^D}yC)qqPrH1Pjq- zH3tVcukbsc=%Yp_UIl+3D9?QY4;u;VasYHX<%On~o5MB#gSz6h_LXY|ychm=R1Y&2 zYts@UysJ;v>QekBWHzeS*!*w53nV@mR>`Aw7|UH`G8r$C$R;#gTQ!W*FUMHM1x%&y zz}aL`bh(F0LuntXTGKyFf$U>)#bBK?c|^TnK0KqS^kajhucKN3M<+TcM<<*4*)Oo; z(4Kg!<|>vx{R-N0RIKm@Mtb5FSgp?W3fd|@HOTQD=-AC@Eaesd9f&QBX&m)pv-#w0 z5t!KvC==5H>(B9Wi(oFrg@Amf2EkD&AA+SU>8(xIRp|lIV7Di<{k#t0BpzpA4TRsu z#7}vE|AJ{4A|gZxpMJxEQgbu53!iiKe_S$jq$AuF{-NKE0-MsnAQ*g%Gpfx>RX>Ut zE>Y4`*Evg^O27KJ=A?fMHyzFDZ=^boL+{TK6qA{7N3=@_b4#g<0SC<(>h;7OENjCd9eV8f}>R^V+ej> zDaaKWfiwuqG8G!)I9A3h^#*aVKA|8#ZPH~5@hmLnh5(#8;$RG4D4WAWIiyij9ID7M zoFhfD{n{>WoF(>`&>naRgI2g7V7}Eo&&{Ov&?nMu)J&ch=@PZ8-2iZWMVENSQeP+`qsL2}z!K6c4F+?hCLXK9q z!ydMmm4oE5jt9j%cT}njh3cE(i|SrAn!(pML5GRqdCQY+S zS-@Gc6993um1ozwV>Yci*j=!HqsG(hGfPWwqEJaLq20Tbv)gFMKW+29^SWZ%m*8EM z8#&jt*V8kWB2295F(%aMrb2^Io!4Cyt{);L?aQl@j*u{Z1L(F)X0VAcvKphw!;!}W zr`2MQlUVGS2g_FJi#TCcr5;8nuO_E-R@)ojL&tsu)X~EhokaJ3 z-gV61Tg%JcFy@{qzl4fR6U2EhONwK;THaJ|6u{%1o+0eo8$0moa<&E_ypn~YgDIG{ z%7v43Cj9WD7Ix%2gzzK?X~V@icTU zp5u!e34S>5cY$~rebZx}eS1O9`PVRTsO@~3O znmtk6ysq+_*@K?C(v$!rN`ghS{!DKhTz>8rvi9auReR(#^p=(+)ayO6E6OKY zR2w|uuTx3pE7DKoYX9Osn#Y%@X??^ zp#6>)Nd4ntpwI8P$G>+3UN{D$Y_rAdth#cZ<$0N;22H*sz`Y`6%w!s) z6ooA=p9ekoS7Hd{N@;j?gGTtKis+_HXY0mOakLsJua03i%|ewv`M0g9)r`nM!JUK0 zwG=|!G&a4e){4-CWL!4y2Adzm{s>Gj;swk)WyUme`Kz)VY=VZOgdDQjYE-xha%^Bs zS)v!4MKy@2wSg)wwm2YeKRILR8t*b*(_F=U}{!AQA{MG$TrPqkx zRPWFhtE^PrEo#iJCxBvR+SB@S%d!ab8-%O%lm3PPe)lm#Nq?F0_e9m=Quk&k`xn*H zu(ms^BwFgXt;q?Wk<1m=spx^*1YqlOM|_EDW?DyHd1Gw3N!CpvzTlEVt?z(eg)kie zpD+mZtFZA30hJ9%MOF=d3d;bq9y1Yt6F~xH%Mb(7hj^35 zRk~L~)2OhCOQ!%15If57e`*Hfr%llNKAwz2@ytpcGoXF0q;~EZ%Ax)svty24JS9@Mw6RB zOuw=UM7wIQceX0!fKsa&6?_T*YkDoE@UT$PZJY(Za(f^QI44Iu*mzS4WSmwZw{)l% z+o9dFiQQwupSF_Vl=54fx!OeD%uUdvn&y`|$rElQ-qp!KMYi|g?v~pl4KU-fWL89! z@M&QB+rG&~sq&??gsa%C_L)-Slg`|=JH{W@W2=DoJg}@hEw>k1N0oEq)j{|2gc9+} zf*vj)=>IeX&*{7!B9SnilymRD)qB6IavJw*k0%Sic5@eAyI&Y#EEaXoUiE&n{`(=T z`$zM9$3}pQKf;%0StRg#oFF5J7f7X;JdY86DxQO&)D2V$$CL;q3>B1I7p^xm86@%x z7j=%F81DR0GlQwJ>}sG4>tfcB8pW0DekLF#MhiZlh@f7 zNzP3OiAf{(Ch3-35w=yjufUpNB-_8+MN$W9Fs}A=)lnk$^{nY^;j0@F&t`>+I|Z7? z?ljNd;+f4GmAVq%y(Mz|TBL|oZh;Bu&dDHdDgnR!!d0#L2C*9OnZE-^=!Sww4 zkEZbw##jpHSaxJ=qZi|E|4vhkuwj3JbeQF_@>F4#CAD*|^Q*$~%leesTCvL%^|#Ft z{DqPD;;X3L^l*LyJgZFlp-6KC{AEwxh5>7nGIM$5yS@!@W&~q;U#JEpM3SV6 zWs5jZm?$jD@4K;^#b-UFzi+jYy&vZiy7EJ-tcHi6-Lz6nV9OJ>&R1J0Ft;A^UMb!M zX6e}2n<&DtCzxaW-qr#P#aYPp@JpFlodUIV~7#UI!b;>GfF+>Ea9FuZ;1{ zWh?rM%sW&}r;S-n0c*VxYuKE%zB8s&jVTe!-iIs7^X0<3C6zX7e3W9*%bUR8BdsF<>~8Sy6$Cv zHFCnXY+o=M*)Y>)AN;Cdy=FZ;gn^2j@KH3 z3b{$ylEq_;aV;8bE|V6=>F>qX)2?e(ih~?OH{&)^s(Vn5nVX!IV;|Ao*}r}`T(W+$ z=)7KQW%WnxQ>9np#3jHlY(p#{xz{Npuae-2;?4|9kvdE*Fi0qDVf9!g`8t<>y~BQ1 ziQ%>&-ase>`Ih3 zX^Ih}^k-|3W&50WJIb0>VNrzMqfctD`ep_`sVCjBOvsug(H@z)us@Y3Wt<akfxGYH2_{el|K#=(0Jm9t35A2`OVvf3G6c{RqA?3a_C=FiNRjJN@oyYIQrdrLZ zNl0dO6-BUq<+M}J)bsL?{=RFyZ{z&YrWxT8p_3#w=32RFTXHP}Y|T;7feIYw))1~+ zR^iK3VcWe{Q%9O7I6crq@&5Lb3H!O5jbiqpOtD{HY^X=9I@17qF8L9_&S3?2r0FIGkCad^_7a5r7i4X5#b?A57S|9 zZ){cVQF+2~x#cd}5l86i$`}?zcl=h5o>>FMnmn>}enbYcefg4nC37Q*k#E(xVjO~6 zie&qDy=>r;zpS6ePB%L*=K2o zwzoh*F3FR#((kQ#QG1;y2@;Ua1e0o7xbUax+5?UVD&k})0W&Um{zKWObBJp-jq`cI zqxdR6143YH=Ea^3k8`&F@cv`bw-ro7qT$*3sycqvS@gn*{mD`b{(y7mSVP{MT+Z(` z-sP(E0%AA#<~b674{3KkBo@byfjKKwI80Xc{CdOTRo7CPzqCH8C+q>4bvR#dWc_>x z`sk+1a{4{wVo@bM2kD1abV=qKA+a=_B+`KfCQj-$Br*mz7^%W)f{Bc?eSF?6ya$Hj z1^)UAq<*P5-s5D}*B7x?!3opFj6E|DdJq3(g$-8|o~vaji2emv_@=j?alE*7ks%EJ zBA(6A$kc&D<~IUPG{ELEJ#iX;GcO?|E>PAwUJ|E~gV6-o{;36=C1hyJ{NY*eMbHa8 z`dMw)6JJ=cSDE`Z{zH;E^P*tK97cqjEfZlS#?i+;Ui=6Ye(WyNrR zwyz}cUHQ@#XtV~DwA)dUQYrs+Abs2`c*jnl(DU7abGcFL5VYyA<4bCZccQ@dExV@) zEEtw=eVukXZ2z)v&(9_ZWaDjSEmUh3{yx^OVpE&-My-3ZcqMR~UFQ6pV;tBjn(g4N zPZoXjMYUp|<7QO?G7K(&F?{#u8#M%pFFY)!#9ajnw4cVhu&y1=h?Ku{iEDTc60c%u zzm%z4U@)+A96P;x2Y5kPu(|t0? zb{*h<&25HOb#?=xo4Gy78SP6+sX`I$B5bUS48 zcSoS7bT(aQ{`wD=BeG3*wJM*dNs*?*K;zZdtsmG$DMxasA6I*FO&>nW{pKC(H~xBd z9UbH6KYTLu?C;btYfH|Y$-3z9FV%hdwb|#yiDaHIpUChm(BO~zNw9!uI<)v6Fk6_{ z=@PB7|FgNg>9H{OPRev$%D3qg&MM^Z!#|Wv>FE0}t^X_pela{vc-6%I-~1o#Mwc72 zA1@3G(Xv!!Ebd+B!`%Av`XYu77N@N&Zf`F*I6|A{tcY6bq@jGA6J-IaY2k-U#nGsk z8QBi|a;1c|&HtEtaNdKb#PCW#!8&)Iq!G1yy>>E<&{R4`hU)xu&eHGn;Ld@)R->*C z<~oY*GQDPmPdYpLZYeh1o}THbc3R=9Nk>?7Yl=28q+Bp`=X9AQW#ol(c1`2qN!0{h zx){Z|=CoopX*Us^-nen0Nn7fH;MtdOd$Y3WC{V|o%uoc61xlMAOwtvW#+h0tPo04^ z70kUHG@F4xCOoL?f(vwLw^~!YgTr)q0wJoRb0)Oi81f=9OzT^j8u@hF5x#oXnKlm4m;3B#mnaZ%7uO6EGkgYZ=>2~`NNs1na zn~Y6*vQsgVzE-!RZpg*KQyo52N4ENz=lrC}+aw-%w!iD-K)t`F(Q>|(A@@&{kRw}Z zKY_?{OK~f6!qUw_3`#!iUa|Om`(d@93*$#|kz-HAvdTE3ne9ApT#5QS`+~w7cPftaJ*sbSqXh%Zf=G6 z+qvDD682J23;nBE`ZNLAh33~1E$r>Z%-hl@x<-c!UHkm)meJj{YSz^$o60uGjPL`D zZ->Z_1=E8(Pe+vdXGu~}Qwi$hs}ggc>_o#JMf0{CeJ-Eus{il;Mve(|Fim#0XKFfk zdaPQBc1So>haq79iW5`!`LBcxfdVON92b`KVbQ<22uUs+hP`sW-{4!+d}3}O2Ynffu#RC4+3rb4R4Gc(DRL}HU6ISK^+1@M zHM5r(s5lPZ5$_e`us3okBNJ*2eqjo2qd^&;CaE!xK=hcjVtDVdi(k(*Qv<=&&*vuC?&+X4>jLCh@%FWJ zCZOaM+jr(sisZsor}NS-^0m*eb^gmoKPwh-0F+2~c#5qtr-2=CSm)c$3APdaxv8P} zz~bzMy$ppcDQcY%t4Mv27aqi~$s`O|N%s__;rS3hk@a6~l0(`V-@SZh?b6iQrg^3e z`zm+g5`#EO_t336UlFIaQ-Hpwxk_&3p_LzLi)wpU)~?nMY935{$a_&m-q(Xi6payq zE=?L^)sG^mEl|vhQ1Pm0U1=ufpFnST+$`B}p1E4SPOGMC##c_55=R7{iKoqri`ZYO zE;a`i53(%|D2{CGn4shl*?h?mcP2QJZL8RE|En}mD>40oiS(FCLch;o^@*sNiKG58 z97<(t!uTtt+igeC!6n&3z6APCYDk&wlGWWsS1>mFfug7crMz}0D-#7p65NU z`(3T31KFF*fp@>G?uy{#dCf#I%Bx+2;)%LCZx@1e<~dLJ$K+fO^a62}e5c?CLfJg} zp!BrqVk@TZDXNLXsIyYnusS$>q}9Z9bjmK2Ao6IyN?UM;i1@i<&H8T?8E=`l=md`; z+=ecdgYU-Lqph49q3$lA zrupU3^Gp{bl1w!<8lfN^FPkH}J$!ArDsLMCR}r(<+~lk&nacTLVSPkPM1AV}J6a9z1o4z*~lk7!EQE?%*+DmDV zylXm#z;y--tVIf(GCNKD_fuZePao>lbQdWgEao;X9fI+qS8F@FX_8bQMemoS+FSjG z4hmu;YdxJy0nu9vf9;ZTthpws_3t}*0SoU8D6)OHDa3G}E%}8hht2;UxVnP%+O5)b zg{tpl8`?ccnNcOby$1Eoa!cPk@#PyAf1W8@#B(PmGHhu5Fdpn}DBBv9O9Bo;50lD2 zrhe!Ccqd4{pzC;9y&1Z;JSyULXe{y^Wp$3zre$k(;!e~YYN4_^1Q;C`awP#5mP>~= zkRu8z^!9hgw`b=5g)u!wM3dbLeU?93u7g8I7d7E|Q+N)!T3pWh>&ReQe`UH~>xpV`eg=}GG*<=iJ1gG#3F z%0iEH#8a%$Rk<<0HVAT)*Xg_xef#cz{$Co@oR0`u4{+nBKi-9pBTo@;ug9nd7&hWt zWxrf{v>Il7Oc&&jaeYSj+=@{rOSeZc$iwD@HdFJcW^o*60fnlV2j8uMLE6ey$Z*7JK$MvWSo13jm;?hFBhM)c=V zUrI;9r1-S6d5lbQEoVlCcy4HUPCw9F5C1c=vSWyQ#%AA2KM$V{b0TRJPb05so0~vl zC!J%hm;##;DjG+m)}y%k@i;-ew->&KzbFuu{u7vE>6Fqmlbp_%5ComtXk34{In|ZN z?xi$kXvCzZ&oHo2m`x#T66o_H2q;!E?HS?tf=-3WEJ%u}MwufFoPm@|z-J|zCv)s< z4oD-c{L4n4NV$C3H*w(;^2S9!?4H#3w|QhXvdkA>96NmLZ1f0^^D-f(CC8dc#Z2KD zwHO_=H_+!$lr}Uwr4X-vQ|}aYRW4n2|I7NQ=>lbmYUFjJX`C`GsWtIz613Y$`!pFP zcWqEw8ApjQQB5DoP{dPAM*A;OBW4V%3;65SF6p7KdqPI-fNSz-uC>!T3S{)SbDJH@Hn!Z`F&Rs8BkP^MlOsaUBPLQ*^B0q0Z$VkNe{G7<# zBoB5Pfh$-aRshlTBxl^W%ZxFh|8xysm5ZnMVtBHV_>YV9Y{$4SH-=cJ`?Q|Wn7sko_ZMgx$48t_^hav3c?8|7h_yllxx8{5 zR2~x&JKA=E)?43tUVBCBc0Nulyq@S=Y89qG6B?a7V@kTfnaSx%Bbf^QVZEU!8a1~Y zQ$>04EYHYOw$IjeudzPJqXo0lHs}iiqgVVAvK3 zlHO(c9>E-|7>CqiPCEkJw;GpqXV&tMvwz0?E!!+5c7gLN*?fQVAsbnnu~d59Y&bjL z=R!v{mOMIzO1Wl!h|o7M%gnSIbJ%eV)uP?rp#)jcYD(iX1DHDchfaOrQNZN}l3{tS zp<^Y>L#xlvx(zjlCXTE=*M;fT7!asB3FCk1>cP0OWi4lEcA3^shSOr*YNp^$I^;!k zUIe~+lDj_oYQi+xw%SbJpgTE1j`maXILatpFvk=?(v$Br@*0Yt&NZ0okLHTx1C6oT=X~^2F_iUm={iB_`s*;YIUDIDWlOPa55+c7Q~G^Bh5U<|>)_Vp zjrEjb=T^NxtMR@8oL*;s|HL`zi9Y;SDb&Bv?5(@QKN!3Di_rr(UEs;c8d7&@)->*% z+8%gC3#Lj!wW0#!am-u`!73xv^y6~^yc#PhMx`Ug!A8tL0__4o$G#F})*ijo!!$XGX`&PK3r^!viAI-VEaY@FxpegUNemA7 z5soH-uAZ$CHYL!|s?DZSkTDN9uUiUo%ODFDx1< z>-;@49$}Q8g3gTP*17CwTD|a+JvGSum}0(@Qg||pwP%+5OO6B0IRP9197ArQSLBSU zxGVtBz{Jo2VZ1s!{_#{RZllV?Zj0TIw$i1LVK^uF+`z$Pqx9UMfLW;UZ-aM)g`V6H zkrbmPClGxnwJOWnl@S~cWT^9H(OURWA!mkBp3gz0y=xY$N@rztEJ??4d_(NuC}p|j z7T8fScPBl6&xQJ#Ozm~abMLWsJ{{zA1hdm}f zn3`$mJN3@i?bKTcLDO#AFF1~48LahQB`;|JW&W9iC!j}g}gCo z`;xl}EqR$C&!PShJc+>Yw3hy-ocPtpn3|I*3n0lA9zD<+O&m3|BwgwAJ1=Gd5!_E8 zn0>+&0k!yBI7j0lAvDDneBa;8kx_j3+T{edG2Y1Om{P3!fO@^evnrGXBu7T*lB2(Wf+gX#~t0NdhW($OS09L-cO@_Ds4Py z@Bm|{yfQ4?mujLIQ>Yiig@rY{&_>U5wbW(`IHXSP6p&Qj7d0);3LG0hjjkD+I1;SS zZ;Szc!^Vm;#kIYUL&j)zWI2H6HAkV_L$v5Darw4MEl;+*WZjU-CRQ$;&hnGZ^$ZrW z-M`c7(_~y^EoIN2kP{}->}xqot8J}EuIXD2<~zJ=9ZycX8j=}nB?#7P7V?-U8hRXU zri=uC^AW)i$T)B10`DcWZr?IdTF3D`iwk2u zQ3V|p|A86iq8a6)ocWIPRS*@5^kt(MkU;L6^fp&QB4GsmPakT2VaNQCNzpqDL%2-U zW7K|b>f17%Na)HO#WwDPZIPW~!+EN!5hDsnlW)%*zS;DUgIs|9mP0)VDDu^-NpeI0 z3}z~^GbKoI-NI0`2Xn@98ji#w3z@E~S z17M{LOsRZ`aZ*Tc42mR$4vr`j?nT7@sV$rdw`utQ1f!Kl3khUh@x}jXpa5P_0cy?x z79eMd6;3eVpj;Bx#BNBOn3IT!Y|)bq!b$yX4vW|pdf3HkY*}5y9A_2S9wsTx*qT#c z<7N8G4RwW-> zaD*_vK--^~2pL6HyXoXb44#8n3pl3_3%mDK&=Xtvgdw?AoBzdq_=^ROv6Ji7b1H5BDQrSGRNpB41G8XLDaPd1w#nMJP)a^v98}un{+aX znEu_3kT)aJ{GU831Wo%zlFm2-BU6oJjPgkTN&f_0j8{%V-vw6eO3MUWVJvtt#_X%u z8)eqD#W^DtN26>ZX-F_0><9;4gqIQ(Mg!Fl!s8&;69`CzkbwaSN7o^kv=I-DEvq0W zQyCcB-ZCB3Hu72sk$6b26hi<6E?>NM?aGDA7A{@2X4TTAE0?Z>vSiKLrOVeYUc7MO z+U4ulLtGIF+S(D<;&PDOZk!$cq?6gS#63GDt9US1w_^bOr1AD;Us_wM^~`<|~&$Su2AfBpQ?B zE@HeYx(yl87f6F~dH&)x3oTES1PN-4o0M^`S`yJ+Hc*mQgIAO1%kNT04UJv^Xbjgu+dWmns}MAyYSKDkey3~zS-CTdiC?|VXDsV z?d^iw_xI-Rw^eTF^5`PJ@#MM6alNa@g__&l+iiR_0!%suKW6s!_KJ#%u&}WA_xAt* z0RH~|A^8LV00000EC2ui0E+-G000L6z*cWaEEFMdcUl8%k6r< z;IMd1E}O}{fWnGByWjA*T%KNE=i^n!GwFL42zY{nZ*^>hTQ53UFBcbmep(_Th?SOE zhIfM}6$ufa2{khhq>dLJA}%tkt1fMquyC2LZ!MHr03W&$x*ru47a5Ko78?>EAQ;LR zlsynM5HYdSVzXyGA}K7$$tgND9|gU-Gg%fED_O=l6359lG$r!$(A4%@)?Wxcfm$Z) z+}cSnp@6}-4=_%6F(H9MJ7g>%P{2W9o;(`&GUn6L2mz)+Fwufcx-*5n z@S9e57v2cMNN|`;0+1OSJ2C?x832H11!4j05dFhO7aal;cOEccbmAW^GY8IM0|4vM zhksbPEnti2(ORrz9?he0i{HaDW6G*2O9saoP)wdqokZ?102s91F@Ql~9t>;`7(2i- zfFG>61YiJqy^r_r8JI>7e@7Mp4B*GdRX~4%9gFk;Ujg$Cpq~!~Fd%>q{T=ATa(2-2 z0yq)CaDxWaO{c+z(ue{79uHb{#sC7~{jdUS1AwT-4h0Ob#d@IS7ax2B=+HugJ}~e@ z4?DbzJjJh0`Z8sx@TKUyeIKw9A87XWzTiFV$eUnaR;06o6Prl|-ND&qjL4msWr z4JIiZ4=XT8=m-F=1ptGaX!3yE z9WH>MhsQqu;KHmES)|GT*?<|$ydU1;59BgPK3Vaqg06dts+nHOeQ0fXKj!BaGW5yrqS)CJ^53@nK7h&4>24SnH6jU+IN4Il=mK7d6eYO#a{$YB?sI3=~j1U z#t5qaagB`mA|f(i!x7H$j}mkM4ey9YSnv=IaO~qB7a0N?MxcO&q>CO2kw`@{@`w>A zMyi3R{9CN;T9OC0hId_1Ed%V>ZMK(dsTIHem}kjgq@F#;8UjC{3wKSIW|sy7Z+T iFpX*a^t7Gi*z~42&8bdz%F~|u^rt`#YI0B%1OPi{2poO@ diff --git a/doc/salome/tui/GEOM/sources/myheader_py2.html b/doc/salome/tui/GEOM/sources/myheader_py2.html deleted file mode 100755 index 372b2247f..000000000 --- a/doc/salome/tui/GEOM/sources/myheader_py2.html +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - Main Page - - - -  -
- - - - - - -
-
-
- - - - diff --git a/doc/salome/tui/GEOM/sources/static/page2.html b/doc/salome/tui/GEOM/sources/static/page2.html deleted file mode 100755 index 1966a56fc..000000000 --- a/doc/salome/tui/GEOM/sources/static/page2.html +++ /dev/null @@ -1,43 +0,0 @@ - - - - - - - - Main Page - - - - -   -
- - - - - - - - -
- - -
-
- - -
- - diff --git a/doc/salome/tui/GEOM/sources/static/tree.js.in b/doc/salome/tui/GEOM/sources/static/tree.js.in deleted file mode 100755 index 52841f853..000000000 --- a/doc/salome/tui/GEOM/sources/static/tree.js.in +++ /dev/null @@ -1,59 +0,0 @@ -foldersTree = gFld("SALOME v.@VERSION@ ", "", "") - 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")) -*/ diff --git a/doc/salome/tui/GEOM/sources/static/treeview.js b/doc/salome/tui/GEOM/sources/static/treeview.js deleted file mode 100644 index 55eb43d07..000000000 --- a/doc/salome/tui/GEOM/sources/static/treeview.js +++ /dev/null @@ -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 0) - auxEv = "" - else - auxEv = "" - - if (level>0) - if (lastNode) //the last 'brother' in the children array - { - this.renderOb(leftSide + auxEv + "") -// leftSide = leftSide + "" - this.isLastNode = 1 - } - else - { - this.renderOb(leftSide + auxEv + "") - leftSide = leftSide + "" - 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("") - } - if (browserVersion == 3) - { - doc.write("
") - } - - doc.write("\n") - doc.write("\n\n") - doc.write("\n
") - doc.write(leftSide) - this.outputLink() - doc.write("") - doc.write("") - if (USETEXTLINKS) - { - this.outputLink() - doc.write(this.desc + "") - } - else - doc.write(this.desc) - -/*! - if (this.tagName!="") - { - doc.write(" [external]") - } -*/ - doc.write("
\n") - - if (browserVersion == 2) { - doc.write("") - } - if (browserVersion == 3) { - doc.write("
") - } - - 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(" 0) - doc.write("onClick='javascript:clickOnFolder("+this.id+")'") - doc.write(">") - } - else - doc.write("") -} - -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 + "") - leftSide = leftSide + "" - } - else - { - this.renderOb(leftSide + "") - leftSide = leftSide + "" - } - else - this.renderOb("") -} - -function drawItem(leftSide) -{ - if (browserVersion == 2) - doc.write("") - if (browserVersion == 3) - doc.write("
") - - doc.write("\n\n") - doc.write("\n
") - doc.write(leftSide) - if (this.link!="") - { - doc.write("") - } - doc.write("") - if (this.link!="") - { - doc.write("") - } - doc.write("") - if (USETEXTLINKS && this.link!="") - doc.write("" + this.desc + "") - else - doc.write(this.desc) -/*! - if (this.tagName!="") - { - doc.write(" [external]"); - } -*/ - doc.write("\n
\n") - - if (browserVersion == 2) - doc.write("") - if (browserVersion == 3) - doc.write("
") - - 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(" ") - - // 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 diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am index b401ba210..68b275776 100644 --- a/doc/salome/tui/Makefile.am +++ b/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: - cp -fr $(srcdir)/GEOM ./INPUT; \ - cp -f ./GEOM/doxyfile ./INPUT; \ - 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 +dev_docs: doxyfile + echo "Running doxygen in directory: "`pwd`; \ + $(DOXYGEN) $<; -doctuidir=$(docdir)/tui/GEOM +clean-local: + -rm -fr GEOM doxygen.bak -nodist_doctui_DATA= GEOM/doxyfile -EXTRA_DIST+= GEOM/doxyfile.in +install-data-local: + if test -d GEOM; then \ + $(INSTALL) -d $(DESTDIR)$(docdir)/tui ; \ + cp -rp GEOM $(DESTDIR)$(docdir)/tui ; \ + fi; + +uninstall-local: + rm -rf $(docdir)/tui/GEOM diff --git a/doc/salome/tui/GEOM/doxyfile.in b/doc/salome/tui/doxyfile.in similarity index 92% rename from doc/salome/tui/GEOM/doxyfile.in rename to doc/salome/tui/doxyfile.in index cba99e1ca..4b69ca9ad 100755 --- a/doc/salome/tui/GEOM/doxyfile.in +++ b/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 \ - ../../../build/salome +STRIP_FROM_PATH = @top_srcdir@ @top_builddir@ 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 \ - ../../../share/salome/idl -FILE_PATTERNS = *.hxx *.cxx *.h *.c *.hh *.cc *.idl python_extension_must_be_here +INPUT = @top_srcdir@/src \ + @top_srcdir@/bin \ + @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_FOOTER = sources/footer.html -HTML_STYLESHEET = sources/static/doxygen.css +HTML_HEADER = @srcdir@/static/myheader.html +HTML_FOOTER = @srcdir@/static/footer.html +HTML_STYLESHEET = @srcdir@/static/doxygen.css HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO CHM_FILE = diff --git a/doc/salome/tui/GEOM/sources/occ.gif b/doc/salome/tui/images/occ.gif similarity index 100% rename from doc/salome/tui/GEOM/sources/occ.gif rename to doc/salome/tui/images/occ.gif diff --git a/doc/salome/tui/GEOM/sources/static/doxygen.css b/doc/salome/tui/static/doxygen.css similarity index 100% rename from doc/salome/tui/GEOM/sources/static/doxygen.css rename to doc/salome/tui/static/doxygen.css diff --git a/doc/salome/tui/GEOM/sources/footer.html b/doc/salome/tui/static/footer.html similarity index 100% rename from doc/salome/tui/GEOM/sources/footer.html rename to doc/salome/tui/static/footer.html diff --git a/doc/salome/tui/GEOM/sources/myheader.html b/doc/salome/tui/static/myheader.html similarity index 100% rename from doc/salome/tui/GEOM/sources/myheader.html rename to doc/salome/tui/static/myheader.html diff --git a/idl/Makefile.am b/idl/Makefile.am index 93172d6bf..db18f15d4 100644 --- a/idl/Makefile.am +++ b/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 - -EXTRA_DIST+= $(BASEIDL_FILES) +BASEIDL_FILES = GEOM_Gen.idl GEOM_Superv.idl # 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 =\ - -I$(top_builddir)/salome_adm/unix \ - -I$(top_builddir)/idl \ +libSalomeIDLGEOM_la_CPPFLAGS = \ + -I$(top_builddir)/salome_adm/unix \ + -I$(top_builddir)/idl \ @CORBA_CXXFLAGS@ @CORBA_INCLUDES@ @KERNEL_CXXFLAGS@ libSalomeIDLGEOM_la_LDFLAGS = -no-undefined -version-info=0:0:0 -libSalomeIDLGEOM_la_LIBADD = \ - $(STDLIB) \ - @CORBA_LIBS@ \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel +libSalomeIDLGEOM_la_LIBADD = $(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 = \ - -bcxx \ - @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 +IDLCXXFLAGS = -bcxx @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 diff --git a/resources/Makefile.am b/resources/Makefile.am index de56c79c3..8a5787ddf 100644 --- a/resources/Makefile.am +++ b/resources/Makefile.am @@ -27,183 +27,186 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am -dist_salomeres_DATA = \ -GEOM_en.xml \ -GEOM_fr.xml \ -GEOM.config \ -SalomeApp.xml \ -Plugin \ -GEOMDS_Resources \ -ImportExport \ -ShHealing \ -angle.png \ -arc.png \ -archimede.png \ -axisinertia.png \ -basicproperties.png \ -bounding.png \ -box.png \ -box2points.png \ -boxdxyz.png \ -build_compound.png \ -build_edge.png \ -build_face.png \ -build_shell.png \ -build_solid.png \ -build_wire.png \ -centergravity.png \ -chamfer.png \ -chamferall.png \ -chamferedge.png \ -chamferface.png \ -chamferedgefromface.png \ -change_orientation.png \ -check.png \ -circle.png \ -circlepointvector.png \ -circle3points.png \ -circlecenter2pnts.png \ -common.png \ -cone.png \ -conedxyz.png \ -conepointvector.png \ -cut.png \ -cylinder.png \ -cylinderdxyz.png \ -cylinderpointvector.png \ -delete.png \ -disk.png \ -disk3points.png \ -disk_pntvecr.png \ -disk_r.png \ -display.png \ -displayonly.png \ -displayall.png \ -erase.png \ -eraseall.png \ -face_hw.png \ -face_vechw.png \ -fillet.png \ -filletall.png \ -filletedge.png \ -filletface.png \ -filling.png \ -fuse.png \ -geometry.png \ -line.png \ -line2points.png \ -line2faces.png \ -mindist.png \ -mirrorPoint.png \ -mirrorAxe.png \ -mirrorPlane.png \ -ModuleGeom.png \ -multirotation.png \ -multirotationdouble.png \ -multirotationsimple.png \ -multitranslation.png \ -multitranslationdouble.png \ -multitranslationsimple.png \ -normale.png \ -offset.png \ -partition.png \ -partitionkeep.png \ -partitionplane.png \ -pipe.png \ -plane.png \ -planeWorking.png \ -plane3points.png \ -planeface.png \ -planepointvector.png \ -planeworkingface.png \ -planeworkingvector.png \ -planeworkingorigin.png \ -point2.png \ -pointonedge.png \ -pointonface.png \ -point_line_intersection.png \ -polyline.png \ -prism.png \ -prism2.png \ -prism3.png \ -revol.png \ -rotate.png \ -rotatepnt.png \ -scale.png \ -scale_along_axes.png \ -section.png \ -select1.png \ -sewing.png \ -shading.png \ -shapesonshape.png \ -sketch.png \ -sphere.png \ -spheredxyz.png \ -spherepoint.png \ -subshape.png \ -supressHolesOnFaceShell.png \ -supressface.png \ -supresshole.png \ -tolerance.png \ -torus.png \ -torusdxyz.png \ -toruspointvector.png \ -translationDxyz.png \ -translationPoints.png \ -translationVector.png \ -tree_compound.png \ -tree_compsolid.png \ -tree_edge.png \ -tree_face.png \ -tree_shape.png \ -tree_shell.png \ -tree_solid.png \ -tree_vertex.png \ -tree_wire.png \ -tree_group_vertex.png \ -tree_group_edge.png \ -tree_group_face.png \ -tree_group_solid.png \ -tree_lcs.png \ -vector.png \ -vector2points.png \ -vectordxyz.png \ -whatis.png \ -ellipse.png \ -ellipsepointvector.png \ -bezier.png \ -interpol.png \ -spline.png \ -closecontour.png \ -suppressintwires.png \ -marker.png \ -marker2.png \ -marker3.png \ -position.png \ -position2.png \ -free_bound.png \ -point_coord.png \ -point3.png \ -shapeprocess.png \ -block_2f.png \ -block_6f.png \ -block_face_2e.png \ -block_face_4e.png \ -block_face_4v.png \ -block_multitrsf_double.png \ -block_multitrsf_simple.png \ -tree_block.png \ -subblock.png \ -group_new.png \ -group_edit.png \ -glue.png \ -check_blocks_compound.png \ -free_faces.png \ -propagate.png \ -redo.png \ -undo.png \ -arccenter.png \ -glue2.png \ -remove_extra_edges.png +dist_salomeres_DATA = \ +GEOM_en.xml \ +GEOM_fr.xml \ +GEOM.config \ +SalomeApp.xml \ +Plugin \ +GEOMDS_Resources \ +ImportExport \ +ShHealing \ +angle.png \ +arc.png \ +archimede.png \ +axisinertia.png \ +basicproperties.png \ +bounding.png \ +box.png \ +box2points.png \ +boxdxyz.png \ +build_compound.png \ +build_edge.png \ +build_face.png \ +build_shell.png \ +build_solid.png \ +build_wire.png \ +centergravity.png \ +chamfer.png \ +chamferall.png \ +chamferedge.png \ +chamferface.png \ +chamferedgefromface.png \ +change_orientation.png \ +check.png \ +circle.png \ +circlepointvector.png \ +circle3points.png \ +circlecenter2pnts.png \ +common.png \ +cone.png \ +conedxyz.png \ +conepointvector.png \ +cut.png \ +cylinder.png \ +cylinderdxyz.png \ +cylinderpointvector.png \ +delete.png \ +disk.png \ +disk3points.png \ +disk_pntvecr.png \ +disk_r.png \ +display.png \ +displayonly.png \ +displayall.png \ +erase.png \ +eraseall.png \ +face_hw.png \ +face_vechw.png \ +fillet.png \ +filletall.png \ +filletedge.png \ +filletface.png \ +filling.png \ +fuse.png \ +geometry.png \ +line.png \ +line2points.png \ +line2faces.png \ +mindist.png \ +mirrorPoint.png \ +mirrorAxe.png \ +mirrorPlane.png \ +ModuleGeom.png \ +multirotation.png \ +multirotationdouble.png \ +multirotationsimple.png \ +multitranslation.png \ +multitranslationdouble.png \ +multitranslationsimple.png \ +normale.png \ +offset.png \ +partition.png \ +partitionkeep.png \ +partitionplane.png \ +pipe.png \ +plane.png \ +planeWorking.png \ +plane3points.png \ +planeface.png \ +planepointvector.png \ +planeworkingface.png \ +planeworkingvector.png \ +planeworkingorigin.png \ +point2.png \ +pointonedge.png \ +pointonface.png \ +point_line_intersection.png \ +polyline.png \ +prism.png \ +prism2.png \ +prism3.png \ +revol.png \ +rotate.png \ +rotatepnt.png \ +scale.png \ +scale_along_axes.png \ +section.png \ +select1.png \ +sewing.png \ +shading.png \ +shapesonshape.png \ +sketch.png \ +sphere.png \ +spheredxyz.png \ +spherepoint.png \ +subshape.png \ +supressHolesOnFaceShell.png \ +supressface.png \ +supresshole.png \ +tolerance.png \ +torus.png \ +torusdxyz.png \ +toruspointvector.png \ +translationDxyz.png \ +translationPoints.png \ +translationVector.png \ +tree_compound.png \ +tree_compsolid.png \ +tree_edge.png \ +tree_face.png \ +tree_shape.png \ +tree_shell.png \ +tree_solid.png \ +tree_vertex.png \ +tree_wire.png \ +tree_group_vertex.png \ +tree_group_edge.png \ +tree_group_face.png \ +tree_group_solid.png \ +tree_lcs.png \ +vector.png \ +vector2points.png \ +vectordxyz.png \ +whatis.png \ +ellipse.png \ +ellipsepointvector.png \ +bezier.png \ +interpol.png \ +spline.png \ +closecontour.png \ +suppressintwires.png \ +marker.png \ +marker2.png \ +marker3.png \ +position.png \ +position2.png \ +free_bound.png \ +point_coord.png \ +point3.png \ +shapeprocess.png \ +block_2f.png \ +block_6f.png \ +block_face_2e.png \ +block_face_4e.png \ +block_face_4v.png \ +block_multitrsf_double.png \ +block_multitrsf_simple.png \ +tree_block.png \ +subblock.png \ +group_new.png \ +group_edit.png \ +glue.png \ +check_blocks_compound.png \ +free_faces.png \ +propagate.png \ +redo.png \ +undo.png \ +arccenter.png \ +glue2.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 diff --git a/src/ARCHIMEDE/Makefile.am b/src/ARCHIMEDE/Makefile.am index 63d6d9d08..f2b4c52c8 100644 --- a/src/ARCHIMEDE/Makefile.am +++ b/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 -libGEOMArchimede_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libGEOMArchimede_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libGEOMArchimede_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_KERNEL) \ - $(CAS_MODELER) -lTKMesh \ +libGEOMArchimede_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_KERNEL) \ + $(CAS_MODELER) -lTKMesh \ $(STDLIB) diff --git a/src/BREPExport/Makefile.am b/src/BREPExport/Makefile.am index fa1ce21e3..a481961ea 100644 --- a/src/BREPExport/Makefile.am +++ b/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 -libBREPExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libBREPExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libBREPExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ +libBREPExport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ $(CAS_LDPATH) -lTKBRep diff --git a/src/BREPImport/Makefile.am b/src/BREPImport/Makefile.am index 610cddfb4..aae40d07f 100644 --- a/src/BREPImport/Makefile.am +++ b/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 -libBREPImport_la_CPPFLAGS = \ - $(KERNEL_CXXFLAGS) \ +# additional information to compile and link file + +libBREPImport_la_CPPFLAGS = \ + $(KERNEL_CXXFLAGS) \ $(CAS_CPPFLAGS) -libBREPImport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(CAS_LDPATH) -lTKBRep \ +libBREPImport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(CAS_LDPATH) -lTKBRep \ $(STDLIB) diff --git a/src/BasicGUI/Makefile.am b/src/BasicGUI/Makefile.am index 6dccd990e..b137e6f04 100644 --- a/src/BasicGUI/Makefile.am +++ b/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 -dist_libBasicGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ 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 - -# LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libBasicGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/BlocksGUI/Makefile.am b/src/BlocksGUI/Makefile.am index 894a52ae1..37dada73f 100644 --- a/src/BlocksGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file -libBlocksGUI_la_CPPFLAGS = \ +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 \ diff --git a/src/BooleanGUI/Makefile.am b/src/BooleanGUI/Makefile.am index 3e665eeb6..3ab4b7b5a 100644 --- a/src/BooleanGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file -libBooleanGUI_la_CPPFLAGS = \ +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 diff --git a/src/BuildGUI/Makefile.am b/src/BuildGUI/Makefile.am index 9e9a48c0b..cc1ebd271 100644 --- a/src/BuildGUI/Makefile.am +++ b/src/BuildGUI/Makefile.am @@ -27,21 +27,20 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = - -# Libraries targets -lib_LTLIBRARIES = libBuildGUI.la - -# Sources files -dist_libBuildGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ 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 - -# LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file -libBuildGUI_la_CPPFLAGS = \ +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 = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ +libBuildGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMBase/libGEOMBase.la diff --git a/src/DisplayGUI/Makefile.am b/src/DisplayGUI/Makefile.am index 1f0054a73..6448fc7e1 100644 --- a/src/DisplayGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libDisplayGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am index bd8407d3d..46df04ce7 100644 --- a/src/DlgRef/Makefile.am +++ b/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) \ - $(GUI_CXXFLAGS) -# $(KERNEL_CXXFLAGS) \ -# $(GUI_CXXFLAGS) +libDlgRef_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(GUI_CXXFLAGS) -libDlgRef_la_LDFLAGS = \ - $(STDLIB) \ +libDlgRef_la_LDFLAGS = \ + $(STDLIB) \ $(QT_MT_LIBS) - -# $(GUI_LDFLAGS) diff --git a/src/EntityGUI/Makefile.am b/src/EntityGUI/Makefile.am index 5fb23fd5d..89c9671ce 100644 --- a/src/EntityGUI/Makefile.am +++ b/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 = - -dist_libEntityGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ 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 - -# LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile 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 \ diff --git a/src/GEOM/Makefile.am b/src/GEOM/Makefile.am index 9eea77f17..ba367230d 100644 --- a/src/GEOM/Makefile.am +++ b/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 = \ - GEOM_Application.cxx \ - GEOM_Engine.cxx \ - GEOM_Function.cxx \ - GEOM_Object.cxx \ - GEOM_IOperations.cxx \ - GEOM_Solver.cxx \ - GEOM_SubShapeDriver.cxx \ - GEOM_PythonDump.cxx \ - GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx \ - GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx \ +dist_libGEOMbasic_la_SOURCES = \ + GEOM_Application.cxx \ + GEOM_Engine.cxx \ + GEOM_Function.cxx \ + GEOM_Object.cxx \ + GEOM_IOperations.cxx \ + GEOM_Solver.cxx \ + GEOM_SubShapeDriver.cxx \ + GEOM_PythonDump.cxx \ + GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_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 = \ - GEOM_Application.hxx \ - Handle_GEOM_Application.hxx \ - GEOM_Engine.hxx \ - GEOM_Function.hxx \ - GEOM_Object.hxx \ - GEOM_IOperations.hxx \ - GEOM_ISubShape.hxx \ - GEOM_Solver.hxx \ - GEOM_PythonDump.hxx \ - GEOM_DataMapOfAsciiStringTransient.hxx \ +salomeinclude_HEADERS = \ + GEOM_Application.hxx \ + GEOM_Application.ixx \ + GEOM_Application.jxx \ + Handle_GEOM_Application.hxx \ + GEOM_Engine.hxx \ + GEOM_Function.hxx \ + GEOM_Object.hxx \ + GEOM_SubShapeDriver.hxx \ + GEOM_IOperations.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 -libGEOMbasic_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - -I$(top_builddir)/idl \ +# additional information to compile and link file + +libGEOMbasic_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOMbasic_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKXSBase \ - $(CAS_OCAF) \ +libGEOMbasic_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKXSBase \ + $(CAS_OCAF) \ $(CAS_OCAFVIS) diff --git a/src/GEOMAlgo/Makefile.am b/src/GEOMAlgo/Makefile.am index b1a0f9609..d7a659781 100644 --- a/src/GEOMAlgo/Makefile.am +++ b/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 = \ - BlockFix.cxx \ - BlockFix_BlockFixAPI.cxx \ - BlockFix_CheckTool.cxx \ - BlockFix_PeriodicSurfaceModifier.cxx \ - BlockFix_SphereSpaceModifier.cxx \ - BlockFix_UnionEdges.cxx \ - BlockFix_UnionFaces.cxx \ - GEOMAlgo_Algo.cxx \ - GEOMAlgo_Builder_0.cxx \ - GEOMAlgo_Builder_1.cxx \ - GEOMAlgo_Builder_2.cxx \ - GEOMAlgo_Builder_3.cxx \ - GEOMAlgo_Builder_4.cxx \ - GEOMAlgo_BuilderArea.cxx \ - GEOMAlgo_Builder.cxx \ - GEOMAlgo_BuilderFace.cxx \ - GEOMAlgo_BuilderShape.cxx \ - GEOMAlgo_BuilderSolid.cxx \ - GEOMAlgo_BuilderTools.cxx \ - GEOMAlgo_ClsfBox.cxx \ - GEOMAlgo_Clsf.cxx \ - GEOMAlgo_ClsfSurf.cxx \ - GEOMAlgo_CoupleOfShapes.cxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx \ - GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx \ - GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx \ - GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx \ - GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx \ - GEOMAlgo_DataMapOfPassKeyInteger_0.cxx \ - GEOMAlgo_DataMapOfRealListOfShape_0.cxx \ - GEOMAlgo_DataMapOfShapeReal_0.cxx \ - GEOMAlgo_DataMapOfShapeShapeSet_0.cxx \ - GEOMAlgo_FinderShapeOn1.cxx \ - GEOMAlgo_FinderShapeOn2.cxx \ - GEOMAlgo_FinderShapeOn.cxx \ - GEOMAlgo_FinderShapeOnQuad.cxx \ - GEOMAlgo_GlueAnalyser.cxx \ - GEOMAlgo_Gluer.cxx \ - GEOMAlgo_Gluer1.cxx \ - GEOMAlgo_HAlgo.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx \ - GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx \ - GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx \ - GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx \ - GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx \ - GEOMAlgo_IndexedDataMapOfShapeState_0.cxx \ - GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx \ - GEOMAlgo_ListIteratorOfListOfPnt_0.cxx \ - GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx \ - GEOMAlgo_ListNodeOfListOfPnt_0.cxx \ - GEOMAlgo_ListOfCoupleOfShapes_0.cxx \ - GEOMAlgo_ListOfPnt_0.cxx \ - GEOMAlgo_PassKey.cxx \ - GEOMAlgo_PassKeyMapHasher.cxx \ - GEOMAlgo_PassKeyShape.cxx \ - GEOMAlgo_PassKeyShapeMapHasher.cxx \ - GEOMAlgo_ShapeAlgo.cxx \ - GEOMAlgo_ShapeSet.cxx \ - GEOMAlgo_ShapeSolid.cxx \ - GEOMAlgo_ShellSolid.cxx \ - GEOMAlgo_SolidSolid.cxx \ - GEOMAlgo_Splitter.cxx \ - GEOMAlgo_StateCollector.cxx \ - GEOMAlgo_SurfaceTools.cxx \ - GEOMAlgo_Tools3D.cxx \ - GEOMAlgo_Tools.cxx \ - GEOMAlgo_VertexSolid.cxx \ - GEOMAlgo_WESCorrector.cxx \ - GEOMAlgo_WireEdgeSet.cxx \ - GEOMAlgo_WireSolid.cxx \ - GEOMAlgo_WireSplitter.cxx \ - GEOMAlgo_ClsfSolid.cxx \ - GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx \ - GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx \ - GEOMAlgo_ShapeInfoFiller_1.cxx \ - GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx \ - GEOMAlgo_ShapeInfo.cxx \ +dist_libGEOMAlgo_la_SOURCES = \ + BlockFix.cxx \ + BlockFix_BlockFixAPI.cxx \ + BlockFix_CheckTool.cxx \ + BlockFix_PeriodicSurfaceModifier.cxx \ + BlockFix_SphereSpaceModifier.cxx \ + BlockFix_UnionEdges.cxx \ + BlockFix_UnionFaces.cxx \ + GEOMAlgo_Algo.cxx \ + GEOMAlgo_Builder_0.cxx \ + GEOMAlgo_Builder_1.cxx \ + GEOMAlgo_Builder_2.cxx \ + GEOMAlgo_Builder_3.cxx \ + GEOMAlgo_Builder_4.cxx \ + GEOMAlgo_BuilderArea.cxx \ + GEOMAlgo_Builder.cxx \ + GEOMAlgo_BuilderFace.cxx \ + GEOMAlgo_BuilderShape.cxx \ + GEOMAlgo_BuilderSolid.cxx \ + GEOMAlgo_BuilderTools.cxx \ + GEOMAlgo_ClsfBox.cxx \ + GEOMAlgo_Clsf.cxx \ + GEOMAlgo_ClsfSurf.cxx \ + GEOMAlgo_CoupleOfShapes.cxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape_0.cxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal_0.cxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet_0.cxx \ + GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx \ + GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape_0.cxx \ + GEOMAlgo_DataMapNodeOfDataMapOfShapeReal_0.cxx \ + GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet_0.cxx \ + GEOMAlgo_DataMapOfPassKeyInteger_0.cxx \ + GEOMAlgo_DataMapOfRealListOfShape_0.cxx \ + GEOMAlgo_DataMapOfShapeReal_0.cxx \ + GEOMAlgo_DataMapOfShapeShapeSet_0.cxx \ + GEOMAlgo_FinderShapeOn1.cxx \ + GEOMAlgo_FinderShapeOn2.cxx \ + GEOMAlgo_FinderShapeOn.cxx \ + GEOMAlgo_FinderShapeOnQuad.cxx \ + GEOMAlgo_GlueAnalyser.cxx \ + GEOMAlgo_Gluer.cxx \ + GEOMAlgo_Gluer1.cxx \ + GEOMAlgo_HAlgo.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx \ + GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx \ + GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx \ + GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx \ + GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx \ + GEOMAlgo_IndexedDataMapOfShapeState_0.cxx \ + GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx \ + GEOMAlgo_ListIteratorOfListOfPnt_0.cxx \ + GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx \ + GEOMAlgo_ListNodeOfListOfPnt_0.cxx \ + GEOMAlgo_ListOfCoupleOfShapes_0.cxx \ + GEOMAlgo_ListOfPnt_0.cxx \ + GEOMAlgo_PassKey.cxx \ + GEOMAlgo_PassKeyMapHasher.cxx \ + GEOMAlgo_PassKeyShape.cxx \ + GEOMAlgo_PassKeyShapeMapHasher.cxx \ + GEOMAlgo_ShapeAlgo.cxx \ + GEOMAlgo_ShapeSet.cxx \ + GEOMAlgo_ShapeSolid.cxx \ + GEOMAlgo_ShellSolid.cxx \ + GEOMAlgo_SolidSolid.cxx \ + GEOMAlgo_Splitter.cxx \ + GEOMAlgo_StateCollector.cxx \ + GEOMAlgo_SurfaceTools.cxx \ + GEOMAlgo_Tools3D.cxx \ + GEOMAlgo_Tools.cxx \ + GEOMAlgo_VertexSolid.cxx \ + GEOMAlgo_WESCorrector.cxx \ + GEOMAlgo_WireEdgeSet.cxx \ + GEOMAlgo_WireSolid.cxx \ + GEOMAlgo_WireSplitter.cxx \ + GEOMAlgo_ClsfSolid.cxx \ + GEOMAlgo_DataMapNodeOfDataMapOfPassKeyShapeShape_0.cxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyShapeShape_0.cxx \ + GEOMAlgo_DataMapOfPassKeyShapeShape_0.cxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeShapeInfo_0.cxx \ + GEOMAlgo_ShapeInfoFiller_1.cxx \ + GEOMAlgo_IndexedDataMapOfShapeShapeInfo_0.cxx \ + GEOMAlgo_ShapeInfo.cxx \ GEOMAlgo_ShapeInfoFiller.cxx # header files -salomeinclude_HEADERS = \ - BlockFix_BlockFixAPI.hxx \ - BlockFix_BlockFixAPI.lxx \ - BlockFix_CheckTool.hxx \ - Handle_BlockFix_BlockFixAPI.hxx \ - GEOMAlgo_Algo.hxx \ - GEOMAlgo_BuilderArea.hxx \ - GEOMAlgo_BuilderFace.hxx \ - GEOMAlgo_Builder.hxx \ - GEOMAlgo_BuilderShape.hxx \ - GEOMAlgo_BuilderSolid.hxx \ - GEOMAlgo_BuilderTools.hxx \ - GEOMAlgo_ClsfBox.hxx \ - GEOMAlgo_Clsf.hxx \ - GEOMAlgo_ClsfSurf.hxx \ - GEOMAlgo_CoupleOfShapes.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx \ - GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx \ - GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \ - GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \ - GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \ - GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \ - GEOMAlgo_DataMapOfPassKeyInteger.hxx \ - GEOMAlgo_DataMapOfRealListOfShape.hxx \ - GEOMAlgo_DataMapOfShapeReal.hxx \ - GEOMAlgo_DataMapOfShapeShapeSet.hxx \ - GEOMAlgo_FinderShapeOn1.hxx \ - GEOMAlgo_FinderShapeOn2.hxx \ - GEOMAlgo_FinderShapeOn.hxx \ - GEOMAlgo_FinderShapeOnQuad.hxx \ - GEOMAlgo_GlueAnalyser.hxx \ - GEOMAlgo_Gluer.hxx \ - GEOMAlgo_Gluer.ixx \ - GEOMAlgo_Gluer.jxx \ - GEOMAlgo_Gluer1.hxx \ - GEOMAlgo_Gluer1.ixx \ - GEOMAlgo_Gluer1.jxx \ - GEOMAlgo_HAlgo.hxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \ - GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \ - GEOMAlgo_IndexedDataMapOfIntegerShape.hxx \ - GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx \ - GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx \ - GEOMAlgo_IndexedDataMapOfShapeBox.hxx \ - GEOMAlgo_IndexedDataMapOfShapeState.hxx \ - GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx \ - GEOMAlgo_ListIteratorOfListOfPnt.hxx \ - GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \ - GEOMAlgo_ListNodeOfListOfPnt.hxx \ - GEOMAlgo_ListOfCoupleOfShapes.hxx \ - GEOMAlgo_ListOfPnt.hxx \ - GEOMAlgo_PassKey.hxx \ - GEOMAlgo_PassKeyMapHasher.hxx \ - GEOMAlgo_PassKeyShape.hxx \ - GEOMAlgo_PassKeyShapeMapHasher.hxx \ - GEOMAlgo_PWireEdgeSet.hxx \ - GEOMAlgo_ShapeAlgo.hxx \ - GEOMAlgo_ShapeSet.hxx \ - GEOMAlgo_ShapeSolid.hxx \ - GEOMAlgo_ShellSolid.hxx \ - GEOMAlgo_SolidSolid.hxx \ - GEOMAlgo_Splitter.hxx \ - GEOMAlgo_StateCollector.hxx \ - GEOMAlgo_State.hxx \ - GEOMAlgo_SurfaceTools.hxx \ - GEOMAlgo_Tools3D.hxx \ - GEOMAlgo_Tools.hxx \ - GEOMAlgo_VertexSolid.hxx \ - GEOMAlgo_WESCorrector.hxx \ - GEOMAlgo_WireEdgeSet.hxx \ - GEOMAlgo_WireSolid.hxx \ - GEOMAlgo_WireSplitter.hxx \ - 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 \ +salomeinclude_HEADERS = \ + BlockFix.hxx \ + BlockFix.ixx \ + BlockFix.jxx \ + BlockFix_BlockFixAPI.hxx \ + BlockFix_BlockFixAPI.ixx \ + BlockFix_BlockFixAPI.jxx \ + BlockFix_BlockFixAPI.lxx \ + BlockFix_CheckTool.hxx \ + BlockFix_CheckTool.ixx \ + BlockFix_CheckTool.jxx \ + BlockFix_PeriodicSurfaceModifier.hxx \ + BlockFix_PeriodicSurfaceModifier.ixx \ + BlockFix_PeriodicSurfaceModifier.jxx \ + BlockFix_SphereSpaceModifier.hxx \ + BlockFix_SphereSpaceModifier.ixx \ + BlockFix_SphereSpaceModifier.jxx \ + BlockFix_UnionEdges.hxx \ + BlockFix_UnionEdges.ixx \ + BlockFix_UnionEdges.jxx \ + BlockFix_UnionFaces.hxx \ + BlockFix_UnionFaces.ixx \ + BlockFix_UnionFaces.jxx \ + Handle_BlockFix_BlockFixAPI.hxx \ + Handle_BlockFix_SphereSpaceModifier.hxx \ + Handle_BlockFix_PeriodicSurfaceModifier.hxx \ + GEOMAlgo_Algo.hxx \ + GEOMAlgo_Algo.ixx \ + GEOMAlgo_Algo.jxx \ + GEOMAlgo_BuilderArea.hxx \ + GEOMAlgo_BuilderArea.ixx \ + GEOMAlgo_BuilderArea.jxx \ + GEOMAlgo_BuilderFace.hxx \ + GEOMAlgo_BuilderFace.ixx \ + GEOMAlgo_BuilderFace.jxx \ + GEOMAlgo_Builder.hxx \ + GEOMAlgo_Builder.ixx \ + GEOMAlgo_Builder.jxx \ + GEOMAlgo_BuilderShape.hxx \ + GEOMAlgo_BuilderShape.ixx \ + GEOMAlgo_BuilderShape.jxx \ + GEOMAlgo_BuilderSolid.hxx \ + GEOMAlgo_BuilderSolid.ixx \ + GEOMAlgo_BuilderSolid.jxx \ + GEOMAlgo_BuilderTools.hxx \ + GEOMAlgo_BuilderTools.ixx \ + GEOMAlgo_BuilderTools.jxx \ + GEOMAlgo_ClsfBox.hxx \ + GEOMAlgo_ClsfBox.ixx \ + GEOMAlgo_ClsfBox.jxx \ + GEOMAlgo_Clsf.hxx \ + GEOMAlgo_Clsf.ixx \ + GEOMAlgo_Clsf.jxx \ + GEOMAlgo_ClsfSurf.hxx \ + GEOMAlgo_ClsfSurf.ixx \ + GEOMAlgo_ClsfSurf.jxx \ + GEOMAlgo_CoupleOfShapes.hxx \ + GEOMAlgo_CoupleOfShapes.ixx \ + GEOMAlgo_CoupleOfShapes.jxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfRealListOfShape.hxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfShapeReal.hxx \ + GEOMAlgo_DataMapIteratorOfDataMapOfShapeShapeSet.hxx \ + GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx \ + GEOMAlgo_DataMapNodeOfDataMapOfRealListOfShape.hxx \ + GEOMAlgo_DataMapNodeOfDataMapOfShapeReal.hxx \ + GEOMAlgo_DataMapNodeOfDataMapOfShapeShapeSet.hxx \ + GEOMAlgo_DataMapOfPassKeyInteger.hxx \ + GEOMAlgo_DataMapOfRealListOfShape.hxx \ + GEOMAlgo_DataMapOfShapeReal.hxx \ + GEOMAlgo_DataMapOfShapeShapeSet.hxx \ + GEOMAlgo_FinderShapeOn1.ixx \ + GEOMAlgo_FinderShapeOn1.hxx \ + GEOMAlgo_FinderShapeOn1.jxx \ + GEOMAlgo_FinderShapeOn2.hxx \ + GEOMAlgo_FinderShapeOn2.ixx \ + GEOMAlgo_FinderShapeOn2.jxx \ + GEOMAlgo_FinderShapeOn.hxx \ + GEOMAlgo_FinderShapeOn.ixx \ + GEOMAlgo_FinderShapeOn.jxx \ + GEOMAlgo_FinderShapeOnQuad.hxx \ + GEOMAlgo_GlueAnalyser.hxx \ + GEOMAlgo_GlueAnalyser.ixx \ + GEOMAlgo_GlueAnalyser.jxx \ + GEOMAlgo_Gluer.hxx \ + GEOMAlgo_Gluer.ixx \ + GEOMAlgo_Gluer.jxx \ + GEOMAlgo_Gluer1.hxx \ + GEOMAlgo_Gluer1.ixx \ + GEOMAlgo_Gluer1.jxx \ + GEOMAlgo_HAlgo.hxx \ + GEOMAlgo_HAlgo.ixx \ + GEOMAlgo_HAlgo.jxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx \ + GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx \ + GEOMAlgo_IndexedDataMapOfIntegerShape.hxx \ + GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx \ + GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx \ + GEOMAlgo_IndexedDataMapOfShapeBox.hxx \ + GEOMAlgo_IndexedDataMapOfShapeState.hxx \ + GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx \ + GEOMAlgo_ListIteratorOfListOfPnt.hxx \ + GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx \ + GEOMAlgo_ListNodeOfListOfPnt.hxx \ + GEOMAlgo_ListOfCoupleOfShapes.hxx \ + GEOMAlgo_ListOfPnt.hxx \ + GEOMAlgo_PassKey.hxx \ + GEOMAlgo_PassKey.ixx \ + 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 = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../NMTDS \ +libGEOMAlgo_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../NMTDS \ -I$(srcdir)/../NMTTools -libGEOMAlgo_la_LDFLAGS = \ - ../NMTTools/libNMTTools.la \ - $(STDLIB) \ +libGEOMAlgo_la_LDFLAGS = \ + ../NMTTools/libNMTTools.la \ + $(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) diff --git a/src/GEOMBase/Makefile.am b/src/GEOMBase/Makefile.am index 044ed56a8..a9e7750bb 100644 --- a/src/GEOMBase/Makefile.am +++ b/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 \ -# SALOMEDS.idl \ -# SALOMEDS_Attributes.idl \ -# SALOME_GenericObj.idl \ -# SALOME_Component.idl \ -# GEOM_Gen.idl - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libGEOMBase_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/GEOMClient/Makefile.am b/src/GEOMClient/Makefile.am index 959b3859f..f906a30f6 100644 --- a/src/GEOMClient/Makefile.am +++ b/src/GEOMClient/Makefile.am @@ -30,30 +30,30 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - GEOM_Client.hxx - +salomeinclude_HEADERS = \ + 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 -libGEOMClient_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(top_builddir)/idl \ +# additional information to compile and link file + +libGEOMClient_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOMClient_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \ +libGEOMClient_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../GEOM/libGEOMbasic.la \ + $(KERNEL_LDFLAGS) -lSalomeIDLKernel -lOpUtil \ $(CAS_TKTopAlgo) # \ diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx deleted file mode 100644 index 3dd94d851..000000000 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx +++ /dev/null @@ -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 -#include CORBA_SERVER_HEADER(GEOM_Gen) -#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) - -// Open CASCADE Includes -#include -#include - -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 diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx deleted file mode 100644 index 1b3af3248..000000000 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx +++ /dev/null @@ -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 -#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() {} - diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx deleted file mode 100644 index 791245987..000000000 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx +++ /dev/null @@ -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 diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx deleted file mode 100644 index 7184542d4..000000000 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx +++ /dev/null @@ -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 -#include CORBA_SERVER_HEADER(GEOM_Gen) -#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) - -// Open CASCADE Includes -#include -#include - -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 diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx b/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx deleted file mode 100644 index 92b872d7b..000000000 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx +++ /dev/null @@ -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 -#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() {} - diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx deleted file mode 100644 index 43abd891a..000000000 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx +++ /dev/null @@ -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 diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx deleted file mode 100644 index eeb6e61d3..000000000 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx +++ /dev/null @@ -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 -#include -#include - -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 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx deleted file mode 100644 index 14117451e..000000000 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx +++ /dev/null @@ -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 - -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 diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx deleted file mode 100644 index 2222f5188..000000000 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx +++ /dev/null @@ -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 -#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() {} - diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx deleted file mode 100644 index 4342c9cdb..000000000 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx +++ /dev/null @@ -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 diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx deleted file mode 100644 index 1de7bd2e0..000000000 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx +++ /dev/null @@ -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 - -#include "GEOM_ShapeTypeFilter.ixx" -#include "SALOME_InteractiveObject.hxx" -#include "GEOM_Client.hxx" -#include "QAD_Application.h" -#include "QAD_Desktop.h" -#include "utilities.h" - -#include - -//======================================================================= -// 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; -} - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx deleted file mode 100644 index 5af6de182..000000000 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx +++ /dev/null @@ -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 -#include CORBA_SERVER_HEADER(GEOM_Gen) -#include CORBA_SERVER_HEADER(SALOMEDS_Attributes) - -// Open CASCADE Includes -#include -#include -#include -#include - -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 diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx deleted file mode 100644 index 86ca838f4..000000000 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx +++ /dev/null @@ -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 -#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() {} - diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx deleted file mode 100644 index 0ddda3484..000000000 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx +++ /dev/null @@ -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 diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx deleted file mode 100644 index 8be86f636..000000000 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx +++ /dev/null @@ -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 - -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 - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx deleted file mode 100644 index 37fb4c6da..000000000 --- a/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx +++ /dev/null @@ -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 -#endif -#ifndef _Standard_HeaderFile -#include -#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 diff --git a/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx deleted file mode 100644 index e1b669f5c..000000000 --- a/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx +++ /dev/null @@ -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 -#endif -#ifndef _Standard_HeaderFile -#include -#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 diff --git a/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx deleted file mode 100644 index a5d7c5312..000000000 --- a/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx +++ /dev/null @@ -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 -#endif -#ifndef _Standard_HeaderFile -#include -#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 diff --git a/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx deleted file mode 100644 index c9de83ce3..000000000 --- a/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx +++ /dev/null @@ -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 -#endif -#ifndef _Standard_HeaderFile -#include -#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 diff --git a/src/GEOMFiltersSelection/Makefile.am b/src/GEOMFiltersSelection/Makefile.am index 3b7cb0df1..72c669796 100644 --- a/src/GEOMFiltersSelection/Makefile.am +++ b/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) \ diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am index 50f008430..cd1e27d11 100644 --- a/src/GEOMGUI/Makefile.am +++ b/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 \ -# SALOMEDS.idl \ -# SALOMEDS_Attributes.idl \ -# SALOME_GenericObj.idl \ -# SALOME_Component.idl \ -# GEOM_Gen.idl - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile 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 \ diff --git a/src/GEOMImpl/GEOMImpl_Template.cxx b/src/GEOMImpl/GEOMImpl_Template.cxx deleted file mode 100644 index ccfb70528..000000000 --- a/src/GEOMImpl/GEOMImpl_Template.cxx +++ /dev/null @@ -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 - -#include -#include -#include - -//======================================================================= -//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 ; -} - - diff --git a/src/GEOMImpl/GEOMImpl_Template.hxx b/src/GEOMImpl/GEOMImpl_Template.hxx deleted file mode 100644 index 866b7fefe..000000000 --- a/src/GEOMImpl/GEOMImpl_Template.hxx +++ /dev/null @@ -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 -#endif -#ifndef _Standard_TypeMismatch_HeaderFile -#include -#endif - -#ifndef _Standard_HeaderFile -#include -#endif - -#ifndef _Standard_Macro_HeaderFile -#include -#endif -#ifndef _Standard_HeaderFile -#include -#endif -#ifndef _Standard_GUID_HeaderFile -#include -#endif - -#ifndef _Handle_TFunction_Driver_HeaderFile -#include -#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 -#endif -#ifndef _TFunction_Logbook_HeaderFile -#include -#endif -#ifndef _Standard_CString_HeaderFile -#include -#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 diff --git a/src/GEOMImpl/Makefile.am b/src/GEOMImpl/Makefile.am index 1df11ecab..8bd5c417e 100644 --- a/src/GEOMImpl/Makefile.am +++ b/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 = \ - GEOMImpl_Gen.hxx \ - GEOMImpl_IBasicOperations.hxx \ - GEOMImpl_ITransformOperations.hxx \ - GEOMImpl_IHealingOperations.hxx \ - GEOMImpl_I3DPrimOperations.hxx \ - GEOMImpl_IShapesOperations.hxx \ - GEOMImpl_IBlocksOperations.hxx \ - GEOMImpl_IBooleanOperations.hxx \ - GEOMImpl_ICurvesOperations.hxx \ - GEOMImpl_ILocalOperations.hxx \ - GEOMImpl_IInsertOperations.hxx \ - GEOMImpl_IMeasureOperations.hxx \ - GEOMImpl_IGroupOperations.hxx \ - GEOMImpl_CopyDriver.hxx \ - GEOMImpl_Types.hxx \ +salomeinclude_HEADERS = \ + GEOMImpl_Gen.hxx \ + GEOMImpl_IBasicOperations.hxx \ + GEOMImpl_ITransformOperations.hxx \ + GEOMImpl_IHealingOperations.hxx \ + GEOMImpl_I3DPrimOperations.hxx \ + GEOMImpl_IShapesOperations.hxx \ + GEOMImpl_IBlocksOperations.hxx \ + GEOMImpl_IBooleanOperations.hxx \ + GEOMImpl_ICurvesOperations.hxx \ + GEOMImpl_ILocalOperations.hxx \ + GEOMImpl_IInsertOperations.hxx \ + GEOMImpl_IMeasureOperations.hxx \ + GEOMImpl_IGroupOperations.hxx \ + GEOMImpl_IGlue.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 = \ - GEOMImpl_IBasicOperations.cxx \ - GEOMImpl_ITransformOperations.cxx \ - GEOMImpl_IHealingOperations.cxx \ - GEOMImpl_I3DPrimOperations.cxx \ - GEOMImpl_IShapesOperations.cxx \ - GEOMImpl_IBlocksOperations.cxx \ - GEOMImpl_IBooleanOperations.cxx \ - GEOMImpl_ICurvesOperations.cxx \ - GEOMImpl_ILocalOperations.cxx \ - GEOMImpl_IInsertOperations.cxx \ - GEOMImpl_IMeasureOperations.cxx \ - GEOMImpl_IGroupOperations.cxx \ - GEOMImpl_Gen.cxx \ - GEOMImpl_PointDriver.cxx \ - GEOMImpl_VectorDriver.cxx \ - GEOMImpl_LineDriver.cxx \ - GEOMImpl_PlaneDriver.cxx \ - GEOMImpl_MarkerDriver.cxx \ - GEOMImpl_TranslateDriver.cxx \ - GEOMImpl_MirrorDriver.cxx \ - GEOMImpl_OffsetDriver.cxx \ - GEOMImpl_ScaleDriver.cxx \ - GEOMImpl_PositionDriver.cxx \ - GEOMImpl_BoxDriver.cxx \ - GEOMImpl_FaceDriver.cxx \ - GEOMImpl_DiskDriver.cxx \ - GEOMImpl_ConeDriver.cxx \ - GEOMImpl_CylinderDriver.cxx \ - GEOMImpl_SphereDriver.cxx \ - GEOMImpl_TorusDriver.cxx \ - GEOMImpl_PrismDriver.cxx \ - GEOMImpl_PipeDriver.cxx \ - GEOMImpl_ThruSectionsDriver.cxx \ - GEOMImpl_RevolutionDriver.cxx \ - GEOMImpl_ShapeDriver.cxx \ - GEOMImpl_BlockDriver.cxx \ - GEOMImpl_Block6Explorer.cxx \ - GEOMImpl_MeasureDriver.cxx \ - GEOMImpl_PolylineDriver.cxx \ - GEOMImpl_CircleDriver.cxx \ - GEOMImpl_EllipseDriver.cxx \ - GEOMImpl_ArcDriver.cxx \ - GEOMImpl_SplineDriver.cxx \ - GEOMImpl_SketcherDriver.cxx \ - GEOMImpl_FilletDriver.cxx \ - GEOMImpl_ChamferDriver.cxx \ - GEOMImpl_BooleanDriver.cxx \ - GEOMImpl_PartitionDriver.cxx \ - GEOMImpl_CopyDriver.cxx \ - GEOMImpl_ExportDriver.cxx \ - GEOMImpl_ImportDriver.cxx \ - GEOMImpl_RotateDriver.cxx \ - GEOMImpl_ArchimedeDriver.cxx \ - GEOMImpl_HealingDriver.cxx \ - GEOMImpl_FillingDriver.cxx \ +dist_libGEOMimpl_la_SOURCES = \ + GEOMImpl_IBasicOperations.cxx \ + GEOMImpl_ITransformOperations.cxx \ + GEOMImpl_IHealingOperations.cxx \ + GEOMImpl_I3DPrimOperations.cxx \ + GEOMImpl_IShapesOperations.cxx \ + GEOMImpl_IBlocksOperations.cxx \ + GEOMImpl_IBooleanOperations.cxx \ + GEOMImpl_ICurvesOperations.cxx \ + GEOMImpl_ILocalOperations.cxx \ + GEOMImpl_IInsertOperations.cxx \ + GEOMImpl_IMeasureOperations.cxx \ + GEOMImpl_IGroupOperations.cxx \ + GEOMImpl_Gen.cxx \ + GEOMImpl_PointDriver.cxx \ + GEOMImpl_VectorDriver.cxx \ + GEOMImpl_LineDriver.cxx \ + GEOMImpl_PlaneDriver.cxx \ + GEOMImpl_MarkerDriver.cxx \ + GEOMImpl_TranslateDriver.cxx \ + GEOMImpl_MirrorDriver.cxx \ + GEOMImpl_OffsetDriver.cxx \ + GEOMImpl_ScaleDriver.cxx \ + GEOMImpl_PositionDriver.cxx \ + GEOMImpl_BoxDriver.cxx \ + GEOMImpl_FaceDriver.cxx \ + GEOMImpl_DiskDriver.cxx \ + GEOMImpl_ConeDriver.cxx \ + GEOMImpl_CylinderDriver.cxx \ + GEOMImpl_SphereDriver.cxx \ + GEOMImpl_TorusDriver.cxx \ + GEOMImpl_PrismDriver.cxx \ + GEOMImpl_PipeDriver.cxx \ + GEOMImpl_ThruSectionsDriver.cxx \ + GEOMImpl_RevolutionDriver.cxx \ + GEOMImpl_ShapeDriver.cxx \ + GEOMImpl_BlockDriver.cxx \ + GEOMImpl_Block6Explorer.cxx \ + GEOMImpl_MeasureDriver.cxx \ + GEOMImpl_PolylineDriver.cxx \ + GEOMImpl_CircleDriver.cxx \ + GEOMImpl_EllipseDriver.cxx \ + GEOMImpl_ArcDriver.cxx \ + GEOMImpl_SplineDriver.cxx \ + GEOMImpl_SketcherDriver.cxx \ + GEOMImpl_FilletDriver.cxx \ + GEOMImpl_ChamferDriver.cxx \ + GEOMImpl_BooleanDriver.cxx \ + GEOMImpl_PartitionDriver.cxx \ + GEOMImpl_CopyDriver.cxx \ + GEOMImpl_ExportDriver.cxx \ + GEOMImpl_ImportDriver.cxx \ + GEOMImpl_RotateDriver.cxx \ + GEOMImpl_ArchimedeDriver.cxx \ + GEOMImpl_HealingDriver.cxx \ + GEOMImpl_FillingDriver.cxx \ GEOMImpl_GlueDriver.cxx -# additionnal information to compil and link file -libGEOMimpl_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - -I$(srcdir)/../ShHealOper \ - -I$(srcdir)/../NMTTools \ - -I$(srcdir)/../GEOM \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../SKETCHER \ - -I$(srcdir)/../ARCHIMEDE \ - -I$(top_builddir)/idl \ +# additional information to compile and link file + +libGEOMimpl_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + -I$(srcdir)/../ShHealOper \ + -I$(srcdir)/../NMTTools \ + -I$(srcdir)/../GEOM \ + -I$(srcdir)/../GEOMAlgo \ + -I$(srcdir)/../SKETCHER \ + -I$(srcdir)/../ARCHIMEDE \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOMimpl_la_LDFLAGS = \ - ../GEOM/libGEOMbasic.la \ - ../GEOMAlgo/libGEOMAlgo.la \ - ../ShHealOper/libShHealOper.la \ - ../ARCHIMEDE/libGEOMArchimede.la \ - ../SKETCHER/libGEOMSketcher.la \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ +libGEOMimpl_la_LDFLAGS = \ + ../GEOM/libGEOMbasic.la \ + ../GEOMAlgo/libGEOMAlgo.la \ + ../ShHealOper/libShHealOper.la \ + ../ARCHIMEDE/libGEOMArchimede.la \ + ../SKETCHER/libGEOMSketcher.la \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset +# extra dist files +EXTRA_DIST += GUID.txt diff --git a/src/GEOMToolsGUI/Makefile.am b/src/GEOMToolsGUI/Makefile.am index e58b28ad6..c30639ad2 100644 --- a/src/GEOMToolsGUI/Makefile.am +++ b/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 = - -dist_libGEOMToolsGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ + GEOMToolsGUI.h \ 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 \ -# SALOME_GenericObj.idl \ -# SALOME_Exception.idl \ -# SALOME_Component.idl - -#LIB_SERVER_IDL = +# additional information to compile and link file -# additionnal information to compile and link file libGEOMToolsGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ $(VTK_INCLUDES) \ diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am index 33b0aceba..b69313e48 100644 --- a/src/GEOM_I/Makefile.am +++ b/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 = \ - GEOM_Object_i.hh \ - GEOM_IOperations_i.hh \ - GEOM_IBasicOperations_i.hh \ - GEOM_IHealingOperations_i.hh \ - GEOM_I3DPrimOperations_i.hh \ - GEOM_IShapesOperations_i.hh \ - GEOM_IBlocksOperations_i.hh \ - GEOM_IBooleanOperations_i.hh \ - GEOM_ICurvesOperations_i.hh \ - GEOM_ILocalOperations_i.hh \ - GEOM_IInsertOperations_i.hh \ - GEOM_ITransformOperations_i.hh \ - GEOM_IMeasureOperations_i.hh \ - GEOM_IGroupOperations_i.hh \ - GEOM_Gen_i.hh \ +salomeinclude_HEADERS = \ + GEOM_Object_i.hh \ + GEOM_IOperations_i.hh \ + GEOM_IBasicOperations_i.hh \ + GEOM_IHealingOperations_i.hh \ + GEOM_I3DPrimOperations_i.hh \ + GEOM_IShapesOperations_i.hh \ + GEOM_IBlocksOperations_i.hh \ + GEOM_IBooleanOperations_i.hh \ + GEOM_ICurvesOperations_i.hh \ + GEOM_ILocalOperations_i.hh \ + GEOM_IInsertOperations_i.hh \ + GEOM_ITransformOperations_i.hh \ + GEOM_IMeasureOperations_i.hh \ + GEOM_IGroupOperations_i.hh \ + GEOM_Gen_i.hh \ GEOM_GEOM_I.hxx -dist_libGEOMEngine_la_SOURCES = \ - GEOM_Object_i.cc \ - GEOM_IOperations_i.cc \ - GEOM_IBasicOperations_i.cc \ - GEOM_IHealingOperations_i.cc \ - GEOM_I3DPrimOperations_i.cc \ - GEOM_IShapesOperations_i.cc \ - GEOM_IBlocksOperations_i.cc \ - GEOM_IBooleanOperations_i.cc \ - GEOM_ICurvesOperations_i.cc \ - GEOM_ILocalOperations_i.cc \ - GEOM_IInsertOperations_i.cc \ - GEOM_ITransformOperations_i.cc \ - GEOM_IMeasureOperations_i.cc \ - GEOM_IGroupOperations_i.cc \ - GEOM_Gen_i.cc \ +dist_libGEOMEngine_la_SOURCES = \ + GEOM_Object_i.cc \ + GEOM_IOperations_i.cc \ + GEOM_IBasicOperations_i.cc \ + GEOM_IHealingOperations_i.cc \ + GEOM_I3DPrimOperations_i.cc \ + GEOM_IShapesOperations_i.cc \ + GEOM_IBlocksOperations_i.cc \ + GEOM_IBooleanOperations_i.cc \ + GEOM_ICurvesOperations_i.cc \ + GEOM_ILocalOperations_i.cc \ + GEOM_IInsertOperations_i.cc \ + GEOM_ITransformOperations_i.cc \ + GEOM_IMeasureOperations_i.cc \ + GEOM_IGroupOperations_i.cc \ + GEOM_Gen_i.cc \ GEOM_DumpPython.cc -# additionnal information to compil and link file -libGEOMEngine_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../SKETCHER \ - -I$(srcdir)/../ARCHIMEDE \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOMAlgo \ - -I$(srcdir)/../GEOM \ - -I$(top_builddir)/idl \ +# additional information to compile and link file + +libGEOMEngine_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../SKETCHER \ + -I$(srcdir)/../ARCHIMEDE \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOMAlgo \ + -I$(srcdir)/../GEOM \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOMEngine_la_LDFLAGS = \ - ../../idl/libSalomeIDLGEOM.la \ - ../ARCHIMEDE/libGEOMArchimede.la \ - ../GEOMImpl/libGEOMimpl.la \ - ../SKETCHER/libGEOMSketcher.la \ - ../GEOM/libGEOMbasic.la \ - $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ - $(CAS_DATAEXCHANGE) \ +libGEOMEngine_la_LDFLAGS = \ + ../../idl/libSalomeIDLGEOM.la \ + ../ARCHIMEDE/libGEOMArchimede.la \ + ../GEOMImpl/libGEOMimpl.la \ + ../SKETCHER/libGEOMSketcher.la \ + ../GEOM/libGEOMbasic.la \ + $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS \ + $(CAS_DATAEXCHANGE) \ $(CAS_LDPATH) -lTKFillet -lTKOffset # \ diff --git a/src/GEOM_I_Superv/Makefile.am b/src/GEOM_I_Superv/Makefile.am index b5abf8279..bd0d156d2 100644 --- a/src/GEOM_I_Superv/Makefile.am +++ b/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 \ -# SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl +# additional information to compile and link file -# additionnal information to compil and link file -libGEOM_SupervEngine_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(QT_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(BOOST_CPPFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(srcdir)/../GEOMBase \ - -I$(srcdir)/../GEOMClient \ - -I$(srcdir)/../GEOMImpl \ - -I$(srcdir)/../GEOM \ - -I$(srcdir)/../GEOM_I \ - -I$(srcdir)/../GEOMAlgo \ - -I$(top_builddir)/idl \ +libGEOM_SupervEngine_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(QT_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ + $(BOOST_CPPFLAGS) \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + -I$(srcdir)/../GEOMGUI \ + -I$(srcdir)/../GEOMBase \ + -I$(srcdir)/../GEOMClient \ + -I$(srcdir)/../GEOMImpl \ + -I$(srcdir)/../GEOM \ + -I$(srcdir)/../GEOM_I \ + -I$(srcdir)/../GEOMAlgo \ + -I$(top_builddir)/idl \ -I$(top_builddir)/salome_adm/unix -libGEOM_SupervEngine_la_LDFLAGS = \ - $(CORBA_LIBS) \ +libGEOM_SupervEngine_la_LDFLAGS = \ + $(CORBA_LIBS) \ $(KERNEL_LDFLAGS) -lSalomeGenericObj -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -lSalomeDSClient \ $(STDLIB) diff --git a/src/GEOM_SWIG/Makefile.am b/src/GEOM_SWIG/Makefile.am index 040d500ce..04fbc0fe5 100644 --- a/src/GEOM_SWIG/Makefile.am +++ b/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= \ - geompy.py \ - geompyDC.py \ - batchmode_geompy.py \ - GEOM_Spanner.py \ - GEOM_blocks.py \ - GEOM_example.py \ - GEOM_example2.py \ - GEOM_example3.py \ - GEOM_example4.py \ - GEOM_example5.py \ - GEOM_example6.py \ - GEOM_moteur.py \ - GEOM_TestAll.py \ - GEOM_TestOthers.py \ - GEOM_TestHealing.py \ - GEOM_TestMeasures.py \ - GEOM_usinggeom.py \ - GEOM_Partition1.py \ - GEOM_Partition2.py \ - GEOM_Partition3.py \ - GEOM_Partition4.py \ - GEOM_Partition5.py \ - GEOM_cyl2complementary.py \ - GEOM_shellSolid.py \ - GEOM_tube_geom.py \ - GEOM_tube_geom_gg2.py \ - GEOM_Nut.py \ - GEOM_Sketcher.py \ - PAL_MESH_019_020_geometry.py \ - PAL_MESH_028_geometry.py \ - PAL_MESH_030_geometry.py \ - PAL_MESH_033_geometry.py \ +dist_salomescript_DATA = \ + geompy.py \ + geompyDC.py \ + batchmode_geompy.py \ + GEOM_Spanner.py \ + GEOM_blocks.py \ + GEOM_example.py \ + GEOM_example2.py \ + GEOM_example3.py \ + GEOM_example4.py \ + GEOM_example5.py \ + GEOM_example6.py \ + GEOM_moteur.py \ + GEOM_TestAll.py \ + GEOM_TestOthers.py \ + GEOM_TestHealing.py \ + GEOM_TestMeasures.py \ + GEOM_usinggeom.py \ + GEOM_Partition1.py \ + GEOM_Partition2.py \ + GEOM_Partition3.py \ + GEOM_Partition4.py \ + GEOM_Partition5.py \ + GEOM_cyl2complementary.py \ + GEOM_shellSolid.py \ + GEOM_tube_geom.py \ + GEOM_tube_geom_gg2.py \ + GEOM_Nut.py \ + GEOM_Sketcher.py \ + PAL_MESH_019_020_geometry.py \ + PAL_MESH_028_geometry.py \ + PAL_MESH_030_geometry.py \ + PAL_MESH_033_geometry.py \ PAL_MESH_035_geometry.py -sharedpkgpython_PYTHON = \ +sharedpkgpython_PYTHON = \ GEOM_shared_modules.py diff --git a/src/GEOM_SWIG_WITHIHM/Makefile.am b/src/GEOM_SWIG_WITHIHM/Makefile.am index e71593115..fe4232a9c 100644 --- a/src/GEOM_SWIG_WITHIHM/Makefile.am +++ b/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 -# /lib/python/site-package/salome. -# The library will be installed in the same place. +# The file libGEOM_Swig.py will be installed to the +# /bin/salome directory. +# The library _libGEOM_Swig.so will be installed to the +# /lib/python/site-package/salome directory. # -# this option puts it to dist -#BUILT_SOURCES = swig_wrap.cpp - -SWIG_FLAGS = \ - @SWIG_FLAGS@ \ - -I$(srcdir) \ - -I$(srcdir)/../GEOMGUI - +SWIG_FLAGS = @SWIG_FLAGS@ -I$(srcdir) -I$(srcdir)/../GEOMGUI SWIG_SOURCES = libGEOM_Swig.i -# Libraries targets -lib_LTLIBRARIES = libGEOM_Swigcmodule.la - -nodist_pkgpython_DATA = libGEOM_Swig.py +nodist_salomepython_DATA = libGEOM_Swig.py libGEOM_Swig.py: swig_wrap.cpp -libGEOM_Swigcmodule_la_SOURCES = \ - $(BUILT_SOURCES) \ - $(SWIG_SOURCES) - -nodist_libGEOM_Swigcmodule_la_SOURCES = swig_wrap.cpp - -#LIB_CLIENT_IDL = SALOMEDS.idl \ -# SALOMEDS_Attributes.idl \ -# SALOME_Exception.idl \ -# GEOM_Gen.idl \ -# SALOME_Component.idl \ -# SALOME_GenericObj.idl - -libGEOM_Swigcmodule_la_CPPFLAGS = \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(OGL_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ - $(GUI_CXXFLAGS) \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - -I$(srcdir)/../GEOMGUI \ - -I$(top_builddir)/idl \ +# Libraries targets +lib_LTLIBRARIES = _libGEOM_Swig.la +_libGEOM_Swig_la_SOURCES = $(SWIG_SOURCES) +nodist__libGEOM_Swig_la_SOURCES = swig_wrap.cpp +salomeinclude_HEADERS = $(SWIG_SOURCES) + +_libGEOM_Swig_la_CPPFLAGS = \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(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 = \ - ../GEOMGUI/libGEOM.la - - -libGEOM_Swigcmodule_la_LIBADD = \ +_libGEOM_Swig_la_LDFLAGS = -module +_libGEOM_Swig_la_LIBADD = \ + ../GEOMGUI/libGEOM.la \ $(PYTHON_LIBS) swig_wrap.cpp : $(SWIG_SOURCES) $(SWIG) $(SWIG_FLAGS) -o $@ $< -CLEANFILES = \ - swig_wrap.cpp +CLEANFILES = swig_wrap.cpp libGEOM_Swig.py # # =============================================================== @@ -116,12 +97,8 @@ CLEANFILES = \ # =============================================================== # -# Scripts to be installed. -dist_salomescript_DATA= \ - libGEOM_Swig.py - -install-exec-hook:\ - $(libdir)/_libGEOM_Swig.so +# Scripts to be installed (distributed) +dist_salomescript_DATA = -$(libdir)/_libGEOM_Swig.so: - ( cd $(libdir); ln -sf libGEOM_Swigcmodule.so _libGEOM_Swig.so; ) +# Scripts to be installed (non-distributed) +nodist_salomescript_DATA = diff --git a/src/GenerationGUI/Makefile.am b/src/GenerationGUI/Makefile.am index ffb186a43..43a954602 100644 --- a/src/GenerationGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libGenerationGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/GroupGUI/Makefile.am b/src/GroupGUI/Makefile.am index 06642987f..8f8a733b4 100755 --- a/src/GroupGUI/Makefile.am +++ b/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 - -# LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libGroupGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/IGESExport/Makefile.am b/src/IGESExport/Makefile.am index 8eb7a855d..e5adb8a18 100644 --- a/src/IGESExport/Makefile.am +++ b/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 -libIGESExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libIGESExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libIGESExport_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKIGES \ +libIGESExport_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKIGES \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/IGESImport/Makefile.am b/src/IGESImport/Makefile.am index 9675012eb..a62c02bef 100644 --- a/src/IGESImport/Makefile.am +++ b/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 -libIGESImport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libIGESImport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libIGESImport_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKIGES \ +libIGESImport_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKIGES \ $(KERNEL_LDFLAGS) -lSALOMELocalTrace diff --git a/src/Makefile.am b/src/Makefile.am index 6b26b5611..4537a83e9 100644 --- a/src/Makefile.am +++ b/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 diff --git a/src/MeasureGUI/Makefile.am b/src/MeasureGUI/Makefile.am index c916457c7..b9acafd3c 100644 --- a/src/MeasureGUI/Makefile.am +++ b/src/MeasureGUI/Makefile.am @@ -27,12 +27,7 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = - -# Libraries targets -lib_LTLIBRARIES = libMeasureGUI.la - -dist_libMeasureGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ 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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile 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 diff --git a/src/NMTAlgo/Makefile.am b/src/NMTAlgo/Makefile.am index 9968f3522..15ad1e995 100644 --- a/src/NMTAlgo/Makefile.am +++ b/src/NMTAlgo/Makefile.am @@ -30,34 +30,49 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - NMTAlgo_Splitter1.hxx \ - NMTAlgo_Splitter.hxx \ - NMTAlgo_Builder.hxx \ - NMTAlgo_Algo.hxx +salomeinclude_HEADERS = \ + NMTAlgo_Splitter1.hxx \ + NMTAlgo_Splitter1.ixx \ + NMTAlgo_Splitter1.jxx \ + 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 = \ - NMTAlgo_Algo.cxx \ - NMTAlgo_Builder.cxx \ - NMTAlgo_Loop3d.cxx \ - NMTAlgo_Splitter.cxx \ - NMTAlgo_Splitter1.cxx \ - NMTAlgo_Splitter_1.cxx \ - NMTAlgo_Splitter_2.cxx \ +dist_libNMTAlgo_la_SOURCES = \ + NMTAlgo_Algo.cxx \ + NMTAlgo_Builder.cxx \ + NMTAlgo_Loop3d.cxx \ + NMTAlgo_Splitter.cxx \ + NMTAlgo_Splitter1.cxx \ + NMTAlgo_Splitter_1.cxx \ + NMTAlgo_Splitter_2.cxx \ NMTAlgo_Tools.cxx -# additionnal information to compil and link file -libNMTAlgo_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ - -I$(srcdir)/../NMTDS \ +# additional information to compile and link file + +libNMTAlgo_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ + -I$(srcdir)/../NMTDS \ -I$(srcdir)/../NMTTools -libNMTAlgo_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBool -lTKBO \ - $(KERNEL_LDFLAGS) \ +libNMTAlgo_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_LDPATH) -lTKBool -lTKBO \ + $(KERNEL_LDFLAGS) \ ../NMTTools/libNMTTools.la diff --git a/src/NMTDS/Makefile.am b/src/NMTDS/Makefile.am index edc19fc65..19e749180 100644 --- a/src/NMTDS/Makefile.am +++ b/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 = \ - $(CAS_CPPFLAGS) \ +libNMTDS_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libNMTDS_la_LDFLAGS = \ - $(STDLIB) \ +libNMTDS_la_LDFLAGS = \ + $(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) diff --git a/src/NMTTools/Makefile.am b/src/NMTTools/Makefile.am index ecd125530..681cc9216 100644 --- a/src/NMTTools/Makefile.am +++ b/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 = \ - $(CAS_CPPFLAGS) \ - $(KERNEL_CXXFLAGS) \ +libNMTTools_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ + $(KERNEL_CXXFLAGS) \ -I$(srcdir)/../NMTDS -libNMTTools_la_LDFLAGS = \ - ../NMTDS/libNMTDS.la \ - $(STDLIB) \ - $(CAS_LDPATH) -lTKBool -lTKBO \ +libNMTTools_la_LDFLAGS = \ + ../NMTDS/libNMTDS.la \ + $(STDLIB) \ + $(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 diff --git a/src/OBJECT/Makefile.am b/src/OBJECT/Makefile.am index 88f780dda..ec4bbc11b 100644 --- a/src/OBJECT/Makefile.am +++ b/src/OBJECT/Makefile.am @@ -29,57 +29,62 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - GEOM_Actor.h \ - GEOM_AssemblyBuilder.h \ - GEOM_AISShape.hxx \ - Handle_GEOM_AISShape.hxx \ - GEOM_InteractiveObject.hxx \ - Handle_GEOM_InteractiveObject.hxx \ - GEOM_AISTrihedron.hxx \ - GEOM_VTKTrihedron.hxx \ - GEOM_AISVector.hxx \ - GEOM_OBJECT_defs.hxx \ - GEOM_SmartPtr.h \ - GEOM_DeviceActor.h \ - GEOM_EdgeSource.h \ - GEOM_FaceSource.h \ - GEOM_ShadingFace.h \ - GEOM_VertexSource.h \ +salomeinclude_HEADERS = \ + GEOM_Actor.h \ + GEOM_AssemblyBuilder.h \ + GEOM_AISShape.hxx \ + GEOM_AISShape.ixx \ + GEOM_AISShape.jxx \ + Handle_GEOM_AISShape.hxx \ + GEOM_InteractiveObject.hxx \ + GEOM_InteractiveObject.ixx \ + GEOM_InteractiveObject.jxx \ + Handle_GEOM_InteractiveObject.hxx \ + GEOM_AISTrihedron.hxx \ + GEOM_VTKTrihedron.hxx \ + GEOM_AISVector.hxx \ + GEOM_OBJECT_defs.hxx \ + GEOM_OCCReader.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 = \ - GEOM_Actor.cxx \ - GEOM_OCCReader.cxx \ - GEOM_AssemblyBuilder.cxx \ - GEOM_AISShape.cxx \ - GEOM_InteractiveObject.cxx \ - GEOM_AISTrihedron.cxx \ - GEOM_VTKTrihedron.cxx \ - GEOM_AISVector.cxx \ - GEOM_DeviceActor.cxx \ - GEOM_EdgeSource.cxx \ - GEOM_FaceSource.cxx \ - GEOM_ShadingFace.cxx \ - GEOM_VertexSource.cxx \ +dist_libGEOMObject_la_SOURCES = \ + GEOM_Actor.cxx \ + GEOM_OCCReader.cxx \ + GEOM_AssemblyBuilder.cxx \ + GEOM_AISShape.cxx \ + GEOM_InteractiveObject.cxx \ + GEOM_AISTrihedron.cxx \ + GEOM_VTKTrihedron.cxx \ + GEOM_AISVector.cxx \ + GEOM_DeviceActor.cxx \ + GEOM_EdgeSource.cxx \ + GEOM_FaceSource.cxx \ + GEOM_ShadingFace.cxx \ + GEOM_VertexSource.cxx \ GEOM_WireframeFace.cxx -libGEOMObject_la_CPPFLAGS = \ - $(CORBA_CXXFLAGS) \ - $(CORBA_INCLUDES) \ - $(QT_INCLUDES) \ - $(PYTHON_INCLUDES) \ - $(CAS_CPPFLAGS) \ - $(VTK_INCLUDES) \ - $(KERNEL_CXXFLAGS) \ +libGEOMObject_la_CPPFLAGS = \ + $(CORBA_CXXFLAGS) \ + $(CORBA_INCLUDES) \ + $(QT_INCLUDES) \ + $(PYTHON_INCLUDES) \ + $(CAS_CPPFLAGS) \ + $(VTK_INCLUDES) \ + $(KERNEL_CXXFLAGS) \ $(GUI_CXXFLAGS) -libGEOMObject_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ +libGEOMObject_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ $(GUI_LDFLAGS) -lqtx -lVTKViewer -lSVTK -lSalomeObject # $(CORBA_LIBS) \ # $(STDLIB) \ diff --git a/src/OperationGUI/Makefile.am b/src/OperationGUI/Makefile.am index 5fbae3e65..d92ee6493 100644 --- a/src/OperationGUI/Makefile.am +++ b/src/OperationGUI/Makefile.am @@ -27,20 +27,19 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = - -# Libraries targets -lib_LTLIBRARIES = libOperationGUI.la - -dist_libOperationGUI_la_SOURCES = \ +salomeinclude_HEADERS = \ OperationGUI.h \ OperationGUI_ArchimedeDlg.h \ OperationGUI_PartitionDlg.h \ - OperationGUI_GetShapesOnShapeDlg.h \ OperationGUI_FilletDlg.h \ OperationGUI_ChamferDlg.h \ - OperationGUI_ClippingDlg.h \ - \ + OperationGUI_GetShapesOnShapeDlg.h \ + OperationGUI_ClippingDlg.h + +# Libraries targets +lib_LTLIBRARIES = libOperationGUI.la + +dist_libOperationGUI_la_SOURCES = \ 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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile 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 diff --git a/src/PrimitiveGUI/Makefile.am b/src/PrimitiveGUI/Makefile.am index f919d9c2a..76ca2285e 100644 --- a/src/PrimitiveGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file libPrimitiveGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ diff --git a/src/RepairGUI/Makefile.am b/src/RepairGUI/Makefile.am index 6e9c46474..f6bd46485 100644 --- a/src/RepairGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile and link file -libRepairGUI_la_CPPFLAGS = \ +libRepairGUI_la_CPPFLAGS = \ $(QT_INCLUDES) \ $(VTK_INCLUDES) \ $(CAS_CPPFLAGS) \ diff --git a/src/SKETCHER/Makefile.am b/src/SKETCHER/Makefile.am index 92dde135b..bc6165be6 100644 --- a/src/SKETCHER/Makefile.am +++ b/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 -libGEOMSketcher_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libGEOMSketcher_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libGEOMSketcher_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ - $(CAS_KERNEL) \ +libGEOMSketcher_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ + $(CAS_KERNEL) \ $(CAS_MODELER) diff --git a/src/STEPExport/Makefile.am b/src/STEPExport/Makefile.am index 66467dfa7..4ac944c6c 100644 --- a/src/STEPExport/Makefile.am +++ b/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 -libSTEPExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libSTEPExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libSTEPExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ +libSTEPExport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ $(CAS_LDPATH) -lTKSTEP diff --git a/src/STEPImport/Makefile.am b/src/STEPImport/Makefile.am index 7fd6d51f3..4e987c227 100644 --- a/src/STEPImport/Makefile.am +++ b/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 -libSTEPImport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libSTEPImport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libSTEPImport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ +libSTEPImport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ $(CAS_LDPATH) -lTKSTEP diff --git a/src/STLExport/Makefile.am b/src/STLExport/Makefile.am index 9b358c0a3..2e734eea6 100644 --- a/src/STLExport/Makefile.am +++ b/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 -libSTLExport_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +# additional information to compile and link file + +libSTLExport_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libSTLExport_la_LDFLAGS = \ - $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ - $(STDLIB) \ +libSTLExport_la_LDFLAGS = \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(STDLIB) \ $(CAS_LDPATH) -lTKSTL diff --git a/src/ShHealOper/Makefile.am b/src/ShHealOper/Makefile.am index bb8409246..6e9859888 100644 --- a/src/ShHealOper/Makefile.am +++ b/src/ShHealOper/Makefile.am @@ -30,45 +30,45 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am # header files -salomeinclude_HEADERS = \ - ShHealOper_CloseContour.hxx \ - ShHealOper_EdgeDivide.hxx \ - ShHealOper_FillHoles.hxx \ - ShHealOper_RemoveFace.hxx \ - ShHealOper_RemoveInternalWires.hxx \ - ShHealOper_Sewing.hxx \ - ShHealOper_ShapeProcess.hxx \ - ShHealOper_SpiltCurve2d.hxx \ - ShHealOper_SplitCurve2d.hxx \ - ShHealOper_SplitCurve3d.hxx \ - ShHealOper_ChangeOrientation.hxx \ +salomeinclude_HEADERS = \ + ShHealOper_CloseContour.hxx \ + ShHealOper_EdgeDivide.hxx \ + ShHealOper_FillHoles.hxx \ + ShHealOper_RemoveFace.hxx \ + ShHealOper_RemoveInternalWires.hxx \ + ShHealOper_Sewing.hxx \ + ShHealOper_ShapeProcess.hxx \ + ShHealOper_SpiltCurve2d.hxx \ + ShHealOper_SplitCurve2d.hxx \ + ShHealOper_SplitCurve3d.hxx \ + ShHealOper_ChangeOrientation.hxx \ ShHealOper_Tool.hxx # Libraries targets lib_LTLIBRARIES = libShHealOper.la -dist_libShHealOper_la_SOURCES = \ - ShHealOper_CloseContour.cxx \ - ShHealOper_EdgeDivide.cxx \ - ShHealOper_FillHoles.cxx \ - ShHealOper_RemoveFace.cxx \ - ShHealOper_RemoveInternalWires.cxx \ - ShHealOper_Sewing.cxx \ - ShHealOper_ShapeProcess.cxx \ - ShHealOper_SplitCurve2d.cxx \ - ShHealOper_SplitCurve3d.cxx \ - ShHealOper_ChangeOrientation.cxx \ +dist_libShHealOper_la_SOURCES = \ + ShHealOper_CloseContour.cxx \ + ShHealOper_EdgeDivide.cxx \ + ShHealOper_FillHoles.cxx \ + ShHealOper_RemoveFace.cxx \ + ShHealOper_RemoveInternalWires.cxx \ + ShHealOper_Sewing.cxx \ + ShHealOper_ShapeProcess.cxx \ + ShHealOper_SplitCurve2d.cxx \ + ShHealOper_SplitCurve3d.cxx \ + ShHealOper_ChangeOrientation.cxx \ ShHealOper_Tool.cxx -# additionnal information to compil and link file +# additional information to compile and link file -libShHealOper_la_CPPFLAGS = \ - $(CAS_CPPFLAGS) \ +libShHealOper_la_CPPFLAGS = \ + $(CAS_CPPFLAGS) \ $(KERNEL_CXXFLAGS) -libShHealOper_la_LDFLAGS = \ - $(STDLIB) \ - $(CAS_KERNEL) \ - $(CAS_MATH) \ - $(CAS_TKTopAlgo) \ +libShHealOper_la_LDFLAGS = \ + $(STDLIB) \ + $(CAS_KERNEL) \ + $(CAS_MATH) \ + $(CAS_TKTopAlgo) \ $(CAS_LDPATH) -lTKBool -lTKShHealing -lTKLCAF diff --git a/src/TransformationGUI/Makefile.am b/src/TransformationGUI/Makefile.am index 0ac51b82a..c4f0206af 100644 --- a/src/TransformationGUI/Makefile.am +++ b/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 - -#LIB_SERVER_IDL = - -# additionnal information to compil and link file +# additional information to compile 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 = \ - ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ +libTransformationGUI_la_LDFLAGS = \ + ../GEOMFiltersSelection/libGEOMFiltersSelection.la \ ../GEOMBase/libGEOMBase.la -- 2.39.2