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
copyrights are updated
[modules/hydro.git]
/
src
/
HYDROData
/
HYDROData_ShapeFile.cxx
diff --git
a/src/HYDROData/HYDROData_ShapeFile.cxx
b/src/HYDROData/HYDROData_ShapeFile.cxx
index 7db8a1442ffcd10709168a4a5c102e4bf4a1ee31..688ef2b9b72fa28755972fa1ced97cb66402a595 100644
(file)
--- a/
src/HYDROData/HYDROData_ShapeFile.cxx
+++ b/
src/HYDROData/HYDROData_ShapeFile.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 EDF-R&D
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
@@
-24,7
+20,6
@@
#include <HYDROData_PolylineXY.h>
#include <HYDROData_Polyline3D.h>
#include <HYDROData_Bathymetry.h>
#include <HYDROData_PolylineXY.h>
#include <HYDROData_Polyline3D.h>
#include <HYDROData_Bathymetry.h>
-#include <HYDROData_LandCover.h>
#include <HYDROData_Profile.h>
#include <HYDROData_Iterator.h>
#include <HYDROData_Profile.h>
#include <HYDROData_Iterator.h>
@@
-52,6
+47,10
@@
#include <QColor>
#include <BRepTopAdaptor_FClass2d.hxx>
#include <QColor>
#include <BRepTopAdaptor_FClass2d.hxx>
+#ifdef WIN32
+ #pragma warning( disable: 4996 )
+#endif
+
HYDROData_ShapeFile::HYDROData_ShapeFile() : myHSHP(NULL)
{
}
HYDROData_ShapeFile::HYDROData_ShapeFile() : myHSHP(NULL)
{
}
@@
-64,9
+63,10
@@
HYDROData_ShapeFile::~HYDROData_ShapeFile()
void HYDROData_ShapeFile::Export(const QString& aFileName,
NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
void HYDROData_ShapeFile::Export(const QString& aFileName,
NCollection_Sequence<Handle_HYDROData_PolylineXY> aPolyXYSeq,
NCollection_Sequence<Handle_HYDROData_Polyline3D> aPoly3DSeq,
-
NCollection_Sequence<Handle_HYDROData_LandCover>
aLCSeq,
+
const Handle_HYDROData_LandCoverMap&
aLCSeq,
QStringList& aNonExpList)
{
QStringList& aNonExpList)
{
+ /*TODO
SHPHandle hSHPHandle;
if (!aPolyXYSeq.IsEmpty() && aPoly3DSeq.IsEmpty())
{
SHPHandle hSHPHandle;
if (!aPolyXYSeq.IsEmpty() && aPoly3DSeq.IsEmpty())
{
@@
-98,7
+98,7
@@
void HYDROData_ShapeFile::Export(const QString& aFileName,
QString aFN = aFileName.simplified();
remove (aFN.toStdString().c_str());
remove (aFN.replace( ".shp", ".shx", Qt::CaseInsensitive).toStdString().c_str());
QString aFN = aFileName.simplified();
remove (aFN.toStdString().c_str());
remove (aFN.replace( ".shp", ".shx", Qt::CaseInsensitive).toStdString().c_str());
- }
+ }
*/
}
int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly )
}
int HYDROData_ShapeFile::WriteObjectPolyXY(SHPHandle theShpHandle, Handle_HYDROData_PolylineXY thePoly )
@@
-168,7
+168,7
@@
int HYDROData_ShapeFile::WriteObjectPoly3D(SHPHandle theShpHandle, Handle_HYDROD
return 1;
}
return 1;
}
-int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC )
+
/*TODO:
int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_LandCover theLC )
{
TopoDS_Shape aSh = theLC->GetShape();
if (aSh.IsNull())
{
TopoDS_Shape aSh = theLC->GetShape();
if (aSh.IsNull())
@@
-215,7
+215,7
@@
int HYDROData_ShapeFile::WriteObjectLC(SHPHandle theShpHandle, Handle_HYDROData_
return 1;
}
return 1;
}
-
+*/
void HYDROData_ShapeFile::ProcessFace(TopoDS_Face theFace, SHPHandle theShpHandle)
{
SHPObject *aSHPObj;
void HYDROData_ShapeFile::ProcessFace(TopoDS_Face theFace, SHPHandle theShpHandle)
{
SHPObject *aSHPObj;