diff --git a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
index bd655b92e7..c012803294 100644
--- a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
+++ b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp
@@ -1,213 +1,225 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2009-03-21 19:27:37 +0100 (Sa, 21 Mrz 2009) $
 Version:   $Revision: 16719 $ 
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html 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 notices for more information.
 
 =========================================================================*/
 
 #include "QmitkToolTrackingStatusWidget.h"
 
 
 
 
 
 QmitkToolTrackingStatusWidget::QmitkToolTrackingStatusWidget(QWidget* parent)  
 : QWidget(parent), m_Controls(NULL), m_StatusLabels (NULL), m_NavigationDatas(NULL)
 {
   this->CreateQtPartControl( this );
   m_ShowPositions = false;
+  m_ShowQuaternions = false;
   m_Alignment = Qt::AlignHCenter;
   m_Style = QmitkToolTrackingStatusWidget::VerticalUpperStyle;
 }
 
 
 void QmitkToolTrackingStatusWidget::SetStyle(QmitkToolTrackingStatusWidget::Style newStyle)
   {
   m_Style = newStyle;
   }
 
 void QmitkToolTrackingStatusWidget::SetShowPositions(bool enable)
 {
   m_ShowPositions = enable;
 }
 
+void QmitkToolTrackingStatusWidget::SetShowQuaternions(bool enable)
+{
+  m_ShowQuaternions = enable;
+}
+
 void QmitkToolTrackingStatusWidget::SetTextAlignment(Qt::AlignmentFlag alignment)
 {
   m_Alignment = alignment;
 }
 
 QmitkToolTrackingStatusWidget::~QmitkToolTrackingStatusWidget()
 {
   //m_Controls = NULL;
   delete m_StatusLabels;
   delete m_NavigationDatas;
 }
 
 void QmitkToolTrackingStatusWidget::CreateQtPartControl(QWidget *parent)
 {
   if (!m_Controls)
   {
     // create GUI widgets
     m_Controls = new Ui::QmitkToolTrackingStatusWidgetControls;
     m_Controls->setupUi(parent);
 
     this->CreateConnections();
   }
 }
 
 void QmitkToolTrackingStatusWidget::CreateConnections()
 {
 
 }
 
 
 void QmitkToolTrackingStatusWidget::SetNavigationDatas(std::vector<mitk::NavigationData::Pointer>* navDatas)
 {  
   m_NavigationDatas = navDatas;
 }
 
 
 void QmitkToolTrackingStatusWidget::AddNavigationData(mitk::NavigationData::Pointer nd)
 {
   if(m_NavigationDatas == NULL)
     m_NavigationDatas = new std::vector<mitk::NavigationData::Pointer>();
 
   m_NavigationDatas->push_back(nd);
 }
 
 
 void QmitkToolTrackingStatusWidget::Refresh()
 {
 
   if(m_NavigationDatas == NULL || m_NavigationDatas->size() <= 0)
     return;
 
   mitk::NavigationData* navData; 
 
   for(unsigned int i = 0; i < m_NavigationDatas->size(); i++)
   {
     navData = m_NavigationDatas->at(i).GetPointer();
     QString name(navData->GetName());
     QString pos = "";
+    QString quat = "";
     if (m_ShowPositions)
       {
       mitk::Point3D position = navData->GetPosition();
       pos = " [" + QString::number(position[0]) + ";" + QString::number(position[1]) + ";" + QString::number(position[2]) + "]";
       }
+    if (m_ShowQuaternions)
+      {
+      mitk::Quaternion quaternion = navData->GetOrientation();
+      quat = " / [qx:" + QString::number(quaternion.x()) + ";qy:" + QString::number(quaternion.y()) + ";qz:" + QString::number(quaternion.z()) + ";qr:" + QString::number(quaternion.r()) + "]";
+      }
 
     if(name.compare(m_StatusLabels->at(i)->objectName()) == 0)
-    {
-      m_StatusLabels->at(i)->setText(name+pos);
+      {
+      m_StatusLabels->at(i)->setText(name+pos+quat);
       if(navData->IsDataValid())
         m_StatusLabels->at(i)->setStyleSheet("QLabel{background-color: #8bff8b }");
       
       else
         m_StatusLabels->at(i)->setStyleSheet("QLabel{background-color: #ff7878 }");
-    }
+      }
   }
 }
 
 
 void QmitkToolTrackingStatusWidget::ShowStatusLabels()
 {
   RemoveGuiLabels(); 
 
   if(m_NavigationDatas == NULL || m_NavigationDatas->size() <= 0)
     return;
 
 
   m_StatusLabels = new QVector<QLabel*>();
   mitk::NavigationData* navData;
   QLabel* label;
 
 
   for(unsigned int i = 0; i < m_NavigationDatas->size(); i++)
   {
     navData = m_NavigationDatas->at(i).GetPointer();
 
     QString name(navData->GetName());
    
     label = new QLabel(name, this);
     label->setObjectName(name);
     label->setAlignment(m_Alignment | Qt::AlignVCenter);
     label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
 
     m_StatusLabels->append(label);
     if (m_Style == QmitkToolTrackingStatusWidget::VerticalUpperStyle) m_Controls->m_VerticalLayout->addWidget(m_StatusLabels->at(i));
     else m_Controls->m_GridLayout->addWidget(m_StatusLabels->at(i),0,i);
     
   }
 }
 
 void QmitkToolTrackingStatusWidget::PreShowTools(mitk::NavigationToolStorage::Pointer toolStorage)
   {
   QLabel* label;
 
   for(unsigned int i = 0; i < toolStorage->GetToolCount(); i++)
     {
     QString name(toolStorage->GetTool(i)->GetToolName().c_str());
    
     label = new QLabel(name, this);
     label->setObjectName(name);
     label->setAlignment(m_Alignment | Qt::AlignVCenter);
     label->setFrameStyle(QFrame::Panel | QFrame::Sunken);
     if (m_Style == QmitkToolTrackingStatusWidget::VerticalUpperStyle) m_Controls->m_VerticalLayout->addWidget(label);
     else m_Controls->m_GridLayout->addWidget(label);
     
     }
 
   }
 
 
 void QmitkToolTrackingStatusWidget::RemoveStatusLabels()
 {
   //remove GUI elements
   RemoveGuiLabels();  
 
   //clear members
   if(m_StatusLabels != NULL && m_StatusLabels->size() > 0)
     {
     delete m_StatusLabels;
     m_StatusLabels = new QVector< QLabel* >();
     }
 
   if(m_NavigationDatas != NULL && m_NavigationDatas->size() > 0)
     {
     delete m_NavigationDatas;
     m_NavigationDatas = new std::vector<mitk::NavigationData::Pointer>();
     }
 
 }
 
 void QmitkToolTrackingStatusWidget::RemoveGuiLabels()
   {
   while(m_Controls->m_GridLayout->count() > 0 || m_Controls->m_VerticalLayout->count() > 0)
     {
     if (m_Controls->m_GridLayout->count() > 0)
       {
       QWidget* actWidget = m_Controls->m_GridLayout->itemAt(0)->widget();
       m_Controls->m_GridLayout->removeWidget(actWidget);
       delete actWidget;
       }
     else if (m_Controls->m_VerticalLayout->count() > 0)
       {
       QWidget* actWidget = m_Controls->m_VerticalLayout->itemAt(0)->widget();
       m_Controls->m_VerticalLayout->removeWidget(actWidget);
       delete actWidget;
       }
     }
   }
 
 
 
 
diff --git a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.h b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.h
index 18123a1263..f3272764e9 100644
--- a/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.h
+++ b/Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.h
@@ -1,128 +1,133 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date: 2009-03-21 19:27:37 +0100 (Sa, 21 Mrz 2009) $
 Version:   $Revision: 16719 $ 
 
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html 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 notices for more information.
 
 =========================================================================*/
 
 #ifndef _QmitkToolTrackingStatusWidget_H_INCLUDED
 #define _QmitkToolTrackingStatusWidget_H_INCLUDED
 
 #include "ui_QmitkToolTrackingStatusWidgetControls.h"
 #include "MitkIGTUIExports.h"
 
 #include <mitkNavigationDataSource.h>
 #include <mitkNavigationToolStorage.h>
 #include <QVector>
 #include <QLabel>
 
 
 
 
 /*!
 \brief QmitkToolTrackingStatusWidget
 
 Widget for setting up and controlling an update timer in an IGT-Pipeline.
 
 */
 class MitkIGTUI_EXPORT QmitkToolTrackingStatusWidget : public QWidget
 {  
   Q_OBJECT // this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
 public: 
 
 
   typedef std::vector< mitk::NavigationData::Pointer > NavigationDataPointerArray;
 
   enum Style
     {
     GridLowerStyle,
     VerticalUpperStyle
     };
 
   /*!  
   \brief default constructor  
   */ 
   QmitkToolTrackingStatusWidget( QWidget* parent );
 
 
   /*!  
   \brief default destructor  
   */ 
   virtual ~QmitkToolTrackingStatusWidget();
 
   /*!  
   \brief Sets up the labels in this widget's QGridLayout for showing the track status of the tracking tools
   */ 
   void ShowStatusLabels();
   
   /*!
   \brief Sets the ND for this widget
   */
   void SetNavigationDatas(std::vector<mitk::NavigationData::Pointer>* navDatas);
 
 
   void AddNavigationData(mitk::NavigationData::Pointer nd);
 
   /*!  
   \brief Changes background color of status labels (green or red) to show if actual navigation data of each tool is valid.
   */ 
   void Refresh();
   
   /*!  
   \brief Removes all status labels.
   */ 
   void RemoveStatusLabels();
 
   /** @brief Enables / disables if the tool positions are shown. Default is off.*/
   void SetShowPositions(bool enable);
 
+  /** @brief Enables / disables if the tool quaternions are shown. Default is off.*/
+  void SetShowQuaternions(bool enable);
+
   /** @brief Sets the text alignment of the tool labels. Default is center. Example: Use Qt::AlignLeft for left alignment. */
   void SetTextAlignment(Qt::AlignmentFlag alignment);
 
   /** @brief Sets the alignment style of this widget:
     *         GridLowerStyle: Tool labels are at the lower side of the widget in grid alignment
     *         VerticalUpperStyle: Tool labels are at the upper side in a vertical alignment (default)
     */
   void SetStyle(QmitkToolTrackingStatusWidget::Style newStyle);
 
   /** @brief Shows tool labels for the tools in the tool storage. This method can be called BEFORE connecting the navigation data to
    *         make a preview of the tools.
    */
   void PreShowTools(mitk::NavigationToolStorage::Pointer toolStorage);
 
 protected:
   void CreateConnections();
   void CreateQtPartControl( QWidget *parent );
   Ui::QmitkToolTrackingStatusWidgetControls* m_Controls;  ///< gui widgets
 
 
 private:  
 
   /*!  
   \brief Vector for all tool tracking status labels.
   */
   QVector< QLabel* >* m_StatusLabels;
 
   std::vector<mitk::NavigationData::Pointer>*  m_NavigationDatas; 
 
   bool m_ShowPositions;
 
+  bool m_ShowQuaternions;
+
   Qt::AlignmentFlag m_Alignment;
 
   QmitkToolTrackingStatusWidget::Style m_Style;
 
   void RemoveGuiLabels();
 
 };
 #endif // _QmitkToolTrackingStatusWidget_H_INCLUDED