diff --git a/Modules/QmitkExt/QmitkHistogramJSWidget.h b/Modules/QmitkExt/QmitkHistogramJSWidget.h
index 0f1c286a13..03cef0f746 100644
--- a/Modules/QmitkExt/QmitkHistogramJSWidget.h
+++ b/Modules/QmitkExt/QmitkHistogramJSWidget.h
@@ -1,91 +1,90 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 
 #ifndef QMITKHISTOGRAMJSWIDGET_H
 #define QMITKHISTOGRAMJSWIDGET_H
 
 #include <QWidget>
 #include <QUrl>
 #include <QtWebKit/QtWebKit>
 #include "QmitkExtExports.h"
 #include <QVariant>
 #include "mitkImage.h"
 #include "mitkPlanarFigure.h"
 #include <itkPolyLineParametricPath.h>
 
 
-
 class QmitkExt_EXPORT QmitkHistogramJSWidget : public QWebView
 {
   Q_OBJECT
 
 // Properties which can be used in JavaScript
   Q_PROPERTY(QList<QVariant> measurement
              READ getMeasurement)
   Q_PROPERTY(QList<QVariant> frequency
              READ getFrequency)
   Q_PROPERTY(bool useLineGraph
              READ getUseLineGraph)
   Q_PROPERTY(bool intensityProfile
              READ getIntensityProfile)
 
 public:
   typedef mitk::Image::HistogramType HistogramType;
   typedef mitk::Image::HistogramType::ConstIterator HistogramConstIteratorType;
   typedef itk::PolyLineParametricPath< 3 > ParametricPathType;
   typedef itk::ParametricPath< 3 >::Superclass PathType;
 
   explicit QmitkHistogramJSWidget(QWidget *parent = 0);
   ~QmitkHistogramJSWidget();
   void resizeEvent(QResizeEvent* resizeEvent);
   void ComputeHistogram(HistogramType* histogram);
   void clearHistogram();
   QList<QVariant> getMeasurement();
   QList<QVariant> getFrequency();
   bool getUseLineGraph();
   void setImage(mitk::Image* image);
   void setPlanarFigure(const mitk::PlanarFigure* planarFigure);
   void ComputeHistogramOfPlanarFigure();
   bool getIntensityProfile();
 
 private:
   QList<QVariant> m_Frequency;
   QList<QVariant> m_Measurement;
   mitk::Image::Pointer m_Image;
   mitk::PlanarFigure::ConstPointer m_PlanarFigure;
   bool m_UseLineGraph;
   HistogramType::ConstPointer m_Histogram;
   PathType::ConstPointer m_DerivedPath;
   ParametricPathType::Pointer m_ParametricPath;
   bool m_IntensityProfile;
 
   void clearData();
 
 private slots:
   void addJSObject();
 
 public slots:
   void histogramToBarChart();
   void histogramToLineGraph();
   void resetView();
 
 signals:
   void DataChanged();
   void GraphChanged();
 };
 
 #endif // QMITKHISTOGRAMJSWIDGET_H
diff --git a/Modules/QmitkExt/resources/Histogram.js b/Modules/QmitkExt/resources/Histogram.js
index 2f8715ee7d..86030a3881 100644
--- a/Modules/QmitkExt/resources/Histogram.js
+++ b/Modules/QmitkExt/resources/Histogram.js
@@ -1,398 +1,392 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 var margin = {
   top : 10,
   bottom : 50,
   left : 45,
   right : 20,
   };
 var height = histogramData.height - margin.top - margin.bottom;
 var width = histogramData.width - margin.left - margin.right;
 var tension = 0.8;
 var connected = false;
 var dur = 1000;
 var binSize = 0;
 
 // connecting signal from qt side with JavaScript method
 if (!connected)
 {
   connected = true;
   histogramData.DataChanged.connect(updateHistogram);
   histogramData.GraphChanged.connect(updateHistogram);
 }
 
 var xScale = d3.scale.linear()
   .domain([d3.min(histogramData.measurement),d3.max(histogramData.measurement)])
   .range([0,width]);
 
 var yScale = d3.scale.linear()
   .domain([d3.min(histogramData.frequency),d3.max(histogramData.frequency)])
   .range([height,margin.top]);
 
 var xAxis = d3.svg.axis()
   .scale(xScale)
   .orient("bottom")
   .tickFormat(d3.format("s"));
 
 var yAxis = d3.svg.axis()
   .scale(yScale)
   .orient("left")
   .tickFormat(d3.format("s"));
 
 var zoombie = d3.behavior.zoom().x(xScale).scaleExtent([1, 50]).on("zoom", zoom);
 
 var svg = d3.select("body")
   .append("svg")
   .attr("class", "svg")
   .attr("width", width + margin.right + margin.left)
   .attr("height", height + margin.top + margin.bottom)
  .append("g")
   .attr("transform", "translate (" + margin.left + "," + margin.top + ")")
   .call(zoombie)
   .on("mousemove", myMouseMove);
 
 svg.append("rect")
   .attr("width", width + margin.left + margin.right)
   .attr("height", height + margin.top + margin.bottom)
   .attr("opacity", 0);
 
 var vis = svg.append("svg")
   .attr("width", width)
   .attr("height", height);
 
 var line = d3.svg.line()
   .interpolate("linear")
   .x(function(d,i) {
     return xScale(histogramData.measurement[i]-binSize/2);
   })
   .y(function(d) {
     return yScale(d);
   });
 
 var linenull = d3.svg.line()
   .interpolate("linear")
   .x(function(d,i) {
     return xScale(histogramData.measurement[i]-binSize/2);
   })
   .y(function(d) {
     return yScale(0);
   });
 
 updateHistogram();
 
 // method to update and choose histogram
 function updateHistogram()
 {
   calcBinSize();
   if (!histogramData.useLineGraph)
   {
     barChart();
   }
   else if (histogramData.useLineGraph)
   {
     linePlot()
   }
 }
 
 function calcBinSize()
 {
   var min = d3.min(histogramData.measurement);
   var max = d3.max(histogramData.measurement);
   binSize = Math.round((max - min) / (histogramData.measurement.length));
 }
 
 // method to display histogram as barchart
 function barChart()
 {
   definition();
   zoombie = d3.behavior.zoom().x(xScale).scaleExtent([1, 50]).on("zoom", zoom);
 
   svg.call(zoombie);
-  var linenull = d3.svg.line()
-    .interpolate("linear")
-    .x(function(d,i) {
-      return xScale(histogramData.measurement[i]);
-    })
-    .y(function(d) {
-      return yScale(0);
-    });
 
 // element to animate transition from linegraph to barchart
   vis.selectAll("path.line").remove();
   vis.selectAll("circle").remove();
 
   var bar = vis.selectAll("rect.bar").data(histogramData.frequency);
 
   bar.enter().append("rect")
     .attr("class", "bar")
     .on("mouseover", myMouseOver)
     .on("mouseout", myMouseOut)
     .attr("x", function(d,i) {
       return xScale(histogramData.measurement[i]-binSize/2);
     })
     .attr("y", height)
     .attr("height", 0)
     .attr("width", barWidth)
 
   bar.transition()
     .duration(dur)
     .attr("x", function(d,i) {
       return xScale(histogramData.measurement[i]-binSize/2);
     })
     .attr("y", myYPostion)
     .attr("height", barHeight)
     .attr("width", barWidth);
 
   bar.exit()
     .transition()
     .duration(dur)
     .attr("y", height)
     .attr("height", 0)
     .remove();
 
   svg.selectAll("g")
     .remove();
 
   svg.append("g")
     .attr("class", "x axis")
     .attr("transform", "translate(0," + height + ")")
     .call(xAxis);
 
   svg.append("g")
     .attr("class", "y axis")
     .call(yAxis);
 }
 
 // method to display histogram as linegraph
 function linePlot()
 {
   definition();
   zoombie = d3.behavior.zoom().x(xScale).y(yScale).scaleExtent([1, 50]).on("zoom", zoom);
 
   svg.call(zoombie);
 // element to animate transition from barchart to linegraph
   if(!histogramData.intensityProfile)
   {
     vis.selectAll("rect.bar")
       .transition()
       .duration(dur)
       .attr("height", 0)
       .remove();
   }
   else
   {
     vis.selectAll("rect.bar")
       .transition()
       .duration(dur)
       .attr("y", height)
       .attr("height", 0)
       .remove();
   }
 
-  vis.selectAll("circle").remove();
-
-  var graph = vis.selectAll("path.line")
-    .data([histogramData.frequency]);
-
-  graph.enter()
-    .append("path")
-    .attr("class", "line")
-    .transition()
-    .duration(dur)
-    .attr("d", line);
-
-  graph.transition()
-    .duration(dur)
-    .attr("d", line);
-
   if(histogramData.intensityProfile)
   {
   var circles = vis.selectAll("circle").data(histogramData.frequency);
 
   circles.enter()
     .append("circle")
     .on("mouseover", myMouseOverLine)
     .on("mouseout", myMouseOutLine)
     .attr("cx", function(d,i) {
       return xScale(histogramData.measurement[i]-binSize/2);
     })
     .attr("cy", function (d) {
       return yScale(d)
     })
     .attr("r", 5)
     .attr("opacity", 0)
     .style("stroke", "red")
     .style("stroke-width", 1)
     .style("fill-opacity", 0);
 
   circles.exit().remove();
   }
+  else
+  {
+    vis.selectAll("circle").remove();
+  }
+
+  var graph = vis.selectAll("path.line")
+    .data([histogramData.frequency]);
+
+  graph.enter()
+    .append("path")
+    .attr("class", "line")
+    .transition()
+    .duration(dur)
+    .attr("d", line);
+
+  graph.transition()
+    .duration(dur)
+    .attr("d", line);
 
   svg.selectAll("g")
     .remove();
 
   svg.append("g")
     .attr("class", "x axis")
     .attr("transform", "translate(0," + height + ")")
     .call(xAxis);
 
   svg.append("g")
     .attr("class", "y axis")
     .call(yAxis);
 }
 
 function definition()
 {
 // match scale to current data
   xScale = d3.scale.linear()
     .domain([d3.min(histogramData.measurement)-binSize/2,d3.max(histogramData.measurement)+binSize/2])
     .range([0,width]);
 
   yScale = d3.scale.linear()
     .domain([d3.min(histogramData.frequency),d3.max(histogramData.frequency)])
     .range([height,margin.top]);
 
   xAxis = d3.svg.axis()
     .scale(xScale)
     .orient("bottom")
     .tickFormat(d3.format("s"));
 
   yAxis = d3.svg.axis()
     .scale(yScale)
     .orient("left")
     .tickFormat(d3.format("s"));
 }
 
 // method to ensure barwidth is not smaller than 1px
 function barWidth(d, i)
 {
   var bw;
   bw =(xScale(histogramData.measurement[i + 1]) - xScale(histogramData.measurement[i])) * (histogramData.frequency.length / (histogramData.frequency.length + 1)) - 1;
   bw = bw > 1 ? bw : 1;
   return bw;
 }
 
 function barHeight(d)
 {
   var bh;
   bh = height - yScale(d);
   bh = bh >=2 ? bh : 2;
   return bh;
 }
 
 function myYPostion(d)
 {
   var myy = yScale(d);
   myy = (height-myy) > 2 ? myy : (height-2);
   if (d == 0)
   {
     return height;
   }
   return myy;
 }
 
 // zoom function, with plot focus by scale 1 and different zooming mode
 function zoom()
 {
   if (zoombie.scale() == 1)
   {
     zoombie.translate([0,0]);
     xScale.domain([d3.min(histogramData.measurement),d3.max(histogramData.measurement)]);
     yScale.domain([d3.min(histogramData.frequency),d3.max(histogramData.frequency)]);
   }
   if (!histogramData.useLineGraph)
   {
     svg.select(".x.axis").call(xAxis);
     vis.selectAll(".bar")
       .attr("width", barWidth)
       .attr("x", function(d, i) {
         return xScale(histogramData.measurement[i]-binSize/2);
         });
   }
   else
   {
     svg.select(".x.axis").call(xAxis);
     svg.select(".y.axis").call(yAxis);
     vis.selectAll("path.line")
       .attr("transform", "translate(" + zoombie.translate() + ")scale(" + zoombie.scale() + ")")
       .style("stroke-width", 1 / zoombie.scale());
     vis.selectAll("circle")
       .attr("cx", function(d, i) {
         return xScale(histogramData.measurement[i]-binSize/2);
       })
       .attr("cy", function(d) {
         return yScale(d);
       });
   }
 }
 
 // method to show infobox, while mouse is over a bin
 function myMouseOver()
 {
   var myBar = d3.select(this);
   var reScale = d3.scale.linear()
     .domain(xScale.range())
     .range(xScale.domain());
   var y = myBar.data();
   var x = reScale(myBar.attr("x"));
 
   myBar.style("fill", "red");
   d3.select(".infobox").style("display", "block");
   d3.select(".measurement").text("Greyvalue: " + (Math.round(x)) + " ... " + (Math.round(x+binSize)));
   d3.select(".frequency").text("Frequency: " + y);
 }
 
 // hide infobox, when mouse not over a bin
 function myMouseOut()
 {
   var myBar = d3.select(this);
   myBar.style("fill", d3.rgb(0,71,185));
   d3.select(".infobox").style("display", "none");
 }
 
 function myMouseOverLine()
 {
   var myCircle = d3.select(this)
   var reScale = d3.scale.linear()
     .domain(xScale.range())
     .range(xScale.domain());
   var y = myCircle.data();
   var x = reScale(myCircle.attr("cx"));
 
   x = x >= 0 ? x : 0;
 
   myCircle.attr("opacity", 1);
   d3.select(".infobox").style("display", "block");
   d3.select(".measurement").text("Distance: " + (Math.round(x*100)/100) + " mm");
   d3.select(".frequency").text("Intesity: " + y);
 }
 
 function myMouseOutLine()
 {
   var myCircle = d3.select(this);
   myCircle.attr("opacity", 0);
   d3.select(".infobox").style("display", "none");
 }
 
 // update mousecoordinates by mousemove
 function myMouseMove()
 {
   var infobox = d3.select(".infobox");
   var coords = d3.mouse(this);
   infobox.style("left", coords[0] + 75 + "px");
   infobox.style("top", coords[1] + "px");
 }
diff --git a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
index 143564d1af..288e4f927f 100644
--- a/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
+++ b/Plugins/org.mitk.gui.qt.measurementtoolbox/src/internal/QmitkImageStatisticsView.cpp
@@ -1,702 +1,704 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center,
 Division of Medical and Biological Informatics.
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
 #include "QmitkImageStatisticsView.h"
 
 // Qt includes
 #include <qclipboard.h>
 
 // berry includes
 #include <berryIWorkbenchPage.h>
 
 // mitk includes
 #include "mitkNodePredicateDataType.h"
 #include "mitkPlanarFigureInteractor.h"
 
 // itk includes
 #include "itksys/SystemTools.hxx"
 #include <mitkILinkedRenderWindowPart.h>
 #include <QmitkRenderWindow.h>
 
 const std::string QmitkImageStatisticsView::VIEW_ID = "org.mitk.views.imagestatistics";
 
 QmitkImageStatisticsView::QmitkImageStatisticsView(QObject* /*parent*/, const char* /*name*/)
 : m_Controls( NULL ),
 m_TimeStepperAdapter( NULL ),
 m_SelectedImage( NULL ),
 m_SelectedImageMask( NULL ),
 m_SelectedPlanarFigure( NULL ),
 m_ImageObserverTag( -1 ),
 m_ImageMaskObserverTag( -1 ),
 m_PlanarFigureObserverTag( -1 ),
 m_CurrentStatisticsValid( false ),
 m_StatisticsUpdatePending( false ),
 m_DataNodeSelectionChanged ( false ),
 m_Visible(false)
 {
   this->m_CalculationThread = new QmitkImageStatisticsCalculationThread;
 }
 
 QmitkImageStatisticsView::~QmitkImageStatisticsView()
 {
   if ( m_SelectedImage != NULL )
     m_SelectedImage->RemoveObserver( m_ImageObserverTag );
   if ( m_SelectedImageMask != NULL )
     m_SelectedImageMask->RemoveObserver( m_ImageMaskObserverTag );
   if ( m_SelectedPlanarFigure != NULL )
     m_SelectedPlanarFigure->RemoveObserver( m_PlanarFigureObserverTag );
 
   while(this->m_CalculationThread->isRunning()) // wait until thread has finished
   {
     itksys::SystemTools::Delay(100);
   }
   delete this->m_CalculationThread;
 }
 
 void QmitkImageStatisticsView::CreateQtPartControl(QWidget *parent)
 {
   if (m_Controls == NULL)
   {
     m_Controls = new Ui::QmitkImageStatisticsViewControls;
     m_Controls->setupUi(parent);
     this->CreateConnections();
 
     m_Controls->m_ErrorMessageLabel->hide();
     m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
     m_Controls->m_LineProfileWidget->SetPathModeToPlanarFigure();
   }
 }
 
 void QmitkImageStatisticsView::CreateConnections()
 {
   if ( m_Controls )
   {
     connect( (QObject*)(this->m_Controls->m_ButtonCopyHistogramToClipboard), SIGNAL(clicked()),(QObject*) this, SLOT(OnClipboardHistogramButtonClicked()) );
     connect( (QObject*)(this->m_Controls->m_ButtonCopyStatisticsToClipboard), SIGNAL(clicked()),(QObject*) this, SLOT(OnClipboardStatisticsButtonClicked()) );
     connect( (QObject*)(this->m_Controls->m_IgnoreZerosCheckbox), SIGNAL(clicked()),(QObject*) this, SLOT(OnIgnoreZerosCheckboxClicked()) );
     connect( (QObject*) this->m_CalculationThread, SIGNAL(finished()),this, SLOT( OnThreadedStatisticsCalculationEnds()),Qt::QueuedConnection);
     connect( (QObject*) this, SIGNAL(StatisticsUpdate()),this, SLOT( RequestStatisticsUpdate()), Qt::QueuedConnection);
     connect( (QObject*) this->m_Controls->m_StatisticsTable, SIGNAL(cellDoubleClicked(int,int)),this, SLOT( JumpToCoordinates(int,int)) );
     connect( (QObject*) (this->m_Controls->m_barRadioButton), SIGNAL(clicked()), (QObject*) (this->m_Controls->m_JSHistogram), SLOT(histogramToBarChart()));
     connect( (QObject*) (this->m_Controls->m_lineRadioButton), SIGNAL(clicked()), (QObject*) (this->m_Controls->m_JSHistogram), SLOT(histogramToLineGraph()));
   }
 }
 
 void QmitkImageStatisticsView::JumpToCoordinates(int row ,int col)
 {
     mitk::Point3D world;
     if (row==4)
         world = m_WorldMin;
     else if (row==3)
         world = m_WorldMax;
     else
         return;
 
     mitk::IRenderWindowPart* part = this->GetRenderWindowPart();
     if (part)
     {
         part->GetRenderWindow("axial")->GetSliceNavigationController()->SelectSliceByPoint(world);
         part->GetRenderWindow("sagittal")->GetSliceNavigationController()->SelectSliceByPoint(world);
         part->GetRenderWindow("coronal")->GetSliceNavigationController()->SelectSliceByPoint(world);
     }
 }
 
 void QmitkImageStatisticsView::OnIgnoreZerosCheckboxClicked()
 {
   emit StatisticsUpdate();
 }
 
 void QmitkImageStatisticsView::OnClipboardHistogramButtonClicked()
 {
   if ( m_CurrentStatisticsValid )
   {
     typedef mitk::ImageStatisticsCalculator::HistogramType HistogramType;
     const HistogramType *histogram = this->m_CalculationThread->GetTimeStepHistogram().GetPointer();
 
     QString clipboard( "Measurement \t Frequency\n" );
     for ( HistogramType::ConstIterator it = histogram->Begin();
       it != histogram->End();
       ++it )
     {
       clipboard = clipboard.append( "%L1 \t %L2\n" )
         .arg( it.GetMeasurementVector()[0], 0, 'f', 2 )
         .arg( it.GetFrequency() );
     }
 
     QApplication::clipboard()->setText(
       clipboard, QClipboard::Clipboard );
   }
   else
   {
     QApplication::clipboard()->clear();
   }
 }
 
 void QmitkImageStatisticsView::OnClipboardStatisticsButtonClicked()
 {
   if ( this->m_CurrentStatisticsValid )
   {
     const mitk::ImageStatisticsCalculator::Statistics &statistics =
       this->m_CalculationThread->GetStatisticsData();
 
     // Copy statistics to clipboard ("%Ln" will use the default locale for
     // number formatting)
     QString clipboard( "Mean \t StdDev \t RMS \t Max \t Min \t N \t V (mm³)\n" );
     clipboard = clipboard.append( "%L1 \t %L2 \t %L3 \t %L4 \t %L5 \t %L6 \t %L7" )
       .arg( statistics.Mean, 0, 'f', 10 )
       .arg( statistics.Sigma, 0, 'f', 10 )
       .arg( statistics.RMS, 0, 'f', 10 )
       .arg( statistics.Max, 0, 'f', 10 )
       .arg( statistics.Min, 0, 'f', 10 )
       .arg( statistics.N )
       .arg( m_Controls->m_StatisticsTable->item( 0, 6 )->text() );
 
     QApplication::clipboard()->setText(
       clipboard, QClipboard::Clipboard );
   }
   else
   {
     QApplication::clipboard()->clear();
   }
 }
 
 void QmitkImageStatisticsView::OnSelectionChanged( berry::IWorkbenchPart::Pointer /*part*/,
                                                   const QList<mitk::DataNode::Pointer> &selectedNodes )
 {
   if (this->m_Visible)
   {
     this->SelectionChanged( selectedNodes );
   }
   else
   {
     this->m_DataNodeSelectionChanged = true;
   }
 }
 
 void QmitkImageStatisticsView::SelectionChanged(const QList<mitk::DataNode::Pointer> &selectedNodes)
 {
   if( this->m_StatisticsUpdatePending )
   {
     this->m_DataNodeSelectionChanged = true;
     return; // not ready for new data now!
   }
 
   if (selectedNodes.size() == this->m_SelectedDataNodes.size())
   {
     int i = 0;
     for (; i < selectedNodes.size(); ++i)
     {
       if (selectedNodes.at(i) != this->m_SelectedDataNodes.at(i))
       {
         break;
       }
     }
     // node selection did not change
     if (i == selectedNodes.size()) return;
   }
 
   this->ReinitData();
   if (!selectedNodes.size())
   {
     m_Controls->m_JSHistogram->clearHistogram();
   }
   if(selectedNodes.size() == 1 || selectedNodes.size() == 2)
   {
     for (int i= 0; i< selectedNodes.size(); ++i)
     {
       this->m_SelectedDataNodes.push_back(selectedNodes.at(i));
     }
     this->m_DataNodeSelectionChanged = false;
     this->m_Controls->m_ErrorMessageLabel->setText( "" );
     this->m_Controls->m_ErrorMessageLabel->hide();
     emit StatisticsUpdate();
   }
   else
   {
     this->m_DataNodeSelectionChanged = false;
   }
 }
 
 void QmitkImageStatisticsView::ReinitData()
 {
 
   while( this->m_CalculationThread->isRunning()) // wait until thread has finished
   {
     itksys::SystemTools::Delay(100);
   }
 
   if(this->m_SelectedImage != NULL)
   {
     this->m_SelectedImage->RemoveObserver( this->m_ImageObserverTag);
     this->m_SelectedImage = NULL;
   }
   if(this->m_SelectedImageMask != NULL)
   {
     this->m_SelectedImageMask->RemoveObserver( this->m_ImageMaskObserverTag);
     this->m_SelectedImageMask = NULL;
   }
   if(this->m_SelectedPlanarFigure != NULL)
   {
     this->m_SelectedPlanarFigure->RemoveObserver( this->m_PlanarFigureObserverTag);
     this->m_SelectedPlanarFigure = NULL;
   }
   this->m_SelectedDataNodes.clear();
   this->m_StatisticsUpdatePending = false;
 
   m_Controls->m_ErrorMessageLabel->setText( "" );
   m_Controls->m_ErrorMessageLabel->hide();
   this->InvalidateStatisticsTableView();
   m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
 }
 
 void QmitkImageStatisticsView::OnThreadedStatisticsCalculationEnds()
 {
   std::stringstream message;
   message << "";
   m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
   m_Controls->m_ErrorMessageLabel->hide();
   this->WriteStatisticsToGUI();
 }
 
 void QmitkImageStatisticsView::UpdateStatistics()
 {
   mitk::IRenderWindowPart* renderPart = this->GetRenderWindowPart();
   if ( renderPart == NULL )
   {
     this->m_StatisticsUpdatePending =  false;
     return;
   }
   m_WorldMin.Fill(-1);
   m_WorldMax.Fill(-1);
 
  // classify selected nodes
   mitk::NodePredicateDataType::Pointer imagePredicate = mitk::NodePredicateDataType::New("Image");
 
   std::string maskName = std::string();
   std::string maskType = std::string();
   unsigned int maskDimension = 0;
 
   // reset data from last run
   ITKCommandType::Pointer changeListener = ITKCommandType::New();
   changeListener->SetCallbackFunction( this, &QmitkImageStatisticsView::SelectedDataModified );
 
   mitk::DataNode::Pointer planarFigureNode;
   for( int i= 0 ; i < this->m_SelectedDataNodes.size(); ++i)
   {
     mitk::PlanarFigure::Pointer planarFig = dynamic_cast<mitk::PlanarFigure*>(this->m_SelectedDataNodes.at(i)->GetData());
     if( imagePredicate->CheckNode(this->m_SelectedDataNodes.at(i)) )
     {
       bool isMask = false;
       this->m_SelectedDataNodes.at(i)->GetPropertyValue("binary", isMask);
 
       if( this->m_SelectedImageMask == NULL && isMask)
       {
         this->m_SelectedImageMask = dynamic_cast<mitk::Image*>(this->m_SelectedDataNodes.at(i)->GetData());
         this->m_ImageMaskObserverTag = this->m_SelectedImageMask->AddObserver(itk::ModifiedEvent(), changeListener);
 
         maskName = this->m_SelectedDataNodes.at(i)->GetName();
         maskType = m_SelectedImageMask->GetNameOfClass();
         maskDimension = 3;
       }
       else if( !isMask )
       {
         if(this->m_SelectedImage == NULL)
         {
           this->m_SelectedImage = static_cast<mitk::Image*>(this->m_SelectedDataNodes.at(i)->GetData());
           this->m_ImageObserverTag = this->m_SelectedImage->AddObserver(itk::ModifiedEvent(), changeListener);
         }
       }
     }
     else if (planarFig.IsNotNull())
     {
       if(this->m_SelectedPlanarFigure == NULL)
       {
         this->m_SelectedPlanarFigure = planarFig;
         this->m_PlanarFigureObserverTag  =
           this->m_SelectedPlanarFigure->AddObserver(mitk::EndInteractionPlanarFigureEvent(), changeListener);
         maskName = this->m_SelectedDataNodes.at(i)->GetName();
         maskType = this->m_SelectedPlanarFigure->GetNameOfClass();
         maskDimension = 2;
         planarFigureNode = m_SelectedDataNodes.at(i);
       }
     }
     else
     {
       std::stringstream message;
       message << "<font color='red'>" << "Invalid data node type!" << "</font>";
       m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
       m_Controls->m_ErrorMessageLabel->show();
     }
   }
 
   if(maskName == "")
   {
     maskName = "None";
     maskType = "";
     maskDimension = 0;
   }
 
   if (m_SelectedPlanarFigure != NULL && m_SelectedImage == NULL)
   {
       mitk::DataStorage::SetOfObjects::ConstPointer parentSet = this->GetDataStorage()->GetSources(planarFigureNode);
       for (int i=0; i<parentSet->Size(); i++)
       {
           mitk::DataNode::Pointer node = parentSet->ElementAt(i);
           if( imagePredicate->CheckNode(node) )
           {
             bool isMask = false;
             node->GetPropertyValue("binary", isMask);
 
             if( !isMask )
             {
               if(this->m_SelectedImage == NULL)
               {
                 this->m_SelectedImage = static_cast<mitk::Image*>(node->GetData());
                 this->m_ImageObserverTag = this->m_SelectedImage->AddObserver(itk::ModifiedEvent(), changeListener);
               }
             }
           }
       }
   }
 
   unsigned int timeStep = renderPart->GetTimeNavigationController()->GetTime()->GetPos();
 
   if ( m_SelectedImage != NULL && m_SelectedImage->IsInitialized())
   {
     // Check if a the selected image is a multi-channel image. If yes, statistics
     // cannot be calculated currently.
     if ( m_SelectedImage->GetPixelType().GetNumberOfComponents() > 1 )
     {
       std::stringstream message;
       message << "<font color='red'>Multi-component images not supported.</font>";
       m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
       m_Controls->m_ErrorMessageLabel->show();
 
       this->InvalidateStatisticsTableView();
       m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
       m_Controls->m_JSHistogram->clearHistogram();
       m_CurrentStatisticsValid = false;
       this->m_StatisticsUpdatePending = false;
       return;
     }
 
     std::stringstream maskLabel;
     maskLabel << maskName;
     if ( maskDimension > 0 )
     {
       maskLabel << "  [" << maskDimension << "D " << maskType << "]";
     }
     m_Controls->m_SelectedMaskLabel->setText( maskLabel.str().c_str() );
 
     // check time step validity
     if(m_SelectedImage->GetDimension() <= 3 && timeStep > m_SelectedImage->GetDimension(3)-1)
     {
       timeStep = m_SelectedImage->GetDimension(3)-1;
     }
 
     //// initialize thread and trigger it
     this->m_CalculationThread->SetIgnoreZeroValueVoxel( m_Controls->m_IgnoreZerosCheckbox->isChecked() );
     this->m_CalculationThread->Initialize( m_SelectedImage, m_SelectedImageMask, m_SelectedPlanarFigure );
     this->m_CalculationThread->SetTimeStep( timeStep );
     std::stringstream message;
     message << "<font color='red'>Calculating statistics...</font>";
     m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
     m_Controls->m_ErrorMessageLabel->show();
 
     try
     {
       // Compute statistics
       this->m_CalculationThread->start();
     }
     catch ( const mitk::Exception& e)
     {
       std::stringstream message;
       message << "<font color='red'>" << e.GetDescription() << "</font>";
       m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
       m_Controls->m_ErrorMessageLabel->show();
       this->m_StatisticsUpdatePending = false;
     }
     catch ( const std::runtime_error &e )
     {
       // In case of exception, print error message on GUI
       std::stringstream message;
       message << "<font color='red'>" << e.what() << "</font>";
       m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
       m_Controls->m_ErrorMessageLabel->show();
       this->m_StatisticsUpdatePending = false;
     }
     catch ( const std::exception &e )
     {
       MITK_ERROR << "Caught exception: " << e.what();
 
       // In case of exception, print error message on GUI
       std::stringstream message;
       message << "<font color='red'>Error! Unequal Dimensions of Image and Segmentation. No recompute possible </font>";
       m_Controls->m_ErrorMessageLabel->setText( message.str().c_str() );
       m_Controls->m_ErrorMessageLabel->show();
       this->m_StatisticsUpdatePending = false;
     }
   }
   else
   {
     this->m_StatisticsUpdatePending = false;
   }
 }
 
 void QmitkImageStatisticsView::SelectedDataModified()
 {
   if( !m_StatisticsUpdatePending )
   {
     emit StatisticsUpdate();
   }
 }
 
 void QmitkImageStatisticsView::NodeRemoved(const mitk::DataNode *node)
 {
   while(this->m_CalculationThread->isRunning()) // wait until thread has finished
   {
     itksys::SystemTools::Delay(100);
   }
 
   if (node->GetData() == m_SelectedImage)
   {
     m_SelectedImage = NULL;
   }
 }
 
 void QmitkImageStatisticsView::RequestStatisticsUpdate()
 {
   if ( !m_StatisticsUpdatePending )
   {
     if(this->m_DataNodeSelectionChanged)
     {
       this->SelectionChanged(this->GetCurrentSelection());
     }
     else
     {
       this->m_StatisticsUpdatePending = true;
       this->UpdateStatistics();
     }
   }
   if (this->GetRenderWindowPart())
     this->GetRenderWindowPart()->RequestUpdate();
 }
 
 void QmitkImageStatisticsView::WriteStatisticsToGUI()
 {
   m_Controls->m_lineRadioButton->setEnabled(true);
   m_Controls->m_barRadioButton->setEnabled(true);
   m_Controls->m_InfoLabel->setText(QString(""));
-  if (m_Controls->m_barRadioButton->isChecked())
-  {
-    m_Controls->m_JSHistogram->histogramToBarChart();
-  }
+
   if(m_DataNodeSelectionChanged)
   {
     this->m_StatisticsUpdatePending = false;
     this->RequestStatisticsUpdate();
     return;    // stop visualization of results and calculate statistics of new selection
   }
 
   if ( this->m_CalculationThread->GetStatisticsUpdateSuccessFlag())
   {
     if ( this->m_CalculationThread->GetStatisticsChangedFlag() )
     {
       // Do not show any error messages
       m_Controls->m_ErrorMessageLabel->hide();
       m_CurrentStatisticsValid = true;
     }
 
+    if (m_Controls->m_barRadioButton->isChecked())
+    {
+      m_Controls->m_JSHistogram->histogramToBarChart();
+    }
     m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
     m_Controls->m_JSHistogram->ComputeHistogram( this->m_CalculationThread->GetTimeStepHistogram().GetPointer() );
     this->FillStatisticsTableView( this->m_CalculationThread->GetStatisticsData(), this->m_CalculationThread->GetStatisticsImage());
   }
   else
   {
     m_Controls->m_SelectedMaskLabel->setText( "None" );
     m_Controls->m_ErrorMessageLabel->setText( m_CalculationThread->GetLastErrorMessage().c_str() );
     m_Controls->m_ErrorMessageLabel->show();
     // Clear statistics and histogram
     this->InvalidateStatisticsTableView();
     m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
-    m_Controls->m_JSHistogram->clearHistogram();
+    //m_Controls->m_JSHistogram->clearHistogram();
     m_CurrentStatisticsValid = false;
 
+
     // If a (non-closed) PlanarFigure is selected, display a line profile widget
     if ( m_SelectedPlanarFigure != NULL )
     {
       // check whether PlanarFigure is initialized
       const mitk::Geometry2D *planarFigureGeometry2D = m_SelectedPlanarFigure->GetGeometry2D();
       if ( planarFigureGeometry2D == NULL )
       {
         // Clear statistics, histogram, and GUI
         this->InvalidateStatisticsTableView();
         m_Controls->m_StatisticsWidgetStack->setCurrentIndex( 0 );
         m_Controls->m_JSHistogram->clearHistogram();
         m_CurrentStatisticsValid = false;
         m_Controls->m_ErrorMessageLabel->hide();
         m_Controls->m_SelectedMaskLabel->setText( "None" );
         this->m_StatisticsUpdatePending = false;
         return;
       }
       // TODO: enable line profile widget
       m_Controls->m_JSHistogram->setImage(this->m_CalculationThread->GetStatisticsImage());
       m_Controls->m_JSHistogram->setPlanarFigure(m_SelectedPlanarFigure);
       m_Controls->m_JSHistogram->ComputeHistogramOfPlanarFigure();
       m_Controls->m_lineRadioButton->setEnabled(false);
       m_Controls->m_barRadioButton->setEnabled(false);
       std::stringstream message;
       message << "<font color='red'>Only linegraph available for an intesityprofile!</font>";
       m_Controls->m_InfoLabel->setText(message.str().c_str());
     }
   }
   this->m_StatisticsUpdatePending = false;
 }
 
 void QmitkImageStatisticsView::ComputeIntensityProfile( mitk::PlanarLine* line )
 {
   double sampling = 300;
   QmitkVtkHistogramWidget::HistogramType::Pointer histogram = QmitkVtkHistogramWidget::HistogramType::New();
   itk::Size<1> siz;
   siz[0] = sampling;
   itk::FixedArray<double,1> lower, higher;
   lower.Fill(0);
   mitk::Point3D begin = line->GetWorldControlPoint(0);
   mitk::Point3D end = line->GetWorldControlPoint(1);
   itk::Vector<double,3> direction = (end - begin);
   higher.Fill(direction.GetNorm());
   histogram->Initialize(siz, lower, higher);
   for(int i = 0; i < sampling; i++)
   {
     double d = m_SelectedImage->GetPixelValueByWorldCoordinate(begin + double(i)/sampling * direction);
     histogram->SetFrequency(i,d);
   }
   m_Controls->m_JSHistogram->ComputeHistogram( histogram );
 }
 
 void QmitkImageStatisticsView::FillStatisticsTableView(
   const mitk::ImageStatisticsCalculator::Statistics &s,
   const mitk::Image *image )
 {
     if (s.MaxIndex.size()==3)
     {
         mitk::Point3D index;
         index[0] = s.MaxIndex[0];
         index[1] = s.MaxIndex[1];
         index[2] = s.MaxIndex[2];
         m_SelectedImage->GetGeometry()->IndexToWorld(index, m_WorldMax);
         index[0] = s.MinIndex[0];
         index[1] = s.MinIndex[1];
         index[2] = s.MinIndex[2];
         m_SelectedImage->GetGeometry()->IndexToWorld(index, m_WorldMin);
     }
 
     int decimals = 2;
 
     mitk::PixelType doublePix = mitk::MakeScalarPixelType< double >();
     mitk::PixelType floatPix = mitk::MakeScalarPixelType< float >();
     if (image->GetPixelType()==doublePix || image->GetPixelType()==floatPix)
         decimals = 5;
 
   this->m_Controls->m_StatisticsTable->setItem( 0, 0, new QTableWidgetItem(
     QString("%1").arg(s.Mean, 0, 'f', decimals) ) );
   this->m_Controls->m_StatisticsTable->setItem( 0, 1, new QTableWidgetItem(
     QString("%1").arg(s.Sigma, 0, 'f', decimals) ) );
 
   this->m_Controls->m_StatisticsTable->setItem( 0, 2, new QTableWidgetItem(
     QString("%1").arg(s.RMS, 0, 'f', decimals) ) );
 
     QString max; max.append(QString("%1").arg(s.Max, 0, 'f', decimals));
     max += " (";
     for (int i=0; i<s.MaxIndex.size(); i++)
     {
         max += QString::number(s.MaxIndex[i]);
         if (i<s.MaxIndex.size()-1)
             max += ",";
     }
     max += ")";
   this->m_Controls->m_StatisticsTable->setItem( 0, 3, new QTableWidgetItem( max ) );
 
     QString min; min.append(QString("%1").arg(s.Min, 0, 'f', decimals));
     min += " (";
     for (int i=0; i<s.MinIndex.size(); i++)
     {
         min += QString::number(s.MinIndex[i]);
         if (i<s.MinIndex.size()-1)
             min += ",";
     }
     min += ")";
   this->m_Controls->m_StatisticsTable->setItem( 0, 4, new QTableWidgetItem( min ) );
 
   this->m_Controls->m_StatisticsTable->setItem( 0, 5, new QTableWidgetItem(
     QString("%1").arg(s.N) ) );
 
   const mitk::Geometry3D *geometry = image->GetGeometry();
   if ( geometry != NULL )
   {
     const mitk::Vector3D &spacing = image->GetGeometry()->GetSpacing();
     double volume = spacing[0] * spacing[1] * spacing[2] * (double) s.N;
     this->m_Controls->m_StatisticsTable->setItem( 0, 6, new QTableWidgetItem(
       QString("%1").arg(volume, 0, 'f', decimals) ) );
   }
   else
   {
     this->m_Controls->m_StatisticsTable->setItem( 0, 6, new QTableWidgetItem(
       "NA" ) );
   }
 }
 
 void QmitkImageStatisticsView::InvalidateStatisticsTableView()
 {
   for ( unsigned int i = 0; i < 7; ++i )
   {
     this->m_Controls->m_StatisticsTable->setItem( 0, i, new QTableWidgetItem( "NA" ) );
   }
 }
 
 void QmitkImageStatisticsView::Activated()
 {
 }
 
 void QmitkImageStatisticsView::Deactivated()
 {
 }
 
 void QmitkImageStatisticsView::Visible()
 {
   m_Visible = true;
   if (m_DataNodeSelectionChanged)
   {
     if (this->IsCurrentSelectionValid())
     {
       this->SelectionChanged(this->GetCurrentSelection());
     }
     else
     {
       this->SelectionChanged(this->GetDataManagerSelection());
     }
     m_DataNodeSelectionChanged = false;
   }
 }
 
 void QmitkImageStatisticsView::Hidden()
 {
   m_Visible = false;
 }
 
 void QmitkImageStatisticsView::SetFocus()
 {
 }