From 33459aac4f00ea33156d034d70851dd5d6503bba Mon Sep 17 00:00:00 2001 From: eap Date: Mon, 11 Apr 2011 07:50:58 +0000 Subject: [PATCH] med-2.1 file no longer supported --- src/DriverMED/DriverMED_Family.cxx | 6 +++--- src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx | 6 +++--- src/DriverMED/Makefile.am | 4 +--- src/SMESHClient/Makefile.am | 2 +- src/SMESHGUI/SMESHGUI.cxx | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/DriverMED/DriverMED_Family.cxx b/src/DriverMED/DriverMED_Family.cxx index 0f0f5709f..f8e91f956 100644 --- a/src/DriverMED/DriverMED_Family.cxx +++ b/src/DriverMED/DriverMED_Family.cxx @@ -329,9 +329,9 @@ DriverMED_Family::GetFamilyInfo(const MED::PWrapper& theWrapper, string aValue = aStr.str(); // PAL19785,0019867 - med forbids whitespace to be the last char in the name int maxSize; - if ( theWrapper->GetVersion() == MED::eV2_1 ) - maxSize = MED::GetNOMLength(); - else +// if ( theWrapper->GetVersion() == MED::eV2_1 ) +// maxSize = MED::GetNOMLength(); +// else maxSize = MED::GetNOMLength(); int lastCharPos = min( maxSize, (int) aValue.size() ) - 1; while ( isspace( aValue[ lastCharPos ] )) diff --git a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx index 20e0c0840..44f8e68f0 100644 --- a/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx +++ b/src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx @@ -70,9 +70,9 @@ string DriverMED_W_SMESHDS_Mesh::GetVersionString(const MED::EVersion theVersion { TInt majeur, mineur, release; majeur = mineur = release = 0; - if ( theVersion == eV2_1 ) - MED::GetVersionRelease(majeur, mineur, release); - else +// if ( theVersion == eV2_1 ) +// MED::GetVersionRelease(majeur, mineur, release); +// else MED::GetVersionRelease(majeur, mineur, release); ostringstream name; if ( theNbDigits > 0 ) diff --git a/src/DriverMED/Makefile.am b/src/DriverMED/Makefile.am index e9db01b30..97c53f576 100644 --- a/src/DriverMED/Makefile.am +++ b/src/DriverMED/Makefile.am @@ -70,7 +70,7 @@ libMeshDriverMED_la_CPPFLAGS = \ libMeshDriverMED_la_LDFLAGS = \ $(BOOST_LIBS) \ ../Driver/libMeshDriver.la \ - $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lMEDWrapper_V2_2 + $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2 MED_Test_CPPFLAGS = \ @@ -88,7 +88,5 @@ MED_Test_LDADD = \ $(MED_LDFLAGS) \ -lMEDWrapper \ -lMEDWrapperBase \ - -lMEDWrapper_V2_1 \ - -lmed_V2_1 \ -lMEDWrapper_V2_2 diff --git a/src/SMESHClient/Makefile.am b/src/SMESHClient/Makefile.am index 01590a5be..ecca968f5 100644 --- a/src/SMESHClient/Makefile.am +++ b/src/SMESHClient/Makefile.am @@ -69,7 +69,7 @@ libSMESHClient_la_LDFLAGS = \ $(KERNEL_LDFLAGS) -lSalomeLifeCycleCORBA -lSalomeNS -lOpUtil -lSALOMEBasics \ -lSalomeIDLKernel -lSALOMELocalTrace \ $(GEOM_LDFLAGS) -lNMTDS -lSalomeIDLGEOM \ - $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lSalomeIDLMED -lMEDWrapper \ + $(MED_LDFLAGS) -lMEDWrapper_V2_2 -lSalomeIDLMED -lMEDWrapper \ $(CAS_KERNEL) SMESHClientBin_CPPFLAGS = \ diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx index 581d23ef9..b148780d3 100644 --- a/src/SMESHGUI/SMESHGUI.cxx +++ b/src/SMESHGUI/SMESHGUI.cxx @@ -392,9 +392,9 @@ } } // PAL18696 - QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2)); + //QString v21 (aMesh->GetVersionString(SMESH::MED_V2_1, 2)); QString v22 (aMesh->GetVersionString(SMESH::MED_V2_2, 2)); - aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v21 ) + " (*.med)", SMESH::MED_V2_1 ); + //aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v21 ) + " (*.med)", SMESH::MED_V2_1 ); aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v22 ) + " (*.med)", SMESH::MED_V2_2 ); } break; -- 2.39.2