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 83d20b38 authored by Philippe Pébay's avatar Philippe Pébay
Browse files

The hyper tree grid source is not a fractal

Change-Id: Iae8156bbd3d2f5b3c5a2d5ddd60657e3177ab4bd
parent 51056288
......@@ -9,7 +9,7 @@ All rights reserved.
#include "vtkHyperTreeGrid.h"
#include "vtkHyperTreeGridAxisCut.h"
#include "vtkHyperTreeGridFractalSource.h"
#include "vtkHyperTreeGridSource.h"
#include "vtkHyperTreeGridGeometry.h"
#include "vtkCellData.h"
......@@ -94,7 +94,7 @@ int TestHyperTreeGrid( int argc, char* argv[] )
int testIntValue = 0;
// Create hyper tree grid source
vtkHyperTreeGridFractalSource* fractal = vtkHyperTreeGridFractalSource::New();
vtkHyperTreeGridSource* fractal = vtkHyperTreeGridSource::New();
fractal->SetMaximumLevel( 3 );
fractal->DualOn();
if ( dim == 3 )
......
......@@ -9,7 +9,7 @@
#include "vtkHyperTreeGrid.h"
#include "vtkHyperTreeGridAxisCut.h"
#include "vtkHyperTreeGridFractalSource.h"
#include "vtkHyperTreeGridSource.h"
#include "vtkCamera.h"
#include "vtkCellData.h"
......@@ -22,7 +22,7 @@
int TestHyperTreeGridAxisCut( int argc, char* argv[] )
{
vtkNew<vtkHyperTreeGridFractalSource> fractal;
vtkNew<vtkHyperTreeGridSource> fractal;
fractal->SetMaximumLevel( 3 );
fractal->SetGridSize( 3, 4, 2 );
fractal->SetDimension( 3 );
......
......@@ -8,7 +8,7 @@
// This test was written by Philippe Pebay, Kitware SAS 2012
#include "vtkHyperTreeGridGeometry.h"
#include "vtkHyperTreeGridFractalSource.h"
#include "vtkHyperTreeGridSource.h"
#include "vtkCamera.h"
#include "vtkCellData.h"
......@@ -21,7 +21,7 @@
int TestHyperTreeGridGeometry( int argc, char* argv[] )
{
vtkNew<vtkHyperTreeGridFractalSource> fractal;
vtkNew<vtkHyperTreeGridSource> fractal;
fractal->SetMaximumLevel( 3 );
fractal->SetGridSize( 3, 4, 2 );
fractal->SetDimension( 3 );
......
......@@ -10,7 +10,7 @@ set(Module_SRCS
vtkFrustumSource.cxx
vtkGlyphSource2D.cxx
vtkHyperOctreeFractalSource.cxx
vtkHyperTreeGridFractalSource.cxx
vtkHyperTreeGridSource.cxx
vtkLineSource.cxx
vtkOutlineCornerFilter.cxx
vtkOutlineCornerSource.cxx
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkHyperTreeGridFractalSource.cxx
Module: vtkHyperTreeGridSource.cxx
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,7 +12,7 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#include "vtkHyperTreeGridFractalSource.h"
#include "vtkHyperTreeGridSource.h"
#include "vtkDataArray.h"
#include "vtkDoubleArray.h"
......@@ -26,10 +26,10 @@
#include <assert.h>
vtkStandardNewMacro(vtkHyperTreeGridFractalSource);
vtkStandardNewMacro(vtkHyperTreeGridSource);
//----------------------------------------------------------------------------
vtkHyperTreeGridFractalSource::vtkHyperTreeGridFractalSource()
vtkHyperTreeGridSource::vtkHyperTreeGridSource()
{
// This a source: no input ports
this->SetNumberOfInputPorts( 0 );
......@@ -64,7 +64,7 @@ vtkHyperTreeGridFractalSource::vtkHyperTreeGridFractalSource()
}
//----------------------------------------------------------------------------
vtkHyperTreeGridFractalSource::~vtkHyperTreeGridFractalSource()
vtkHyperTreeGridSource::~vtkHyperTreeGridSource()
{
if ( this->XCoordinates )
{
......@@ -89,7 +89,7 @@ vtkHyperTreeGridFractalSource::~vtkHyperTreeGridFractalSource()
// Description:
// Return the maximum number of levels of the hyperoctree.
// \post positive_result: result>=1
int vtkHyperTreeGridFractalSource::GetMaximumLevel()
int vtkHyperTreeGridSource::GetMaximumLevel()
{
assert("post: positive_result" && this->MaximumLevel>=1);
return this->MaximumLevel;
......@@ -102,7 +102,7 @@ int vtkHyperTreeGridFractalSource::GetMaximumLevel()
// \pre positive_levels: levels>=1
// \post is_set: this->GetLevels()==levels
// \post min_is_valid: this->GetMinLevels()<this->GetLevels()
void vtkHyperTreeGridFractalSource::SetMaximumLevel( int levels )
void vtkHyperTreeGridSource::SetMaximumLevel( int levels )
{
if ( levels < 1 )
{
......@@ -132,7 +132,7 @@ void vtkHyperTreeGridFractalSource::SetMaximumLevel( int levels )
// Description:
// Return the minimal number of levels of systematic subdivision.
// \post positive_result: result>=0
int vtkHyperTreeGridFractalSource::GetMinimumLevel()
int vtkHyperTreeGridSource::GetMinimumLevel()
{
assert( "post: positive_result" && this->MinimumLevel >= 0 );
return this->MinimumLevel;
......@@ -143,7 +143,7 @@ int vtkHyperTreeGridFractalSource::GetMinimumLevel()
// Set the minimal number of levels of systematic subdivision.
// \pre positive_minLevels: minLevels>=0 && minLevels<this->GetLevels()
// \post is_set: this->GetMinLevels()==minLevels
void vtkHyperTreeGridFractalSource::SetMinimumLevel( int minLevels )
void vtkHyperTreeGridSource::SetMinimumLevel( int minLevels )
{
if ( minLevels < 1 )
{
......@@ -161,7 +161,7 @@ void vtkHyperTreeGridFractalSource::SetMinimumLevel( int minLevels )
}
//----------------------------------------------------------------------------
int vtkHyperTreeGridFractalSource::RequestInformation( vtkInformation*,
int vtkHyperTreeGridSource::RequestInformation( vtkInformation*,
vtkInformationVector**,
vtkInformationVector *outputVector )
{
......@@ -196,7 +196,7 @@ int vtkHyperTreeGridFractalSource::RequestInformation( vtkInformation*,
}
//----------------------------------------------------------------------------
int vtkHyperTreeGridFractalSource::RequestData( vtkInformation*,
int vtkHyperTreeGridSource::RequestData( vtkInformation*,
vtkInformationVector**,
vtkInformationVector *outputVector )
{
......@@ -299,7 +299,7 @@ int vtkHyperTreeGridFractalSource::RequestData( vtkInformation*,
//----------------------------------------------------------------------------
void vtkHyperTreeGridFractalSource::Subdivide( vtkHyperTreeCursor* cursor,
void vtkHyperTreeGridSource::Subdivide( vtkHyperTreeCursor* cursor,
int level,
vtkHyperTreeGrid* output,
int index,
......@@ -401,7 +401,7 @@ void vtkHyperTreeGridFractalSource::Subdivide( vtkHyperTreeCursor* cursor,
}
//-----------------------------------------------------------------------------
void vtkHyperTreeGridFractalSource::PrintSelf(ostream& os, vtkIndent indent)
void vtkHyperTreeGridSource::PrintSelf(ostream& os, vtkIndent indent)
{
this->Superclass::PrintSelf(os,indent);
......
/*=========================================================================
Program: Visualization Toolkit
Module: vtkHyperTreeGridFractalSource.h
Module: vtkHyperTreeGridSource.h
Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
All rights reserved.
......@@ -12,7 +12,7 @@
PURPOSE. See the above copyright notice for more information.
=========================================================================*/
// .NAME vtkHyperTreeGridFractalSource - Create a hyper octree grid from a fractal.
// .NAME vtkHyperTreeGridSource - Create a synthetic grid of hypertrees.
//
// .SECTION Description
//
......@@ -22,8 +22,8 @@
// .SECTION Thanks
// This class was written by Philippe Pebay, Kitware SAS 2012
#ifndef __vtkHyperTreeGridFractalSource_h
#define __vtkHyperTreeGridFractalSource_h
#ifndef __vtkHyperTreeGridSource_h
#define __vtkHyperTreeGridSource_h
#include "vtkFiltersSourcesModule.h" // For export macro
#include "vtkHyperTreeGridAlgorithm.h"
......@@ -31,13 +31,13 @@
class vtkDataArray;
class vtkImplicitFunction;
class VTKFILTERSSOURCES_EXPORT vtkHyperTreeGridFractalSource : public vtkHyperTreeGridAlgorithm
class VTKFILTERSSOURCES_EXPORT vtkHyperTreeGridSource : public vtkHyperTreeGridAlgorithm
{
public:
vtkTypeMacro(vtkHyperTreeGridFractalSource,vtkHyperTreeGridAlgorithm);
vtkTypeMacro(vtkHyperTreeGridSource,vtkHyperTreeGridAlgorithm);
void PrintSelf(ostream& os, vtkIndent indent);
static vtkHyperTreeGridFractalSource *New();
static vtkHyperTreeGridSource *New();
// Description:
// Return the maximum number of levels of the hyperoctree.
......@@ -74,8 +74,8 @@ public:
vtkGetMacro(Dimension, int);
protected:
vtkHyperTreeGridFractalSource();
~vtkHyperTreeGridFractalSource();
vtkHyperTreeGridSource();
~vtkHyperTreeGridSource();
int RequestInformation (vtkInformation * vtkNotUsed(request),
vtkInformationVector ** vtkNotUsed( inputVector ),
......@@ -104,8 +104,8 @@ protected:
vtkDataArray *ZCoordinates;
private:
vtkHyperTreeGridFractalSource(const vtkHyperTreeGridFractalSource&); // Not implemented.
void operator=(const vtkHyperTreeGridFractalSource&); // Not implemented.
vtkHyperTreeGridSource(const vtkHyperTreeGridSource&); // Not implemented.
void operator=(const vtkHyperTreeGridSource&); // 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