diff --git a/Modules/ToFHardware/mitkToFConfig.h.in b/Modules/ToFHardware/mitkToFConfig.h.in
index be76ab9540..abd6154cd6 100644
--- a/Modules/ToFHardware/mitkToFConfig.h.in
+++ b/Modules/ToFHardware/mitkToFConfig.h.in
@@ -1,14 +1,15 @@
 /*
   mitToFConfig.h
   this file is generated. Do not change!
 */
 
 #define MITK_TOF_PMDCAMBOARD_SOURCE_PLUGIN "@MITK_TOF_PMD_CAMBOARD_SOURCE@"
 #define MITK_TOF_PMDCAMBOARD_PROCESSING_PLUGIN "@MITK_TOF_PMD_CAMBOARD_PROC@"
 #define MITK_TOF_PMDO3_SOURCE_PLUGIN "@MITK_TOF_PMD_O3D_SOURCE@"
 #define MITK_TOF_PMDO3_PROCESSING_PLUGIN "@MITK_TOF_PMD_O3D_PROC@"
 #define MITK_TOF_PMDFILE_SOURCE_PLUGIN "@MITK_TOF_PMD_FILE_SOURCE@"
 #define MITK_TOF_PMDCAMCUBE_SOURCE_PLUGIN "@MITK_TOF_PMD_CAMCUBE_SOURCE@"
 #define MITK_TOF_PMDCAMCUBE_PROCESSING_PLUGIN "@MITK_TOF_PMD_CAMCUBE_PROC@"
 #define MITK_TOF_PLATFORM "@_PLATFORM_STRING@"
 #define MITK_TOF_DATA_DIR "@MITK_DATA_DIR@/ToF-Data"
+#define MITK_TOF_CAMERAS "@MITK_TOF_AVAILABLE_CAMERAS@"
diff --git a/Modules/ToFHardware/mitkToFHardware.cmake b/Modules/ToFHardware/mitkToFHardware.cmake
index adadcafa6b..9d85f70eab 100644
--- a/Modules/ToFHardware/mitkToFHardware.cmake
+++ b/Modules/ToFHardware/mitkToFHardware.cmake
@@ -1,107 +1,115 @@
 #option MITK_USE_TOF_HARDWARE
 
 IF(WIN32)
   IF(CMAKE_CL_64)
     SET(_PLATFORM_STRING "W64")
   ELSE(CMAKE_CL_64)
     SET(_PLATFORM_STRING "W32")
   ENDIF(CMAKE_CL_64)
 ELSE(WIN32)
   IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
     SET(_PLATFORM_STRING "L64")
   ELSE(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
     SET(_PLATFORM_STRING "L32")
   ENDIF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
 ENDIF(WIN32)
 
 OPTION(MITK_ENABLE_TOF_HARDWARE "Support for range cameras" OFF)
 IF(MITK_ENABLE_TOF_HARDWARE)
+SET(MITK_TOF_AVAILABLE_CAMERAS MITK Player)
+	
 #Begin PMD Camcube hardware
 OPTION(MITK_USE_TOF_PMDCAMCUBE "Enable support for PMD camcube" OFF)
 
 # only if PMD Camcube is enabled
 IF(MITK_USE_TOF_PMDCAMCUBE)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_CAMCUBE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camcube3.${_PLATFORM_STRING}.pap)
   SET(MITK_TOF_PMD_CAMCUBE_PROC ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.${_PLATFORM_STRING}.ppp)
   SET(MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp)
+  SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamCube 2.0/3.0,PMD Player,PMD Raw Data Player)
 #  FILE(GLOB MITK_TOF_PMD_CAMCUBE_SOURCE camcube3.${_PLATFORM_STRING}.pap)
 #  FILE(GLOB MITK_TOF_PMD_CAMCUBE_PROC camcubeproc.${_PLATFORM_STRING}.ppp)
 #  FILE(GLOB MITK_TOF_PMD_FILE_SOURCE pmdfile.${_PLATFORM_STRING}.pcp)
   IF(WIN32)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W32.pap  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W32.ppp  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcube3.W64.pap  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camcubeproc.W64.ppp  CONFIGURATIONS Release)
    MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp  CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_PMDCAMCUBE)
 #End PMD Camcube Hardware
 
 #Begin PMD CamBoard hardware
 OPTION(MITK_USE_TOF_PMDCAMBOARD "Enable support for PMD camboard" OFF)
 
 # only if PMD CamBoard is enabled
 IF(MITK_USE_TOF_PMDCAMBOARD)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_CAMBOARD_SOURCE ${MITK_PMD_SDK_DIR}/plugins/camboard.${_PLATFORM_STRING}.pap)
   SET(MITK_TOF_PMD_CAMBOARD_PROC ${MITK_PMD_SDK_DIR}/plugins/camboardproc.${_PLATFORM_STRING}.ppp)
+  SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD CamBoard)
 #  FILE(GLOB MITK_TOF_PMD_CAMBOARD_SOURCE camboard.${_PLATFORM_STRING}.pap)
 #  FILE(GLOB MITK_TOF_PMD_CAMBOARD_PROC camboardproc.${_PLATFORM_STRING}.ppp)
 #  FILE(GLOB MITK_TOF_PMD_FILE_SOURCE ${MITK_PMD_SDK_DIR}/plugins/pmdfile.${_PLATFORM_STRING}.pcp)
   IF(WIN32)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll DESTINATION bin CONFIGURATIONS Release)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W32.pap DESTINATION bin CONFIGURATIONS Release)
    INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W32.ppp DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboard.W64.pap DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/camboardproc.W64.ppp DESTINATION bin CONFIGURATIONS Release)
 #   INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/pmdfile.W32.pcp DESTINATION bin CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_PMDCAMBOARD)
 #End PMD CamBoard Hardware
 
 #Begin MESA SR4000 hardware
 OPTION(MITK_USE_TOF_MESASR4000 "Enable support for MESA SR4000" OFF)
 
 # only if MESA SR4000 is enabled
 IF(MITK_USE_TOF_MESASR4000)
   FIND_LIBRARY(MITK_MESA_LIB libMesaSR DOC "MESA access library.")
   GET_FILENAME_COMPONENT(MITK_MESA_SDK_DIR ${MITK_MESA_LIB} PATH)
   SET(MITK_MESA_SDK_DIR ${MITK_MESA_SDK_DIR}/..)
   FIND_PATH(MITK_MESA_INCLUDE_DIR libMesaSR.h ${MITK_MESA_SDK_DIR}/include DOC  "Include directory of MESA-SDK.")
+  SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},MESA Swissranger 4000)
   IF(WIN32)
    INSTALL(FILES ${MITK_MESA_SDK_DIR}/bin/libMesaSR.dll DESTINATION bin CONFIGURATIONS Release)
   ENDIf(WIN32)
 ENDIF(MITK_USE_TOF_MESASR4000)
 #End MESA SR4000 Hardware
 
 IF (WIN32)
 
 #Begin PMD O3 hardware
 OPTION(MITK_USE_TOF_PMDO3 "Enable support for PMD O3 camera" OFF)
 # only if PMD O3 is enabled
 IF(MITK_USE_TOF_PMDO3)
   FIND_LIBRARY(MITK_PMD_LIB pmdaccess2 DOC "PMD access library.")
   GET_FILENAME_COMPONENT(MITK_PMD_SDK_DIR ${MITK_PMD_LIB} PATH)
   SET(MITK_PMD_SDK_DIR ${MITK_PMD_SDK_DIR}/..)
   FIND_PATH(MITK_PMD_INCLUDE_DIR pmdsdk2.h ${MITK_PMD_SDK_DIR}/include DOC  "Include directory of PMD-SDK.")
   SET(MITK_TOF_PMD_O3D_SOURCE ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp)
   SET(MITK_TOF_PMD_O3D_PROC ${MITK_PMD_SDK_DIR}/plugins/o3d.${_PLATFORM_STRING}.pcp)
+  SET(MITK_TOF_AVAILABLE_CAMERAS ${MITK_TOF_AVAILABLE_CAMERAS},PMD O3D)
+  
 #  FILE(GLOB MITK_TOF_PMD_O3D_SOURCE o3d.${_PLATFORM_STRING}.pcp)
 #  FILE(GLOB MITK_TOF_PMD_O3D_PROC o3d.${_PLATFORM_STRING}.pcp)
   MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/bin/pmdaccess2.dll  CONFIGURATIONS Release)
   MITK_INSTALL(FILES ${MITK_PMD_SDK_DIR}/plugins/o3d.W32.pcp  CONFIGURATIONS Release)
 ENDIF(MITK_USE_TOF_PMDO3)
 #End PMD O3 Hardware
 ENDIF(WIN32)
+
 ENDIF(MITK_ENABLE_TOF_HARDWARE)
 
 CONFIGURE_FILE(mitkToFConfig.h.in ${PROJECT_BINARY_DIR}/mitkToFConfig.h @ONLY)
 
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
index 5a3cb61fbf..ee6157dc70 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.cpp
@@ -1,424 +1,429 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
 Version:   $Revision: 17332 $
 
 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.
 
 =========================================================================*/
 
 //#define _USE_MATH_DEFINES
 #include <QmitkToFConnectionWidget.h>
 
 //QT headers
 #include <qmessagebox.h>
 #include <qfiledialog.h>
 #include <qcombobox.h>
 
 //mitk headers
+#include "mitkToFConfig.h"
 #include <mitkToFImageGrabberCreator.h>
 
 //itk headers
 #include <itksys/SystemTools.hxx>
 
 const std::string QmitkToFConnectionWidget::VIEW_ID = "org.mitk.views.qmitktofconnectionwidget";
 
 QmitkToFConnectionWidget::QmitkToFConnectionWidget(QWidget* parent, Qt::WindowFlags f): QWidget(parent, f)
 {
   this->m_IntegrationTime = 0;
   this->m_ModulationFrequency = 0;
   this->m_ToFImageGrabber = NULL;
 
   m_Controls = NULL;
   CreateQtPartControl(this);
 }
 
 QmitkToFConnectionWidget::~QmitkToFConnectionWidget()
 {
 }
 
 void QmitkToFConnectionWidget::CreateQtPartControl(QWidget *parent)
 {
   if (!m_Controls)
   {
     // create GUI widgets
     m_Controls = new Ui::QmitkToFConnectionWidgetControls;
     m_Controls->setupUi(parent);
     this->CreateConnections();
+    // set available cameras to combo box
+    QString string(MITK_TOF_CAMERAS);
+    string.replace(";"," ");
+    QStringList list = string.split(",");
+    m_Controls->m_SelectCameraCombobox->addItems(list);
 
     ShowParameterWidget();
   }
 }
 
 void QmitkToFConnectionWidget::CreateConnections()
 {
   if ( m_Controls )
   {
     connect( (QObject*)(m_Controls->m_ConnectCameraButton), SIGNAL(clicked()),(QObject*) this, SLOT(OnConnectCamera()) );
-    connect( m_Controls->m_SelectCameraCombobox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnSelectCamera(int)) );
+    connect( m_Controls->m_SelectCameraCombobox, SIGNAL(currentIndexChanged(const QString)), this, SLOT(OnSelectCamera(const QString)) );
     connect( m_Controls->m_SelectCameraCombobox, SIGNAL(activated(int)), this, SLOT(OnSelectCamera(int)) );
     connect( m_Controls->m_SelectCameraCombobox, SIGNAL(activated(int)), this, SIGNAL(ToFCameraSelected(int)) );
 
     //connect( m_Controls->m_IntegrationTimeSpinBox, SIGNAL(valueChanged(int)), this, SLOT(OnChangeIntegrationTimeSpinBox(int)) );
     //connect( m_Controls->m_ModulationFrequencySpinBox, SIGNAL(valueChanged(int)), this, SLOT(OnChangeModulationFrequencySpinBox(int)) );
   }
 }
 
 void QmitkToFConnectionWidget::ShowParameterWidget()
 {
   int selectedCamera = m_Controls->m_SelectCameraCombobox->currentIndex();
   switch (selectedCamera)
   {
   case 0:
   case 1:
   case 2:   ShowPMDParameterWidget();
             break;
   case 3:   ShowMESAParameterWidget();
             break;
   default:  this->m_Controls->m_PMDParameterWidget->hide();
             this->m_Controls->m_MESAParameterWidget->hide();
   }
 }
 
 void QmitkToFConnectionWidget::ShowPMDParameterWidget()
 {
   this->m_Controls->m_PMDParameterWidget->show();
   this->m_Controls->m_MESAParameterWidget->hide();
 }
 
 void QmitkToFConnectionWidget::ShowMESAParameterWidget()
 {
   this->m_Controls->m_PMDParameterWidget->hide();
   this->m_Controls->m_MESAParameterWidget->show();
 }
 
 void QmitkToFConnectionWidget::ShowPlayerParameterWidget()
 {
   this->m_Controls->m_PMDParameterWidget->hide();
   this->m_Controls->m_MESAParameterWidget->hide();
 }
 
 mitk::ToFImageGrabber* QmitkToFConnectionWidget::GetToFImageGrabber()
 {
   return m_ToFImageGrabber;
 }
 
-void QmitkToFConnectionWidget::OnSelectCamera(int index)
+void QmitkToFConnectionWidget::OnSelectCamera(const QString selectedText)
 {
-  if (index == 0) // PMD camcube 2
+  if (selectedText == "PMD CamCube 2.0/3.0") // PMD camcube 2
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(true);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(true);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(true);
     ShowPMDParameterWidget();
   }
-  else if (index == 1) // pmd camboard
+  else if (selectedText == "PMD CamBoard") // pmd camboard
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(true);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(true);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     ShowPMDParameterWidget();
   }
-  else if (index == 2) // pmd O3d
+  else if (selectedText == "PMD O3D") // pmd O3d
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(true);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(true);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     ShowPMDParameterWidget();
   }
-  else if (index == 3) // MESA 4000
+  else if (selectedText == "MESA Swissranger 4000") // MESA 4000
   {
     ShowMESAParameterWidget();
   }
-  else if (index == 4) // pmd file player
+  else if (selectedText == "PMD Player") // pmd file player
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(false);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(false);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     ShowPlayerParameterWidget();
   }
-  else if (index == 5) // pmd raw data player
+  else if (selectedText == "PMD Raw Data Player") // pmd raw data player
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(false);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(false);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     ShowPlayerParameterWidget();
   }
-  else if (index == 6) // mitk player
+  else if (selectedText == "MITK Player") // mitk player
   {
     //m_Controls->m_IntegrationTimeSpinBox->setEnabled(false);
     //m_Controls->m_ModulationFrequencySpinBox->setEnabled(false);
     //m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     ShowPlayerParameterWidget();
   }
 }
 
 void QmitkToFConnectionWidget::OnConnectCamera()
 {
   bool playerMode = false;
 
   if (m_Controls->m_ConnectCameraButton->text()=="Connect")
   {   
     //reset the status of the GUI buttons
     m_Controls->m_ConnectCameraButton->setEnabled(false);
     m_Controls->m_SelectCameraCombobox->setEnabled(false);
 //    m_Controls->m_CalibrationParameterGroupBox->setEnabled(false);
     //repaint the widget
     this->repaint();
 
     QString tmpFileName("");
     QString fileFilter("");
 
     //select the camera to connect with
-    int selectedCamera = m_Controls->m_SelectCameraCombobox->currentIndex();
-    if (selectedCamera == 0)
+    QString selectedCamera = m_Controls->m_SelectCameraCombobox->currentText();
+    if (selectedCamera == "PMD CamCube 2.0/3.0")
     { //PMD CamCube
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDCamCubeImageGrabber();
     }
-    else if (selectedCamera == 1)
+    else if (selectedCamera == "PMD CamBoard")
     { //PMD CamBoard
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDCamBoardImageGrabber();
     }
-    else if (selectedCamera == 2)
+    else if (selectedCamera == "PMD O3D")
     {//PMD O3
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDO3ImageGrabber();
     }
-    else if (selectedCamera == 3)
+    else if (selectedCamera == "MESA Swissranger 4000")
     {//MESA SR4000
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetMESASR4000ImageGrabber();
     }
-    else if (selectedCamera == 4)
+    else if (selectedCamera == "PMD Player")
     {//PMD player
       playerMode = true;
       fileFilter.append("PMD Files (*.pmd)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDPlayerImageGrabber();
     }
-    else if (selectedCamera == 5)
+    else if (selectedCamera == "PMD Raw Data Player")
     {//PMD MITK player
       playerMode = true;
       fileFilter.append("MITK Images (*.pic)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetPMDMITKPlayerImageGrabber();
     }
-    else if (selectedCamera == 6)
+    else if (selectedCamera == "MITK Player")
     {//MITK player
       playerMode = true;
       fileFilter.append("MITK Images (*.pic)");
       this->m_ToFImageGrabber = mitk::ToFImageGrabberCreator::GetInstance()->GetMITKPlayerImageGrabber();
     }
 
     // if a player was selected ...
     if (playerMode)
     { //... open a QFileDialog to chose the corresponding file from the disc
       tmpFileName = QFileDialog::getOpenFileName(NULL, "Play Image From...", "", fileFilter);
       if (tmpFileName.isEmpty())
       {
         m_Controls->m_ConnectCameraButton->setChecked(false);
         m_Controls->m_ConnectCameraButton->setEnabled(true);
         m_Controls->m_SelectCameraCombobox->setEnabled(true);
 //        m_Controls->m_CalibrationParameterGroupBox->setEnabled(true);
-        OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentIndex());
+        OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
         QMessageBox::information( this, "Template functionality", "Please select a valid image before starting some action.");
         return;
       }
-      if(selectedCamera == 4)
+      if(selectedCamera == "PMD Player")
       { //set the PMD file name
         this->m_ToFImageGrabber->SetStringProperty("PMDFileName", tmpFileName.toStdString().c_str() );
       }
-      if (selectedCamera == 5 || selectedCamera == 6)
+      if (selectedCamera == "PMD Raw Data Player" || selectedCamera == "MITK Player")
       {
         std::string msg = "";
         try
         {
           //get 3 corresponding file names
           std::string dir = itksys::SystemTools::GetFilenamePath( tmpFileName.toStdString() );
           std::string baseFilename = itksys::SystemTools::GetFilenameWithoutLastExtension( tmpFileName.toStdString() );
           std::string extension = itksys::SystemTools::GetFilenameLastExtension( tmpFileName.toStdString() );
 
           if (extension != ".pic")
           {
             msg = msg + "Invalid file format, please select a \".pic\"-file";
             throw std::logic_error(msg.c_str());
           }
           int found = baseFilename.rfind("_DistanceImage");
           if (found == std::string::npos)
           {
             found = baseFilename.rfind("_AmplitudeImage");
           }
           if (found == std::string::npos)
           {
             found = baseFilename.rfind("_IntensityImage");
           }
           if (found == std::string::npos)
           {
             msg = msg + "Input file name must end with \"_DistanceImage.pic\", \"_AmplitudeImage.pic\" or \"_IntensityImage.pic\"!";
             throw std::logic_error(msg.c_str());
           }
           std::string baseFilenamePrefix = baseFilename.substr(0,found);
 
           std::string distanceImageFileName = dir + "/" + baseFilenamePrefix + "_DistanceImage" + extension;
           std::string amplitudeImageFileName = dir + "/" + baseFilenamePrefix + "_AmplitudeImage" + extension;
           std::string intensityImageFileName = dir + "/" + baseFilenamePrefix + "_IntensityImage" + extension;
 
           if (!itksys::SystemTools::FileExists(distanceImageFileName.c_str(), true))
           {
             msg = msg + "Inputfile not exist! " + distanceImageFileName;
             throw std::logic_error(msg.c_str());
           }
           if (!itksys::SystemTools::FileExists(amplitudeImageFileName.c_str(), true))
           {
             msg = msg + "Inputfile not exist! " + amplitudeImageFileName;
             throw std::logic_error(msg.c_str());
           }
           if (!itksys::SystemTools::FileExists(intensityImageFileName.c_str(), true))
           {
             msg = msg + "Inputfile not exist! " + intensityImageFileName;
             throw std::logic_error(msg.c_str());
           }
           //set the file names
           this->m_ToFImageGrabber->SetStringProperty("DistanceImageFileName", distanceImageFileName.c_str());
           this->m_ToFImageGrabber->SetStringProperty("AmplitudeImageFileName", amplitudeImageFileName.c_str());
           this->m_ToFImageGrabber->SetStringProperty("IntensityImageFileName", intensityImageFileName.c_str());
 
         }
         catch (std::exception &e)
         {
           MITK_ERROR << e.what();
           QMessageBox::critical( this, "Error", e.what() );
           m_Controls->m_ConnectCameraButton->setChecked(false);
           m_Controls->m_ConnectCameraButton->setEnabled(true);
           m_Controls->m_SelectCameraCombobox->setEnabled(true);
 //          m_Controls->m_CalibrationParameterGroupBox->setEnabled(true);
-          OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentIndex());
+          OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
           return;
         }
       }
 
     }
     //if a connection could be established
     if (this->m_ToFImageGrabber->ConnectCamera())
     {
       this->m_Controls->m_PMDParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
       this->m_Controls->m_MESAParameterWidget->SetToFImageGrabber(this->m_ToFImageGrabber);
 
-      switch (selectedCamera)
+      if ((selectedCamera == "PMD CamCube 2.0/3.0")||(selectedCamera == "PMD CamBoard")||(selectedCamera=="PMD O3D"))
       {
-      case 0:
-      case 1:
-      case 2: this->m_Controls->m_PMDParameterWidget->ActivateAllParameters();
-              break;
-      case 3: this->m_Controls->m_MESAParameterWidget->ActivateAllParameters();
-              break;
+        this->m_Controls->m_PMDParameterWidget->ActivateAllParameters();
+      }
+      else if (selectedCamera=="MESA Swissranger 4000")
+      {
+        this->m_Controls->m_MESAParameterWidget->ActivateAllParameters();
       }
 
       
 /*
       //get the integration time and modulation frequency
       this->m_IntegrationTime = m_Controls->m_IntegrationTimeSpinBox->value();
       this->m_ModulationFrequency = m_Controls->m_ModulationFrequencySpinBox->value();
 
       //set the integration time and modulation frequency in the grabber
       this->m_IntegrationTime = this->m_ToFImageGrabber->SetIntegrationTime(this->m_IntegrationTime);
       this->m_ModulationFrequency = this->m_ToFImageGrabber->SetModulationFrequency(this->m_ModulationFrequency);
 
       //set the PMD calibration according to the check boxes
       bool boolValue = false;
       boolValue = m_Controls->m_FPNCalibCB->isChecked();
       this->m_ToFImageGrabber->SetBoolProperty("SetFPNCalibration", boolValue);
       boolValue = m_Controls->m_FPPNCalibCB->isChecked();
       this->m_ToFImageGrabber->SetBoolProperty("SetFPPNCalibration", boolValue);
       boolValue = m_Controls->m_LinearityCalibCB->isChecked();
       this->m_ToFImageGrabber->SetBoolProperty("SetLinearityCalibration", boolValue);
       boolValue = m_Controls->m_LensCorrection->isChecked();
       this->m_ToFImageGrabber->SetBoolProperty("SetLensCalibration", boolValue);
       boolValue = m_Controls->m_ExposureModeCB->isChecked();
       this->m_ToFImageGrabber->SetBoolProperty("SetExposureMode", boolValue);
 
       //reset the GUI elements
       m_Controls->m_IntegrationTimeSpinBox->setValue(this->m_IntegrationTime);
       m_Controls->m_ModulationFrequencySpinBox->setValue(this->m_ModulationFrequency);
 */
       m_Controls->m_ConnectCameraButton->setText("Disconnect");
 
       // send connect signal to the caller functionality
       emit ToFCameraConnected();
     }
     else
     {
       QMessageBox::critical( this, "Error", "Connection failed. Check if you have installed the latest driver for your system." );
       m_Controls->m_ConnectCameraButton->setChecked(false);
       m_Controls->m_ConnectCameraButton->setEnabled(true);
       m_Controls->m_SelectCameraCombobox->setEnabled(true);
 //      m_Controls->m_CalibrationParameterGroupBox->setEnabled(true);
-      OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentIndex());
+      OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
       return;
 
     }
     m_Controls->m_ConnectCameraButton->setEnabled(true);
 
   }
   else if (m_Controls->m_ConnectCameraButton->text()=="Disconnect")
   {
     //send camera stop to the caller functionality
     emit ToFCameraStop();
 
     this->m_ToFImageGrabber->StopCamera();
     this->m_ToFImageGrabber->DisconnectCamera();
     m_Controls->m_ConnectCameraButton->setText("Connect");
     m_Controls->m_SelectCameraCombobox->setEnabled(true);
 //    m_Controls->m_CalibrationParameterGroupBox->setEnabled(true);
-    OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentIndex());
+    OnSelectCamera(m_Controls->m_SelectCameraCombobox->currentText());
 
     this->m_ToFImageGrabber = NULL;
     // send disconnect signal to the caller functionality
     emit ToFCameraDisconnected();
 
   }
 }
 /*
 void QmitkToFConnectionWidget::OnChangeIntegrationTimeSpinBox(int value)
 {
   if (this->m_ToFImageGrabber != NULL)
   {
     // stop camera if active
     bool active = m_ToFImageGrabber->IsCameraActive();
     if (active)
     {
       m_ToFImageGrabber->StopCamera();
     }
     this->m_IntegrationTime = m_Controls->m_IntegrationTimeSpinBox->value();
     this->m_IntegrationTime = this->m_ToFImageGrabber->SetIntegrationTime(this->m_IntegrationTime);
     if (active)
     {
       m_ToFImageGrabber->StartCamera();
     }
   }
 }
 
 void QmitkToFConnectionWidget::OnChangeModulationFrequencySpinBox(int value)
 {
   if (this->m_ToFImageGrabber != NULL)
   {
     // stop camera if active
     bool active = m_ToFImageGrabber->IsCameraActive();
     if (active)
     {
       m_ToFImageGrabber->StopCamera();
     }
     this->m_ModulationFrequency = m_Controls->m_ModulationFrequencySpinBox->value();
     this->m_ModulationFrequency = this->m_ToFImageGrabber->SetModulationFrequency(this->m_ModulationFrequency);
     if (active)
     {
       m_ToFImageGrabber->StartCamera();
     }
   }
 }
 */
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
index 441f89ddef..09a7895d68 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidget.h
@@ -1,127 +1,127 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Module:    $RCSfile$
 Language:  C++
 Date:      $Date: 2009-05-20 13:35:09 +0200 (Mi, 20 Mai 2009) $
 Version:   $Revision: 17332 $
 
 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 _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
 #define _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
 
 #include "mitkTOFUIExports.h"
 #include "ui_QmitkToFConnectionWidgetControls.h"
 
 //QT headers
 #include <QWidget>
 
 //mitk headers
 #include "mitkToFImageGrabber.h"
 
 /**
 * @brief Widget allowing to connect to different ToF / range cameras (located in module ToFProcessing)
 *
 * The widget basically allows to connect/disconnect to different ToF cameras
 *
 * @ingroup ToFUI
 */
 class mitkTOFUI_EXPORT QmitkToFConnectionWidget :public QWidget
 {
 
   //this is needed for all Qt objects that should have a MOC object (everything that derives from QObject)
   Q_OBJECT
 
   public:
 
     static const std::string VIEW_ID;
 
     QmitkToFConnectionWidget(QWidget* p = 0, Qt::WindowFlags f1 = 0);
     virtual ~QmitkToFConnectionWidget();
 
     /* @brief This method is part of the widget an needs not to be called seperately. */
     virtual void CreateQtPartControl(QWidget *parent);
     /* @brief This method is part of the widget an needs not to be called seperately. (Creation of the connections of main and control widget.)*/
     virtual void CreateConnections();
 
     /*!
     \brief returns the ToFImageGrabber which was provided by the ToFImageGrabberCreator after selecting a camera / player
     \return ToFImageGrabber currently used by the widget
     */
     mitk::ToFImageGrabber* GetToFImageGrabber();
   
   signals:
 
     /*!
     \brief This signal is sent if the user has connected the TOF camera.
      *        The ToFImageGrabber is now availiable if the method GetToFImageGrabber() is called.
     */
     void ToFCameraConnected();
     /*!
     \brief This signal is sent if the user has disconnect the TOF camera.
      */
     void ToFCameraDisconnected();
     /*!
     \brief signal that is emitted when the ToF camera is started
     */
     void ToFCameraStart();
     /*!
     \brief signal that is emitted when the ToF camera is stopped
     */
     void ToFCameraStop();
     /*!
     \brief signal that is emitted when a ToF camera is selected in the combo box
     */
-    void ToFCameraSelected(int);
+    void ToFCameraSelected(const QString selectedText);
 
   protected slots:
   
     /*!
     \brief slot called when the "Connect Camera" button was pressed
     * According to the selection in the camera combo box, the ToFImageGrabberCreator provides
     * the desired instance of the ToFImageGrabber
     */
     void OnConnectCamera();
     /*!
     \brief slot updating the GUI elements after the selection of the camera combo box has changed
     */
-    void OnSelectCamera(int index);
+    void OnSelectCamera(const QString selectedText);
     /*!
     \brief slot updating the member m_IntegrationTime and the parameter "integration time" of the current ToFImageGrabber
     */
     //void OnChangeIntegrationTimeSpinBox(int value);
     /*!
     \brief slot updating the member m_ModulationFrequency and the parameter "modulation frequency" of the current ToFImageGrabber
     */
     //void OnChangeModulationFrequencySpinBox(int value);
 
   protected:
 
     Ui::QmitkToFConnectionWidgetControls* m_Controls; ///< member holding the UI elements of this widget
 
     mitk::ToFImageGrabber* m_ToFImageGrabber; ///< member holding the current ToFImageGrabber
 
     int m_IntegrationTime; ///< member for the current integration time of the ToF device
     int m_ModulationFrequency; ///< member for the current modulation frequency of the ToF device
 
   private:
 
     void ShowParameterWidget();
 
     void ShowPMDParameterWidget();
 
     void ShowMESAParameterWidget();
 
     void ShowPlayerParameterWidget();
 };
 
 #endif // _QMITKTOFCONNECTIONWIDGET_H_INCLUDED
diff --git a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
index 55404b00c5..d43807972c 100644
--- a/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
+++ b/Modules/ToFUI/Qmitk/QmitkToFConnectionWidgetControls.ui
@@ -1,162 +1,133 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkToFConnectionWidgetControls</class>
  <widget class="QWidget" name="QmitkToFConnectionWidgetControls">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>405</width>
     <height>124</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
   <property name="windowTitle">
    <string>QmitkToFConnection</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
        <pointsize>11</pointsize>
       </font>
      </property>
      <property name="text">
       <string>ToF camera connection</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QComboBox" name="m_SelectCameraCombobox">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>50</height>
+      </size>
+     </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
       </font>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>-1</number>
      </property>
      <property name="maxVisibleItems">
       <number>7</number>
      </property>
      <property name="insertPolicy">
       <enum>QComboBox::InsertAtBottom</enum>
      </property>
      <property name="sizeAdjustPolicy">
       <enum>QComboBox::AdjustToContents</enum>
      </property>
      <property name="frame">
       <bool>true</bool>
      </property>
-     <item>
-      <property name="text">
-       <string>PMD Camcube 2.0/3.0</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>PMD CamBoard</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>PMD O3D</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>MESA SR4000</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>PMD Player</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>PMD Raw Data Player</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>MITK Player</string>
-      </property>
-     </item>
     </widget>
    </item>
    <item row="1" column="1">
     <widget class="QPushButton" name="m_ConnectCameraButton">
      <property name="minimumSize">
       <size>
        <width>0</width>
        <height>50</height>
       </size>
      </property>
      <property name="font">
       <font>
        <pointsize>10</pointsize>
       </font>
      </property>
      <property name="toolTip">
       <string>Connect to camera</string>
      </property>
      <property name="text">
       <string>Connect</string>
      </property>
      <property name="icon">
       <iconset resource="../resources/QmitkToFUtilWidget.qrc">
        <normaloff>:/images/powerRed.png</normaloff>
        <normalon>:/images/powerGreen.png</normalon>:/images/powerRed.png</iconset>
      </property>
      <property name="iconSize">
       <size>
        <width>30</width>
        <height>30</height>
       </size>
      </property>
      <property name="checkable">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item row="2" column="0" colspan="2">
     <widget class="QmitkToFPMDParameterWidget" name="m_PMDParameterWidget" native="true"/>
    </item>
    <item row="3" column="0" colspan="2">
     <widget class="QmitkToFMESAParameterWidget" name="m_MESAParameterWidget" native="true"/>
    </item>
   </layout>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
   <customwidget>
    <class>QmitkToFPMDParameterWidget</class>
    <extends>QWidget</extends>
    <header>QmitkToFPMDParameterWidget.h</header>
    <container>1</container>
   </customwidget>
   <customwidget>
    <class>QmitkToFMESAParameterWidget</class>
    <extends>QWidget</extends>
    <header>QmitkToFMESAParameterWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
   <include location="../resources/QmitkToFUtilWidget.qrc"/>
  </resources>
  <connections/>
 </ui>