ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2025-02-04 22:14:17 +05:00
Code Issues Packages Projects Releases Wiki Activity

Mantis issue 0021668: [CEA 564] MED2.1 to MED2.3

Browse Source
This commit is contained in:
jfa 2012-08-09 11:15:15 +00:00
parent bd4e115a78
commit f190e6cfb1
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DriverMED/DriverMED_Family.cxx
View File

@ -357,9 +357,9 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper,
string aValue = aStr.str(); string aValue = aStr.str();
// PAL19785,0019867 - med forbids whitespace to be the last char in the name // PAL19785,0019867 - med forbids whitespace to be the last char in the name
int maxSize; int maxSize;
if ( theWrapper->GetVersion() == MED::eV2_1 ) //if ( theWrapper->GetVersion() == MED::eV2_1 )
maxSize = MED::GetNOMLength<MED::eV2_1>(); // maxSize = MED::GetNOMLength<MED::eV2_1>();
else //else
maxSize = MED::GetNOMLength<MED::eV2_2>(); maxSize = MED::GetNOMLength<MED::eV2_2>();
int lastCharPos = min( maxSize, (int) aValue.size() ) - 1; int lastCharPos = min( maxSize, (int) aValue.size() ) - 1;
while ( isspace( aValue[ lastCharPos ] )) while ( isspace( aValue[ lastCharPos ] ))

10
src/DriverMED/Makefile.am
View File

@ -15,15 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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
#
# SMESH DriverMED : driver to read and write 'med' files # SMESH DriverMED : driver to read and write 'med' files
# File : Makefile.in # File : Makefile.in
# Author : Marc Tajchman (CEA) # Author : Marc Tajchman (CEA)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SMESH # Module : SMESH
# $Header$
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files # header files
@ -62,7 +60,7 @@ libMeshDriverMED_la_CPPFLAGS = \
libMeshDriverMED_la_LDFLAGS = \ libMeshDriverMED_la_LDFLAGS = \
$(BOOST_LIBS) \ $(BOOST_LIBS) \
../Driver/libMeshDriver.la \ ../Driver/libMeshDriver.la \
$(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2
MED_Test_CPPFLAGS = \ MED_Test_CPPFLAGS = \
@ -80,6 +78,4 @@ MED_Test_LDADD = \
$(MED_LDFLAGS) \ $(MED_LDFLAGS) \
-lMEDWrapper \ -lMEDWrapper \
-lMEDWrapperBase \ -lMEDWrapperBase \
-lMEDWrapper_V2_2 \ -lMEDWrapper_V2_2
-lMEDWrapper_V2_1

5
src/SMESHClient/Makefile.am
View File

@ -15,14 +15,13 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # 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
#
# GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client # GEOM GEOMClient : tool to transfer BREP files from GEOM server to GEOM client
# File : Makefile.in # File : Makefile.in
# Author : Pavel TELKOV (OCC) # Author : Pavel TELKOV (OCC)
# Modified by : Alexander BORODIN (OCN) - autotools usage # Modified by : Alexander BORODIN (OCN) - autotools usage
# Module : SHESM # Module : SHESM
#
include $(top_srcdir)/adm_local/unix/make_common_starter.am include $(top_srcdir)/adm_local/unix/make_common_starter.am
# header files # header files
@ -69,7 +68,7 @@ libSMESHClient_la_LDFLAGS = \
$(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \
-lSalomeIDLKernel -lSALOMELocalTrace \ -lSalomeIDLKernel -lSALOMELocalTrace \
$(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \
$(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \ $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \
$(CAS_KERNEL) $(CAS_KERNEL)
SMESHClientBin_CPPFLAGS = \ SMESHClientBin_CPPFLAGS = \