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

med-2.1 file no longer supported

Browse Source
This commit is contained in:
eap 2011-04-11 07:50:58 +00:00
parent e38b8cec43
commit 33459aac4f
5 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/DriverMED/DriverMED_Family.cxx
View File

@ -329,9 +329,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 ] ))

6
src/DriverMED/DriverMED_W_SMESHDS_Mesh.cxx
View File

@ -70,9 +70,9 @@ string DriverMED_W_SMESHDS_Mesh::GetVersionString(const MED::EVersion theVersion
{ {
TInt majeur, mineur, release; TInt majeur, mineur, release;
majeur = mineur = release = 0; majeur = mineur = release = 0;
if ( theVersion == eV2_1 ) // if ( theVersion == eV2_1 )
MED::GetVersionRelease<eV2_1>(majeur, mineur, release); // MED::GetVersionRelease<eV2_1>(majeur, mineur, release);
else // else
MED::GetVersionRelease<eV2_2>(majeur, mineur, release); MED::GetVersionRelease<eV2_2>(majeur, mineur, release);
ostringstream name; ostringstream name;
if ( theNbDigits > 0 ) if ( theNbDigits > 0 )

4
src/DriverMED/Makefile.am
View File

@ -70,7 +70,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_1 -lMEDWrapper_V2_2 $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_2
MED_Test_CPPFLAGS = \ MED_Test_CPPFLAGS = \
@ -88,7 +88,5 @@ MED_Test_LDADD = \
$(MED_LDFLAGS) \ $(MED_LDFLAGS) \
-lMEDWrapper \ -lMEDWrapper \
-lMEDWrapperBase \ -lMEDWrapperBase \
-lMEDWrapper_V2_1 \
-lmed_V2_1 \
-lMEDWrapper_V2_2 -lMEDWrapper_V2_2

2
src/SMESHClient/Makefile.am
View File

@ -69,7 +69,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 = \

4
src/SMESHGUI/SMESHGUI.cxx
View File

@ -392,9 +392,9 @@
} }
} }
// PAL18696 // 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)); 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 ); aFilterMap.insert( QObject::tr( "MED_VX_FILES_FILTER" ).arg( v22 ) + " (*.med)", SMESH::MED_V2_2 );
} }
break; break;