ENH: ctkTransferFunction* add bar representation (ideal for histograms)

Libs/Widgets/CMakeLists.txt

@@ -60,8 +60,8 @@ SET(KIT_SRCS
   ctkTransferFunctionControlPointsItem.h
   ctkTransferFunctionGradientItem.cpp
   ctkTransferFunctionGradientItem.h
-  ctkTransferFunctionHistogramItem.cpp
-  ctkTransferFunctionHistogramItem.h
+  ctkTransferFunctionBarsItem.cpp
+  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionItem.cpp
   ctkTransferFunctionItem.h
   ctkTransferFunctionWidget.cpp
@@ -98,7 +98,7 @@ SET(KIT_MOC_SRCS
   ctkTitleComboBox.h
   ctkTransferFunctionControlPointsItem.h
   ctkTransferFunctionGradientItem.h
-  ctkTransferFunctionHistogramItem.h
+  ctkTransferFunctionBarsItem.h
   ctkTransferFunctionItem.h
   ctkTransferFunctionControlPointsItem.h
   ctkTransferFunctionWidget.h

Libs/Widgets/ctkTransferFunctionBarsItem.cpp

@@ -0,0 +1,117 @@
+/*=========================================================================
+
+  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>
+#include <QGraphicsSceneMouseEvent>
+#include <QPainter>
+#include <QtGlobal>
+#include <QVariant>
+
+/// CTK includes
+#include "ctkTransferFunction.h"
+#include "ctkTransferFunctionBarsItem.h"
+#include "ctkTransferFunctionScene.h"
+
+//-----------------------------------------------------------------------------
+class ctkTransferFunctionBarsItemPrivate: public ctkPrivate<ctkTransferFunctionBarsItem>
+{
+public:
+  ctkTransferFunctionBarsItemPrivate();
+  qreal BarWidth;
+};
+
+ctkTransferFunctionBarsItemPrivate::ctkTransferFunctionBarsItemPrivate()
+{
+  this->BarWidth = 0.7;
+}
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionBarsItem::ctkTransferFunctionBarsItem(QGraphicsItem* parentGraphicsItem)
+  :ctkTransferFunctionItem(parentGraphicsItem)
+{
+  CTK_INIT_PRIVATE(ctkTransferFunctionBarsItem);
+}
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionBarsItem::ctkTransferFunctionBarsItem(
+  ctkTransferFunction* transferFunc, QGraphicsItem* parentItem)
+  :ctkTransferFunctionItem(transferFunc, parentItem)
+{
+  CTK_INIT_PRIVATE(ctkTransferFunctionBarsItem);
+}
+
+//-----------------------------------------------------------------------------
+ctkTransferFunctionBarsItem::~ctkTransferFunctionBarsItem()
+{  
+}
+
+//-----------------------------------------------------------------------------
+void ctkTransferFunctionBarsItem::setBarWidth(qreal newBarWidth)
+{
+  CTK_D(ctkTransferFunctionBarsItem);
+  if (d->BarWidth == newBarWidth)
+    {
+    return;
+    }
+  d->BarWidth = newBarWidth;
+  this->update();
+}
+
+//-----------------------------------------------------------------------------
+qreal ctkTransferFunctionBarsItem::barWidth()const
+{
+  CTK_D(const ctkTransferFunctionBarsItem);
+  return d->BarWidth;
+}
+
+//-----------------------------------------------------------------------------
+void ctkTransferFunctionBarsItem::paint(
+  QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget)
+{
+  CTK_D(ctkTransferFunctionBarsItem);
+  int count = this->transferFunction() ? this->transferFunction()->count() : 0;
+  if (count <= 0)
+    {
+    return;
+    }
+
+  ctkTransferFunctionScene* tfScene = dynamic_cast<ctkTransferFunctionScene*>(this->scene());
+  Q_ASSERT(tfScene);
+  const QList<QPointF>& points = tfScene->points();
+
+  QPainterPath bars;
+  QPen pen(QColor(255, 255, 255, 191), 1);
+  pen.setCosmetic(true);
+  painter->setPen(pen);
+  painter->setBrush(QBrush(QColor(191, 191, 191, 127)));
+
+  qreal barWidth = d->BarWidth * (this->rect().width() / (points.size() - 1)); 
+  qDebug() << "WIDTH: " << barWidth;
+  foreach(const QPointF& point, points)
+    {
+    qDebug() << point << point.x()-barWidth/2 << this->rect().height() - point.y();
+    bars.addRect(point.x()-barWidth/2, this->rect().height() - point.y(),
+                 barWidth, point.y());
+    }
+  painter->drawPath(bars);
+}
+

Libs/Widgets/ctkTransferFunctionBarsItem.h

@@ -0,0 +1,54 @@
+/*=========================================================================
+
+  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 __ctkTransferFunctionBarsItem_h
+#define __ctkTransferFunctionBarsItem_h
+
+/// Qt includes
+#include <QGraphicsObject>
+
+/// CTK includes
+#include "ctkPimpl.h"
+#include "ctkTransferFunctionItem.h"
+#include "CTKWidgetsExport.h"
+
+class ctkTransferFunction;
+class ctkTransferFunctionBarsItemPrivate;
+
+//-----------------------------------------------------------------------------
+class CTK_WIDGETS_EXPORT ctkTransferFunctionBarsItem: public ctkTransferFunctionItem
+{
+  Q_OBJECT
+  Q_PROPERTY(qreal barWidth READ barWidth WRITE setBarWidth)
+public:
+  ctkTransferFunctionBarsItem(QGraphicsItem* parent = 0);
+  ctkTransferFunctionBarsItem(ctkTransferFunction* transferFunc, 
+                              QGraphicsItem* parent = 0);
+  virtual ~ctkTransferFunctionBarsItem();
+  
+  void setBarWidth(qreal newBarWidth);  
+  qreal barWidth()const;
+
+  virtual void paint(QPainter * painter, const QStyleOptionGraphicsItem * option, QWidget * widget = 0);
+private:
+  CTK_DECLARE_PRIVATE(ctkTransferFunctionBarsItem);
+};
+
+#endif

Libs/Widgets/ctkTransferFunctionWidget.cpp

@@ -30,7 +30,7 @@
 #include "ctkTransferFunctionScene.h"
 #include "ctkTransferFunctionGradientItem.h"
 #include "ctkTransferFunctionControlPointsItem.h"
-#include "ctkTransferFunctionHistogramItem.h"
+#include "ctkTransferFunctionBarsItem.h"
 
 //-----------------------------------------------------------------------------
 class ctkTransferFunctionWidgetPrivate: public ctkPrivate<ctkTransferFunctionWidget>
@@ -93,15 +93,14 @@ void ctkTransferFunctionWidget::setTransferFunction(ctkTransferFunction* transfe
 
   ctkTransferFunctionGradientItem* gradient = 
     new ctkTransferFunctionGradientItem(transferFunction);
-  gradient->setRect(tfScene->sceneRect());
+  //gradient->setRect(tfScene->sceneRect());
   this->scene()->addItem(gradient);
 
   if (qobject_cast<ctkHistogram*>(transferFunction) != 0)
     {
     gradient->setMask(false);
-    ctkHistogram* histogram = qobject_cast<ctkHistogram*>(transferFunction);
-    ctkTransferFunctionHistogramItem* histogramItem = 
-      new ctkTransferFunctionHistogramItem(histogram);
+    ctkTransferFunctionBarsItem* histogramItem = 
+      new ctkTransferFunctionBarsItem(transferFunction);
     //controlPoints->setRect(tfScene->sceneRect());
     this->scene()->addItem(histogramItem);
     }