Commit badfc930 authored by allens's avatar allens

fix for separting channels over time and backing out test for tabs

git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@16432 18c085ea-50e0-402c-830e-de6fd14e8384
parent ae3099cc
......@@ -136,7 +136,7 @@ QvisLineSamplerWindow::CreateWindowContents()
// ----------------------------------------------------------------------
// Main tab
// ----------------------------------------------------------------------
mainTab = new QWidget();
mainTab = new QWidget(central);
propertyTabs->addTab(mainTab, tr("Main"));
QGridLayout *mainLayout = new QGridLayout(mainTab);
......@@ -216,7 +216,7 @@ QvisLineSamplerWindow::CreateWindowContents()
// ----------------------------------------------------------------------
// Geometry tab
// ----------------------------------------------------------------------
geometryTab = new QWidget();
geometryTab = new QWidget(central);
propertyTabs->addTab(geometryTab, tr("Geometry"));
mainLayout = new QGridLayout(geometryTab);
......@@ -457,7 +457,7 @@ QvisLineSamplerWindow::CreateWindowContents()
// ----------------------------------------------------------------------
// List tab
// ----------------------------------------------------------------------
listTab = new QWidget();
listTab = new QWidget(central);
propertyTabs->addTab(listTab, tr("List"));
mainLayout = new QGridLayout(listTab);
......@@ -529,7 +529,7 @@ QvisLineSamplerWindow::CreateWindowContents()
// ----------------------------------------------------------------------
// Sampling tab
// ----------------------------------------------------------------------
samplingTab = new QWidget();
samplingTab = new QWidget(central);
propertyTabs->addTab(samplingTab, tr("Sampling"));
mainLayout = new QGridLayout(samplingTab);
......@@ -797,7 +797,7 @@ QvisLineSamplerWindow::CreateWindowContents()
// ----------------------------------------------------------------------
// View tab
// ----------------------------------------------------------------------
viewTab = new QWidget();
viewTab = new QWidget(central);
propertyTabs->addTab(viewTab, tr("View"));
mainLayout = new QGridLayout(viewTab);
......
......@@ -336,6 +336,7 @@ avtLineSamplerFilter::Execute()
return;
}
double channelPlotOffset = atts.GetChannelPlotOffset();
double heightPlotScale = atts.GetHeightPlotScale();
vtkUnstructuredGrid *uGrid;
......@@ -391,7 +392,8 @@ avtLineSamplerFilter::Execute()
vtkDataArray *scalars = tmp_ds->GetPointData()->GetScalars();
double nextPathPoint[3] = { 0,
i+heightPlotScale * *(scalars->GetTuple(i)),
(double) i * channelPlotOffset +
heightPlotScale * *(scalars->GetTuple(i)),
0 };
if( atts.GetTimeSampling() ==
......@@ -1295,21 +1297,17 @@ avtLineSamplerFilter::ExecuteChannelData(vtkDataSet *in_ds, int, std::string)
// if( atts.GetChannelGeometry() == LineSamplerAttributes::Point ||
// atts.GetChannelGeometry() == LineSamplerAttributes::Line )
{
double pt[3];
float *points_ptr;
if( atts.GetChannelIntegration() ==
LineSamplerAttributes::IntegrateAlongChannel ||
atts.GetChannelGeometry() == LineSamplerAttributes::Point ||
atts.GetViewGeometry() == LineSamplerAttributes::Points )
if( out_ds->IsA("vtkUnstructuredGrid") )
{
vtkUnstructuredGrid* out_ug = vtkUnstructuredGrid::SafeDownCast(out_ds);
vtkUnstructuredGrid* out_ug =
vtkUnstructuredGrid::SafeDownCast(out_ds);
points_ptr =
(float *) out_ug->GetPoints()->GetVoidPointer(0);
}
else //if( atts.GetChannelGeometry() == LineSamplerAttributes::Line )
else if( out_ds->IsA("vtkPolyData") )
{
vtkPolyData* out_pd = vtkPolyData::SafeDownCast(out_ds);
......
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