Merge branch 'master' of github.com:pieper/CTK

CTestConfig.cmake

@@ -4,4 +4,4 @@ set(CTEST_NIGHTLY_START_TIME "23:00:00 EDT")
 set(CTEST_DROP_METHOD "http")
 set(CTEST_DROP_SITE "my.cdash.org")
 set(CTEST_DROP_LOCATION "/submit.php?project=CTK")
-set(CTEST_DROP_SITE_CDASH TRUE)
+set(CTEST_DROP_SITE_CDASH TRUE)

Libs/DICOM/Core/ctkDICOMIndexer.cpp

@@ -92,7 +92,7 @@ void ctkDICOMIndexer::addDirectory(QSqlDatabase database, const QString& directo
 
   OFList<OFString> originalDcmtkFileNames;
   OFList<OFString> dcmtkFileNames;
-  OFStandard::searchDirectoryRecursively(src_directory.c_str(), originalDcmtkFileNames, NULL, NULL);
+  OFStandard::searchDirectoryRecursively( src_directory.c_str(), originalDcmtkFileNames, "", "");
 
   // hack to reverse list of filenames (not neccessary when image loading works correctly)
   for ( OFListIterator(OFString) iter = originalDcmtkFileNames.begin(); iter != originalDcmtkFileNames.end(); ++iter )

Libs/Visualization/VTK/Core/CMakeLists.txt

@@ -34,6 +34,8 @@ SET(KIT_SRCS
   ctkVTKObject.h
   ctkVTKObjectEventsObserver.cpp
   ctkVTKObjectEventsObserver.h
+  ctkVTKPiecewiseFunction.cpp
+  ctkVTKPiecewiseFunction.h
   )
 
 # Headers that should run through moc
@@ -42,6 +44,7 @@ SET(KIT_MOC_SRCS
   ctkVTKConnection.h
   ctkVTKLookupTable.h
   ctkVTKObjectEventsObserver.h
+  ctkVTKPiecewiseFunction.h
   )
 
 # UI files

Libs/Visualization/VTK/Core/ctkVTKPiecewiseFunction.cpp

@@ -0,0 +1,255 @@
+/*=========================================================================
+
+  Library:   CTK
+
+  Copyright (c) 2010  Kitware Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.commontk.org/LICENSE
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=========================================================================*/
+
+/// Qt includes
+#include <QColor>
+#include <QDebug>
+
+/// CTK includes
+#include "ctkVTKPiecewiseFunction.h"
+
+/// VTK includes
+#include <vtkPiecewiseFunction.h>
+#include <vtkSmartPointer.h>
+
+class ctkVTKPiecewiseFunctionPrivate: public ctkPrivate<ctkVTKPiecewiseFunction>
+{
+public:
+  vtkSmartPointer<vtkPiecewiseFunction> PiecewiseFunction;
+};
+
+//-----------------------------------------------------------------------------
+ctkVTKPiecewiseFunction::ctkVTKPiecewiseFunction(vtkPiecewiseFunction* piecewiseFunction,
+                                                         QObject* parentObject)
+  :ctkTransferFunction(parentObject)
+{
+  CTK_INIT_PRIVATE(ctkVTKPiecewiseFunction);
+  this->setPiecewiseFunction(piecewiseFunction);
+}
+
+//-----------------------------------------------------------------------------
+ctkVTKPiecewiseFunction::~ctkVTKPiecewiseFunction()
+{
+}
+
+//-----------------------------------------------------------------------------
+int ctkVTKPiecewiseFunction::count()const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  if (d->PiecewiseFunction.GetPointer() == 0)
+    {
+    Q_ASSERT(d->PiecewiseFunction.GetPointer());
+    return -1;
+    }
+  return d->PiecewiseFunction->GetSize();
+}
+
+//-----------------------------------------------------------------------------
+void ctkVTKPiecewiseFunction::range(qreal& minRange, qreal& maxRange)const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  if (d->PiecewiseFunction.GetPointer() == 0)
+    {
+    Q_ASSERT(d->PiecewiseFunction.GetPointer());
+    minRange = 1.;
+    maxRange = 0.;
+    return;
+    }
+  double rangeValues[2];
+  d->PiecewiseFunction->GetRange(rangeValues);
+  minRange = rangeValues[0];
+  maxRange = rangeValues[1];
+}
+
+//-----------------------------------------------------------------------------
+QVariant ctkVTKPiecewiseFunction::minValue()const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  if (d->PiecewiseFunction.GetPointer() == 0)
+    {
+    Q_ASSERT(d->PiecewiseFunction.GetPointer());
+    return -1;
+    }
+  //Initialize to max value
+  /// TODO initialize with max value
+  double minValue = 9999.99;
+  for (int i = 0; i < this->count(); ++i)
+    {
+    double value[4];
+    d->PiecewiseFunction->GetNodeValue(i, value);
+    if ( value[1] < minValue)
+      {
+      minValue = value[1];
+      }
+    }
+  return minValue;
+}
+
+//-----------------------------------------------------------------------------
+QVariant ctkVTKPiecewiseFunction::maxValue()const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  if (d->PiecewiseFunction.GetPointer() == 0)
+    {
+    Q_ASSERT(d->PiecewiseFunction.GetPointer());
+    return -1;
+    }
+  //Initialize to max value
+  /// TODO initialize with max value
+  qreal maxValue = 0.;
+  for (int i = 0; i < this->count(); ++i)
+    {
+    double value[4];
+    d->PiecewiseFunction->GetNodeValue(i, value);
+    if ( maxValue < value[1])
+      {
+      maxValue = value[1];
+      }
+    }
+  return maxValue;
+}
+
+//-----------------------------------------------------------------------------
+ctkControlPoint* ctkVTKPiecewiseFunction::controlPoint(int index)const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  Q_ASSERT(index >= 0 && index < this->count());
+
+  double values[4];
+  double* range = d->PiecewiseFunction->GetRange();
+  d->PiecewiseFunction->GetNodeValue(index, values);
+
+  QVariant rangeY[2];
+  rangeY[0] = this->minValue();
+  rangeY[1] = this->maxValue();
+  //    rangeYDiff /= rangeY[1].toReal() - rangeY[0].toReal();
+
+
+  Q_ASSERT(values[0] >= range[0] && values[0] <= range [1] &&  // X
+           values[1] >= rangeY[0].toDouble() && values[1] <= rangeY[1].toDouble()  &&  // Y
+           values[2] >= 0. && values[2] <= 1. &&                // Midpoint
+           values[3] >= 0. && values[3] <= 1. );                // Sharpness
+
+  if (index + 1 >= this->count())
+    {
+    ctkControlPoint* cp = new ctkControlPoint();
+    cp->P.X = values[0];
+    cp->P.Value = values[1];
+    return cp;
+    }
+  ctkNonLinearControlPoint* cp = new ctkNonLinearControlPoint();
+  cp->P.X = values[0];
+  cp->P.Value = values[1];
+  d->PiecewiseFunction->GetNodeValue(index + 1, values);
+
+
+  Q_ASSERT(values[0] >= range[0] && values[0] <= range[1]  &&  // X
+           values[1] >= rangeY[0].toDouble() && values[1] <= rangeY[1].toDouble()  &&  // Y
+           values[2] >= 0. && values[2] <= 1. &&                // Midpoint
+           values[3] >= 0. && values[3] <= 1. );                // Sharpness
+
+  double subPoints[30];
+  d->PiecewiseFunction->GetTable(cp->x(), values[0], 10, subPoints);
+  qreal interval = (values[0] - cp->x()) / 9.;
+
+  // subPoints[i] since value varies (not like in color transfer function widget)
+  for(int i = 0; i < 10; ++i)
+    {
+    cp->SubPoints << ctkPoint(cp->x() + interval*i, subPoints[i]);
+    }
+  return cp;
+}
+
+//-----------------------------------------------------------------------------
+QVariant ctkVTKPiecewiseFunction::value(qreal pos)const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  Q_ASSERT(d->PiecewiseFunction.GetPointer());
+  qreal value;
+  // get value for given x
+  value = d->PiecewiseFunction->GetValue( pos );
+  return value;
+}
+
+//-----------------------------------------------------------------------------
+int ctkVTKPiecewiseFunction::insertControlPoint(const ctkControlPoint& cp)
+{
+  CTK_D(ctkVTKPiecewiseFunction);
+  int index = -1;
+  if (d->PiecewiseFunction.GetPointer() == 0)
+    {
+    return index;
+    }
+  qreal value = cp.value().value<qreal>();
+  const ctkNonLinearControlPoint* nonLinearCp = dynamic_cast<const ctkNonLinearControlPoint*>(&cp);
+  if (nonLinearCp)
+    {
+    // TODO retrieve midpoint & sharpness
+    index = d->PiecewiseFunction->AddPoint(
+      cp.x(), value);
+    }
+  else
+    {
+    index = d->PiecewiseFunction->AddPoint(
+      cp.x(), value);
+    }
+  return index;
+}
+
+//-----------------------------------------------------------------------------
+void ctkVTKPiecewiseFunction::setControlPointPos(int index, qreal pos)
+{
+  CTK_D(ctkVTKPiecewiseFunction);
+  double values[4];
+  d->PiecewiseFunction->GetNodeValue(index, values);
+  // warning, a possible new range is not supported
+  // SetNodeValue eventually fire the signal changed()
+  values[0] = pos;
+  d->PiecewiseFunction->SetNodeValue(index, values);
+}
+
+//-----------------------------------------------------------------------------
+void ctkVTKPiecewiseFunction::setControlPointValue(int index, const QVariant& value)
+{
+  CTK_D(ctkVTKPiecewiseFunction);
+  Q_ASSERT(value.value<QColor>().isValid());
+  QColor rgb = value.value<QColor>();
+  double values[4];
+  d->PiecewiseFunction->GetNodeValue(index, values);
+  // setNodeValue should eventually fired the signal changed()
+  d->PiecewiseFunction->SetNodeValue(index, values);
+}
+
+//-----------------------------------------------------------------------------
+void ctkVTKPiecewiseFunction::setPiecewiseFunction(vtkPiecewiseFunction* piecewiseFunction)
+{
+  CTK_D(ctkVTKPiecewiseFunction);
+  d->PiecewiseFunction = piecewiseFunction;
+  this->qvtkReconnect(d->PiecewiseFunction,vtkCommand::ModifiedEvent,
+                      this, SIGNAL(changed()));
+  emit changed();
+}
+
+//-----------------------------------------------------------------------------
+vtkPiecewiseFunction* ctkVTKPiecewiseFunction::piecewiseFunction()const
+{
+  CTK_D(const ctkVTKPiecewiseFunction);
+  return d->PiecewiseFunction;
+}

Libs/Visualization/VTK/Core/ctkVTKPiecewiseFunction.h

@@ -0,0 +1,63 @@
+/*=========================================================================
+
+  Library:   CTK
+
+  Copyright (c) 2010  Kitware Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.commontk.org/LICENSE
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=========================================================================*/
+
+#ifndef __ctkVTKPiecewiseFunction_h
+#define __ctkVTKPiecewiseFunction_h
+
+// CTK includes
+#include "ctkTransferFunction.h"
+#include "ctkPimpl.h"
+#include "CTKVisualizationVTKCoreExport.h"
+#include "ctkVTKObject.h"
+
+class vtkPiecewiseFunction;
+class ctkVTKPiecewiseFunctionPrivate;
+
+///
+/// Transfer function for a vtkPiecewiseFunction
+
+class CTK_VISUALIZATION_VTK_CORE_EXPORT ctkVTKPiecewiseFunction: public ctkTransferFunction
+{
+  Q_OBJECT;
+  QVTK_OBJECT;
+public:
+  ctkVTKPiecewiseFunction(vtkPiecewiseFunction* piecewiserFunction,
+                              QObject* parent = 0);
+  virtual ~ctkVTKPiecewiseFunction();
+
+  virtual ctkControlPoint* controlPoint(int index)const;
+  virtual QVariant value(qreal pos)const;
+  virtual int count()const;
+
+  virtual void range(qreal& minRange, qreal& maxRange)const;
+  virtual QVariant minValue()const;
+  virtual QVariant maxValue()const;
+
+  virtual int insertControlPoint(const ctkControlPoint& cp);
+  virtual void setControlPointPos(int index, qreal pos);
+  virtual void setControlPointValue(int index, const QVariant& value);
+
+  void setPiecewiseFunction(vtkPiecewiseFunction* piecewiseFunction);
+  vtkPiecewiseFunction* piecewiseFunction()const;
+private:
+  CTK_DECLARE_PRIVATE(ctkVTKPiecewiseFunction);
+};
+
+#endif

Libs/Visualization/VTK/Widgets/Testing/Cpp/CMakeLists.txt

@@ -3,6 +3,7 @@ SET(KIT ${PROJECT_NAME})
 CREATE_TEST_SOURCELIST(Tests ${KIT}CppTests.cpp
   ctkTransferFunctionWidgetTest1.cpp
   ctkTransferFunctionWidgetTest2.cpp
+  ctkTransferFunctionWidgetTest3.cpp
   #EXTRA_INCLUDE TestingMacros.h
   )
 
@@ -31,3 +32,4 @@ ENDMACRO( SIMPLE_TEST  )
 #SIMPLE_TEST( ctkVTKObjectTest1 )
 SIMPLE_TEST( ctkTransferFunctionWidgetTest1 )
 SIMPLE_TEST( ctkTransferFunctionWidgetTest2 )
+SIMPLE_TEST( ctkTransferFunctionWidgetTest3 )

Libs/Visualization/VTK/Widgets/Testing/Cpp/ctkTransferFunctionWidgetTest3.cpp

@@ -0,0 +1,59 @@
+/*=========================================================================
+
+  Library:   CTK
+
+  Copyright (c) 2010  Kitware Inc.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.commontk.org/LICENSE
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+
+=========================================================================*/
+
+// Qt includes
+#include <QApplication>
+#include <QSharedPointer>
+#include <QTimer>
+
+// CTK includes
+#include "ctkTransferFunction.h"
+#include "ctkTransferFunctionWidget.h"
+#include "ctkVTKPiecewiseFunction.h"
+
+// VTK includes
+#include <vtkPiecewiseFunction.h>
+#include <vtkSmartPointer.h>
+
+// STD includes
+#include <iostream>
+
+//-----------------------------------------------------------------------------
+int ctkTransferFunctionWidgetTest3(int argc, char * argv [] )
+{
+  QApplication app(argc, argv);
+
+  vtkSmartPointer<vtkPiecewiseFunction> pwf =
+    vtkSmartPointer<vtkPiecewiseFunction>::New();
+  //
+  pwf->AddPoint(0.2, 1.);
+  pwf->AddPoint(0.8, 2.);
+
+  QSharedPointer<ctkTransferFunction> transferFunction =
+    QSharedPointer<ctkTransferFunction>(new ctkVTKPiecewiseFunction(pwf));
+  ctkTransferFunctionWidget transferFunctionWidget(transferFunction.data(), 0);
+  // the widget is not really shown here, only when app.exec() is called
+  transferFunctionWidget.show();
+
+  QTimer autoExit;
+  QObject::connect(&autoExit, SIGNAL(timeout()), &app, SLOT(quit()));
+  autoExit.start(1000);
+  return app.exec();
+}

Libs/Widgets/ctkTransferFunctionItem.cpp

@@ -180,10 +180,16 @@ qreal ctkTransferFunctionItem::y(const QVariant& v) const
 //-----------------------------------------------------------------------------
 QColor ctkTransferFunctionItem::color(const QVariant& v) const
 { 
-  Q_ASSERT(v.canConvert<QColor>());
+  //Q_ASSERT(v.canConvert<QColor>());
   if (v.canConvert<QColor>())
     {
     return v.value<QColor>();
     }
+  else
+    {
+    //black background
+    QColor defaultColor(0., 0., 0.);
+    return defaultColor;
+    }
   return QColor();
 }