Commit e890ac55 authored by bonnell's avatar bonnell

Fix CracksClipper operator

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@12597 18c085ea-50e0-402c-830e-de6fd14e8384
parent eb021e25
......@@ -125,11 +125,13 @@ ENDIF(NOT VISIT_SERVER_COMPONENTS_ONLY AND NOT VISIT_ENGINE_ONLY AND NOT VISIT_D
ADD_LIBRARY(ECracksClipperOperator_ser ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECracksClipperOperator_ser visitcommon avtexpressions_ser avtfilters_ser avtpipeline_ser )
SET(INSTALLTARGETS ${INSTALLTARGETS} ECracksClipperOperator_ser)
ADD_TARGET_DEFINITIONS(ECracksClipperOperator_ser ENGINE)
IF(VISIT_PARALLEL)
ADD_PARALLEL_LIBRARY(ECracksClipperOperator_par ${LIBE_SOURCES})
TARGET_LINK_LIBRARIES(ECracksClipperOperator_par visitcommon avtexpressions_par avtfilters_par avtpipeline_par )
SET(INSTALLTARGETS ${INSTALLTARGETS} ECracksClipperOperator_par)
ADD_TARGET_DEFINITIONS(ECracksClipperOperator_par ENGINE)
ENDIF(VISIT_PARALLEL)
VISIT_INSTALL_OPERATOR_PLUGINS(${INSTALLTARGETS})
......
This diff is collapsed.
......@@ -39,11 +39,11 @@
#ifndef VTK_CRACKS_CLIPPER_H
#define VTK_CRACKS_CLIPPER_H
#include <vtkVisItClipper.h>
#include <vtkImplicitFunction.h>
#include <vtkDataSetToUnstructuredGridFilter.h>
class vtkImplicitBoolean;
class vtkUnstructuredGrid;
class AlwaysNegative : public vtkImplicitFunction
{
......@@ -80,18 +80,34 @@ private:
// Creation: August 22, 2005
//
// Modifications:
// Kathleen Bonnell, Thu Sep 23 13:28:57 MST 2010
// Changed inheritance to vtkDataSetToUnstructuredGridFilter and added all
// functionality from 1.12 version of vtkVisItClipper class. Changes made
// to vtkVisItClipper for 2.0 don't meet needs of CracksClipper, which
// applies a different Clip Function to every cell.
//
// ****************************************************************************
class vtkCracksClipper : public vtkVisItClipper
class vtkCracksClipper
: public vtkDataSetToUnstructuredGridFilter
{
public:
vtkTypeRevisionMacro(vtkCracksClipper,vtkVisItClipper);
vtkTypeRevisionMacro(vtkCracksClipper,vtkDataSetToUnstructuredGridFilter);
void PrintSelf(ostream& os, vtkIndent indent);
static vtkCracksClipper *New();
virtual void SetUpClipFunction(int);
virtual void SetUseOppositePlane(bool val) { useOppositePlane = val;};
virtual void SetRemoveWholeCells(bool);
virtual void SetClipFunction(vtkImplicitFunction*);
virtual void SetClipScalars(vtkDataArray *, float);
virtual void SetInsideOut(bool);
virtual void SetComputeInsideAndOut(bool);
virtual void SetUseZeroCrossings(bool);
virtual vtkUnstructuredGrid *GetOtherOutput();
void SetCellList(int *, int);
void SetUpClipFunction(int);
void SetUseOppositePlane(bool val) { useOppositePlane = val;};
vtkSetStringMacro(CrackDir);
vtkSetStringMacro(CrackWidth);
......@@ -101,7 +117,29 @@ class vtkCracksClipper : public vtkVisItClipper
vtkCracksClipper();
~vtkCracksClipper();
void Execute();
void RectilinearGridExecute();
void StructuredGridExecute();
void UnstructuredGridExecute();
void PolyDataExecute();
void GeneralExecute();
void ClipDataset(vtkDataSet *, vtkUnstructuredGrid *);
int *CellList;
int CellListSize;
private:
bool removeWholeCells;
bool insideOut;
vtkImplicitFunction *clipFunction;
bool iOwnData;
float *scalarArray;
vtkDataArray *scalarArrayAsVTK;
float scalarCutoff;
bool scalarFlip;
bool useZeroCrossings;
bool computeInsideAndOut;
vtkUnstructuredGrid *otherOutput;
vtkCracksClipper(const vtkCracksClipper&); // Not implemented.
void operator=(const vtkCracksClipper&); // Not implemented.
......
......@@ -43,6 +43,7 @@
#ifndef VTK_BINARY_PARTITION_VOLUME_FROM_VOLUME_H
#define VTK_BINARY_PARTITION_VOLUME_FROM_VOLUME_H
#include <visit_vtk_exports.h>
#include <vtkVolumeFromVolume.h>
#include <FixedLengthBitField.h>
......@@ -77,7 +78,7 @@ class vtkUnstructuredGrid;
//
// ****************************************************************************
class vtkBinaryPartitionVolumeFromVolume : private vtkVolumeFromVolume
class VISIT_VTK_API vtkBinaryPartitionVolumeFromVolume : private vtkVolumeFromVolume
{
protected:
......
......@@ -43,6 +43,7 @@
#ifndef VTK_SURFACE_FROM_VOLUME_H
#define VTK_SURFACE_FROM_VOLUME_H
#include <visit_vtk_exports.h>
#include <vtkDataSetFromVolume.h>
#include <vector>
......@@ -74,7 +75,7 @@ class vtkPolyData;
//
// ****************************************************************************
class vtkSurfaceFromVolume : public vtkDataSetFromVolume
class VISIT_VTK_API vtkSurfaceFromVolume : public vtkDataSetFromVolume
{
class TriangleList
......
......@@ -43,6 +43,7 @@
#ifndef VTK_VOLUME_FROM_VOLUME_H
#define VTK_VOLUME_FROM_VOLUME_H
#include <visit_vtk_exports.h>
#include <vtkDataSetFromVolume.h>
#include <vtkCellType.h>
......@@ -87,7 +88,7 @@ class vtkUnstructuredGrid;
//
// ****************************************************************************
class vtkVolumeFromVolume : public vtkDataSetFromVolume
class VISIT_VTK_API vtkVolumeFromVolume : public vtkDataSetFromVolume
{
protected:
class ShapeList
......
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