Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'BR_quadtree' into V7_dev
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_ShapeFile.h
diff --git
a/src/HYDROData/HYDROData_ShapeFile.h
b/src/HYDROData/HYDROData_ShapeFile.h
index 4046f0b8562466173ccb70b81164bf39b118da45..157ea9a438ef36159f598043b1e19ef4a654c768 100644
(file)
--- a/
src/HYDROData/HYDROData_ShapeFile.h
+++ b/
src/HYDROData/HYDROData_ShapeFile.h
@@
-88,19
+88,23
@@
public:
HYDRODATA_EXPORT void Export(const QString& aFileName,
const Handle_HYDROData_LandCoverMap& aLCM,
HYDRODATA_EXPORT void Export(const QString& aFileName,
const Handle_HYDROData_LandCoverMap& aLCM,
- QStringList& aNonExpList);
+ QStringList& aNonExpList,
+ bool bCheckLinear = true,
+ bool bUseDiscr = false,
+ double theDefl = 0.1);
int WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly );
int WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROData_Polyline3D thePoly );
int WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly );
int WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROData_Polyline3D thePoly );
- int WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS_Shape& theInputShape );
+ int WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS_Shape& theInputShape
, bool bUseDiscr, double theDefl
);
//Import
bool Parse(SHPHandle theHandle, ShapeType theType, int& theShapeTypeOfFile);
//Import Landcover
//Import
bool Parse(SHPHandle theHandle, ShapeType theType, int& theShapeTypeOfFile);
//Import Landcover
- void ReadSHPPolygon(SHPObject* anObj, int i, TopoDS_Face& F);
+ void ReadSHPPolygon(
Handle(HYDROData_Document) theDocument,
SHPObject* anObj, int i, TopoDS_Face& F);
- HYDRODATA_EXPORT int ImportPolygons(const QString theFileName,
+ HYDRODATA_EXPORT int ImportPolygons(Handle(HYDROData_Document) theDocument,
+ const QString theFileName,
QStringList& thePolygonsList,
TopTools_SequenceOfShape& theFaces,
int& theShapeTypeOfFile);
QStringList& thePolygonsList,
TopTools_SequenceOfShape& theFaces,
int& theShapeTypeOfFile);
@@
-133,7
+137,9
@@
public:
private:
void ProcessFace(const TopoDS_Face& theFace, SHPHandle theShpHandle,
private:
void ProcessFace(const TopoDS_Face& theFace, SHPHandle theShpHandle,
- bool bUseDiscr = false, double theDefl = 0.1);
+ bool bUseDiscr, double theDefl);
+
+ bool CheckLinear(const TopoDS_Shape& theInpShape);
int TryOpenShapeFile(QString theFileName);
int TryOpenShapeFile(QString theFileName);