Reorganization of tests in the Charts kit.

Removed a test that did not do very much, renamed the parallel
coordinates test, fixed ordering in CMakeLists and only build the tests
requiring baseline images if VTKData is present.

Charts/Testing/Cxx/CMakeLists.txt

@@ -4,45 +4,45 @@ IF (VTK_USE_RENDERING AND VTK_USE_VIEWS)
   # add tests that do not require data
   SET(MyTests
     TestContextScene.cxx
-    #    TestContextUnicode.cxx # Disabled until Freetype unicode works
-    TestPieChart.cxx
-    TestPCPlot.cxx
-    TestDiagram.cxx
-    TestLinePlot.cxx
-    TestScatterPlot.cxx
-    TestScalarsToColors.cxx
-    TestStackedPlot.cxx
-    TestBarGraph.cxx
-    TestStackedBarGraph.cxx
-    TestContext.cxx
-    TestGLSL.cxx
     TestVector.cxx
-    TestMarks.cxx
-    TestMarksCallback.cxx
-    TestMarksGanttChart.cxx
-    TestMarksWedge.cxx
-    TestMarksWedgeCallback.cxx
-    TestMarksWedgeLine.cxx
-    TestMultipleChartRenderers.cxx
-    TestMultipleRenderers.cxx
-    TestMultipleScalarsToColors.cxx
     )
 
   IF (VTK_DATA_ROOT)
     # add tests that require data
-#    SET(MyTests ${MyTests}
-#      TestSpanTreeLayoutStrategy.cxx
-#      )
+    SET(MyTests ${MyTests}
+      #    TestContextUnicode.cxx # Disabled until Freetype unicode works
+      TestBarGraph.cxx
+      TestContext.cxx
+      TestDiagram.cxx
+      TestGLSL.cxx
+      TestLinePlot.cxx
+      TestMarks.cxx
+      TestMarksCallback.cxx
+      TestMarksWedge.cxx
+      TestMarksWedgeCallback.cxx
+      TestMarksWedgeLine.cxx
+      TestMultipleChartRenderers.cxx
+      TestMultipleRenderers.cxx
+      TestMultipleScalarsToColors.cxx
+      TestParallelCoordinates.cxx
+      TestPieChart.cxx
+      TestScalarsToColors.cxx
+      TestScatterPlot.cxx
+      TestStackedBarGraph.cxx
+      TestStackedPlot.cxx
+      )
   ENDIF (VTK_DATA_ROOT)
 
   IF (VTK_USE_QT)
     #add tests that require Qt
     INCLUDE(${QT_USE_FILE})
-    SET(MyTests ${MyTests}
-      TestQtDiagram.cxx
-      TestQtContextUnicode.cxx
-      )
-    ENDIF(VTK_USE_QT)
+    IF (VTK_DATA_ROOT)
+      SET(MyTests ${MyTests}
+        TestQtDiagram.cxx
+        TestQtContextUnicode.cxx
+        )
+    ENDIF (VTK_DATA_ROOT)
+  ENDIF(VTK_USE_QT)
   CREATE_TEST_SOURCELIST(Tests ${KIT}CxxTests.cxx ${MyTests}
     EXTRA_INCLUDE vtkTestDriver.h)
   ADD_EXECUTABLE(${KIT}CxxTests ${Tests})

Charts/Testing/Cxx/TestMarksGanttChart.cxx

-/*=========================================================================
-
-  Program:   Visualization Toolkit
-  Module:    TestMarksGanttChart.cxx
-
-  Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen
-  All rights reserved.
-  See Copyright.txt or http://www.kitware.com/Copyright.htm for details.
-
-     This software is distributed WITHOUT ANY WARRANTY; without even
-     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-     PURPOSE.  See the above copyright notice for more information.
-
-=========================================================================*/
-
-#include "vtkBarMark.h"
-#include "vtkContextScene.h"
-#include "vtkContextView.h"
-#include "vtkDoubleArray.h"
-#include "vtkLineMark.h"
-#include "vtkMath.h"
-#include "vtkPanelMark.h"
-#include "vtkRegressionTestImage.h"
-#include "vtkRenderer.h"
-#include "vtkRenderWindow.h"
-#include "vtkRenderWindowInteractor.h"
-#include "vtkTable.h"
-
-namespace
-{
-  double LeftFunction(vtkMark* vtkNotUsed(m), vtkDataElement& d)
-  {
-    return d.GetValue(0).ToDouble() * 30.0;
-  }
-
-  double HeightFunction(vtkMark* vtkNotUsed(m), vtkDataElement& vtkNotUsed(d))
-  {
-    return 15.0;
-  }
-
-  double WidthFunction(vtkMark* vtkNotUsed(m), vtkDataElement& d)
-  {
-    return (d.GetValue(1).ToDouble() - d.GetValue(0).ToDouble()) * 20.0;
-  }
-
-  double BottomFunction(vtkMark* m, vtkDataElement& vtkNotUsed(d))
-  {
-    return (m->GetIndex() * 20.0);
-  }
-}
-
-
-int TestMarksGanttChart(int argc, char* argv[])
-{
-  // Set up a 2D context view, context test object and add it to the scene
-  vtkSmartPointer<vtkContextView> view = vtkSmartPointer<vtkContextView>::New();
-  view->GetRenderer()->SetBackground(1.0, 1.0, 1.0);
-  view->GetRenderWindow()->SetSize(400, 400);
-
-  vtkSmartPointer<vtkTable> t = vtkSmartPointer<vtkTable>::New();
-  vtkSmartPointer<vtkDoubleArray> startTime = vtkSmartPointer<vtkDoubleArray>::New();
-  vtkSmartPointer<vtkDoubleArray> compTime = vtkSmartPointer<vtkDoubleArray>::New();
-  startTime->SetName("StartTime");
-  compTime->SetName("CompTime");
-
-  //vtkMath::RandomSeed(time(NULL));
-
-  double endTime[] = {1.0, 5.0, 10.0, 6.0};
-
-  for (vtkIdType i = 0; i < 4; ++i)
-    {
-    startTime->InsertNextValue(i);
-    }
-
-  for (vtkIdType i = 0; i < 4; ++i)
-    {
-    compTime->InsertNextValue(i + endTime[i]);
-    }
-
-  t->AddColumn(startTime);
-  t->AddColumn(compTime);
-
-  vtkDataElement data(t);
-
-  // This would set each row as the children.
-  data.SetDimension(0);
-
-  vtkSmartPointer<vtkPanelMark> panel = vtkSmartPointer<vtkPanelMark>::New();
-  view->GetScene()->AddItem(panel);
-
-  // Set the data on the vtkMark instead of vtkPanelMark.
-  vtkMark* bar = panel->Add(vtkMark::BAR);
-  bar->SetData(data);
-  bar->SetLeft(LeftFunction);
-  bar->SetBottom(BottomFunction);
-  bar->SetWidth(WidthFunction);
-  bar->SetHeight(HeightFunction);
-
-  view->GetInteractor()->Initialize();
-
-  int retVal = vtkRegressionTestImage(view->GetRenderWindow());
-  if(retVal == vtkRegressionTester::DO_INTERACTOR)
-    {
-    view->GetInteractor()->Start();
-    }
-
-  return !retVal;
-}

Charts/Testing/Cxx/TestPCPlot.cxx → Charts/Testing/Cxx/TestParallelCoordinates.cxx

@@ -29,7 +29,7 @@
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
 //----------------------------------------------------------------------------
-int TestPCPlot(int argc, char* argv[])
+int TestParallelCoordinates(int argc, char* argv[])
 {
   // Set up a 2D scene, add an XY chart to it
   VTK_CREATE(vtkContextView, view);