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
tests 1 to 7 OK, 8 and above failed
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_ShapeFile.h
diff --git
a/src/HYDROData/HYDROData_ShapeFile.h
b/src/HYDROData/HYDROData_ShapeFile.h
index cf24d3b5248b785f6bc7ff86d2b6564afb4b6b87..d74e63d5fa8ccd971d490f8f1912e3f64dd5826f 100644
(file)
--- a/
src/HYDROData/HYDROData_ShapeFile.h
+++ b/
src/HYDROData/HYDROData_ShapeFile.h
@@
-81,26
+81,35
@@
public:
virtual HYDRODATA_EXPORT ~HYDROData_ShapeFile();
//Export operation
virtual HYDRODATA_EXPORT ~HYDROData_ShapeFile();
//Export operation
- HYDRODATA_EXPORT void Export(const QString& aFileName,
+ HYDRODATA_EXPORT void Export(Handle(HYDROData_Document) theDocument,
+ const QString& aFileName,
NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
QStringList& aNonExpList);
NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
QStringList& aNonExpList);
- HYDRODATA_EXPORT void Export(const QString& aFileName,
+ HYDRODATA_EXPORT void Export(Handle(HYDROData_Document) theDocument,
+ const QString& aFileName,
const Handle_HYDROData_LandCoverMap& aLCM,
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 WriteObjectPolyXY(Handle(HYDROData_Document) theDocument, SHPHandle theShpHandle,
+ Handle_HYDROData_PolylineXY thePoly );
- int WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROData_Polyline3D thePoly );
+ int WriteObjectPoly3D(Handle(HYDROData_Document) theDocument, SHPHandle theShpHandle,
+ Handle_HYDROData_Polyline3D thePoly );
- int WriteObjectPolygon(SHPHandle theShpHandle, const TopoDS_Shape& theInputShape, bool bUseDiscr = false, double theDefl = 0.1 );
+ int WriteObjectPolygon(Handle(HYDROData_Document) theDocument, 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);
@@
-109,7
+118,7
@@
public:
//Import Polyline
void ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName,
//Import Polyline
void ReadSHPPolyXY(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName,
- int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
+ int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities
, bool bReadAsPolyline = false
);
void ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName,
int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
void ReadSHPPoly3D(Handle(HYDROData_Document) theDocument, SHPObject* anObj, QString theFileName,
int theInd, NCollection_Sequence<Handle_HYDROData_Entity>& theEntities);
@@
-132,13
+141,17
@@
public:
private:
private:
- void ProcessFace(const TopoDS_Face& theFace, SHPHandle theShpHandle,
+ void ProcessFace(Handle(HYDROData_Document) theDocument,
+ const TopoDS_Face& theFace, SHPHandle theShpHandle,
bool bUseDiscr, double theDefl);
bool CheckLinear(const TopoDS_Shape& theInpShape);
int TryOpenShapeFile(QString theFileName);
bool bUseDiscr, double theDefl);
bool CheckLinear(const TopoDS_Shape& theInpShape);
int TryOpenShapeFile(QString theFileName);
+ void GetFreeIndices(std::vector<int>& theAllowedIndexes, QString strName, size_t theObjsSize,
+ QStringList theExistingNames, QString theBaseFileName);
+
private:
std::vector<SHPObject*> mySHPObjects;
SHPHandle myHSHP;
private:
std::vector<SHPObject*> mySHPObjects;
SHPHandle myHSHP;