Commit 367870ff authored by Yumin Yuan's avatar Yumin Yuan Committed by David Thompson
Browse files

Make things compile again after directory structure changes.

In this commit, a new vtkCMBPolygonModelImporter class is also added. This class is
just a wrapper around vtkGDALVectorReader to output a polydata.
parent eef616cc
......@@ -10,12 +10,12 @@
#include "BathymetryHelper.h"
#ifdef HAS_GDAL_RASTER_READER
#include "smtk/bridge/discrete/extension/reader/vtkGDALRasterReader.h"
#include "smtk/bridge/discrete/extension/reader/vtkGDALRasterPolydataWrapper.h"
#include "smtk/extension/vtk/reader/vtkGDALRasterReader.h"
#include "smtk/extension/vtk/reader/vtkGDALRasterPolydataWrapper.h"
#endif
#include "smtk/bridge/discrete/extension/reader/vtkCMBGeometryReader.h"
#include "smtk/bridge/discrete/extension/reader/vtkLASReader.h"
#include "smtk/extension/vtk/reader/vtkCMBGeometryReader.h"
#include "smtk/extension/vtk/reader/vtkLASReader.h"
#include "smtk/bridge/discrete/Session.h"
#include "vtkAppendPoints.h"
......@@ -34,6 +34,8 @@
#include <algorithm> // for std::transform
using namespace smtk::vtk;
namespace smtk {
namespace bridge {
namespace discrete {
......
......@@ -222,14 +222,14 @@ target_link_libraries(smtkDiscreteSession
vtksys
${__private_dependencies}
vtkPVVTKExtensionsDefault
vtkSMTKDiscreteReaderExt
vtkSMTKReaderExt
vtkSMTKDiscreteModel
)
if (SMTK_ENABLE_REMUS_SUPPORT)
target_link_libraries(smtkDiscreteSession
LINK_PRIVATE
vtkSMTKDiscreteMeshingExt)
vtkSMTKMeshingExt)
endif ()
......
......@@ -31,12 +31,12 @@
#include "vtkMasterPolyDataNormals.h"
#include "vtkMergeDuplicateCells.h"
#include "vtkDataSetRegionSurfaceFilter.h"
#include "smtk/bridge/discrete/extension/reader/vtkCMBGeometryReader.h"
#include "smtk/extension/vtk/reader/vtkCMBGeometryReader.h"
#ifdef SMTK_ENABLE_REMUS_SUPPORT
#include "smtk/bridge/discrete/extension/reader/vtkCMBGeometry2DReader.h"
#include "smtk/bridge/discrete/extension/reader/vtkCMBMapReader.h"
#include "smtk/bridge/discrete/extension/meshing/vtkCMBTriangleMesher.h"
#include "smtk/extension/vtk/reader/vtkCMBGeometry2DReader.h"
#include "smtk/extension/vtk/reader/vtkCMBMapReader.h"
#include "smtk/extension/vtk/meshing/vtkCMBTriangleMesher.h"
#endif
#ifdef SMTK_ENABLE_MOAB_DISCRETE_READER
......@@ -51,6 +51,7 @@
#include "cJSON.h"
using namespace smtk::model;
using namespace smtk::vtk;
namespace smtk {
namespace bridge {
......
......@@ -47,7 +47,7 @@ smtk_public_headers(${polygonHeaders})
install(FILES PointerDefs.h DESTINATION include/smtk/${SMTK_VERSION}/smtk/bridge/polygon)
target_include_directories(smtkPolygonSession
PUBLIC
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}/smtk/bridge/discrete/extension/meshing>
$<BUILD_INTERFACE:${SMTK_SOURCE_DIR}/smtk/extension/vtk/meshing>
)
if(SMTK_ENABLE_PYTHON_WRAPPING AND Shiboken_FOUND)
......
......@@ -34,6 +34,7 @@ if(SMTK_ENABLE_VTK_SUPPORT)
vtkInteractionStyle
vtkViewsCore
vtkViewsInfovis
vtkIOGDAL
vtkIOXML
vtkIOLegacy
vtkInteractionStyle
......
PROJECT(SMTKDiscreteExtensionMeshing)
PROJECT(SMTKVTKExtensionMeshing)
set(srcs
cmbFaceMesherInterface.cxx
......@@ -67,8 +67,8 @@ smtk_get_kit_name(name dir_prefix)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${vtk-module}Module.h DESTINATION include/smtk/${SMTK_VERSION}/${dir_prefix})
if (SMTK_ENABLE_PARAVIEW_SUPPORT)
vtk_add_cs_wrapping(${vtk-module})
smtk_install_library(${vtk-module}CS)
# vtk_add_cs_wrapping(${vtk-module})
# smtk_install_library(${vtk-module}CS)
endif ()
smtk_public_headers(${headers})
......@@ -25,8 +25,8 @@
#include "vtkPoints.h"
#include "vtkPolyData.h"
#include "vtkSetGet.h" //needed for VTK_TT
#include "smtk/bridge/discrete/extension/meshing/vtkCMBPrepareForTriangleMesher.h"
#include "smtk/bridge/discrete/extension/meshing/cmbFaceMesherInterface.h"
#include "smtk/extension/vtk/meshing/vtkCMBPrepareForTriangleMesher.h"
#include "smtk/extension/vtk/meshing/cmbFaceMesherInterface.h"
//#include "vtkModel.h"
//---FIXME---
......@@ -79,8 +79,7 @@ enum ModelEventIdsCOPY {
#endif
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
inline bool arePointsCollinear(const double &x1, const double &y1,
const double &x2, const double &y2,
......@@ -1356,6 +1355,5 @@ bool ModelLoopRep::findPointInsideConcaveNotIn(double& x,double& y, const std::l
//----------------------------------------------------------------------------
*/
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
......@@ -12,10 +12,10 @@
// .SECTION Description
// Convert a vtkModelFace to a triangle input for meshing.
#ifndef __smtkdiscrete_cmbFaceMeshHelper_h
#define __smtkdiscrete_cmbFaceMeshHelper_h
#ifndef __smtk_vtk_cmbFaceMeshHelper_h
#define __smtk_vtk_cmbFaceMeshHelper_h
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include <map> // Needed for STL map.
#include <set> // Needed for STL set.
#include <list> // Needed for STL list.
......@@ -26,15 +26,14 @@
class vtkPolyData;
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class cmbFaceMesherInterface;
//-----------------------------------------------------------------------------
namespace CmbFaceMesherClasses
{
class VTKSMTKDISCRETEMESHINGEXT_EXPORT meshVertex
class VTKSMTKMESHINGEXT_EXPORT meshVertex
{
public:
meshVertex(const double& a, const double& b);
......@@ -50,7 +49,7 @@ public:
bool operator<(const meshVertex &p) const;
};
class VTKSMTKDISCRETEMESHINGEXT_EXPORT meshEdge
class VTKSMTKMESHINGEXT_EXPORT meshEdge
{
public:
meshEdge(const vtkIdType& f, const vtkIdType& s);
......@@ -73,7 +72,7 @@ protected:
vtkIdType ModelId;
};
class VTKSMTKDISCRETEMESHINGEXT_EXPORT ModelEdgeRep
class VTKSMTKMESHINGEXT_EXPORT ModelEdgeRep
{
public:
ModelEdgeRep(const int &id):Id(id){}
......@@ -106,7 +105,7 @@ protected:
std::set<meshVertex> ModelVerts;
};
class VTKSMTKDISCRETEMESHINGEXT_EXPORT ModelLoopRep
class VTKSMTKMESHINGEXT_EXPORT ModelLoopRep
{
public:
ModelLoopRep(const vtkIdType &id, const bool &isInternal)
......@@ -272,7 +271,7 @@ protected:
std::map<vtkIdType,meshVertex> IdsToPoints;
};
class VTKSMTKDISCRETEMESHINGEXT_EXPORT ModelFaceRep
class VTKSMTKMESHINGEXT_EXPORT ModelFaceRep
{
public:
void addLoop(const ModelLoopRep &loop);
......@@ -309,8 +308,7 @@ class VTKSMTKDISCRETEMESHINGEXT_EXPORT ModelFaceRep
};
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
......@@ -15,7 +15,7 @@
#include "cmbFaceMesherInterface.h"
//needed to launch a cmb mesh server
#include "smtk/bridge/discrete/extension/meshing/vtkCMBMeshServerLauncher.h"
#include "smtk/extension/vtk/meshing/vtkCMBMeshServerLauncher.h"
//needed to act like remus client
#include <remus/client/Client.h>
......@@ -29,8 +29,7 @@
#include <vector>
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
struct TriangleOutput
{
......@@ -472,8 +471,7 @@ bool cmbFaceMesherInterface::unPackData(const char* rawData,
return true;
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
// for Triangles
......
......@@ -14,22 +14,21 @@
#ifndef __smtkdiscrete_cmbFaceMesherInterface_h
#define __smtkdiscrete_cmbFaceMesherInterface_h
#ifndef __smtk_vtk_cmbFaceMesherInterface_h
#define __smtk_vtk_cmbFaceMesherInterface_h
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include <string> //for std string
#include "vtkABI.h"
class vtkPolyData;
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class vtkCMBMeshServerLauncher;
class VTKSMTKDISCRETEMESHINGEXT_EXPORT cmbFaceMesherInterface
class VTKSMTKMESHINGEXT_EXPORT cmbFaceMesherInterface
{
public:
cmbFaceMesherInterface();
......@@ -105,8 +104,7 @@ private:
//ETX
};
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
# if there is Remus, add map file reader and support files.
if(SMTK_ENABLE_REMUS_SUPPORT)
vtk_module(vtkSMTKDiscreteMeshingExt
vtk_module(vtkSMTKMeshingExt
DEPENDS
vtkIOXML
PRIVATE_DEPENDS
......
......@@ -8,8 +8,8 @@
// PURPOSE. See the above copyright notice for more information.
//=========================================================================
#ifndef __smtkdiscrete_union_find_h
#define __smtkdiscrete_union_find_h
#ifndef __smtk_vtk_union_find_h
#define __smtk_vtk_union_find_h
#include "vtkObjectBase.h" // for vtkIdType
......@@ -18,8 +18,7 @@
#include <vector>
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
struct UnionFindSet
{
......@@ -137,8 +136,7 @@ inline void UnionFind::CollapseIds(
}
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif // __union_find_h
......@@ -25,8 +25,7 @@
#include <remus/server/WorkerFactory.h>
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
namespace resources
{
......@@ -199,6 +198,5 @@ void vtkCMBMeshServerLauncher::PrintSelf(ostream& os, vtkIndent indent)
os << indent << "Alive: " << this->Alive << std::endl;
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
......@@ -13,20 +13,19 @@
// Starts up a thread remus::server and reports back the host name
// and port that the server has bound to
#ifndef __smtkdiscrete_vtkCMBMeshServerLauncher_h
#define __smtkdiscrete_vtkCMBMeshServerLauncher_h
#ifndef __smtk_vtk_vtkCMBMeshServerLauncher_h
#define __smtk_vtk_vtkCMBMeshServerLauncher_h
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include "vtkObject.h"
#include "vtkStdString.h" //needed for the HostName
namespace remus { namespace server { class Server; } }
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBMeshServerLauncher : public vtkObject
class VTKSMTKMESHINGEXT_EXPORT vtkCMBMeshServerLauncher : public vtkObject
{
public:
//construction of this class will spawn
......@@ -66,8 +65,7 @@ private:
remus::server::Server* Implementation;
};
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
......@@ -19,8 +19,7 @@
#include "vtkCellData.h"
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
vtkStandardNewMacro(vtkCMBPrepareForTriangleMesher);
......@@ -687,6 +686,5 @@ void vtkCMBPrepareForTriangleMesher::PrintSelf(ostream& os, vtkIndent indent)
os << "vtkCMBPrepareForTriangleMesher\n";
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
......@@ -123,12 +123,12 @@
//
//
//
#ifndef __smtkdiscrete_vtkCMBPrepareForTriangleMesher_h
#define __smtkdiscrete_vtkCMBPrepareForTriangleMesher_h
#ifndef __smtk_vtk_vtkCMBPrepareForTriangleMesher_h
#define __smtk_vtk_vtkCMBPrepareForTriangleMesher_h
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include "vtkObject.h"
#include "smtk/bridge/discrete/extension/meshing/cmbFaceMeshHelper.h"
#include "smtk/extension/vtk/meshing/cmbFaceMeshHelper.h"
#include <map>
#include <vector>
......@@ -137,10 +137,9 @@ class vtkPolyData;
class vtkIdTypeArray;
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBPrepareForTriangleMesher : public vtkObject
class VTKSMTKMESHINGEXT_EXPORT vtkCMBPrepareForTriangleMesher : public vtkObject
{
public:
static vtkCMBPrepareForTriangleMesher *New();
......@@ -267,8 +266,7 @@ private:
void operator=(const vtkCMBPrepareForTriangleMesher&); // Not implemented.
};
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
......@@ -34,15 +34,14 @@
#include <list>
#include <set>
#include "smtk/bridge/discrete/extension/meshing/cmbFaceMesherInterface.h"
#include "smtk/bridge/discrete/extension/meshing/cmbFaceMeshHelper.h"
#include "smtk/bridge/discrete/extension/meshing/vtkCMBMeshServerLauncher.h"
#include "smtk/bridge/discrete/extension/meshing/vtkCMBPrepareForTriangleMesher.h"
#include "smtk/bridge/discrete/extension/meshing/vtkCMBUniquePointSet.h"
#include "smtk/extension/vtk/meshing/cmbFaceMesherInterface.h"
#include "smtk/extension/vtk/meshing/cmbFaceMeshHelper.h"
#include "smtk/extension/vtk/meshing/vtkCMBMeshServerLauncher.h"
#include "smtk/extension/vtk/meshing/vtkCMBPrepareForTriangleMesher.h"
#include "smtk/extension/vtk/meshing/vtkCMBUniquePointSet.h"
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
vtkCxxSetObjectMacro(vtkCMBTriangleMesher,Launcher,vtkCMBMeshServerLauncher);
......@@ -420,6 +419,5 @@ int vtkCMBTriangleMesher::RequestData(vtkInformation * /*request*/,
}
return true;
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
......@@ -24,19 +24,18 @@
//
// See vtkCMBPrepareForTriangleMesher for how to format the input poly data
#ifndef __smtkdiscrete_vtkCMBTriangleMesher_h
#define __smtkdiscrete_vtkCMBTriangleMesher_h
#ifndef __smtk_vtk_vtkCMBTriangleMesher_h
#define __smtk_vtk_vtkCMBTriangleMesher_h
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include "vtkPolyDataAlgorithm.h"
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class vtkCMBMeshServerLauncher;
class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBTriangleMesher : public vtkPolyDataAlgorithm
class VTKSMTKMESHINGEXT_EXPORT vtkCMBTriangleMesher : public vtkPolyDataAlgorithm
{
public:
......@@ -169,8 +168,7 @@ class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBTriangleMesher : public vtkPolyData
vtkCMBTriangleMesher(const vtkCMBTriangleMesher&); // Not implemented.
void operator=(const vtkCMBTriangleMesher&); // Not implemented.
};
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
......@@ -13,10 +13,10 @@
// This class is for quickly organizing a bunch of points such that there
// are no duplicates
#ifndef __smtkdiscrete_vtkCMBUniquePointSet_
#define __smtkdiscrete_vtkCMBUniquePointSet_
#ifndef __smtk_vtk_vtkCMBUniquePointSet_
#define __smtk_vtk_vtkCMBUniquePointSet_
#include "smtk/bridge/discrete/extension/meshing/vtkSMTKDiscreteMeshingExtModule.h" // For export macro
#include "smtk/extension/vtk/meshing/vtkSMTKMeshingExtModule.h" // For export macro
#include <map>
#include <vector>
......@@ -26,10 +26,9 @@
#include "vtkABI.h"
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBUniquePointSet
class VTKSMTKMESHINGEXT_EXPORT vtkCMBUniquePointSet
{
public:
struct InternalPt
......@@ -95,8 +94,7 @@ class VTKSMTKDISCRETEMESHINGEXT_EXPORT vtkCMBUniquePointSet
std::vector<InternalPt> ptId2pt;
//ETX
};
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
#endif
......@@ -30,7 +30,7 @@
#include "vtkObjectFactory.h"
#include "smtk/bridge/discrete/extension/meshing/union_find.h"
#include "smtk/extension/vtk/meshing/union_find.h"
#include <deque>
#include <map>
......@@ -42,8 +42,7 @@ typedef vtkVector2d vec2d;
typedef vtkVector3d vec3d;
namespace smtk {
namespace bridge {
namespace discrete {
namespace vtk {
// A edge's use of a vertex
struct VertexEdgeUse
......@@ -1852,6 +1851,5 @@ int vtkDiscoverRegions::RequestData(
return 1;
}
} // namespace discrete
} // namespace bridge
} // namespace vtk
} // namespace smtk
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment