Commit 8d408a33 authored by Marcus D. Hanwell's avatar Marcus D. Hanwell Committed by Code Review
Browse files

Merge topic 'btx-etx-hypertree' into master

0d84e304 Exclude vtkHyperTreeSuperCursor from wrapping
parents d8c776b1 0d84e304
...@@ -122,7 +122,9 @@ ...@@ -122,7 +122,9 @@
#include "vtkDataSet.h" #include "vtkDataSet.h"
class vtkHyperTreeLightWeightCursor; class vtkHyperTreeLightWeightCursor;
//BTX
class vtkHyperTreeSuperCursor; class vtkHyperTreeSuperCursor;
//ETX
class vtkHyperTreeCursor; class vtkHyperTreeCursor;
class vtkHyperTreeInternal; class vtkHyperTreeInternal;
...@@ -374,22 +376,24 @@ public: ...@@ -374,22 +376,24 @@ public:
// arrays, etc. are not included in the return value). THIS METHOD // arrays, etc. are not included in the return value). THIS METHOD
// IS THREAD SAFE. // IS THREAD SAFE.
unsigned long GetActualMemorySize(); unsigned long GetActualMemorySize();
//BTX
// Description: // Description:
// Initialize a super cursor to point to one of the root trees // Initialize a super cursor to point to one of the root trees
// in the grid. The super cursor points to a node in a tree and // in the grid. The super cursor points to a node in a tree and
// also keeps pointers to the 26 neighbors of said node. // also keeps pointers to the 26 neighbors of said node.
void InitializeSuperCursor(vtkHyperTreeSuperCursor* superCursor, int i, int j, int k); void InitializeSuperCursor(vtkHyperTreeSuperCursor* superCursor, int i, int j, int k);
//ETX
// Description: // Description:
// Generate the table before calling InitializeSuperCursorChild. // Generate the table before calling InitializeSuperCursorChild.
void GenerateSuperCursorTraversalTable(); void GenerateSuperCursorTraversalTable();
//BTX
// Description: // Description:
// Initialize a cursor to point to a child of an existing super cursor. // Initialize a cursor to point to a child of an existing super cursor.
// This will not work in place. // This will not work in place.
void InitializeSuperCursorChild(vtkHyperTreeSuperCursor* parent, void InitializeSuperCursorChild(vtkHyperTreeSuperCursor* parent,
vtkHyperTreeSuperCursor* child, vtkHyperTreeSuperCursor* child,
int childIdx); int childIdx);
//ETX
// Description: // Description:
// The number of children each node can have. // The number of children each node can have.
vtkGetMacro(NumberOfChildren,int); vtkGetMacro(NumberOfChildren,int);
...@@ -435,7 +439,7 @@ protected: ...@@ -435,7 +439,7 @@ protected:
int UpdateCellTreeLeafIdOffsets(); int UpdateCellTreeLeafIdOffsets();
void DeleteInternalArrays(); void DeleteInternalArrays();
//BTX
void TraverseDualRecursively( vtkHyperTreeSuperCursor*, void TraverseDualRecursively( vtkHyperTreeSuperCursor*,
int ); int );
void TraverseGridRecursively( vtkHyperTreeSuperCursor*, void TraverseGridRecursively( vtkHyperTreeSuperCursor*,
...@@ -445,7 +449,7 @@ protected: ...@@ -445,7 +449,7 @@ protected:
vtkHyperTreeSuperCursor*, vtkHyperTreeSuperCursor*,
unsigned char*, unsigned char*,
int* ); int* );
//ETX
// Generalizing for 27 tree. I cannot use 3 bits to encode the child to move to. // Generalizing for 27 tree. I cannot use 3 bits to encode the child to move to.
// Input: root in supercursor(3x3x3=27), child(3x3x3=27) // Input: root in supercursor(3x3x3=27), child(3x3x3=27)
// Output: root, child // Output: root, child
......
...@@ -53,8 +53,9 @@ protected: ...@@ -53,8 +53,9 @@ protected:
virtual int FillInputPortInformation(int port, vtkInformation *info); virtual int FillInputPortInformation(int port, vtkInformation *info);
void ProcessTrees(); void ProcessTrees();
//BTX
void RecursiveProcessTree(vtkHyperTreeSuperCursor* superCursor); void RecursiveProcessTree(vtkHyperTreeSuperCursor* superCursor);
//ETX
vtkHyperTreeGrid* Input; vtkHyperTreeGrid* Input;
vtkPolyData* Output; vtkPolyData* Output;
vtkPoints* Points; vtkPoints* Points;
......
Markdown is supported
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