Commit c7447ef1 authored by allens's avatar allens

minor gui changes

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16348 18c085ea-50e0-402c-830e-de6fd14e8384
parent c2e3d479
......@@ -28,6 +28,11 @@
R
Z
</Enum>
<Enum name="ViewGeometry">
Points
Lines
Surfaces
</Enum>
<Enum name="ChannelGeometry">
Point
Line
......@@ -124,6 +129,9 @@
<Field name="toroidalAngle" label="Toroidal angle" type="double">
0.000000
</Field>
<Field name="viewGeometry" label="View geometry" type="enum" subtype="ViewGeometry">
Surfaces
</Field>
<Field name="viewDimension" label="View dimension" type="enum" subtype="ViewDimension">
Three
</Field>
......
......@@ -262,6 +262,44 @@ LineSamplerAttributes::ArrayAxis_FromString(const std::string &s, LineSamplerAtt
return false;
}
//
// Enum conversion methods for LineSamplerAttributes::ViewGeometry
//
static const char *ViewGeometry_strings[] = {
"Points", "Lines", "Surfaces"
};
std::string
LineSamplerAttributes::ViewGeometry_ToString(LineSamplerAttributes::ViewGeometry t)
{
int index = int(t);
if(index < 0 || index >= 3) index = 0;
return ViewGeometry_strings[index];
}
std::string
LineSamplerAttributes::ViewGeometry_ToString(int t)
{
int index = (t < 0 || t >= 3) ? 0 : t;
return ViewGeometry_strings[index];
}
bool
LineSamplerAttributes::ViewGeometry_FromString(const std::string &s, LineSamplerAttributes::ViewGeometry &val)
{
val = LineSamplerAttributes::Points;
for(int i = 0; i < 3; ++i)
{
if(s == ViewGeometry_strings[i])
{
val = (ViewGeometry)i;
return true;
}
}
return false;
}
//
// Enum conversion methods for LineSamplerAttributes::ChannelGeometry
//
......@@ -563,6 +601,7 @@ void LineSamplerAttributes::Init()
poloialRTilt = 0;
poloialZTilt = 0;
toroidalAngle = 0;
viewGeometry = Surfaces;
viewDimension = Three;
heightPlotScale = 1;
channelPlotOffset = 1;
......@@ -637,6 +676,7 @@ void LineSamplerAttributes::Copy(const LineSamplerAttributes &obj)
poloialRTilt = obj.poloialRTilt;
poloialZTilt = obj.poloialZTilt;
toroidalAngle = obj.toroidalAngle;
viewGeometry = obj.viewGeometry;
viewDimension = obj.viewDimension;
heightPlotScale = obj.heightPlotScale;
channelPlotOffset = obj.channelPlotOffset;
......@@ -846,6 +886,7 @@ LineSamplerAttributes::operator == (const LineSamplerAttributes &obj) const
(poloialRTilt == obj.poloialRTilt) &&
(poloialZTilt == obj.poloialZTilt) &&
(toroidalAngle == obj.toroidalAngle) &&
(viewGeometry == obj.viewGeometry) &&
(viewDimension == obj.viewDimension) &&
(heightPlotScale == obj.heightPlotScale) &&
(channelPlotOffset == obj.channelPlotOffset) &&
......@@ -1036,6 +1077,7 @@ LineSamplerAttributes::SelectAll()
Select(ID_poloialRTilt, (void *)&poloialRTilt);
Select(ID_poloialZTilt, (void *)&poloialZTilt);
Select(ID_toroidalAngle, (void *)&toroidalAngle);
Select(ID_viewGeometry, (void *)&viewGeometry);
Select(ID_viewDimension, (void *)&viewDimension);
Select(ID_heightPlotScale, (void *)&heightPlotScale);
Select(ID_channelPlotOffset, (void *)&channelPlotOffset);
......@@ -1215,6 +1257,12 @@ LineSamplerAttributes::CreateNode(DataNode *parentNode, bool completeSave, bool
node->AddNode(new DataNode("toroidalAngle", toroidalAngle));
}
if(completeSave || !FieldsEqual(ID_viewGeometry, &defaultObject))
{
addToParent = true;
node->AddNode(new DataNode("viewGeometry", ViewGeometry_ToString(viewGeometry)));
}
if(completeSave || !FieldsEqual(ID_viewDimension, &defaultObject))
{
addToParent = true;
......@@ -1537,6 +1585,22 @@ LineSamplerAttributes::SetFromNode(DataNode *parentNode)
SetPoloialZTilt(node->AsDouble());
if((node = searchNode->GetNode("toroidalAngle")) != 0)
SetToroidalAngle(node->AsDouble());
if((node = searchNode->GetNode("viewGeometry")) != 0)
{
// Allow enums to be int or string in the config file
if(node->GetNodeType() == INT_NODE)
{
int ival = node->AsInt();
if(ival >= 0 && ival < 3)
SetViewGeometry(ViewGeometry(ival));
}
else if(node->GetNodeType() == STRING_NODE)
{
ViewGeometry value;
if(ViewGeometry_FromString(node->AsString(), value))
SetViewGeometry(value);
}
}
if((node = searchNode->GetNode("viewDimension")) != 0)
{
// Allow enums to be int or string in the config file
......@@ -1837,6 +1901,13 @@ LineSamplerAttributes::SetToroidalAngle(double toroidalAngle_)
Select(ID_toroidalAngle, (void *)&toroidalAngle);
}
void
LineSamplerAttributes::SetViewGeometry(LineSamplerAttributes::ViewGeometry viewGeometry_)
{
viewGeometry = viewGeometry_;
Select(ID_viewGeometry, (void *)&viewGeometry);
}
void
LineSamplerAttributes::SetViewDimension(LineSamplerAttributes::ViewDimension viewDimension_)
{
......@@ -2156,6 +2227,12 @@ LineSamplerAttributes::GetToroidalAngle() const
return toroidalAngle;
}
LineSamplerAttributes::ViewGeometry
LineSamplerAttributes::GetViewGeometry() const
{
return ViewGeometry(viewGeometry);
}
LineSamplerAttributes::ViewDimension
LineSamplerAttributes::GetViewDimension() const
{
......@@ -2384,6 +2461,7 @@ LineSamplerAttributes::GetFieldName(int index) const
case ID_poloialRTilt: return "poloialRTilt";
case ID_poloialZTilt: return "poloialZTilt";
case ID_toroidalAngle: return "toroidalAngle";
case ID_viewGeometry: return "viewGeometry";
case ID_viewDimension: return "viewDimension";
case ID_heightPlotScale: return "heightPlotScale";
case ID_channelPlotOffset: return "channelPlotOffset";
......@@ -2455,6 +2533,7 @@ LineSamplerAttributes::GetFieldType(int index) const
case ID_poloialRTilt: return FieldType_double;
case ID_poloialZTilt: return FieldType_double;
case ID_toroidalAngle: return FieldType_double;
case ID_viewGeometry: return FieldType_enum;
case ID_viewDimension: return FieldType_enum;
case ID_heightPlotScale: return FieldType_double;
case ID_channelPlotOffset: return FieldType_double;
......@@ -2526,6 +2605,7 @@ LineSamplerAttributes::GetFieldTypeName(int index) const
case ID_poloialRTilt: return "double";
case ID_poloialZTilt: return "double";
case ID_toroidalAngle: return "double";
case ID_viewGeometry: return "enum";
case ID_viewDimension: return "enum";
case ID_heightPlotScale: return "double";
case ID_channelPlotOffset: return "double";
......@@ -2684,6 +2764,11 @@ LineSamplerAttributes::FieldsEqual(int index_, const AttributeGroup *rhs) const
retval = (toroidalAngle == obj.toroidalAngle);
}
break;
case ID_viewGeometry:
{ // new scope
retval = (viewGeometry == obj.viewGeometry);
}
break;
case ID_viewDimension:
{ // new scope
retval = (viewDimension == obj.viewDimension);
......
......@@ -91,6 +91,12 @@ public:
R,
Z
};
enum ViewGeometry
{
Points,
Lines,
Surfaces
};
enum ChannelGeometry
{
Point,
......@@ -180,6 +186,7 @@ public:
void SetPoloialRTilt(double poloialRTilt_);
void SetPoloialZTilt(double poloialZTilt_);
void SetToroidalAngle(double toroidalAngle_);
void SetViewGeometry(ViewGeometry viewGeometry_);
void SetViewDimension(ViewDimension viewDimension_);
void SetHeightPlotScale(double heightPlotScale_);
void SetChannelPlotOffset(double channelPlotOffset_);
......@@ -230,6 +237,7 @@ public:
double GetPoloialRTilt() const;
double GetPoloialZTilt() const;
double GetToroidalAngle() const;
ViewGeometry GetViewGeometry() const;
ViewDimension GetViewDimension() const;
double GetHeightPlotScale() const;
double GetChannelPlotOffset() const;
......@@ -293,6 +301,11 @@ public:
static bool ArrayAxis_FromString(const std::string &, ArrayAxis &);
protected:
static std::string ArrayAxis_ToString(int);
public:
static std::string ViewGeometry_ToString(ViewGeometry);
static bool ViewGeometry_FromString(const std::string &, ViewGeometry &);
protected:
static std::string ViewGeometry_ToString(int);
public:
static std::string ChannelGeometry_ToString(ChannelGeometry);
static bool ChannelGeometry_FromString(const std::string &, ChannelGeometry &);
......@@ -359,6 +372,7 @@ public:
ID_poloialRTilt,
ID_poloialZTilt,
ID_toroidalAngle,
ID_viewGeometry,
ID_viewDimension,
ID_heightPlotScale,
ID_channelPlotOffset,
......@@ -410,6 +424,7 @@ private:
double poloialRTilt;
double poloialZTilt;
double toroidalAngle;
int viewGeometry;
int viewDimension;
double heightPlotScale;
double channelPlotOffset;
......@@ -442,6 +457,6 @@ private:
static const char *TypeMapFormatString;
static const private_tmfs_t TmfsStruct;
};
#define LINESAMPLERATTRIBUTES_TMFS "iiiidiiiddidDiddddddiddddiddiddddiiidddiiiid*idd"
#define LINESAMPLERATTRIBUTES_TMFS "iiiidiiiddidDiddddddiiddddiddiddddiiidddiiiid*idd"
#endif
......@@ -212,6 +212,25 @@ PyLineSamplerAttributes_ToString(const LineSamplerAttributes *atts, const char *
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%storoidalAngle = %g\n", prefix, atts->GetToroidalAngle());
str += tmpStr;
const char *viewGeometry_names = "Points, Lines, Surfaces";
switch (atts->GetViewGeometry())
{
case LineSamplerAttributes::Points:
SNPRINTF(tmpStr, 1000, "%sviewGeometry = %sPoints # %s\n", prefix, prefix, viewGeometry_names);
str += tmpStr;
break;
case LineSamplerAttributes::Lines:
SNPRINTF(tmpStr, 1000, "%sviewGeometry = %sLines # %s\n", prefix, prefix, viewGeometry_names);
str += tmpStr;
break;
case LineSamplerAttributes::Surfaces:
SNPRINTF(tmpStr, 1000, "%sviewGeometry = %sSurfaces # %s\n", prefix, prefix, viewGeometry_names);
str += tmpStr;
break;
default:
break;
}
const char *viewDimension_names = "One, Two, Three";
switch (atts->GetViewDimension())
{
......@@ -285,6 +304,8 @@ PyLineSamplerAttributes_ToString(const LineSamplerAttributes *atts, const char *
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%ssampleDistance = %g\n", prefix, atts->GetSampleDistance());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%ssampleVolume = %g\n", prefix, atts->GetSampleVolume());
str += tmpStr;
SNPRINTF(tmpStr, 1000, "%ssampleArc = %g\n", prefix, atts->GetSampleArc());
str += tmpStr;
const char *channelIntegration_names = "NoChannelIntegration, IntegrateAlongChannel";
......@@ -961,6 +982,39 @@ LineSamplerAttributes_GetToroidalAngle(PyObject *self, PyObject *args)
return retval;
}
/*static*/ PyObject *
LineSamplerAttributes_SetViewGeometry(PyObject *self, PyObject *args)
{
LineSamplerAttributesObject *obj = (LineSamplerAttributesObject *)self;
int ival;
if(!PyArg_ParseTuple(args, "i", &ival))
return NULL;
// Set the viewGeometry in the object.
if(ival >= 0 && ival < 3)
obj->data->SetViewGeometry(LineSamplerAttributes::ViewGeometry(ival));
else
{
fprintf(stderr, "An invalid viewGeometry value was given. "
"Valid values are in the range of [0,2]. "
"You can also use the following names: "
"Points, Lines, Surfaces.");
return NULL;
}
Py_INCREF(Py_None);
return Py_None;
}
/*static*/ PyObject *
LineSamplerAttributes_GetViewGeometry(PyObject *self, PyObject *args)
{
LineSamplerAttributesObject *obj = (LineSamplerAttributesObject *)self;
PyObject *retval = PyInt_FromLong(long(obj->data->GetViewGeometry()));
return retval;
}
/*static*/ PyObject *
LineSamplerAttributes_SetViewDimension(PyObject *self, PyObject *args)
{
......@@ -1252,6 +1306,30 @@ LineSamplerAttributes_GetSampleDistance(PyObject *self, PyObject *args)
return retval;
}
/*static*/ PyObject *
LineSamplerAttributes_SetSampleVolume(PyObject *self, PyObject *args)
{
LineSamplerAttributesObject *obj = (LineSamplerAttributesObject *)self;
double dval;
if(!PyArg_ParseTuple(args, "d", &dval))
return NULL;
// Set the sampleVolume in the object.
obj->data->SetSampleVolume(dval);
Py_INCREF(Py_None);
return Py_None;
}
/*static*/ PyObject *
LineSamplerAttributes_GetSampleVolume(PyObject *self, PyObject *args)
{
LineSamplerAttributesObject *obj = (LineSamplerAttributesObject *)self;
PyObject *retval = PyFloat_FromDouble(obj->data->GetSampleVolume());
return retval;
}
/*static*/ PyObject *
LineSamplerAttributes_SetSampleArc(PyObject *self, PyObject *args)
{
......@@ -1731,6 +1809,8 @@ PyMethodDef PyLineSamplerAttributes_methods[LINESAMPLERATTRIBUTES_NMETH] = {
{"GetPoloialZTilt", LineSamplerAttributes_GetPoloialZTilt, METH_VARARGS},
{"SetToroidalAngle", LineSamplerAttributes_SetToroidalAngle, METH_VARARGS},
{"GetToroidalAngle", LineSamplerAttributes_GetToroidalAngle, METH_VARARGS},
{"SetViewGeometry", LineSamplerAttributes_SetViewGeometry, METH_VARARGS},
{"GetViewGeometry", LineSamplerAttributes_GetViewGeometry, METH_VARARGS},
{"SetViewDimension", LineSamplerAttributes_SetViewDimension, METH_VARARGS},
{"GetViewDimension", LineSamplerAttributes_GetViewDimension, METH_VARARGS},
{"SetHeightPlotScale", LineSamplerAttributes_SetHeightPlotScale, METH_VARARGS},
......@@ -1753,6 +1833,8 @@ PyMethodDef PyLineSamplerAttributes_methods[LINESAMPLERATTRIBUTES_NMETH] = {
{"GetStandardDeviation", LineSamplerAttributes_GetStandardDeviation, METH_VARARGS},
{"SetSampleDistance", LineSamplerAttributes_SetSampleDistance, METH_VARARGS},
{"GetSampleDistance", LineSamplerAttributes_GetSampleDistance, METH_VARARGS},
{"SetSampleVolume", LineSamplerAttributes_SetSampleVolume, METH_VARARGS},
{"GetSampleVolume", LineSamplerAttributes_GetSampleVolume, METH_VARARGS},
{"SetSampleArc", LineSamplerAttributes_SetSampleArc, METH_VARARGS},
{"GetSampleArc", LineSamplerAttributes_GetSampleArc, METH_VARARGS},
{"SetChannelIntegration", LineSamplerAttributes_SetChannelIntegration, METH_VARARGS},
......@@ -1883,6 +1965,15 @@ PyLineSamplerAttributes_getattr(PyObject *self, char *name)
return LineSamplerAttributes_GetPoloialZTilt(self, NULL);
if(strcmp(name, "toroidalAngle") == 0)
return LineSamplerAttributes_GetToroidalAngle(self, NULL);
if(strcmp(name, "viewGeometry") == 0)
return LineSamplerAttributes_GetViewGeometry(self, NULL);
if(strcmp(name, "Points") == 0)
return PyInt_FromLong(long(LineSamplerAttributes::Points));
if(strcmp(name, "Lines") == 0)
return PyInt_FromLong(long(LineSamplerAttributes::Lines));
if(strcmp(name, "Surfaces") == 0)
return PyInt_FromLong(long(LineSamplerAttributes::Surfaces));
if(strcmp(name, "viewDimension") == 0)
return LineSamplerAttributes_GetViewDimension(self, NULL);
if(strcmp(name, "One") == 0)
......@@ -1926,6 +2017,8 @@ PyLineSamplerAttributes_getattr(PyObject *self, char *name)
return LineSamplerAttributes_GetStandardDeviation(self, NULL);
if(strcmp(name, "sampleDistance") == 0)
return LineSamplerAttributes_GetSampleDistance(self, NULL);
if(strcmp(name, "sampleVolume") == 0)
return LineSamplerAttributes_GetSampleVolume(self, NULL);
if(strcmp(name, "sampleArc") == 0)
return LineSamplerAttributes_GetSampleArc(self, NULL);
if(strcmp(name, "channelIntegration") == 0)
......@@ -2032,6 +2125,8 @@ PyLineSamplerAttributes_setattr(PyObject *self, char *name, PyObject *args)
obj = LineSamplerAttributes_SetPoloialZTilt(self, tuple);
else if(strcmp(name, "toroidalAngle") == 0)
obj = LineSamplerAttributes_SetToroidalAngle(self, tuple);
else if(strcmp(name, "viewGeometry") == 0)
obj = LineSamplerAttributes_SetViewGeometry(self, tuple);
else if(strcmp(name, "viewDimension") == 0)
obj = LineSamplerAttributes_SetViewDimension(self, tuple);
else if(strcmp(name, "heightPlotScale") == 0)
......@@ -2054,6 +2149,8 @@ PyLineSamplerAttributes_setattr(PyObject *self, char *name, PyObject *args)
obj = LineSamplerAttributes_SetStandardDeviation(self, tuple);
else if(strcmp(name, "sampleDistance") == 0)
obj = LineSamplerAttributes_SetSampleDistance(self, tuple);
else if(strcmp(name, "sampleVolume") == 0)
obj = LineSamplerAttributes_SetSampleVolume(self, tuple);
else if(strcmp(name, "sampleArc") == 0)
obj = LineSamplerAttributes_SetSampleArc(self, tuple);
else if(strcmp(name, "channelIntegration") == 0)
......
......@@ -44,7 +44,7 @@
//
// Functions exposed to the VisIt module.
//
#define LINESAMPLERATTRIBUTES_NMETH 94
#define LINESAMPLERATTRIBUTES_NMETH 98
void PyLineSamplerAttributes_StartUp(LineSamplerAttributes *subj, void *data);
void PyLineSamplerAttributes_CloseDown();
PyMethodDef * PyLineSamplerAttributes_GetMethodTable(int *nMethods);
......
......@@ -799,8 +799,36 @@ QvisLineSamplerWindow::CreateWindowContents()
mainLayout = new QGridLayout(viewTab);
viewGeometryLabel = new QLabel(tr("View geometry"), central);
mainLayout->addWidget(viewGeometryLabel,0,0);
viewGeometry = new QWidget(central);
viewGeometryButtonGroup= new QButtonGroup(viewGeometry);
QHBoxLayout *viewGeometryLayout = new QHBoxLayout(viewGeometry);
viewGeometryLayout->setMargin(0);
viewGeometryLayout->setSpacing(10);
QRadioButton *viewGeometryOne = new QRadioButton(tr("Points"), viewGeometry);
viewGeometryButtonGroup->addButton(viewGeometryOne,0);
viewGeometryLayout->addWidget(viewGeometryOne);
QRadioButton *viewGeometryTwo = new QRadioButton(tr("Lines"), viewGeometry);
viewGeometryButtonGroup->addButton(viewGeometryTwo,1);
viewGeometryLayout->addWidget(viewGeometryTwo);
QRadioButton *viewGeometryThree = new QRadioButton(tr("Surfaces"), viewGeometry);
viewGeometryButtonGroup->addButton(viewGeometryThree,2);
viewGeometryLayout->addWidget(viewGeometryThree);
connect(viewGeometryButtonGroup, SIGNAL(buttonClicked(int)),
this, SLOT(viewGeometryChanged(int)));
mainLayout->addWidget(viewGeometry,0,1);
viewDimensionLabel = new QLabel(tr("View dimension"), central);
mainLayout->addWidget(viewDimensionLabel,0,0);
mainLayout->addWidget(viewDimensionLabel,1,0);
viewDimension = new QWidget(central);
viewDimensionButtonGroup= new QButtonGroup(viewDimension);
......@@ -824,13 +852,13 @@ QvisLineSamplerWindow::CreateWindowContents()
connect(viewDimensionButtonGroup, SIGNAL(buttonClicked(int)),
this, SLOT(viewDimensionChanged(int)));
mainLayout->addWidget(viewDimension,0,1);
mainLayout->addWidget(viewDimension,1,1);
// Create the oneDPlot group box.
oneDPlotGroup = new QGroupBox(viewTab);
oneDPlotGroup->setTitle(tr("1D Plot viewing parameters"));
mainLayout->addWidget(oneDPlotGroup, 1, 0, 2, 7);
mainLayout->addWidget(oneDPlotGroup, 2, 0, 2, 7);
QGridLayout *oneDPlotLayout = new QGridLayout(oneDPlotGroup);
oneDPlotLayout->setMargin(5);
......@@ -1002,6 +1030,12 @@ QvisLineSamplerWindow::UpdateWindow(bool doAll)
case LineSamplerAttributes::ID_toroidalAngle:
toroidalAngle->setText(DoubleToQString(atts->GetToroidalAngle()));
break;
case LineSamplerAttributes::ID_viewGeometry:
viewGeometryButtonGroup->blockSignals(true);
if(viewGeometryButtonGroup->button((int)atts->GetViewGeometry()) != 0)
viewGeometryButtonGroup->button((int)atts->GetViewGeometry())->setChecked(true);
viewGeometryButtonGroup->blockSignals(false);
break;
case LineSamplerAttributes::ID_viewDimension:
viewDimensionButtonGroup->blockSignals(true);
if(viewDimensionButtonGroup->button((int)atts->GetViewDimension()) != 0)
......@@ -1819,6 +1853,17 @@ QvisLineSamplerWindow::toroidalAngleProcessText()
}
void
QvisLineSamplerWindow::viewGeometryChanged(int val)
{
if(val != atts->GetViewGeometry())
{
atts->SetViewGeometry(LineSamplerAttributes::ViewGeometry(val));
Apply();
}
}
void
QvisLineSamplerWindow::viewDimensionChanged(int val)
{
......
......@@ -108,6 +108,7 @@ class QvisLineSamplerWindow : public QvisOperatorWindow
void poloialRTiltProcessText();
void poloialZTiltProcessText();
void toroidalAngleProcessText();
void viewGeometryChanged(int val);
void viewDimensionChanged(int val);
void heightPlotScaleProcessText();
void channelPlotOffsetProcessText();
......@@ -198,6 +199,8 @@ class QvisLineSamplerWindow : public QvisOperatorWindow
QLineEdit *toroidalAngle;
QWidget *viewDimension;
QButtonGroup *viewDimensionButtonGroup;
QWidget *viewGeometry;
QButtonGroup *viewGeometryButtonGroup;
QLineEdit *heightPlotScale;
QLineEdit *channelPlotOffset;
QLineEdit *arrayPlotOffset;
......@@ -257,6 +260,7 @@ class QvisLineSamplerWindow : public QvisOperatorWindow
QLabel *poloialRTiltLabel;
QLabel *poloialZTiltLabel;
QLabel *toroidalAngleLabel;
QLabel *viewGeometryLabel;
QLabel *viewDimensionLabel;
QLabel *heightPlotScaleLabel;
QLabel *channelPlotOffsetLabel;
......
......@@ -46,7 +46,8 @@
//#include <avtPluginDataTreeIterator.h>
#include <avtPluginFilter.h>
#include <avtExecuteThenTimeLoopFilter.h>
#include <avtTimeLoopFilter.h>
#include <avtDatasetToDatasetFilter.h>
#include <avtExtents.h>
......@@ -70,7 +71,8 @@ class vtkUnstructuredGrid;
// ****************************************************************************
class avtLineSamplerFilter : virtual public avtPluginFilter,
virtual public avtExecuteThenTimeLoopFilter
virtual public avtTimeLoopFilter,
virtual public avtDatasetToDatasetFilter
{
public:
avtLineSamplerFilter();
......@@ -89,32 +91,33 @@ class avtLineSamplerFilter : virtual public avtPluginFilter,
protected:
LineSamplerAttributes atts;
int activeTimeStep;
double bounds[6];
avtExtents newExtents;
virtual void InitializeTimeLoop(void);
virtual void ExamineContract(avtContract_p in_contract);
virtual void Execute(void);
virtual void Iterate(int, avtDataTree_p);
virtual void Finalize(void);
virtual void CreateFinalOutput(void);
virtual bool ExecutionSuccessful(void);
virtual vtkDataSet *ExecuteChannelData(vtkDataSet *, int, std::string);
// virtual vtkDataSet *ExecuteChannelList(vtkDataSet *, int, std::string);
virtual vtkUnstructuredGrid* createPoint( avtVector startPoint,
avtVector stopPoint,
bool allocateScalars );
virtual vtkPolyData *createLine( avtVector startPoint,
virtual vtkDataSet* createPoint( avtVector startPoint,
avtVector stopPoint,
bool allocateScalars );
virtual vtkUnstructuredGrid *createCone( avtVector startPoint,
avtVector stopPoint,
avtVector normal,
double radius,
double divergence );
virtual vtkDataSet *createLine( avtVector startPoint,
avtVector stopPoint,
bool allocateScalars );
virtual vtkDataSet *createCone( avtVector startPoint,
avtVector stopPoint,
avtVector normal,
double radius,
double divergence );
avtVector ProjectPointOnPlane( avtVector planePoint,
avtVector planeNormal,
......
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