ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-12-24 16:30:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

DCQ: prepare V2.0.0

Browse Source
This commit is contained in:
yfr 2004-07-19 14:36:32 +00:00
parent e0dd6fa845
commit 498df5aa1f
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/GEOM/GEOM_Gen_i.cc
View File

@ -2735,12 +2735,13 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::ImportIGES(const char* filename)
THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM); } THROW_SALOME_CORBA_EXCEPTION("Error in reading import file", SALOME::BAD_PARAM); }
MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ; MESSAGE("ImportIGES : all Geometry Transfer" << endl ) ;
//OCC 5.1.2 porting #if OCC_VERSION_MAJOR >= 5
// aReader.Clear();
// aReader.TransferRoots(false);
aReader.ClearShapes(); aReader.ClearShapes();
aReader.TransferRoots(); aReader.TransferRoots();
#else
aReader.Clear();
aReader.TransferRoots(false);
#endif
MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl ); MESSAGE("ImportIGES : count of shapes produced = " << aReader.NbShapes() << endl );
TopoDS_Shape shape = aReader.OneShape(); TopoDS_Shape shape = aReader.OneShape();
@ -4891,7 +4892,11 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
fill.Add(E); fill.Add(E);
} }
for (int i = 1;i<=fill.NbContours();i++) { for (int i = 1;i<=fill.NbContours();i++) {
#if OCC_VERSION_MAJOR >= 5
fill.SetRadius(radius,i,i); fill.SetRadius(radius,i,i);
#else
fill.SetRadius(radius,i);
#endif
} }
tds = fill.Shape(); tds = fill.Shape();
@ -4906,7 +4911,11 @@ GEOM::GEOM_Shape_ptr GEOM_Gen_i::MakeFillet( GEOM::GEOM_Shape_ptr shape,
} }
} }
for (int i = 1;i<=fill.NbContours();i++) { for (int i = 1;i<=fill.NbContours();i++) {
#if OCC_VERSION_MAJOR >= 5
fill.SetRadius(radius,i,i); fill.SetRadius(radius,i,i);
#else
fill.SetRadius(radius,i);
#endif
} }
tds = fill.Shape(); tds = fill.Shape();
} }

2
src/OBJECT/Makefile.in
View File

@ -57,7 +57,7 @@ BIN_SRC =
CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome
CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome
LDFLAGS+=$(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) $(PYTHON_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome
%_moc.cxx: %.h %_moc.cxx: %.h
$(MOC) $< -o $@ $(MOC) $< -o $@