ENH: Rename ctkTransferFunctionWidget into ctkTransferFunctionView

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

@@ -4,11 +4,11 @@ SET(KIT ${PROJECT_NAME})
 # Tests
 #
 SET(TEST_SOURCES
-  ctkTransferFunctionWidgetTest1.cpp
-  ctkTransferFunctionWidgetTest2.cpp
-  ctkTransferFunctionWidgetTest3.cpp
-  ctkTransferFunctionWidgetTest4.cpp
-  ctkTransferFunctionWidgetTest5.cpp
+  ctkTransferFunctionViewTest1.cpp
+  ctkTransferFunctionViewTest2.cpp
+  ctkTransferFunctionViewTest3.cpp
+  ctkTransferFunctionViewTest4.cpp
+  ctkTransferFunctionViewTest5.cpp
   )
 
 #
@@ -44,11 +44,11 @@ ENDMACRO( SIMPLE_TEST  )
 # Add Tests
 #
 
-SIMPLE_TEST( ctkTransferFunctionWidgetTest1 )
-SIMPLE_TEST( ctkTransferFunctionWidgetTest2 )
-SIMPLE_TEST( ctkTransferFunctionWidgetTest3 )
-SIMPLE_TEST( ctkTransferFunctionWidgetTest4 )
-SIMPLE_TEST( ctkTransferFunctionWidgetTest5 )
+SIMPLE_TEST( ctkTransferFunctionViewTest1 )
+SIMPLE_TEST( ctkTransferFunctionViewTest2 )
+SIMPLE_TEST( ctkTransferFunctionViewTest3 )
+SIMPLE_TEST( ctkTransferFunctionViewTest4 )
+SIMPLE_TEST( ctkTransferFunctionViewTest5 )
 
 #
 # Add Tests expecting CTKData to be set

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

@@ -25,7 +25,9 @@
 
 // CTK includes
 #include "ctkTransferFunction.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionControlPointsItem.h"
+#include "ctkTransferFunctionGradientItem.h"
+#include "ctkTransferFunctionView.h"
 #include "ctkVTKColorTransferFunction.h"
 
 // VTK includes
@@ -36,7 +38,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkTransferFunctionWidgetTest1(int argc, char * argv [] )
+int ctkTransferFunctionViewTest1(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
   
@@ -51,12 +53,19 @@ int ctkTransferFunctionWidgetTest1(int argc, char * argv [] )
 
   QSharedPointer<ctkTransferFunction> transferFunction = 
     QSharedPointer<ctkTransferFunction>(new ctkVTKColorTransferFunction(ctf));
-  ctkTransferFunctionWidget transferFunctionWidget(transferFunction.data(), 0);
+  ctkTransferFunctionView transferFunctionView(0);
+  ctkTransferFunctionGradientItem* gradient = 
+    new ctkTransferFunctionGradientItem(transferFunction.data());
+  ctkTransferFunctionControlPointsItem* controlPoints = 
+    new ctkTransferFunctionControlPointsItem(transferFunction.data());
+  
+  transferFunctionView.scene()->addItem(gradient);
+  transferFunctionView.scene()->addItem(controlPoints);
   // the widget is not really shown here, only when app.exec() is called
-  transferFunctionWidget.show();
+  transferFunctionView.show();
 
   //ctf->AddRGBPoint(0.7, 0.0,0.0,0.0);
-  //ctkTransferFunctionWidget* toto = new ctkTransferFunctionWidget();
+  //ctkTransferFunctionView* toto = new ctkTransferFunctionView();
   QTimer autoExit;
   if (argc < 2 || QString(argv[1]) != "-I")
     {

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

@@ -25,7 +25,9 @@
 
 // CTK includes
 #include "ctkTransferFunction.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionControlPointsItem.h"
+#include "ctkTransferFunctionGradientItem.h"
+#include "ctkTransferFunctionView.h"
 #include "ctkVTKLookupTable.h"
 
 // VTK includes
@@ -36,7 +38,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkTransferFunctionWidgetTest2(int argc, char * argv [] )
+int ctkTransferFunctionViewTest2(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
   
@@ -52,9 +54,16 @@ int ctkTransferFunctionWidgetTest2(int argc, char * argv [] )
 
   QSharedPointer<ctkTransferFunction> transferFunction = 
     QSharedPointer<ctkTransferFunction>(new ctkVTKLookupTable(ctf));
-  ctkTransferFunctionWidget transferFunctionWidget(transferFunction.data(), 0);
+  ctkTransferFunctionView transferFunctionView(0);
+    ctkTransferFunctionGradientItem* gradient = 
+    new ctkTransferFunctionGradientItem(transferFunction.data());
+  ctkTransferFunctionControlPointsItem* controlPoints = 
+    new ctkTransferFunctionControlPointsItem(transferFunction.data());
+  
+  transferFunctionView.scene()->addItem(gradient);
+  transferFunctionView.scene()->addItem(controlPoints);
   // the widget is not really shown here, only when app.exec() is called
-  transferFunctionWidget.show();
+  transferFunctionView.show();
 
   QTimer autoExit;
   if (argc < 2 || QString(argv[1]) != "-I")

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

@@ -25,7 +25,9 @@
 
 // CTK includes
 #include "ctkTransferFunction.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionControlPointsItem.h"
+#include "ctkTransferFunctionGradientItem.h"
+#include "ctkTransferFunctionView.h"
 #include "ctkVTKPiecewiseFunction.h"
 
 // VTK includes
@@ -36,7 +38,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkTransferFunctionWidgetTest3(int argc, char * argv [] )
+int ctkTransferFunctionViewTest3(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
 
@@ -51,9 +53,16 @@ int ctkTransferFunctionWidgetTest3(int argc, char * argv [] )
 
   QSharedPointer<ctkTransferFunction> transferFunction =
     QSharedPointer<ctkTransferFunction>(new ctkVTKPiecewiseFunction(pwf));
-  ctkTransferFunctionWidget transferFunctionWidget(transferFunction.data(), 0);
+  ctkTransferFunctionView transferFunctionView(0);
+  ctkTransferFunctionGradientItem* gradient = 
+    new ctkTransferFunctionGradientItem(transferFunction.data());
+  ctkTransferFunctionControlPointsItem* controlPoints = 
+    new ctkTransferFunctionControlPointsItem(transferFunction.data());
+  
+  transferFunctionView.scene()->addItem(gradient);
+  transferFunctionView.scene()->addItem(controlPoints);
   // the widget is not really shown here, only when app.exec() is called
-  transferFunctionWidget.show();
+  transferFunctionView.show();
 
   QTimer autoExit;
   if (argc < 2 || QString(argv[1]) != "-I")

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

@@ -25,7 +25,9 @@
 
 // CTK includes
 #include "ctkTransferFunction.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionControlPointsItem.h"
+#include "ctkTransferFunctionGradientItem.h"
+#include "ctkTransferFunctionView.h"
 #include "ctkVTKCompositeFunction.h"
 
 // VTK includes
@@ -37,7 +39,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkTransferFunctionWidgetTest4(int argc, char * argv [] )
+int ctkTransferFunctionViewTest4(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
 
@@ -61,9 +63,16 @@ int ctkTransferFunctionWidgetTest4(int argc, char * argv [] )
 
   QSharedPointer<ctkTransferFunction> transferFunction =
     QSharedPointer<ctkTransferFunction>(new ctkVTKCompositeFunction(pwf, ctf));
-  ctkTransferFunctionWidget transferFunctionWidget(transferFunction.data(), 0);
+  ctkTransferFunctionView transferFunctionView(0);
+  ctkTransferFunctionGradientItem* gradient = 
+    new ctkTransferFunctionGradientItem(transferFunction.data());
+  ctkTransferFunctionControlPointsItem* controlPoints = 
+    new ctkTransferFunctionControlPointsItem(transferFunction.data());
+  
+  transferFunctionView.scene()->addItem(gradient);
+  transferFunctionView.scene()->addItem(controlPoints);
   // the widget is not really shown here, only when app.exec() is called
-  transferFunctionWidget.show();
+  transferFunctionView.show();
 
   QTimer autoExit;
   if (argc < 2 || QString(argv[1]) != "-I")

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

@@ -26,8 +26,8 @@
 // CTK includes
 #include "ctkTransferFunction.h"
 #include "ctkTransferFunctionBarsItem.h"
-#include "ctkTransferFunctionWidget.h"
 #include "ctkTransferFunctionScene.h"
+#include "ctkTransferFunctionView.h"
 #include "ctkVTKHistogram.h"
 
 // VTK includes
@@ -38,7 +38,7 @@
 #include <iostream>
 
 //-----------------------------------------------------------------------------
-int ctkTransferFunctionWidgetTest5(int argc, char * argv [] )
+int ctkTransferFunctionViewTest5(int argc, char * argv [] )
 {
   QApplication app(argc, argv);
   
@@ -54,14 +54,15 @@ int ctkTransferFunctionWidgetTest5(int argc, char * argv [] )
     QSharedPointer<ctkVTKHistogram>(new ctkVTKHistogram(intArray));
   histogram->build();
   //ctkTransferFunctionWidget transferFunctionWidget(histogram.data(), 0);
-  ctkTransferFunctionWidget transferFunctionWidget;
-  // the widget is not really shown here, only when app.exec() is called
-  transferFunctionWidget.show();
+  ctkTransferFunctionView transferFunctionWidget;
+  
   ctkTransferFunctionBarsItem * histogramItem = new ctkTransferFunctionBarsItem;
   histogramItem->setTransferFunction(histogram.data());
   //qobject_cast<ctkTransferFunctionScene*>(transferFunctionWidget.scene())->setTransferFunction(histogram.data());
   transferFunctionWidget.scene()->addItem(histogramItem);
-
+  // the widget is not really shown here, only when app.exec() is called
+  transferFunctionWidget.show();
+  
   QTimer autoExit;
   if (argc < 2 || QString(argv[1]) != "-I")
     {

Libs/Widgets/CMakeLists.txt

@@ -56,18 +56,18 @@ SET(KIT_SRCS
   ctkSliderSpinBoxWidget.h
   ctkTestApplication.cpp
   ctkTestApplication.h
+  ctkTransferFunctionBarsItem.cpp
+  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionControlPointsItem.cpp
   ctkTransferFunctionControlPointsItem.h
   ctkTransferFunctionGradientItem.cpp
   ctkTransferFunctionGradientItem.h
-  ctkTransferFunctionBarsItem.cpp
-  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionItem.cpp
   ctkTransferFunctionItem.h
-  ctkTransferFunctionWidget.cpp
-  ctkTransferFunctionWidget.h
   ctkTransferFunctionScene.cpp
   ctkTransferFunctionScene.h
+  ctkTransferFunctionView.cpp
+  ctkTransferFunctionView.h
   ctkTreeComboBox.cpp
   ctkTreeComboBox.h
   )
@@ -96,13 +96,12 @@ SET(KIT_MOC_SRCS
   ctkSettings.h
   ctkSliderSpinBoxWidget.h
   ctkTestApplication.h
+  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionControlPointsItem.h
   ctkTransferFunctionGradientItem.h
-  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionItem.h
-  ctkTransferFunctionControlPointsItem.h
-  ctkTransferFunctionWidget.h
   ctkTransferFunctionScene.h
+  ctkTransferFunctionView.h
   ctkTreeComboBox.h
   )
 

Libs/Widgets/Plugins/CMakeLists.txt

@@ -43,8 +43,8 @@ SET(PLUGIN_SRCS
   ctkRangeSliderPlugin.h
   ctkRangeWidgetPlugin.cpp
   ctkRangeWidgetPlugin.h
-  ctkTransferFunctionWidgetPlugin.cpp
-  ctkTransferFunctionWidgetPlugin.h
+  ctkTransferFunctionViewPlugin.cpp
+  ctkTransferFunctionViewPlugin.h
   ctkTreeComboBoxPlugin.cpp
   ctkTreeComboBoxPlugin.h
   ctkSliderSpinBoxWidgetPlugin.cpp
@@ -70,7 +70,7 @@ SET(PLUGIN_MOC_SRCS
   ctkMenuButtonPlugin.h
   ctkRangeSliderPlugin.h
   ctkRangeWidgetPlugin.h
-  ctkTransferFunctionWidgetPlugin.h
+  ctkTransferFunctionViewPlugin.h
   ctkTreeComboBoxPlugin.h
   ctkSliderSpinBoxWidgetPlugin.h
   )

Libs/Widgets/Plugins/ctkTransferFunctionWidgetPlugin.cpp

@@ -19,51 +19,51 @@
 =========================================================================*/
 
 // CTK includes
-#include "ctkTransferFunctionWidgetPlugin.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionViewPlugin.h"
+#include "ctkTransferFunctionView.h"
 
 //-----------------------------------------------------------------------------
-ctkTransferFunctionWidgetPlugin::ctkTransferFunctionWidgetPlugin(QObject *_parent)
+ctkTransferFunctionViewPlugin::ctkTransferFunctionViewPlugin(QObject *_parent)
         : QObject(_parent)
 {
 
 }
 
 //-----------------------------------------------------------------------------
-QWidget *ctkTransferFunctionWidgetPlugin::createWidget(QWidget *_parent)
+QWidget *ctkTransferFunctionViewPlugin::createWidget(QWidget *_parent)
 {
-  ctkTransferFunctionWidget* _widget = new ctkTransferFunctionWidget(_parent);
+  ctkTransferFunctionView* _widget = new ctkTransferFunctionView(_parent);
   return _widget;
 }
 
 //-----------------------------------------------------------------------------
-QString ctkTransferFunctionWidgetPlugin::domXml() const
+QString ctkTransferFunctionViewPlugin::domXml() const
 {
-  return "<widget class=\"ctkTransferFunctionWidget\" \
-          name=\"TransferFunctionWidget\">\n"
+  return "<widget class=\"ctkTransferFunctionView\" \
+          name=\"TransferFunctionView\">\n"
           "</widget>\n";
 }
 
 // --------------------------------------------------------------------------
-QIcon ctkTransferFunctionWidgetPlugin::icon() const
+QIcon ctkTransferFunctionViewPlugin::icon() const
 {
   return QIcon();
 }
 
 //-----------------------------------------------------------------------------
-QString ctkTransferFunctionWidgetPlugin::includeFile() const
+QString ctkTransferFunctionViewPlugin::includeFile() const
 {
-  return "ctkTransferFunctionWidget.h";
+  return "ctkTransferFunctionView.h";
 }
 
 //-----------------------------------------------------------------------------
-bool ctkTransferFunctionWidgetPlugin::isContainer() const
+bool ctkTransferFunctionViewPlugin::isContainer() const
 {
   return false;
 }
 
 //-----------------------------------------------------------------------------
-QString ctkTransferFunctionWidgetPlugin::name() const
+QString ctkTransferFunctionViewPlugin::name() const
 {
-  return "ctkTransferFunctionWidget";
+  return "ctkTransferFunctionView";
 }

Libs/Widgets/Plugins/ctkTransferFunctionWidgetPlugin.h

@@ -18,20 +18,20 @@
  
 =========================================================================*/
 
-#ifndef __ctkTransferFunctionWidgetPlugin_h
-#define __ctkTransferFunctionWidgetPlugin_h
+#ifndef __ctkTransferFunctionViewPlugin_h
+#define __ctkTransferFunctionViewPlugin_h
 
 // CTK includes
 #include "ctkWidgetsAbstractPlugin.h"
 
-class CTK_WIDGETS_PLUGINS_EXPORT ctkTransferFunctionWidgetPlugin :
+class CTK_WIDGETS_PLUGINS_EXPORT ctkTransferFunctionViewPlugin :
   public QObject,
   public ctkWidgetsAbstractPlugin
 {
   Q_OBJECT
 
 public:
-  ctkTransferFunctionWidgetPlugin(QObject *_parent = 0);
+  ctkTransferFunctionViewPlugin(QObject *_parent = 0);
 
   QWidget *createWidget(QWidget *_parent);
   QString  domXml() const;

Libs/Widgets/Plugins/ctkWidgetsPlugins.h

@@ -40,7 +40,7 @@
 #include "ctkMenuButtonPlugin.h"
 #include "ctkRangeSliderPlugin.h"
 #include "ctkRangeWidgetPlugin.h"
-#include "ctkTransferFunctionWidgetPlugin.h"
+#include "ctkTransferFunctionViewPlugin.h"
 #include "ctkTreeComboBoxPlugin.h"
 #include "ctkSliderSpinBoxWidgetPlugin.h"
 
@@ -69,9 +69,9 @@ public:
             << new ctkMenuButtonPlugin
             << new ctkRangeSliderPlugin
             << new ctkRangeWidgetPlugin
-            << new ctkTransferFunctionWidgetPlugin
-            << new ctkTreeComboBoxPlugin
-            << new ctkSliderSpinBoxWidgetPlugin;
+            << new ctkSliderSpinBoxWidgetPlugin
+            << new ctkTransferFunctionViewPlugin
+            << new ctkTreeComboBoxPlugin;
     return plugins;
     }
 };

Libs/Widgets/ctkTransferFunctionControlPointsItem.cpp

@@ -32,7 +32,7 @@
 #include "ctkTransferFunctionControlPointsItem.h"
 #include "ctkTransferFunctionRepresentation.h"
 #include "ctkTransferFunctionScene.h"
-#include "ctkTransferFunctionWidget.h"
+#include "ctkTransferFunctionView.h"
 
 //-----------------------------------------------------------------------------
 class ctkTransferFunctionControlPointsItemPrivate: 
@@ -125,7 +125,7 @@ void ctkTransferFunctionControlPointsItem::paint(
 void ctkTransferFunctionControlPointsItem::mousePressEvent(QGraphicsSceneMouseEvent* e)
 {
   CTK_D(ctkTransferFunctionControlPointsItem);
-  ctkTransferFunctionWidget* view = qobject_cast<ctkTransferFunctionWidget*>(e->widget()->parentWidget());
+  ctkTransferFunctionView* view = qobject_cast<ctkTransferFunctionView*>(e->widget()->parentWidget());
   Q_ASSERT(view);
   // e->pos() is ok, pointArea should be in the world coordiate
   QRect pointViewArea(QPoint(-d->PointSize.width() / 2, -d->PointSize.height() / 2), d->PointSize);

Libs/Widgets/ctkTransferFunctionView.cpp

@@ -0,0 +1,99 @@
+/*=========================================================================
+
+  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 <QDebug>
+//#include <QGLWidget>
+#include <QGraphicsScene>
+#include <QResizeEvent>
+
+/// CTK includes
+#include "ctkHistogram.h"
+#include "ctkTransferFunction.h"
+#include "ctkTransferFunctionBarsItem.h"
+#include "ctkTransferFunctionControlPointsItem.h"
+#include "ctkTransferFunctionGradientItem.h"
+#include "ctkTransferFunctionScene.h"
+#include "ctkTransferFunctionView.h"
+
+//-----------------------------------------------------------------------------
+class ctkTransferFunctionViewPrivate: public ctkPrivate<ctkTransferFunctionView>
+{
+  CTK_DECLARE_PUBLIC(ctkTransferFunctionView);
+public:
+  ctkTransferFunctionViewPrivate();
+  void init();
+};
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionViewPrivate::ctkTransferFunctionViewPrivate()
+{
+}
+
+//-----------------------------------------------------------------------------
+void ctkTransferFunctionViewPrivate::init()
+{
+  CTK_P(ctkTransferFunctionView);
+  p->setScene(new ctkTransferFunctionScene(p));
+  p->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  p->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+  //p->setViewport(new QGLWidget);
+  p->setRenderHint(QPainter::Antialiasing);
+}
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionView::ctkTransferFunctionView(QWidget* parentWidget)
+  :QGraphicsView(parentWidget)
+{
+  CTK_INIT_PRIVATE(ctkTransferFunctionView);
+  ctk_d()->init();
+}
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionView::~ctkTransferFunctionView()
+{
+}
+
+//-----------------------------------------------------------------------------
+void ctkTransferFunctionView::resizeEvent(QResizeEvent * event)
+{
+  /*
+  QRectF sceneRect(QPointF(0,0),event->size());
+  this->scene()->setSceneRect(sceneRect);
+  foreach(QGraphicsItem * item, this->scene()->items())
+    {
+    ctkTransferFunctionItem* rectItem = 
+      qgraphicsitem_cast<ctkTransferFunctionItem*>(item);
+    if (rectItem)
+      {
+      rectItem->setRect(sceneRect);
+      }
+    }
+  */
+  QMatrix zoomMatrix;
+  zoomMatrix.scale(event->size().width(), event->size().height());
+  bool blocked = this->blockSignals(true);
+  this->setMatrix(zoomMatrix);
+  this->blockSignals(blocked);
+  this->QGraphicsView::resizeEvent(event);
+  // Control points are resized by the view transform, we want
+  // fixed size control points, lines...
+  //this->fitInView(this->scene()->sceneRect());
+  qDebug() << "resize event caught";
+}

Libs/Widgets/ctkTransferFunctionWidget.h

@@ -18,8 +18,8 @@
  
 =========================================================================*/
 
-#ifndef __ctkTransferFunctionWidget_h
-#define __ctkTransferFunctionWidget_h
+#ifndef __ctkTransferFunctionView_h
+#define __ctkTransferFunctionView_h
 
 /// Qt includes
 #include <QGraphicsView>
@@ -29,19 +29,15 @@
 #include "ctkPimpl.h"
 
 class ctkTransferFunction;
-class ctkTransferFunctionWidgetPrivate;
+class ctkTransferFunctionViewPrivate;
 
 //-----------------------------------------------------------------------------
-class CTK_WIDGETS_EXPORT ctkTransferFunctionWidget: public QGraphicsView
+class CTK_WIDGETS_EXPORT ctkTransferFunctionView: public QGraphicsView
 {
   Q_OBJECT;
 public:
-  ctkTransferFunctionWidget(QWidget* parent = 0);
-  ctkTransferFunctionWidget(ctkTransferFunction* transferFunction, QWidget* parent = 0);
-  virtual ~ctkTransferFunctionWidget();
-
-  void setTransferFunction(ctkTransferFunction* transferFunction);
-  ctkTransferFunction* transferFunction()const;
+  ctkTransferFunctionView(QWidget* parent = 0);
+  virtual ~ctkTransferFunctionView();
 protected:
   virtual void resizeEvent(QResizeEvent * event);
   /*
@@ -50,7 +46,7 @@ protected:
   virtual void mouseReleaseEvent ( QMouseEvent * event );*/
 
 private:
-  CTK_DECLARE_PRIVATE(ctkTransferFunctionWidget);
+  CTK_DECLARE_PRIVATE(ctkTransferFunctionView);
 };
 
 #endif

Libs/Widgets/ctkTransferFunctionWidget.cpp

@@ -1,184 +0,0 @@
-/*=========================================================================
-
-  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 <QDebug>
-//#include <QGLWidget>
-#include <QGraphicsScene>
-#include <QResizeEvent>
-
-/// CTK includes
-#include "ctkHistogram.h"
-#include "ctkTransferFunction.h"
-#include "ctkTransferFunctionWidget.h"
-#include "ctkTransferFunctionScene.h"
-#include "ctkTransferFunctionGradientItem.h"
-#include "ctkTransferFunctionControlPointsItem.h"
-#include "ctkTransferFunctionBarsItem.h"
-
-//-----------------------------------------------------------------------------
-class ctkTransferFunctionWidgetPrivate: public ctkPrivate<ctkTransferFunctionWidget>
-{
-  CTK_DECLARE_PUBLIC(ctkTransferFunctionWidget);
-public:
-  ctkTransferFunctionWidgetPrivate();
-  void init();
-  ctkTransferFunction* TransferFunction;
-};
-
-//-----------------------------------------------------------------------------
-ctkTransferFunctionWidgetPrivate::ctkTransferFunctionWidgetPrivate()
-{
-  this->TransferFunction = 0;
-}
-
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidgetPrivate::init()
-{
-  CTK_P(ctkTransferFunctionWidget);
-  p->setScene(new ctkTransferFunctionScene(p));
-  p->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  p->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  //p->setViewport(new QGLWidget);
-  p->setRenderHint(QPainter::Antialiasing);
-}
-
-//-----------------------------------------------------------------------------
-ctkTransferFunctionWidget::ctkTransferFunctionWidget(QWidget* parentWidget)
-  :QGraphicsView(parentWidget)
-{
-  CTK_INIT_PRIVATE(ctkTransferFunctionWidget);
-  ctk_d()->init();
-}
-
-//-----------------------------------------------------------------------------
-ctkTransferFunctionWidget::ctkTransferFunctionWidget(
-  ctkTransferFunction* transferFunction, QWidget* parentWidget)
-  :QGraphicsView(parentWidget)
-{
-  CTK_INIT_PRIVATE(ctkTransferFunctionWidget);
-  ctk_d()->init();
-  this->setTransferFunction(transferFunction);
-}
-//-----------------------------------------------------------------------------
-ctkTransferFunctionWidget::~ctkTransferFunctionWidget()
-{
-}
-
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidget::setTransferFunction(ctkTransferFunction* transferFunction)
-{
-  CTK_D(ctkTransferFunctionWidget);
-  d->TransferFunction = transferFunction;
-  ctkTransferFunctionScene* tfScene = dynamic_cast<ctkTransferFunctionScene*>(this->scene());
-  Q_ASSERT(tfScene);
-  tfScene->clear();
-  //tfScene->setTransferFunction(transferFunction);
-
-  ctkTransferFunctionGradientItem* gradient = 
-    new ctkTransferFunctionGradientItem(transferFunction);
-  //gradient->setRect(tfScene->sceneRect());
-  this->scene()->addItem(gradient);
-
-  if (qobject_cast<ctkHistogram*>(transferFunction) != 0)
-    {
-    gradient->setMask(false);
-    ctkTransferFunctionBarsItem* histogramItem = 
-      new ctkTransferFunctionBarsItem(transferFunction);
-    //controlPoints->setRect(tfScene->sceneRect());
-    this->scene()->addItem(histogramItem);
-    }
-  else
-    {
-    ctkTransferFunctionControlPointsItem* controlPoints = 
-      new ctkTransferFunctionControlPointsItem(transferFunction);
-    // Useful for key events
-    controlPoints->setFlags(QGraphicsItem::ItemIsFocusable);
-    //controlPoints->setRect(tfScene->sceneRect());
-    this->scene()->addItem(controlPoints);
-    } 
-}
-
-//-----------------------------------------------------------------------------
-ctkTransferFunction* ctkTransferFunctionWidget::transferFunction()const
-{
-  return ctk_d()->TransferFunction;
-}
-
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidget::resizeEvent(QResizeEvent * event)
-{
-  /*
-  QRectF sceneRect(QPointF(0,0),event->size());
-  this->scene()->setSceneRect(sceneRect);
-  foreach(QGraphicsItem * item, this->scene()->items())
-    {
-    ctkTransferFunctionItem* rectItem = 
-      qgraphicsitem_cast<ctkTransferFunctionItem*>(item);
-    if (rectItem)
-      {
-      rectItem->setRect(sceneRect);
-      }
-    }
-  */
-  QMatrix zoomMatrix;
-  zoomMatrix.scale(event->size().width(), event->size().height());
-  bool blocked = this->blockSignals(true);
-  this->setMatrix(zoomMatrix);
-  this->blockSignals(blocked);
-  this->QGraphicsView::resizeEvent(event);
-  // Control points are resized by the view transform, we want
-  // fixed size control points, lines...
-  //this->fitInView(this->scene()->sceneRect());
-  qDebug() << "resize event caught";
-}
-/*
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidget::dragEnterEvent ( QDragEnterEvent * event )
-{
-  qDebug() << "drag event caught";
-
-  this->QGraphicsView::dragEnterEvent(event);
-
-}
-
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidget::mousePressEvent ( QMouseEvent * event )
-{
-  qDebug() << "press event caught";
-  //One control point is added to the scene
-  // 1 - get position of the mouse
-  qDebug() << "x position " << event->x();
-  qDebug() << "y position " << event->y();
-
-  this->scene()->items()[1]->;
-
-  // 2nd item are the control points
-
-  this->QGraphicsView::mousePressEvent(event);
-}
-
-//-----------------------------------------------------------------------------
-void ctkTransferFunctionWidget::mouseReleaseEvent ( QMouseEvent * event )
-{
-  qDebug() << "release event caught";
-
-  this->QGraphicsView::mouseReleaseEvent(event);
-}
-*/