Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
message 'unknown exception' while several mesh in parallel is not relevant
[modules/smesh.git]
/
src
/
SMESH_I
/
SMESH_Filter_i.cxx
diff --git
a/src/SMESH_I/SMESH_Filter_i.cxx
b/src/SMESH_I/SMESH_Filter_i.cxx
index 3ae548024c4bc8eda5a39db17a3653e8b4570f3b..28e749b6e758b5a0650660c187f9d41428028b78 100644
(file)
--- a/
src/SMESH_I/SMESH_Filter_i.cxx
+++ b/
src/SMESH_I/SMESH_Filter_i.cxx
@@
-40,8
+40,6
@@
#include <SALOMEDS_wrap.hxx>
#include <GEOM_wrap.hxx>
#include <SALOMEDS_wrap.hxx>
#include <GEOM_wrap.hxx>
-#include <Basics_OCCTVersion.hxx>
-
#include <BRep_Tool.hxx>
#include <Geom_CylindricalSurface.hxx>
#include <Geom_Plane.hxx>
#include <BRep_Tool.hxx>
#include <Geom_CylindricalSurface.hxx>
#include <Geom_Plane.hxx>
@@
-194,7
+192,7
@@
static TopoDS_Shape getShapeByID (const char* theID)
/*
Class : Functor_i
/*
Class : Functor_i
- Description : An abstact class for all functors
+ Description : An abst
r
act class for all functors
*/
Functor_i::Functor_i():
SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() )
*/
Functor_i::Functor_i():
SALOME::GenericObj_i( SMESH_Gen_i::GetPOA() )
@@
-3489,7
+3487,7
@@
static inline LDOMString toString( CORBA::Long theType )
case FT_LogicalOR : return "Or";
case FT_GroupColor : return "Color of Group";
case FT_LinearOrQuadratic : return "Linear or Quadratic";
case FT_LogicalOR : return "Or";
case FT_GroupColor : return "Color of Group";
case FT_LinearOrQuadratic : return "Linear or Quadratic";
- case FT_ElemGeomType : return "Element geomtry type";
+ case FT_ElemGeomType : return "Element geom
e
try type";
case FT_EntityType : return "Entity type";
case FT_Undefined : return "";
default : return "";
case FT_EntityType : return "Entity type";
case FT_Undefined : return "";
default : return "";
@@
-3544,7
+3542,7
@@
static inline SMESH::FunctorType toFunctorType( const LDOMString& theStr )
else if ( theStr.equals( "Or" ) ) return FT_LogicalOR;
else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor;
else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic;
else if ( theStr.equals( "Or" ) ) return FT_LogicalOR;
else if ( theStr.equals( "Color of Group" ) ) return FT_GroupColor;
else if ( theStr.equals( "Linear or Quadratic" ) ) return FT_LinearOrQuadratic;
- else if ( theStr.equals( "Element geom
try type"
) ) return FT_ElemGeomType;
+ else if ( theStr.equals( "Element geom
etry type"
) ) return FT_ElemGeomType;
else if ( theStr.equals( "Entity type" ) ) return FT_EntityType;
else if ( theStr.equals( "" ) ) return FT_Undefined;
else return FT_Undefined;
else if ( theStr.equals( "Entity type" ) ) return FT_EntityType;
else if ( theStr.equals( "" ) ) return FT_Undefined;
else return FT_Undefined;
@@
-3969,16
+3967,6
@@
CORBA::Boolean FilterLibrary_i::Save()
if ( myFileName == 0 || strlen( myFileName ) == 0 )
return false;
if ( myFileName == 0 || strlen( myFileName ) == 0 )
return false;
-#if OCC_VERSION_MAJOR < 7
- FILE* aOutFile = fopen( myFileName, "wt" );
- if ( !aOutFile )
- return false;
-
- LDOM_XmlWriter aWriter( aOutFile );
- aWriter.SetIndentation( 2 );
- aWriter << myDoc;
- fclose( aOutFile );
-#else
std::filebuf fb;
fb.open( myFileName, std::ios::out );
std::filebuf fb;
fb.open( myFileName, std::ios::out );
@@
-3988,7
+3976,6
@@
CORBA::Boolean FilterLibrary_i::Save()
aWriter.SetIndentation( 2 );
aWriter.Write( os, myDoc );
fb.close();
aWriter.SetIndentation( 2 );
aWriter.Write( os, myDoc );
fb.close();
-#endif
TPythonDump()<<this<<".Save()";
return true;
TPythonDump()<<this<<".Save()";
return true;