An update will be applied December 9th, between 12PM and 1:00PM EST (UTC -5:00). The site may be slow during that time.

Commit 336da26f authored by Philippe Pébay's avatar Philippe Pébay
Browse files

Renamed HT FractalSource a Generator because it is not a source

Change-Id: I9071b1eaf6d4c1e1a12e702a77946911ffb5df82
parent b32a9e5f
......@@ -9,7 +9,7 @@ set(Module_SRCS
vtkHyperOctreeSampleFunction.cxx
vtkHyperOctreeSurfaceFilter.cxx
vtkHyperOctreeToUniformGridFilter.cxx
vtkHyperTreeFractalSource.cxx
vtkHyperTreeGenerator.cxx
vtkHyperTreeGrid.cxx
)
......
......@@ -22,7 +22,7 @@
#include <vtksys/Process.h>
#include <string>
#include "vtkHyperTreeGrid.h"
#include "vtkHyperTreeFractalSource.h"
#include "vtkHyperTreeGenerator.h"
#include "vtkContourFilter.h"
#include "vtkCutter.h"
......@@ -43,7 +43,7 @@
int TestBinaryHyperTreeGrid(int argc, char** argv)
{
vtkNew<vtkHyperTreeFractalSource> fractal;
vtkNew<vtkHyperTreeGenerator> fractal;
fractal->SetMaximumLevel( 4 );
fractal->DualOn();
fractal->SetDimension( 3 );
......
......@@ -8,7 +8,7 @@
// This test was written by Charles Law and Philippe Pebay, Kitware 2012
#include "vtkHyperTreeGrid.h"
#include "vtkHyperTreeFractalSource.h"
#include "vtkHyperTreeGenerator.h"
#include "vtkCamera.h"
#include "vtkContourFilter.h"
......@@ -30,7 +30,7 @@
int TestHyperTreeGrid( int argc, char** argv )
{
vtkNew<vtkHyperTreeFractalSource> fractal;
vtkNew<vtkHyperTreeGenerator> fractal;
fractal->SetMaximumLevel( 3 );
fractal->DualOn();
fractal->SetGridSize( 3, 2, 2 );
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkHyperTreeFractalSource.cxx
Module: vtkHyperTreeGenerator.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,7 +12,7 @@ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkHyperTreeFractalSource.h"
#include "vtkHyperTreeGenerator.h"
#include "vtkObjectFactory.h"
#include "vtkDataArray.h"
......@@ -27,10 +27,10 @@ PURPOSE. See the above copyright notice for more information.
#include <assert.h>
vtkStandardNewMacro(vtkHyperTreeFractalSource);
vtkStandardNewMacro(vtkHyperTreeGenerator);
//----------------------------------------------------------------------------
vtkHyperTreeFractalSource::vtkHyperTreeFractalSource()
vtkHyperTreeGenerator::vtkHyperTreeGenerator()
{
this->GridSize[0] = 1;
this->GridSize[1] = 1;
......@@ -42,12 +42,12 @@ vtkHyperTreeFractalSource::vtkHyperTreeFractalSource()
}
//----------------------------------------------------------------------------
vtkHyperTreeFractalSource::~vtkHyperTreeFractalSource()
vtkHyperTreeGenerator::~vtkHyperTreeGenerator()
{
}
//----------------------------------------------------------------------------
vtkHyperTreeGrid* vtkHyperTreeFractalSource::NewHyperTreeGrid()
vtkHyperTreeGrid* vtkHyperTreeGenerator::NewHyperTreeGrid()
{
// Instantiate hyper tree grid
vtkHyperTreeGrid* output = vtkHyperTreeGrid::New();
......@@ -136,7 +136,7 @@ vtkHyperTreeGrid* vtkHyperTreeFractalSource::NewHyperTreeGrid()
}
//----------------------------------------------------------------------------
void vtkHyperTreeFractalSource::Subdivide( vtkHyperTreeCursor* cursor,
void vtkHyperTreeGenerator::Subdivide( vtkHyperTreeCursor* cursor,
int level,
vtkHyperTreeGrid* output,
int index,
......@@ -216,7 +216,7 @@ void vtkHyperTreeFractalSource::Subdivide( vtkHyperTreeCursor* cursor,
}
//-----------------------------------------------------------------------------
void vtkHyperTreeFractalSource::PrintSelf(ostream& os, vtkIndent indent)
void vtkHyperTreeGenerator::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
}
/*=========================================================================
Program: Visualization Toolkit
Module: vtkHyperTreeFractalSource.h
Module: vtkHyperTreeGenerator.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,15 +12,15 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkHyperTreeFractalSource - Create a hyper tree grid from a fractal.
// .NAME vtkHyperTreeGenerator - Create a hyper tree grid from a fractal.
// hyperTree
// .SECTION Description
//
// .SECTION See Also
// vtkHyperTreeSampleFunction
#ifndef __vtkHyperTreeFractalSource_h
#define __vtkHyperTreeFractalSource_h
#ifndef __vtkHyperTreeGenerator_h
#define __vtkHyperTreeGenerator_h
#include "vtkFiltersHyperTreeModule.h" // For export macro
#include "vtkObject.h"
......@@ -29,13 +29,13 @@ class vtkImplicitFunction;
class vtkHyperTreeGrid;
class vtkHyperTreeCursor;
class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeFractalSource : public vtkObject
class VTKFILTERSHYPERTREE_EXPORT vtkHyperTreeGenerator : public vtkObject
{
public:
vtkTypeMacro(vtkHyperTreeFractalSource,vtkObject);
vtkTypeMacro(vtkHyperTreeGenerator,vtkObject);
void PrintSelf(ostream& os, vtkIndent indent);
static vtkHyperTreeFractalSource *New();
static vtkHyperTreeGenerator *New();
vtkSetVector3Macro(GridSize, int);
vtkGetVector3Macro(GridSize, int);
......@@ -57,8 +57,8 @@ public:
vtkHyperTreeGrid* NewHyperTreeGrid();
protected:
vtkHyperTreeFractalSource();
~vtkHyperTreeFractalSource();
vtkHyperTreeGenerator();
~vtkHyperTreeGenerator();
void Subdivide( vtkHyperTreeCursor* cursor,
int level,
......@@ -75,8 +75,8 @@ protected:
int Dual;
private:
vtkHyperTreeFractalSource(const vtkHyperTreeFractalSource&); // Not implemented.
void operator=(const vtkHyperTreeFractalSource&); // Not implemented.
vtkHyperTreeGenerator(const vtkHyperTreeGenerator&); // Not implemented.
void operator=(const vtkHyperTreeGenerator&); // Not implemented.
};
#endif
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