From: jfa Date: Fri, 7 Mar 2008 07:44:38 +0000 (+0000) Subject: Join modifications from BR_Dev_For_4_0 tag V4_1_1. X-Git-Tag: V4_1_2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=165b38ae585eab5ca1d9c7bed200d01331307df9;p=tools%2Fmedcoupling.git Join modifications from BR_Dev_For_4_0 tag V4_1_1. --- diff --git a/doc/MEDMEM/HOWTO Create A New Driver.txt b/doc/MEDMEM/HOWTO Create A New Driver.txt deleted file mode 100644 index 660f6266c..000000000 --- a/doc/MEDMEM/HOWTO Create A New Driver.txt +++ /dev/null @@ -1,40 +0,0 @@ -Within MEDMEM_GenDriver.hxx : - /* Modify the following line to add a new driver type (step 1) */ - typedef enum { MED_DRIVER = 0, GIBI_DRIVER = 1, VTK_DRIVER = 254, NO_DRIVER = 255 } driverTypes; - -Note : MED Drivers with no Mesh or Field drivers must have a number of 255-i ! - -Within MEDMEM_Object.hxx - // Add your personnal driver header & line (step 2) - // At least one line must exist - // You have to respect the syntax. - #include "MEDMEM_TypeObjectDriver.hxx" - - friend class MED_OBJECT_RDONLY_DRIVER; - friend class MED_OBJECT_WRONLY_DRIVER; - friend class MED_OBJECT_RDWR_DRIVER; - - // Add a similar line for your personnal driver (step 3) - static INSTANCE_DE inst_med ; - -Within MEDMEM_Object.cxx - // Add a similar line for your personnal driver (step 3) - static INSTANCE_DE inst_med ; - - // Add your own driver in the driver list (step 4) - // Note the list must be coherent with the driver type list defined in MEDMEM_DRIVER.hxx. - const OBJECT::INSTANCE * const OBJECT::instances[] = { &OBJECT::inst_med } ; - -Within MEDMEM_TypeObjectDriver.hxx (ypu can use MEDMEM_TypeObjectDriver.hxx as a pattern for your driver !) - - // Faux : you have to create at least create a TYPE_OBJECT_RDWR_DRIVER even if it only throw an exception - // Faux : because RDONLY or WRONLY doesn't exists. - - Whatever is your driver : RDONLY,WRONLY,RDWR, you must inplement the write & read methods ( even if it only throw an exception) - -TODO : - -Gerer l'appartenance d'un driver type 3 Within l'objet - -Within les méthodes addDriver : - driver = instances[driverType]->run(fileName, this) ; --> Il faut vérifier que le numéro auquel on accède existe ! diff --git a/doc/MEDMEM/HOWTO_Create_A_New_Driver.txt b/doc/MEDMEM/HOWTO_Create_A_New_Driver.txt new file mode 100644 index 000000000..660f6266c --- /dev/null +++ b/doc/MEDMEM/HOWTO_Create_A_New_Driver.txt @@ -0,0 +1,40 @@ +Within MEDMEM_GenDriver.hxx : + /* Modify the following line to add a new driver type (step 1) */ + typedef enum { MED_DRIVER = 0, GIBI_DRIVER = 1, VTK_DRIVER = 254, NO_DRIVER = 255 } driverTypes; + +Note : MED Drivers with no Mesh or Field drivers must have a number of 255-i ! + +Within MEDMEM_Object.hxx + // Add your personnal driver header & line (step 2) + // At least one line must exist + // You have to respect the syntax. + #include "MEDMEM_TypeObjectDriver.hxx" + + friend class MED_OBJECT_RDONLY_DRIVER; + friend class MED_OBJECT_WRONLY_DRIVER; + friend class MED_OBJECT_RDWR_DRIVER; + + // Add a similar line for your personnal driver (step 3) + static INSTANCE_DE inst_med ; + +Within MEDMEM_Object.cxx + // Add a similar line for your personnal driver (step 3) + static INSTANCE_DE inst_med ; + + // Add your own driver in the driver list (step 4) + // Note the list must be coherent with the driver type list defined in MEDMEM_DRIVER.hxx. + const OBJECT::INSTANCE * const OBJECT::instances[] = { &OBJECT::inst_med } ; + +Within MEDMEM_TypeObjectDriver.hxx (ypu can use MEDMEM_TypeObjectDriver.hxx as a pattern for your driver !) + + // Faux : you have to create at least create a TYPE_OBJECT_RDWR_DRIVER even if it only throw an exception + // Faux : because RDONLY or WRONLY doesn't exists. + + Whatever is your driver : RDONLY,WRONLY,RDWR, you must inplement the write & read methods ( even if it only throw an exception) + +TODO : + +Gerer l'appartenance d'un driver type 3 Within l'objet + +Within les méthodes addDriver : + driver = instances[driverType]->run(fileName, this) ; --> Il faut vérifier que le numéro auquel on accède existe ! diff --git a/doc/MEDMEM/Makefile.am b/doc/MEDMEM/Makefile.am new file mode 100644 index 000000000..daf99a22e --- /dev/null +++ b/doc/MEDMEM/Makefile.am @@ -0,0 +1,43 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST += \ + FIELDcreate.cxx \ + FIELDcreate.py \ + FIELDgeneral.cxx \ + FIELDgeneral.py \ + HOWTO_Create_A_New_Driver.txt \ + MEDMEM_InvokingDriverAtObjectCreationTime.cxx \ + MEDMEM_InvokingDriverAtObjectCreationTime.py \ + MEDMEM_InvokingDriverByAttachingItToAnObject.cxx \ + MEDMEM_InvokingDriverByAttachingItToAnObject.py \ + MEDMEM_InvokingDriverFromStandardObjectMethod.cxx \ + MEDMEM_InvokingDriverFromStandardObjectMethod.py \ + MEDMEM_MedAddingAnExistingObject.cxx \ + MEDMEM_UsersGuide.lyx \ + MESHconnectivities.cxx \ + MESHconnectivities.py \ + MESHcoordinates.cxx \ + MESHcoordinates.py \ + MESHgeneral.cxx \ + MESHgeneral.py \ + MESHINGexample.cxx \ + MESHINGexample.py \ + TODO_Drivers.txt diff --git a/doc/MEDMEM/Makefile.in b/doc/MEDMEM/Makefile.in deleted file mode 100644 index ed7de656f..000000000 --- a/doc/MEDMEM/Makefile.in +++ /dev/null @@ -1,175 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# -# -* Makefile *- -# -# Author : Nadir BOUHAMOU (CEA) -# - -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -# Executables targets -BIN = MESHgeneral MESHcoordinates MESHconnectivities MESHINGexample FIELDcreate FIELDgeneral MEDMEM_InvokingDriverByAttachingItToAnObject MEDMEM_InvokingDriverFromStandardObjectMethod MEDMEM_InvokingDriverAtObjectCreationTime - -LDFLAGS+= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome -LDFLAGSFORBIN+= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome - -CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) - -CXXFLAGS+=@CXXTMPDPTHFLAGS@ -#LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -# change motivated by the bug KERNEL4778. -LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lmedmem -lmed_V2_1 $(STDLIB) - -#LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -# change motivated by the bug KERNEL4778. -LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lmedmem -lmed_V2_1 - -ifeq ($(MED_WITH_KERNEL),yes) - CPPFLAGS+= ${KERNEL_CXXFLAGS} - CXXFLAGS+= ${KERNEL_CXXFLAGS} - LDFLAGS+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace - LDFLAGSFORBIN+= ${KERNEL_LDFLAGS} -lSALOMELocalTrace -lSALOMEBasics -endif - -LIBSFORBIN= - -LIBS= - -@CONCLUDE@ - -doc: .doxygen_user .doxygen_devel ps - -ps: .doxygen_user .doxygen_devel MedMemory_user.ps MedMemory_devel.ps MEDMEM_UsersGuide.ps - -ps_2on1: .doxygen_user .doxygen_devel MedMemory_user_2on1.ps MedMemory_devel_2on1.ps MEDMEM_UsersGuide_2on1.ps - -pdf: .doxygen_user .doxygen_devel MedMemory_user.pdf MedMemory_devel.pdf MEDMEM_UsersGuide.pdf - -pdf_2on1: .doxygen_user .doxygen_devel MedMemory_user_2on1.pdf MedMemory_devel_2on1.pdf MEDMEM_UsersGuide_2on1.pdf - -# user doc : - -.doxygen_user: $(top_srcdir)/src/MEDMEM/Doxyfile_med_user.in - cd $(top_builddir) ; ./config.status - cd $(top_builddir)/src/MEDMEM && $(doxygen) Doxyfile_med_user - touch $@ - $(RM) -r doc_ref_user - ln -s $(top_builddir)/src/MEDMEM/doc_ref_user doc_ref_user - -MedMemory_user.ps: - cd ./doc_ref_user/latex && $(MAKE) ps - cp -f ./doc_ref_user/latex/refman.ps $@ - -MedMemory_user_2on1.ps: - cd ./doc_ref_user/latex && $(MAKE) ps_2on1 - cp -f ./doc_ref_user/latex/refman_2on1.ps $@ - -MedMemory_user.pdf: - cd ./doc_ref_user/latex && $(MAKE) pdf - cp -f ./doc_ref_user/latex/refman.pdf $@ - -MedMemory_user_2on1.pdf: - cd ./doc_ref_user/latex && $(MAKE) pdf_2on1 - cp -f ./doc_ref_user/latex/refman_2on1.pdf $@ - -# developper doc - -.doxygen_devel: $(top_srcdir)/src/MEDMEM/Doxyfile_med_devel.in - cd $(top_builddir) ; ./config.status - cd $(top_builddir)/src/MEDMEM && $(doxygen) Doxyfile_med_devel - touch $@ - $(RM) -r doc_ref_devel - ln -s $(top_builddir)/src/MEDMEM/doc_ref_devel doc_ref_devel - -MedMemory_devel.ps: - cd ./doc_ref_devel/latex && $(MAKE) ps - cp -f ./doc_ref_devel/latex/refman.ps $@ - -MedMemory_devel_2on1.ps: - cd ./doc_ref_devel/latex && $(MAKE) ps_2on1 - cp -f ./doc_ref_devel/latex/refman_2on1.ps $@ - -MedMemory_devel.pdf: - cd ./doc_ref_devel/latex && $(MAKE) pdf - cp -f ./doc_ref_devel/latex/refman.pdf $@ - -MedMemory_devel_2on1.pdf: - cd ./doc_ref_devel/latex && $(MAKE) pdf_2on1 - cp -f ./doc_ref_devel/latex/refman_2on1.pdf $@ - -# User Guide - -MEDMEM_UsersGuide.ps: MEDMEM_UsersGuide.pdf - pdf2ps MEDMEM_UsersGuide.pdf MEDMEM_UsersGuide.ps - -MEDMEM_UsersGuide_2on1.ps: MEDMEM_UsersGuide.ps - psnup -2 MEDMEM_UsersGuide.ps >MEDMEM_UsersGuide_2on1.ps - -MEDMEM_UsersGuide_2on1.pdf: MEDMEM_UsersGuide_2on1.ps - ps2pdf MEDMEM_UsersGuide_2on1.ps MEDMEM_UsersGuide_2on1.pdf - -MEDMEM_UsersGuide.pdf: MEDMEM_UsersGuide.tex MEDMEM_Content.tex MEDMEM_UML_light.png MEDMEM_UML.png FIELDcreate.cxx FIELDgeneral.cxx MEDMEM_InvokingDriverAtObjectCreationTime.cxx MEDMEM_InvokingDriverByAttachingItToAnObject.cxx MEDMEM_InvokingDriverFromStandardObjectMethod.cxx MEDMEM_MedAddingAnExistingObject.cxx MESHconnectivities.cxx MESHcoordinates.cxx MESHgeneral.cxx MESHINGexample.cxx FIELDcreate.py FIELDgeneral.py MEDMEM_InvokingDriverAtObjectCreationTime.py MEDMEM_InvokingDriverByAttachingItToAnObject.py MEDMEM_InvokingDriverFromStandardObjectMethod.py MESHconnectivities.py MESHcoordinates.py MESHgeneral.py MESHINGexample.py - echo "Running pdflatex..." - pdflatex $< - #echo "Running makeindex..." - #makeindex MEDMEM_UsersGuide.idx - echo "Rerunning latex...." - pdflatex $< - latex_count=5 - while egrep -s 'Rerun (LaTeX|to get cross-references right)' MEDMEM_UsersGuide.log && [ $latex_count -gt 0 ] ;\ - do \ - echo "Rerunning latex...." ;\ - latex $< ;\ - latex_count=`expr $latex_count - 1` ;\ - done - -MEDMEM_UsersGuide.tex:MEDMEM_UsersGuide.tex.in - cd $(top_builddir) && CONFIG_FILES=./doc/MEDMEM/MEDMEM_UsersGuide.tex ./config.status - -MEDMEM_Content.tex:MEDMEM_Content.tex.in - cd $(top_builddir) && CONFIG_FILES=./doc/MEDMEM/MEDMEM_Content.tex ./config.status - -MEDMEM_UML_light.png:MEDMEM_UML_light.png.in - cd $(top_builddir) && CONFIG_FILES=./doc/MEDMEM/MEDMEM_UML_light.png ./config.status - -MEDMEM_UML.png:MEDMEM_UML.png.in - cd $(top_builddir) && CONFIG_FILES=./doc/MEDMEM/MEDMEM_UML.png ./config.status - -# install procedure - -install: $(datadir)/doc ps_2on1 pdf_2on1 - $(RM) -r $(datadir)/doc/html_ref_user $(datadir)/doc/html_ref_devel $(datadir)/doc/*.ps $(datadir)/doc/*.pdf - cp -rf ./doc_ref_user/html $(datadir)/doc/html_ref_user - cp -rf ./doc_ref_devel/html $(datadir)/doc/html_ref_devel - cp -f MedMemory_user_2on1.ps MedMemory_user_2on1.pdf $(datadir)/doc - cp -f MEDMEM_UsersGuide_2on1.ps MEDMEM_UsersGuide_2on1.pdf $(datadir)/doc - cp -f MedMemory_devel_2on1.ps MedMemory_devel_2on1.pdf $(datadir)/doc - -$(datadir)/doc: - $(INSTALL) -d $@ && chmod 755 $@ - -cleandoc: - -$(RM) -r *pdf *ps doc_ref_* $(top_builddir)/src/MEDMEM/doc_ref_* .dep* diff --git a/doc/MEDMEM/TODO Drivers.txt b/doc/MEDMEM/TODO Drivers.txt deleted file mode 100644 index d6cd93c78..000000000 --- a/doc/MEDMEM/TODO Drivers.txt +++ /dev/null @@ -1,4 +0,0 @@ -1- Gerer l'appartenance d'un driver type 3 Within l'objet - -2- Within les méthodes addDriver : - driver = instances[driverType]->run(fileName, this) ; --> Il faut vérifier que le numéro auquel on accède existe ! diff --git a/doc/MEDMEM/TODO_Drivers.txt b/doc/MEDMEM/TODO_Drivers.txt new file mode 100644 index 000000000..d6cd93c78 --- /dev/null +++ b/doc/MEDMEM/TODO_Drivers.txt @@ -0,0 +1,4 @@ +1- Gerer l'appartenance d'un driver type 3 Within l'objet + +2- Within les méthodes addDriver : + driver = instances[driverType]->run(fileName, this) ; --> Il faut vérifier que le numéro auquel on accède existe ! diff --git a/doc/Makefile.am b/doc/Makefile.am new file mode 100644 index 000000000..735b5fa53 --- /dev/null +++ b/doc/Makefile.am @@ -0,0 +1,22 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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 +# + +SUBDIRS= MEDMEM salome + +EXTRA_DIST= html diff --git a/doc/Makefile.in b/doc/Makefile.in deleted file mode 100644 index c54fc262b..000000000 --- a/doc/Makefile.in +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# - -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= salome - -@COMMENCE@ - -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done -clean: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -install: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done diff --git a/doc/html/INPUT/sources/doxygen.css b/doc/html/INPUT/sources/doxygen.css index 6e2c772fe..acda4606c 100755 --- a/doc/html/INPUT/sources/doxygen.css +++ b/doc/html/INPUT/sources/doxygen.css @@ -15,7 +15,8 @@ TD.mdname1 { background-color: lightblue; font-weight: bold; color: #602020; } TD.mdname { background-color: lightblue; font-weight: bold; color: #602020; width: 600px; } DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { background: url(sources/bg_salomepro.gif) } +BODY { background: #FFFFFF; } +/* BODY { background: url(sources/bg_salomepro.gif) } */ TD.indexkey { background-color: #CCCCCC; font-weight: bold; diff --git a/doc/html/INPUT/sources/static/doxygen.css b/doc/html/INPUT/sources/static/doxygen.css index 0a8e93d50..056702051 100755 --- a/doc/html/INPUT/sources/static/doxygen.css +++ b/doc/html/INPUT/sources/static/doxygen.css @@ -15,7 +15,8 @@ TD.mdname1 { background-color: lightblue; font-weight: bold; color: #602020; } TD.mdname { background-color: lightblue; font-weight: bold; color: #602020; width: 600px; } DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { background: url(sources/bg_salome.gif) } +BODY { background: #FFFFFF; } +/* BODY { background: url(sources/bg_salome.gif) } */ TD.indexkey { background-color: #CCCCCC; font-weight: bold; diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in deleted file mode 100644 index 36943e852..000000000 --- a/doc/html/Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# -# -* Makefile *- -# -# Author : Vasily Rusyaev (Open Cascade NN) -# Date : 13/02/2003 -# $Header: -# -# source path -top_srcdir=@top_srcdir@ -root_srcdir=@ROOT_SRCDIR@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -doc: - cp -fr $(srcdir)/INPUT ./; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - cp -fr $(srcdir)/INPUT/sources/static/*.* ./html/ - cp -fr $(srcdir)/INPUT/sources/ html/ - cp -fr $(srcdir)/INPUT/HTML/ html/ - -clean: - rm -rf html - -distclean: clean - rm -rf INPUT - -install: - $(INSTALL) -d $(docdir); \ - cp -rf html $(docdir) - -uninstall: - rm -rf $(docdir)/html diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am new file mode 100644 index 000000000..1bfebe55b --- /dev/null +++ b/doc/salome/Makefile.am @@ -0,0 +1,32 @@ +# 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 +# + +# -* Makefile *- +# +# Author : Patrick GOLDBRONN (CEA) +# Date : 30/11/2001 +# $Header$ +# + +SUBDIRSTUI= tui + +dev_docs: + @@SETX@; for d in $(SUBDIRSTUI); do \ + (cd $$d && $(MAKE) $@) || exit 1; \ + done; diff --git a/doc/salome/Makefile.in b/doc/salome/Makefile.in deleted file mode 100644 index c88e71139..000000000 --- a/doc/salome/Makefile.in +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG -# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT -# 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 -# - -# -* Makefile *- -# -# Author : Patrick GOLDBRONN (CEA) -# Date : 30/11/2001 -# $Header$ -# -# source path -top_srcdir=@top_srcdir@ -top_builddir=../.. -srcdir=@srcdir@ -VPATH=.:@srcdir@ - -SUBDIRS= tui - -@COMMENCE@ - -dev_docs: - @@SETX@; for d in $(SUBDIRS); do \ - (cd $$d && $(MAKE) $@) || exit 1; \ - done; \ - -clean: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -distclean: clean - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done - -install: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@); \ - fi; \ - done - -uninstall: - @@SETX@; for d in $(SUBDIRS); do \ - if test -d $$d/MED; then \ - (cd $$d && $(MAKE) $@) || exit 1; \ - fi; \ - done; \ diff --git a/doc/salome/tui/MED/Makefile.am b/doc/salome/tui/MED/Makefile.am new file mode 100644 index 000000000..e0b08cffa --- /dev/null +++ b/doc/salome/tui/MED/Makefile.am @@ -0,0 +1,15 @@ +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = sources +EXTRA_DIST += HTML + +#doctuidir= $(docdir)/tui/MED +#nodist_doctui_DATA= doxyfile + +#doctuistaticdir= $(docdir)/tui/MED/sources/static +#nodist_doctuistatic_DATA= MED/sources/static/tree.js diff --git a/doc/salome/tui/MED/sources/Application-About.png b/doc/salome/tui/MED/sources/Application-About.png index 7b58330d5..df0d5a187 100755 Binary files a/doc/salome/tui/MED/sources/Application-About.png and b/doc/salome/tui/MED/sources/Application-About.png differ diff --git a/doc/salome/tui/MED/sources/Makefile.am b/doc/salome/tui/MED/sources/Makefile.am new file mode 100644 index 000000000..db3b477a8 --- /dev/null +++ b/doc/salome/tui/MED/sources/Makefile.am @@ -0,0 +1,24 @@ +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = static +EXTRA_DIST += \ + Application-About1.jpg \ + Application-About.png \ + application.gif \ + application.jpg \ + bg_salome.gif \ + footer.html \ + logocorp.gif \ + myheader.html \ + occ.gif + +#doctuidir= $(docdir)/tui/MED +#nodist_doctui_DATA= doxyfile + +#doctuistaticdir= $(docdir)/tui/MED/sources/static +#nodist_doctuistatic_DATA= MED/sources/static/tree.js diff --git a/doc/salome/tui/MED/sources/static/Makefile.am b/doc/salome/tui/MED/sources/static/Makefile.am new file mode 100644 index 000000000..42b89594a --- /dev/null +++ b/doc/salome/tui/MED/sources/static/Makefile.am @@ -0,0 +1,17 @@ +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +EXTRA_DIST += \ + doxygen.css \ + page2.html \ + treeview.js + +#doctuidir= $(docdir)/tui/MED +#nodist_doctui_DATA= doxyfile + +#doctuistaticdir= $(docdir)/tui/MED/sources/static +#nodist_doctuistatic_DATA= MED/sources/static/tree.js diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am new file mode 100644 index 000000000..e1cf0f083 --- /dev/null +++ b/doc/salome/tui/Makefile.am @@ -0,0 +1,40 @@ +# Copyright (C) 2003 CEA/DEN, EDF R&D +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +SUBDIRS = MED +#EXTRA_DIST+= MED + +dev_docs: + cp -fr $(srcdir)/MED ./INPUT; \ + cp -fr ./MED/doxyfile ./INPUT; \ + cp -fr ./MED/sources/static/tree.js ./INPUT/sources/static; \ + 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; \ + mv -f doxyfile1 doxyfile; \ + $(DOXYGEN) ./doxyfile; \ + cd ..; \ + cp -fr $(srcdir)/MED/sources/static/*.* ./MED/ + cp -fr $(srcdir)/MED/sources/ MED/ + cp -fr $(srcdir)/MED/HTML/ MED/ + rm -fr INPUT + +#doctuidir= $(docdir)/tui/MED +#nodist_doctui_DATA= MED/doxyfile + +#doctuistaticdir= $(docdir)/tui/MED/sources/static +#nodist_doctuistatic_DATA= MED/sources/static/tree.js diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in deleted file mode 100644 index 8c85f6e65..000000000 --- a/doc/salome/tui/Makefile.in +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# File : Makefile.in -# Author : Vasily Rusyaev (Open Cascade NN) -# Module : doc -# $Header: - -top_srcdir=@top_srcdir@ -top_builddir=../../.. -root_srcdir=@ROOT_SRCDIR@ -srcdir=@srcdir@ -VPATH=.:@srcdir@ -doxygen=@DOXYGEN@ - -@COMMENCE@ - -dev_docs: - cp -fr $(srcdir)/MED ./INPUT; \ - cp -fr ./MED/doxyfile ./INPUT; \ - cp -fr ./MED/sources/static/tree.js ./INPUT/sources/static; \ - cd INPUT; \ - sed 's|../../../share/salome|$(root_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; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - cd ..; \ - cp -fr $(srcdir)/MED/sources/static/*.* ./MED/ - cp -fr $(srcdir)/MED/sources/ MED/ - cp -fr $(srcdir)/MED/HTML/ MED/ - rm -fr INPUT - -clean: - rm -fr MED - -distclean: clean - rm -fr INPUT - -install: - $(INSTALL) -d $(docdir); \ - mkdir -p $(docdir)/tui - cp -fr MED $(docdir)/tui - -uninstall: - rm -fr $(docdir)/tui/MED diff --git a/src/MEDMEM/DataTest/Data/pointe.med b/src/MEDMEM/DataTest/Data/pointe.med index 430a74bd6..0dbc1e8fb 100644 Binary files a/src/MEDMEM/DataTest/Data/pointe.med and b/src/MEDMEM/DataTest/Data/pointe.med differ diff --git a/src/MedClient/test/resources/pointe.med b/src/MedClient/test/resources/pointe.med index 430a74bd6..0dbc1e8fb 100644 Binary files a/src/MedClient/test/resources/pointe.med and b/src/MedClient/test/resources/pointe.med differ