Gitlab updates will be applied at 1:30pm, (17:30 UTC), today. No downtime expected.

Commit d2bee180 authored by hrchilds's avatar hrchilds

Update from February 7, 2005

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@408 18c085ea-50e0-402c-830e-de6fd14e8384
parent 727f3b0f
......@@ -101,3 +101,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/aix_5_ll/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/aix_5_xlc/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/aix_5_xlc/lib
......@@ -94,3 +94,10 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/lib
......@@ -101,3 +101,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/aix_5_ll
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/aix_5_ll/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/aix_5_ll/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/aix_5_xlc/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/aix_5_xlc/lib
......@@ -94,3 +94,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/chaos_2_ia32_elan3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/chaos_2_ia32_elan3/lib
......@@ -94,3 +94,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/chaos_2_ia32_elan3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/chaos_2_ia32_elan3/lib
......@@ -94,3 +94,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/chaos_2_ia32_elan3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/chaos_2_ia32_elan3/lib
......@@ -94,3 +94,9 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/chaos_2_ia32_elan3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/chaos_2_ia32_elan3/lib
......@@ -94,3 +94,10 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/lib
......@@ -94,3 +94,10 @@ MILI_DIR=/usr/gapps/visit/mili/current/linux_chaos_gcc_3.3.3
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/chaos_2_ia32_elan3/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/linux_chaos_gcc_3.3.3/lib
......@@ -95,3 +95,9 @@ fi
##
DEFAULT_SILO_INCLUDES=/usr/gapps/silo/4.4.1/aix_5_64_fed/include
DEFAULT_SILO_LIBRARY=/usr/gapps/silo/4.4.1/aix_5_64_fed/lib
##
## ViSUS
##
DEFAULT_VISUS_INCLUDE=/usr/gapps/visit/visus/aix_5_xlc/include
DEFAULT_VISUS_LIB=/usr/gapps/visit/visus/aix_5_xlc/lib
......@@ -762,6 +762,11 @@ avtViSUSFileFormat::GetMesh(int, const char *meshname)
// Programmer: mcmiller -- generated by xml2avt
// Creation: Tue Sep 14 19:55:29 PST 2004
//
// Modifications:
//
// Mark C. Miller, Mon Feb 7 19:50:42 PST 2005
// Removed extraneous cerr statement
//
// ****************************************************************************
vtkDataArray *
......@@ -829,8 +834,6 @@ avtViSUSFileFormat::GetVar(int ts, const char *varname)
nzones *= zoneCount[i];
}
cerr << "On processor " << procNum << " zones = " << nzones << endl;
vtkFloatArray *farray = vtkFloatArray::New();
farray->SetNumberOfComponents(1);
farray->SetNumberOfTuples(nzones);
......
......@@ -16,6 +16,8 @@ class QPixmap;
// Creation: January 30, 2001
//
// Modifications:
// Jeremy Meredith, Mon Feb 7 10:37:27 PST 2005
// Removed mouseReleased because it was already in the base class.
//
// ****************************************************************************
......@@ -37,9 +39,6 @@ class GUI_API QvisGaussianOpacityBar : public QvisAbstractOpacityBar
void paintToPixmap(int,int);
void drawControlPoints();
signals:
void mouseReleased();
private:
enum Mode {modeNone, modeX, modeH, modeW, modeWR, modeWL, modeB};
// encapsulation of gaussian parameters
......
This diff is collapsed.
......@@ -16,5 +16,7 @@ PyObject *PyTransformAttributes_WrapPyObject(const TransformAttributes *at
void PyTransformAttributes_SetLogging(bool val);
void PyTransformAttributes_SetDefaults(const TransformAttributes *atts);
PyObject *PyTransformAttributes_StringRepresentation(const TransformAttributes *atts);
#endif
This diff is collapsed.
......@@ -16,6 +16,7 @@ class QvisOpacitySlider;
class QvisColorButton;
class QvisLineStyleWidget;
class QvisLineWidthWidget;
class QTabWidget;
// ****************************************************************************
// Class: QNarrowLineEdit
......@@ -67,6 +68,9 @@ class QNarrowLineEdit : public QLineEdit
// Brad Whitlock, Fri Apr 12 13:16:24 PST 2002
// Made it inherit from QvisOperatorWindow.
//
// Jeremy Meredith, Fri Feb 4 17:48:04 PST 2005
// Added support for coordinate transforms.
//
// ****************************************************************************
class QvisTransformWindow : public QvisOperatorWindow
......@@ -98,7 +102,12 @@ class QvisTransformWindow : public QvisOperatorWindow
void translateXProcessText();
void translateYProcessText();
void translateZProcessText();
void pageTurned(QWidget*);
void inputCoordChanged(int);
void outputCoordChanged(int);
private:
QTabWidget *transformTypeTabs;
QCheckBox *doRotate;
QLineEdit *rotateOrigin;
QLabel *rotateOriginLabel;
......@@ -126,7 +135,12 @@ class QvisTransformWindow : public QvisOperatorWindow
QNarrowLineEdit *translateZ;
QLabel *translateZLabel;
QButtonGroup *inputCoord;
QButtonGroup *outputCoord;
TransformAttributes *atts;
QFrame *firstPage;
QFrame *secondPage;
};
......
<?xml version="1.0"?>
<Plugin name="Transform" type="operator" label="Transform" version="1.0" iconFile="Transform.xpm">
<Plugin name="Transform" type="operator" label="Transform" version="1.0" enabled="true" mdspecificcode="false" onlyengine="false" noengine="false" iconFile="Transform.xpm">
<Attribute name="TransformAttributes" purpose="This class contains attributes for the transform operator." persistent="true" codefile="TransformAttributes.code">
<Enum name="AngleType">
Deg
Rad
</Enum>
<Enum name="TransformType">
Similarity
Coordinate
</Enum>
<Enum name="CoordinateSystem">
Cartesian
Cylindrical
Spherical
</Enum>
<Field name="doRotate" label="Rotate" type="bool">
false
</Field>
......@@ -53,6 +62,15 @@
<Field name="translateZ" label="Z" type="float" enabler="doTranslate:true">
0.000000
</Field>
<Field name="transformType" label="transformType" type="enum" subtype="TransformType">
Similarity
</Field>
<Field name="inputCoordSys" label="Input Coordinate System" type="enum" subtype="CoordinateSystem">
Cartesian
</Field>
<Field name="outputCoordSys" label="Desired Coordinate System" type="enum" subtype="CoordinateSystem">
Spherical
</Field>
<Function name="CopyAttributes" user="false" member="true">
</Function>
<Function name="CreateCompatible" user="false" member="true">
......
This diff is collapsed.
......@@ -12,7 +12,7 @@
// Notes: Autogenerated by xml2atts.
//
// Programmer: xml2atts
// Creation: Thu Dec 18 11:50:24 PDT 2003
// Creation: Fri Feb 4 15:26:55 PST 2005
//
// Modifications:
//
......@@ -26,12 +26,23 @@ public:
Deg,
Rad
};
enum TransformType
{
Similarity,
Coordinate
};
enum CoordinateSystem
{
Cartesian,
Cylindrical,
Spherical
};
TransformAttributes();
TransformAttributes(const TransformAttributes &obj);
virtual ~TransformAttributes();
virtual void operator = (const TransformAttributes &obj);
virtual TransformAttributes& operator = (const TransformAttributes &obj);
virtual bool operator == (const TransformAttributes &obj) const;
virtual bool operator != (const TransformAttributes &obj) const;
......@@ -61,6 +72,9 @@ public:
void SetTranslateX(float translateX_);
void SetTranslateY(float translateY_);
void SetTranslateZ(float translateZ_);
void SetTransformType(TransformType transformType_);
void SetInputCoordSys(CoordinateSystem inputCoordSys_);
void SetOutputCoordSys(CoordinateSystem outputCoordSys_);
// Property getting methods
bool GetDoRotate() const;
......@@ -80,6 +94,9 @@ public:
float GetTranslateX() const;
float GetTranslateY() const;
float GetTranslateZ() const;
TransformType GetTransformType() const;
CoordinateSystem GetInputCoordSys() const;
CoordinateSystem GetOutputCoordSys() const;
// Persistence methods
virtual bool CreateNode(DataNode *node, bool completeSave, bool forceAdd);
......@@ -91,6 +108,16 @@ public:
protected:
static std::string AngleType_ToString(int);
public:
static std::string TransformType_ToString(TransformType);
static bool TransformType_FromString(const std::string &, TransformType &);
protected:
static std::string TransformType_ToString(int);
public:
static std::string CoordinateSystem_ToString(CoordinateSystem);
static bool CoordinateSystem_FromString(const std::string &, CoordinateSystem &);
protected:
static std::string CoordinateSystem_ToString(int);
public:
// Keyframing methods
virtual std::string GetFieldName(int index) const;
......@@ -113,6 +140,9 @@ private:
float translateX;
float translateY;
float translateZ;
int transformType;
int inputCoordSys;
int outputCoordSys;
};
#endif
......@@ -13,7 +13,7 @@ import llnl.visit.Plugin;
// Notes: Autogenerated by xml2java.
//
// Programmer: xml2java
// Creation: Thu Jul 31 16:09:35 PST 2003
// Creation: Fri Feb 4 15:40:18 PST 2005
//
// Modifications:
//
......@@ -21,14 +21,21 @@ import llnl.visit.Plugin;
public class TransformAttributes extends AttributeSubject implements Plugin
{
// Constants
// Enum values
public final static int ANGLETYPE_DEG = 0;
public final static int ANGLETYPE_RAD = 1;
public final static int TRANSFORMTYPE_SIMILARITY = 0;
public final static int TRANSFORMTYPE_COORDINATE = 1;
public final static int COORDINATESYSTEM_CARTESIAN = 0;
public final static int COORDINATESYSTEM_CYLINDRICAL = 1;
public final static int COORDINATESYSTEM_SPHERICAL = 2;
public TransformAttributes()
{
super(14);
super(17);
doRotate = false;
rotateOrigin = new float[3];
......@@ -53,11 +60,14 @@ public class TransformAttributes extends AttributeSubject implements Plugin
translateX = 0f;
translateY = 0f;
translateZ = 0f;
transformType = TRANSFORMTYPE_SIMILARITY;
inputCoordSys = COORDINATESYSTEM_CARTESIAN;
outputCoordSys = COORDINATESYSTEM_SPHERICAL;
}
public TransformAttributes(TransformAttributes obj)
{
super(14);
super(17);
int i;
......@@ -87,6 +97,9 @@ public class TransformAttributes extends AttributeSubject implements Plugin
translateX = obj.translateX;
translateY = obj.translateY;
translateZ = obj.translateZ;
transformType = obj.transformType;
inputCoordSys = obj.inputCoordSys;
outputCoordSys = obj.outputCoordSys;
SelectAll();
}
......@@ -124,7 +137,10 @@ public class TransformAttributes extends AttributeSubject implements Plugin
(doTranslate == obj.doTranslate) &&
(translateX == obj.translateX) &&
(translateY == obj.translateY) &&
(translateZ == obj.translateZ));
(translateZ == obj.translateZ) &&
(transformType == obj.transformType) &&
(inputCoordSys == obj.inputCoordSys) &&
(outputCoordSys == obj.outputCoordSys));
}
public String GetName() { return "Transform"; }
......@@ -245,6 +261,24 @@ public class TransformAttributes extends AttributeSubject implements Plugin
Select(13);
}
public void SetTransformType(int transformType_)
{
transformType = transformType_;
Select(14);
}
public void SetInputCoordSys(int inputCoordSys_)
{
inputCoordSys = inputCoordSys_;
Select(15);
}
public void SetOutputCoordSys(int outputCoordSys_)
{
outputCoordSys = outputCoordSys_;
Select(16);
}
// Property getting methods
public boolean GetDoRotate() { return doRotate; }
public float[] GetRotateOrigin() { return rotateOrigin; }
......@@ -260,6 +294,9 @@ public class TransformAttributes extends AttributeSubject implements Plugin
public float GetTranslateX() { return translateX; }
public float GetTranslateY() { return translateY; }
public float GetTranslateZ() { return translateZ; }
public int GetTransformType() { return transformType; }
public int GetInputCoordSys() { return inputCoordSys; }
public int GetOutputCoordSys() { return outputCoordSys; }
// Write and read methods.
public void WriteAtts(CommunicationBuffer buf)
......@@ -292,6 +329,12 @@ public class TransformAttributes extends AttributeSubject implements Plugin
buf.WriteFloat(translateY);
if(WriteSelect(13, buf))
buf.WriteFloat(translateZ);
if(WriteSelect(14, buf))
buf.WriteInt(transformType);
if(WriteSelect(15, buf))
buf.WriteInt(inputCoordSys);
if(WriteSelect(16, buf))
buf.WriteInt(outputCoordSys);
}
public void ReadAtts(int n, CommunicationBuffer buf)
......@@ -343,6 +386,15 @@ public class TransformAttributes extends AttributeSubject implements Plugin
case 13:
SetTranslateZ(buf.ReadFloat());
break;
case 14:
SetTransformType(buf.ReadInt());
break;
case 15:
SetInputCoordSys(buf.ReadInt());
break;
case 16:
SetOutputCoordSys(buf.ReadInt());
break;
}
}
}
......@@ -363,5 +415,8 @@ public class TransformAttributes extends AttributeSubject implements Plugin
private float translateX;
private float translateY;
private float translateZ;
private int transformType;
private int inputCoordSys;
private int outputCoordSys;
}
......@@ -16,7 +16,7 @@
// Return a new GeneralPluginInfo for the Transform operator.
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Sep 26 11:15:51 PDT 2001
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
extern "C" GeneralOperatorPluginInfo* GetGeneralInfo()
......@@ -33,7 +33,7 @@ extern "C" GeneralOperatorPluginInfo* GetGeneralInfo()
// Returns: A pointer to the name of the operator plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Sep 26 11:15:51 PDT 2001
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -52,7 +52,7 @@ TransformGeneralPluginInfo::GetName() const
// Returns: A pointer to the version of the operator plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Sep 26 11:15:51 PDT 2001
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -71,7 +71,7 @@ TransformGeneralPluginInfo::GetVersion() const
// Returns: A pointer to the id of the operator plugin.
//
// Programmer: meredith -- generated by xml2info
// Creation: Wed Sep 26 11:15:51 PDT 2001
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -80,3 +80,21 @@ TransformGeneralPluginInfo::GetID() const
{
return "Transform_1.0";
}
// ****************************************************************************
// Method: TransformGeneralPluginInfo::EnabledByDefault
//
// Purpose:
// Return true if this plugin should be enabled by default; false otherwise.
//
// Returns: true/false
//
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
bool
TransformGeneralPluginInfo::EnabledByDefault() const
{
return true;
}
......@@ -15,8 +15,8 @@ class TransformAttributes;
// Purpose:
// Five classes that provide all the information about an Transform operator
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// Modifications:
//
......@@ -28,6 +28,7 @@ class TransformGeneralPluginInfo : public virtual GeneralOperatorPluginInfo
virtual char *GetName() const;
virtual char *GetVersion() const;
virtual char *GetID() const;
virtual bool EnabledByDefault() const;
};
class TransformCommonPluginInfo : public virtual CommonOperatorPluginInfo, public virtual TransformGeneralPluginInfo
......
......@@ -15,8 +15,8 @@
// Purpose:
// Return a new ViewerPluginInfo for the Transform operator.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
extern "C" ViewerOperatorPluginInfo* GetViewerInfo()
......@@ -37,8 +37,8 @@ TransformAttributes *TransformViewerPluginInfo::defaultAtts = NULL;
// Purpose:
// Initialize the operator atts.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
void
......@@ -56,8 +56,8 @@ TransformViewerPluginInfo::InitializeGlobalObjects()
//
// Returns: A pointer to the viewer client attributes.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -75,8 +75,8 @@ TransformViewerPluginInfo::GetClientAtts()
//
// Returns: A pointer to the viewer default attributes.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -95,8 +95,8 @@ TransformViewerPluginInfo::GetDefaultAtts()
// Arguments:
// atts A pointer to the new client attributes.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -116,8 +116,8 @@ TransformViewerPluginInfo::SetClientAtts(AttributeSubject *atts)
// Arguments:
// atts A pointer to return the client default attributes in.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -135,9 +135,11 @@ TransformViewerPluginInfo::GetClientAtts(AttributeSubject *atts)
//
// Arguments:
// atts The attribute subject to initialize.
// md The metadata used to initialize.
// atts The variable name used to initialize.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......@@ -160,8 +162,8 @@ TransformViewerPluginInfo::InitializeOperatorAtts(AttributeSubject *atts,
//
// Returns: A pointer to the icon data.
//
// Programmer: kbonnell -- generated by xml2info
// Creation: Tue Sep 9 16:06:12 PST 2003
// Programmer: meredith -- generated by xml2info
// Creation: Fri Feb 4 15:40:10 PST 2005
//
// ****************************************************************************
......
......@@ -7,6 +7,7 @@
#include <SimilarityTransformAttributes.h>
#include <avtSimilarityTransformFilter.h>
#include <avtCoordSystemConvert.h>
// ****************************************************************************
// Method: avtTransformFilter constructor
......@@ -21,11 +22,15 @@
// Hank Childs, Tue Jul 1 08:59:08 PDT 2003
// Reflect that this filter is now a facaded filter.
//
// Hank Childs, Tue Feb 1 16:37:56 PST 2005
// Added coord system convert.
//
// ****************************************************************************
avtTransformFilter::avtTransformFilter()
{
stf = new avtSimilarityTransformFilter();
csc = new avtCoordSystemConvert();
}
......@@ -42,12 +47,17 @@ avtTransformFilter::avtTransformFilter()
// Hank Childs, Tue Jul 1 08:59:08 PDT 2003
// Reflect that this filter is now a facaded filter.
//
// Hank Childs, Tue Feb 1 16:37:56 PST 2005
// Added coord system convert.
//
// ****************************************************************************
avtTransformFilter::~avtTransformFilter()
{
if (stf != NULL)
delete stf;
if (csc != NULL)
delete csc;
}
......@@ -89,6 +99,9 @@ avtTransformFilter::Create()
// Blew away any interpretation of atts and added code to make similarity
// transform atts and pass it to that filter.
//
// Hank Childs, Tue Feb 1 16:37:56 PST 2005
// Also add support for coordinate transformations.
//
// ****************************************************************************
void
......@@ -96,31 +109,61 @@ avtTransformFilter::SetAtts(const AttributeGroup *a)
{
atts = *(const TransformAttributes*)a;
SimilarityTransformAttributes st_atts;
st_atts.SetDoRotate(atts.GetDoRotate());
st_atts.SetRotateOrigin(atts.GetRotateOrigin());
st_atts.SetRotateAxis(atts.GetRotateAxis());
st_atts.SetRotateAmount(atts.GetRotateAmount());
switch (atts.GetRotateType())
if (atts.GetTransformType() == TransformAttributes::Similarity)
{
SimilarityTransformAttributes st_atts;
st_atts.SetDoRotate(atts.GetDoRotate());
st_atts.SetRotateOrigin(atts.GetRotateOrigin());
st_atts.SetRotateAxis(atts.GetRotateAxis());