From a856cb269854be043a0441a77db52c27df2b4644 Mon Sep 17 00:00:00 2001 From: nadir Date: Tue, 18 Nov 2003 09:11:34 +0000 Subject: [PATCH] merge with the branch br_for_V1_3_0_b1 (branch to build the V1_3_0 version of the module. --- adm_local/unix/make_commence.in | 28 +++++++++++++++------- doc/html/INPUT/HTML/Med_Gen.html | 2 +- doc/html/INPUT/doxyfile | 4 ++-- doc/html/Makefile.in | 3 ++- idl/MED.idl | 32 +++++++++++++++++++++----- src/MEDGUI/MED_icons.po | 31 +++++++++++++++++++++---- src/MEDGUI/MED_msg_en.po | 30 ++++++++++++++++++++---- src/MEDGUI/MED_msg_fr.po | 30 ++++++++++++++++++++---- src/MEDMEM_I/MEDMEM_Mesh_i.cxx | 3 ++- src/MedClient/src/COORDINATEClient.cxx | 1 - 10 files changed, 132 insertions(+), 32 deletions(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 6def7e777..12339b179 100644 --- a/adm_local/unix/make_commence.in +++ b/adm_local/unix/make_commence.in @@ -50,8 +50,11 @@ PYTHONHOME = @PYTHONHOME@ PYTHON_INCLUDES = @PYTHON_INCLUDES@ PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_VERSION = @PYTHON_VERSION@ -PYTHON_SITE = @PYTHON_SITE@ -PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +# Changes from the SalomePro V1.2c +#PYTHON_SITE = @PYTHON_SITE@ +#PYTHON_SITE_INSTALL = @PYTHON_SITE_INSTALL@ +PYTHON_SITE = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages +PYTHON_SITE_INSTALL = $(prefix)/lib/python$(PYTHON_VERSION)/site-packages/salome # QT @@ -104,12 +107,18 @@ MED2_MT_LIBS=@MED2_MT_LIBS@ OCC_INCLUDES=@CAS_CPPFLAGS@ OCC_CXXFLAGS=@CAS_CXXFLAGS@ -OCC_KERNEL_LIBS=@CAS_KERNEL@ -OCC_OCAF_LIBS=@CAS_OCAF@ -OCC_VIEWER_LIBS=@CAS_VIEWER@ -OCC_MODELER_LIBS=@CAS_MODELER@ -OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ -OCC_LIBS=@CAS_LDFLAGS@ +#OCC_KERNEL_LIBS=@CAS_KERNEL@ +#OCC_OCAF_LIBS=@CAS_OCAF@ +#OCC_VIEWER_LIBS=@CAS_VIEWER@ +#OCC_MODELER_LIBS=@CAS_MODELER@ +#OCC_DATAEXCHANGE_LIBS=@CAS_DATAEXCHANGE@ +#OCC_LIBS=@CAS_LDFLAGS@ +CAS_KERNEL=@CAS_KERNEL@ +CAS_OCAF=@CAS_OCAF@ +CAS_VIEWER=@CAS_VIEWER@ +CAS_MODELER=@CAS_MODELER@ +CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ +CAS_LDPATH=@CAS_LDPATH@ # MPICH @@ -167,6 +176,8 @@ CXXFLAGS+= $(CORBA_CXXFLAGS) #LDFLAGS+= $(CORBA_LIBS) LIBS+=$(CORBA_LIBS) +DOXYGEN = @DOXYGEN@ + ## Shared libraries LT_STATIC_EXEC=@LT_STATIC_EXEC@ DYNAMIC_DIRS=@DYNAMIC_DIRS@ @@ -197,6 +208,7 @@ includedir=@includedir@/salome datadir=@datadir@/salome idldir=$(prefix)/idl/salome sharedpydir=@libdir@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules +incmakedir=${prefix}/salome_adm/unix docdir=$(datadir)/doc diff --git a/doc/html/INPUT/HTML/Med_Gen.html b/doc/html/INPUT/HTML/Med_Gen.html index b3e7758e0..44b43940b 100644 --- a/doc/html/INPUT/HTML/Med_Gen.html +++ b/doc/html/INPUT/HTML/Med_Gen.html @@ -1,7 +1,7 @@ - + diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile index bce8b4633..a866cb0cc 100755 --- a/doc/html/INPUT/doxyfile +++ b/doc/html/INPUT/doxyfile @@ -3,7 +3,7 @@ #--------------------------------------------------------------------------- # General configuration options #--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME PRO - MED - v.1.2" +PROJECT_NAME = "SALOME - MED - v.1.3.0" PROJECT_NUMBER = id#1.1 OUTPUT_DIRECTORY = ../ OUTPUT_LANGUAGE = English @@ -57,7 +57,7 @@ WARN_LOGFILE = log.txt # configuration options related to the input files #--------------------------------------------------------------------------- INPUT = ../../../share/salome/idl/MED.idl \ - ../../../share/salome/idl/Med_Gen.idl + ../../../share/salome/idl/MED_Gen.idl FILE_PATTERNS = RECURSIVE = NO EXCLUDE = diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in index d52af4892..d364ac76d 100644 --- a/doc/html/Makefile.in +++ b/doc/html/Makefile.in @@ -6,6 +6,7 @@ # # source path top_srcdir=@top_srcdir@ +root_srcdir=@ROOT_SRCDIR@ top_builddir=../.. srcdir=@srcdir@ VPATH=.:@srcdir@ @@ -16,7 +17,7 @@ doxygen=@DOXYGEN@ doc: cp -fr $(srcdir)/INPUT ./; \ cd INPUT; \ - sed 's|../../../share/salome|../$(top_srcdir)|' doxyfile > doxyfile1; \ + sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \ mv -f doxyfile1 doxyfile; \ $(doxygen) ./doxyfile; \ cd ..; \ diff --git a/idl/MED.idl b/idl/MED.idl index fd0cc5ac6..a1b0893c4 100644 --- a/idl/MED.idl +++ b/idl/MED.idl @@ -79,17 +79,26 @@ a %Mesh. const medEntityMesh MED_NODE = 3; const medEntityMesh MED_ALL_ENTITIES = 4; +/*! +This enumeration contains a set of mode to store data in an array. +For example an array of coordinates in 3D tow storage may be considered: + - X1,Y1,Z1,X2,Y2,...,Zn if MED_FULL_INTERLACE + - X1,X2,...Xn,Y1,Y2,...Zn if MED_NO_INTERLACE +*/ typedef long medModeSwitch; const medModeSwitch MED_FULL_INTERLACE = 0; const medModeSwitch MED_NO_INTERLACE = 1; +/*! +This enumeration contains a set of elements defining the type of connectivity. +*/ typedef long medConnectivity; const medConnectivity MED_NODAL = 0; const medConnectivity MED_DESCENDING = 1; /*! - enumeration contains a set of elements difining the type of driver. + enumeration contains a set of elements defining the type of driver. */ typedef long medDriverTypes; /*!medGeometryElement */ typedef sequence medGeometryElement_array; + /*! An array of %FAMILY */ typedef sequence Family_array; + /*! An array of %GROUP */ @@ -169,9 +180,7 @@ a %Mesh. long getNumberOfNodes() raises (SALOME::SALOME_Exception); /*! - Returns an array of coordinates : - - X1,Y1,Z1,X2,Y2,...,Zn if MED_FULL_INTERLACE - - X1,X2,...Xn,Y1,Y2,...Zn if MED_NO_INTERLACE + Returns an array of coordinates stored in any type */ SALOME_MED::double_array getCoordinates(in medModeSwitch typeSwitch) raises (SALOME::SALOME_Exception); @@ -204,11 +213,22 @@ a %Mesh. SALOME_MED::string_array getCoordinatesUnits() raises (SALOME::SALOME_Exception); - SUPPORT getBoundaryElements(in medEntityMesh Entity) - raises (SALOME::SALOME_Exception); + /*! + Returns the SUPPORT containing the boundary elements + of the mesh. + */ + + SUPPORT getBoundaryElements(in medEntityMesh Entity) + raises (SALOME::SALOME_Exception); + + /*! + Returns the SUPPORT containing the boundary elements + of the support mySupport3D. + */ SUPPORT getSkin(in SUPPORT mySupport3D ) raises (SALOME::SALOME_Exception); SALOME_MED::long_array getGlobalNumberingIndex(in medEntityMesh entity) ; + struct coordinateInfos { string coordSystem; diff --git a/src/MEDGUI/MED_icons.po b/src/MEDGUI/MED_icons.po index e1121dcdf..2aefa196f 100644 --- a/src/MEDGUI/MED_icons.po +++ b/src/MEDGUI/MED_icons.po @@ -1,7 +1,29 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". +# MED MEDGUI : MED component GUI implemetation +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : MedGUI_icons.po +# Module : MED + msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" @@ -10,3 +32,4 @@ msgstr "" "Last-Translator: FULLNAME \n" "Content-Type: text/plain; charset=iso-8859-1\n" +< \ No newline at end of file diff --git a/src/MEDGUI/MED_msg_en.po b/src/MEDGUI/MED_msg_en.po index 429a86caa..fdf99dfb5 100644 --- a/src/MEDGUI/MED_msg_en.po +++ b/src/MEDGUI/MED_msg_en.po @@ -1,7 +1,29 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". +# MED MEDGUI : MED component GUI implemetation +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : MED_msg_en.po +# Module : MED + msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" diff --git a/src/MEDGUI/MED_msg_fr.po b/src/MEDGUI/MED_msg_fr.po index ed84d64c4..3ad78ec6d 100644 --- a/src/MEDGUI/MED_msg_fr.po +++ b/src/MEDGUI/MED_msg_fr.po @@ -1,7 +1,29 @@ -# This is a Qt message file in .po format. Each msgid starts with -# a scope. This scope should *NOT* be translated - eg. translating -# from French to English, "Foo::Bar" would be translated to "Pub", -# not "Foo::Pub". +# MED MEDGUI : MED component GUI implemetation +# +# 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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org +# +# +# +# File : MED_msg_fr.po +# Module : MED + msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" diff --git a/src/MEDMEM_I/MEDMEM_Mesh_i.cxx b/src/MEDMEM_I/MEDMEM_Mesh_i.cxx index 97abcd905..e42e214b3 100644 --- a/src/MEDMEM_I/MEDMEM_Mesh_i.cxx +++ b/src/MEDMEM_I/MEDMEM_Mesh_i.cxx @@ -516,7 +516,8 @@ MESSAGE("MED_NODAL"); const int * tab=_mesh->getConnectivityIndex( convertIdlConnToMedConn(mode), convertIdlEntToMedEnt(entity)); - nbelements = tab[elt1 ] - 1 ; + nbelements = elt1*(convertIdlEltToMedElt(geomElement)%100); + // nbelements = tab[elt1 ] - 1 ; } SCRUTE(entity); SCRUTE(geomElement); diff --git a/src/MedClient/src/COORDINATEClient.cxx b/src/MedClient/src/COORDINATEClient.cxx index 428ba09ff..2c8aa6ca9 100644 --- a/src/MedClient/src/COORDINATEClient.cxx +++ b/src/MedClient/src/COORDINATEClient.cxx @@ -1,4 +1,3 @@ -#define _DEBUG_ #include "COORDINATEClient.hxx" #include #include "UtilClient.hxx" -- 2.39.2
interface Med_Gen
interface MED_Gen
IDL file
Python