diff --git a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp
index b6d722be6d..ffbd773a62 100644
--- a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/DicomEventHandler.cpp
@@ -1,76 +1,100 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 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 "mitkPluginActivator.h"
 #include "DicomEventHandler.h"
 #include <service/event/ctkEventConstants.h>
 #include <ctkDictionary.h>
 #include <mitklogmacros.h>
 #include <mitkDicomSeriesReader.h>
 #include <mitkDataNode.h>
 #include <QmitkBaseFunctionalityComponent.h>
 #include <mitkIDataStorageService.h>
 #include <service/event/ctkEventAdmin.h>
 #include <ctkServiceReference.h>
 #include <mitkRenderingManager.h>
 
 
 DicomEventHandler::DicomEventHandler() 
 {    
 }
 
 DicomEventHandler::~DicomEventHandler()
 {
 }
 
 void DicomEventHandler::OnSignalAddSeriesToDataManager(const ctkEvent& ctkEvent)
 {
-    mitk::DicomSeriesReader::UidFileNamesMap dicomSeriesMap = mitk::DicomSeriesReader::GetSeries(ctkEvent.getProperty("Path").toString().toStdString());
-    mitk::DataNode::Pointer node = mitk::DicomSeriesReader::LoadDicomSeries(dicomSeriesMap[ctkEvent.getProperty("SeriesUID").toString().toStdString()]);
+    QString patientName = ctkEvent.getProperty("PatientName").toString();
+    QString studyUID = ctkEvent.getProperty("StudyUID").toString();
+    QString studyName = ctkEvent.getProperty("StudyName").toString();
+    QString seriesUID = ctkEvent.getProperty("SeriesUID").toString();
+    QString seriesName = ctkEvent.getProperty("SeriesName").toString();
+    QString path = ctkEvent.getProperty("Path").toString(); 
+
+    std::list<std::string> qualifiedUIDs;
+    mitk::DicomSeriesReader::StringContainer seriesToLoad;
+    std::size_t found;
+
+    mitk::DicomSeriesReader::UidFileNamesMap dicomSeriesMap = mitk::DicomSeriesReader::GetSeries(path.toStdString());
+    mitk::DicomSeriesReader::UidFileNamesMap::const_iterator qualifiedSeriesInstanceUIDIterator;
+        
+    for(qualifiedSeriesInstanceUIDIterator = dicomSeriesMap.begin();
+        qualifiedSeriesInstanceUIDIterator != dicomSeriesMap.end();
+        ++qualifiedSeriesInstanceUIDIterator)
+    {
+        found = qualifiedSeriesInstanceUIDIterator->first.find(seriesUID.toStdString());
+        if(found!= qualifiedSeriesInstanceUIDIterator->first.npos)
+        {
+            qualifiedUIDs.push_back(qualifiedSeriesInstanceUIDIterator->first); 
+            seriesToLoad = qualifiedSeriesInstanceUIDIterator->second;
+        }
+    }
+
+    mitk::DataNode::Pointer node = mitk::DicomSeriesReader::LoadDicomSeries(seriesToLoad);
     if (node.IsNull())
     {
-        MITK_ERROR << "Could not load series: " << ctkEvent.getProperty("SeriesUID").toString().toStdString();
+        MITK_ERROR << "Could not load series: " << seriesUID.toStdString();
     }
     else
-    {
-        node->SetName(ctkEvent.getProperty("SeriesUID").toString().toStdString());
+    {        
         ctkServiceReference serviceReference =mitk::PluginActivator::getContext()->getServiceReference<mitk::IDataStorageService>();
         mitk::IDataStorageService* storageService = mitk::PluginActivator::getContext()->getService<mitk::IDataStorageService>(serviceReference);
+        
         storageService->GetActiveDataStorage().GetPointer()->GetDataStorage()->Add(node);
         mitk::RenderingManager::GetInstance()->SetDataStorage(storageService->GetActiveDataStorage().GetPointer()->GetDataStorage());
         mitk::RenderingManager::GetInstance()->RequestUpdateAll();
-
     }
 }
 
 void DicomEventHandler::OnSignalRemoveSeriesFromStorage(const ctkEvent& ctkEvent)
 {
 }
 
 void DicomEventHandler::SubscribeSlots()
 {
   ctkServiceReference ref = mitk::PluginActivator::getContext()->getServiceReference<ctkEventAdmin>();
   if (ref)
   {
       ctkEventAdmin* eventAdmin = mitk::PluginActivator::getContext()->getService<ctkEventAdmin>(ref);
       ctkDictionary properties;
       properties[ctkEventConstants::EVENT_TOPIC] = "org/mitk/gui/qt/dicom/ADD";
       eventAdmin->subscribeSlot(this, SLOT(OnSignalAddSeriesToDataManager(ctkEvent)), properties);
       properties[ctkEventConstants::EVENT_TOPIC] = "org/mitk/gui/qt/dicom/DELETED";
       eventAdmin->subscribeSlot(this, SLOT(OnSignalRemoveSeriesFromStorage(ctkEvent)), properties);
   }
 }
\ No newline at end of file
diff --git a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
index a53953b522..8e34174856 100644
--- a/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.dicom/src/internal/QmitkDicomEditor.cpp
@@ -1,191 +1,194 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$
 
 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.
 
 =========================================================================*/
 
 
 // Blueberry
 #include <berryISelectionService.h>
 #include <berryIWorkbenchWindow.h>
 #include <berryUIException.h>
 #include <berryIWorkbenchPage.h>
 #include <berryIPreferencesService.h>
 #include <berryIPartListener.h>
 #include <mitkGlobalInteraction.h>
 #include <mitkDataStorageEditorInput.h>
 #include "berryFileEditorInput.h"
 
 // Qmitk
 #include "QmitkDicomEditor.h"
 #include "mitkPluginActivator.h"
 #include <mitkDicomSeriesReader.h>
 
 //#include "mitkProgressBar.h"
 
 // Qt
 #include <QCheckBox>
 #include <QMessageBox>
 #include <QWidget>
 
 #include <QtSql>
 #include <QSqlDatabase>
 #include <QtCore/QVariant>
 #include <QtGui/QAction>
 #include <QtGui/QApplication>
 #include <QtGui/QButtonGroup>
 #include <QtGui/QGridLayout>
 #include <QtGui/QHeaderView>
 #include <QtGui/QPushButton>
 #include <QtGui/QTextEdit>
 #include <QtGui/QWidget>
 
 //CTK
 #include <ctkDICOMModel.h>
 #include <ctkDICOMAppWidget.h>
 #include <ctkDICOMQueryWidget.h>
 #include <ctkFileDialog.h>
 #include <ctkDICOMQueryRetrieveWidget.h>
 
 
 const std::string QmitkDicomEditor::EDITOR_ID = "org.mitk.editors.dicomeditor";
 
 
 QmitkDicomEditor::QmitkDicomEditor()
 : m_Thread(new QThread())
 , m_DicomDirectoryListener(new QmitkDicomDirectoryListener())
 {
 }
 
 QmitkDicomEditor::~QmitkDicomEditor()
 {
     m_Thread->terminate();
     delete m_Handler;
     delete m_Publisher;
     delete m_StoreSCPLauncher;
     delete m_Thread;
     delete m_DicomDirectoryListener;
 }
 
 void QmitkDicomEditor::CreateQtPartControl(QWidget *parent )
 {   
     m_Controls.setupUi( parent );
     TestHandler();
     SetupDefaults();
 
     connect(m_Controls.externalDataWidget,SIGNAL(SignalAddDicomData(const QString&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QString&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalAddDicomData(const QStringList&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QStringList&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalDicomToDataManager(const QStringList&)),this,SLOT(OnViewButtonAddToDataManager(const QStringList&)));
     connect(m_Controls.externalDataWidget,SIGNAL(SignalChangePage(int)), this, SLOT(OnChangePage(int)));
 
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QString&)),this,SLOT(OnDicomImportFinished(const QString&)));
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QStringList&)),this,SLOT(OnDicomImportFinished(const QStringList&)));
     connect(m_Controls.internalDataWidget,SIGNAL(SignalDicomToDataManager(const QStringList&)),this,SLOT(OnViewButtonAddToDataManager(const QStringList&)));
     
     connect(m_Controls.CDButton, SIGNAL(clicked()), m_Controls.externalDataWidget, SLOT(OnFolderCDImport()));
     connect(m_Controls.FolderButton, SIGNAL(clicked()), m_Controls.externalDataWidget, SLOT(OnFolderCDImport()));
     connect(m_Controls.QueryRetrieveButton, SIGNAL(clicked()), this, SLOT(OnQueryRetrieve()));
     connect(m_Controls.LocalStorageButton, SIGNAL(clicked()), this, SLOT(OnLocalStorage()));    
 }
 
 void QmitkDicomEditor::Init(berry::IEditorSite::Pointer site, berry::IEditorInput::Pointer input)
 {
     this->SetSite(site);
     this->SetInput(input);
 }
 
 void QmitkDicomEditor::SetFocus()
 {
 }
 
 berry::IPartListener::Events::Types QmitkDicomEditor::GetPartEventTypes() const
 {
     return Events::CLOSED | Events::HIDDEN | Events::VISIBLE;
 }
 
 void QmitkDicomEditor::OnQueryRetrieve()
 {
     OnChangePage(2);
 }
 
 void QmitkDicomEditor::OnLocalStorage()
 {
     OnChangePage(0);
 }
 
 void QmitkDicomEditor::OnChangePage(int page)
 {
     try{
         m_Controls.stackedWidget->setCurrentIndex(page);
     }catch(std::exception e){
         MITK_ERROR <<"error: "<< e.what();
         return;
     }
 }
 
 void QmitkDicomEditor::OnDicomImportFinished(const QString& path)
 {
 }
 
 void QmitkDicomEditor::OnDicomImportFinished(const QStringList& path)
 {
 }
 
 void QmitkDicomEditor::StartDicomDirectoryListener(QString& directory)
 {   
     m_DicomDirectoryListener->SetDicomListenerDirectory(directory);
     connect(m_DicomDirectoryListener,SIGNAL(SignalAddDicomData(const QStringList&)),m_Controls.internalDataWidget,SLOT(StartDicomImport(const QStringList&)),Qt::DirectConnection);
     connect(m_Controls.internalDataWidget,SIGNAL(FinishedImport(const QStringList&)),m_DicomDirectoryListener,SLOT(OnDicomImportFinished(const QStringList&)),Qt::DirectConnection);
     m_DicomDirectoryListener->moveToThread(m_Thread);
     m_Thread->start();   
 }
 
 void QmitkDicomEditor::SetupDefaults()
 {
     QString pluginDirectory;
     mitk::PluginActivator::getContext()->getDataFile(pluginDirectory);
     pluginDirectory.append("/");
     QString databaseDirectory;
     //databaseDirectory.append(pluginDirectory);
     databaseDirectory.append(QString("C:/DicomDatabase"));
     QDir tmp(databaseDirectory);
     tmp.mkpath(databaseDirectory);
     m_Controls.internalDataWidget->SetDatabaseDirectory(databaseDirectory);
     QString listenerDirectory("C:/DICOMListenerDirectory");
     StartDicomDirectoryListener(listenerDirectory);
     QmitkStoreSCPLauncherBuilder builder;
     builder.AddPort()->AddTransferSyntax()->AddOtherNetworkOptions()->AddMode()->AddOutputDirectory(listenerDirectory);
     m_StoreSCPLauncher = new QmitkStoreSCPLauncher(&builder);
     m_StoreSCPLauncher->StartStoreSCP();
 }
 
 //TODO Remove
 void QmitkDicomEditor::TestHandler()
 {
       m_Handler = new DicomEventHandler();
       m_Handler->SubscribeSlots();
 }
 
 void QmitkDicomEditor::OnViewButtonAddToDataManager(const QStringList& eventProperties)
 {
     ctkDictionary properties;
-    properties["Action"] = "ADD";
-    properties["SeriesUID"] = eventProperties.at(0);
-    properties["Path"] = eventProperties.at(1);
+    properties["PatientName"] = eventProperties.at(0);
+    properties["StudyUID"] = eventProperties.at(1);
+    properties["StudyName"] = eventProperties.at(2);
+    properties["SeriesUID"] = eventProperties.at(3);
+    properties["SeriesName"] = eventProperties.at(4);
+    properties["Path"] = eventProperties.at(5);
 
     m_Publisher = new QmitkDicomDataEventPublisher();
     m_Publisher->PublishSignals(mitk::PluginActivator::getContext());
 
     m_Publisher->AddSeriesToDataManagerEvent(properties);
 }
\ No newline at end of file
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp b/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
index 238f96b617..44e5a1ac28 100644
--- a/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
+++ b/Modules/DicomUI/Qmitk/QmitkDicomExternalDataWidget.cpp
@@ -1,212 +1,223 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$ 
 
 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 <mitkStatusBar.h>
 
 // Qmitk
 #include "QmitkDicomExternalDataWidget.h"
 #include <mitklogmacros.h>
 
 // Qt
 #include <QCheckBox>
 #include <QMessageBox>
+#include <QMap>
+#include <QVariant>
 
 // CTK
 #include <ctkDICOMDataset.h>
 
 
 
 const std::string QmitkDicomExternalDataWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomExternalDataWidget";
 
 QmitkDicomExternalDataWidget::QmitkDicomExternalDataWidget(QWidget *parent)
 :  m_Controls( 0 )
 , m_DirectoryName(new QString())
 {
     Initialize();
     CreateQtPartControl(this);
 }
 
 QmitkDicomExternalDataWidget::~QmitkDicomExternalDataWidget()
 {
     delete m_ImportDialog;
     delete m_ExternalDatabase;
     delete m_ExternalModel;
     delete m_ExternalIndexer;
     delete m_Controls;
     delete m_DirectoryName;
 }
 
 
 void QmitkDicomExternalDataWidget::CreateQtPartControl( QWidget *parent )
 {
 
     // build up qt Widget, unless already done
     if ( !m_Controls )
     {
         // create GUI widgets from the Qt Designer's .ui file
         m_Controls = new Ui::QmitkDicomExternalDataWidgetControls;
         m_Controls->setupUi( parent );
 
         // 
         m_Controls->ExternalDataTreeView->setSortingEnabled(true);
         m_Controls->ExternalDataTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
         m_Controls->ExternalDataTreeView->setModel(m_ExternalModel);
 
         //Initialize import widget
         m_ImportDialog = new ctkFileDialog();
         QCheckBox* importCheckbox = new QCheckBox("Copy on import", m_ImportDialog);
         m_ImportDialog->setBottomWidget(importCheckbox);
         m_ImportDialog->setFileMode(QFileDialog::Directory);
         m_ImportDialog->setLabelText(QFileDialog::Accept,"Import");
         m_ImportDialog->setWindowTitle("Import DICOM files from directory ...");
         m_ImportDialog->setWindowModality(Qt::ApplicationModal);
         connect(m_ImportDialog, SIGNAL(fileSelected(QString)),this,SLOT(OnFileSelectedAddExternalData(QString)));
 
         //connect Buttons
         connect(m_Controls->downloadButton, SIGNAL(clicked()),this,SLOT(OnDownloadButtonClicked()));
         connect(m_Controls->viewExternalDataButton, SIGNAL(clicked()),this,SLOT(OnViewButtonClicked()));
         connect(m_Controls->cancelButton, SIGNAL(clicked()),this,SLOT(OnDownloadButtonClicked()));
 
         connect(m_Controls->SearchOption_2, SIGNAL(parameterChanged()), this, SLOT(OnSearchParameterChanged()));
     }
 }
 
 void QmitkDicomExternalDataWidget::Initialize()
 {
     m_ExternalDatabase = new ctkDICOMDatabase();
     //m_ExternalDatabase->initializeDatabase();
     try{
         m_ExternalDatabase->openDatabase(QString(":memory:"),QString( "EXTERNAL-DB"));
     }catch(std::exception e){
         MITK_ERROR <<"Database error: "<< m_ExternalDatabase->lastError().toStdString();
         m_ExternalDatabase->closeDatabase();
         return;
     }
 
     m_ExternalModel = new ctkDICOMModel();
     m_ExternalModel->setDatabase(m_ExternalDatabase->database());
     m_ExternalModel->setEndLevel(ctkDICOMModel::SeriesType);
 
     m_ExternalIndexer = new ctkDICOMIndexer();
 }
 
 void QmitkDicomExternalDataWidget::OnFolderCDImport()
 {
     m_ImportDialog->show();
     m_ImportDialog->raise();  
 }
 
 void QmitkDicomExternalDataWidget::OnFileSelectedAddExternalData(QString directory)
 {
     if (QDir(directory).exists())
     {
         m_DirectoryName = new QString(directory);
         QCheckBox* copyOnImport = qobject_cast<QCheckBox*>(m_ImportDialog->bottomWidget());
 
         if (copyOnImport->isChecked())
         {
             //targetDirectory = d->DICOMDatabase->databaseDirectory();
             MBI_DEBUG<<directory.toStdString();
             emit SignalAddDicomData(directory);
         }else{
             if (m_Watcher.isRunning())
             {
                 m_Watcher.waitForFinished();
             }
             m_Future = QtConcurrent::run(this,(void (QmitkDicomExternalDataWidget::*)(QString)) &QmitkDicomExternalDataWidget::AddDicomTemporary,directory);
             m_Watcher.setFuture(m_Future);
 
             emit SignalChangePage(1);
         }
     }
 }
 
 void QmitkDicomExternalDataWidget::OnDownloadButtonClicked()
 {
     QStringList* filePaths= new QStringList();
     GetFileNamesFromIndex(*filePaths);
     emit SignalAddDicomData(*filePaths);
 }
 
 void QmitkDicomExternalDataWidget::OnViewButtonClicked()
 {
     QModelIndex currentIndex = m_Controls->ExternalDataTreeView->currentIndex();
     if(m_ExternalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         QString seriesUID = m_ExternalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
+        QString seriesName = m_ExternalModel->data(currentIndex).toString();        
+        
+        QModelIndex studyIndex = m_ExternalModel->parent(currentIndex);
+        QString studyUID = m_ExternalModel->data(studyIndex,ctkDICOMModel::UIDRole).toString();
+        QString studyName = m_ExternalModel->data(studyIndex).toString();
+
+        QModelIndex patientIndex = m_ExternalModel->parent(studyIndex);
+        QString patientName = m_ExternalModel->data(patientIndex).toString();        
+
         QStringList eventProperties;
-        eventProperties << seriesUID << *m_DirectoryName;
+        eventProperties << patientName << studyUID << studyName << seriesUID << seriesName << *m_DirectoryName;
         MITK_INFO << m_DirectoryName->toStdString();
 
         emit SignalDicomToDataManager(eventProperties);
     }
 }
 
 void QmitkDicomExternalDataWidget::OnCancelButtonClicked()
 {
     m_Watcher.cancel();
     m_Watcher.waitForFinished();
 }
 
 void QmitkDicomExternalDataWidget::GetFileNamesFromIndex(QStringList& filePaths)
 {
     QModelIndex currentIndex = m_Controls->ExternalDataTreeView->currentIndex();
     QString currentUID = m_ExternalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
 
     if(m_ExternalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         filePaths.append(m_ExternalDatabase->filesForSeries(currentUID));
     }
     else if(m_ExternalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::StudyType))
     {
         QStringList seriesList;
         seriesList.append( m_ExternalDatabase->seriesForStudy(currentUID) );
 
         QStringList::Iterator serieIt;
         for(serieIt=seriesList.begin();serieIt!=seriesList.end();++serieIt)
         {
             filePaths.append(m_ExternalDatabase->filesForSeries(*serieIt));
         }
     }
     else if(m_ExternalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::PatientType))
     {
         QStringList studiesList,seriesList;
         studiesList.append( m_ExternalDatabase->studiesForPatient(currentUID) );
 
         QStringList::Iterator studyIt,serieIt;
         for(studyIt=studiesList.begin();studyIt!=studiesList.end();++studyIt)
         {
             seriesList.append( m_ExternalDatabase->seriesForStudy(*studyIt) );
 
             for(serieIt=seriesList.begin();serieIt!=seriesList.end();++serieIt)
             {
                 filePaths.append(m_ExternalDatabase->filesForSeries(*serieIt));
             }
         }
     }
 }
 
 void QmitkDicomExternalDataWidget::AddDicomTemporary(QString directory)
 {
     m_ExternalIndexer->addDirectory(*m_ExternalDatabase,directory);
     m_ExternalModel->reset();
 }
 
 void QmitkDicomExternalDataWidget::OnSearchParameterChanged()
 {
     m_ExternalModel->setDatabase(m_ExternalDatabase->database(),m_Controls->SearchOption_2->parameters());
 }
\ No newline at end of file
diff --git a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
index 525599c04d..e0ca82b064 100644
--- a/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
+++ b/Modules/DicomUI/Qmitk/QmitkDicomLocalStorageWidget.cpp
@@ -1,180 +1,187 @@
 /*=========================================================================
 
 Program:   Medical Imaging & Interaction Toolkit
 Language:  C++
 Date:      $Date$
 Version:   $Revision$ 
 
 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.
 
 =========================================================================*/
 
 // Qmitk
 #include "QmitkDicomLocalStorageWidget.h"
 #include <mitklogmacros.h>
 //#include <mitkProgressBar.h>
 // Qt
 #include <QMessageBox>
 #include <QModelIndex>
+#include <QMap>
+#include <QVariant>
 //#include "QmitkDicomDataEventPublisher.h"
 
 
 
 const std::string QmitkDicomLocalStorageWidget::Widget_ID = "org.mitk.Widgets.QmitkDicomLocalStorageWidget";
 
 QmitkDicomLocalStorageWidget::QmitkDicomLocalStorageWidget(QWidget *parent)
 :  m_Controls( 0 )
 ,m_LocalIndexer(new ctkDICOMIndexer())
 ,m_LocalModel(new ctkDICOMModel())
 {
     CreateQtPartControl(this);
 }
 
 QmitkDicomLocalStorageWidget::~QmitkDicomLocalStorageWidget()
 {
     m_LocalDatabase->closeDatabase();
     delete m_LocalDatabase;
     delete m_LocalIndexer;
     delete m_LocalModel;
     delete m_Controls;
 }
 
 void QmitkDicomLocalStorageWidget::CreateQtPartControl( QWidget *parent )
 {
     if ( !m_Controls )
     {
         m_Controls = new Ui::QmitkDicomLocalStorageWidgetControls;
         m_Controls->setupUi( parent );
         m_Controls->groupBox->setVisible(false);
         m_Controls->InternalDataTreeView->setSortingEnabled(true);
         m_Controls->InternalDataTreeView->setSelectionBehavior(QAbstractItemView::SelectRows);
         m_Controls->InternalDataTreeView->setModel(m_LocalModel);
         connect(m_Controls->deleteButton,SIGNAL(clicked()),this,SLOT(OnDeleteButtonClicked()));
         connect(m_Controls->CancelButton, SIGNAL(clicked()), this , SLOT(OnCancelButtonClicked()));
         connect(m_Controls->viewInternalDataButton, SIGNAL(clicked()), this , SLOT(OnViewButtonClicked()));
         connect(m_Controls->SearchOption, SIGNAL(parameterChanged()), this, SLOT(OnSearchParameterChanged()));
     }
 }
 
 void QmitkDicomLocalStorageWidget::StartDicomImport(const QString& dicomData)
 {
     if (m_Watcher.isRunning()){
         m_Watcher.waitForFinished();
     }
     m_Future = QtConcurrent::run(this,(void (QmitkDicomLocalStorageWidget::*)(const QString&)) &QmitkDicomLocalStorageWidget::AddDICOMData,dicomData);
     m_Watcher.setFuture(m_Future); 
 }
 
 void QmitkDicomLocalStorageWidget::StartDicomImport(const QStringList& dicomData)
 {
     if (m_Watcher.isRunning())
     {
         m_Watcher.waitForFinished();
     }
     m_Future = QtConcurrent::run(this,(void (QmitkDicomLocalStorageWidget::*)(const QStringList&)) &QmitkDicomLocalStorageWidget::AddDICOMData,dicomData);
     m_Watcher.setFuture(m_Future);
 }
 
 void QmitkDicomLocalStorageWidget::AddDICOMData(const QString& directory)
 {
     if(m_LocalDatabase->isOpen())
     {
         m_LocalIndexer->addDirectory(*m_LocalDatabase,directory,m_LocalDatabase->databaseDirectory());
     }
     m_LocalModel->setDatabase(m_LocalDatabase->database());
     emit FinishedImport(directory);
 }
 
 void QmitkDicomLocalStorageWidget::AddDICOMData(const QStringList& patientFiles)
 {
     if(m_LocalDatabase->isOpen())
     {
         QStringListIterator fileIterator(patientFiles);
         while(fileIterator.hasNext())
         {
             m_LocalIndexer->addFile(*m_LocalDatabase,fileIterator.next(),m_LocalDatabase->databaseDirectory());
         }
     }
     m_LocalModel->setDatabase(m_LocalDatabase->database());
     emit FinishedImport(patientFiles);
 }
 
 void QmitkDicomLocalStorageWidget::OnDeleteButtonClicked()
 {
     QModelIndex currentIndex = m_Controls->InternalDataTreeView->currentIndex();
     QString currentUID = m_LocalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
     if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         m_LocalDatabase->removeSeries(currentUID);
     }
     else if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::StudyType))
     {
         m_LocalDatabase->removeStudy(currentUID);
     }
     else if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::PatientType))
     {
         m_LocalDatabase->removePatient(currentUID);
     }
     m_LocalModel->reset();
 }
 
 void QmitkDicomLocalStorageWidget::OnCancelButtonClicked()
 {
     m_Watcher.cancel();
     m_Watcher.waitForFinished();
     m_LocalDatabase->closeDatabase();
 }
 //TODO
 void QmitkDicomLocalStorageWidget::OnViewButtonClicked()
 {
     QModelIndex currentIndex = m_Controls->InternalDataTreeView->currentIndex();
     if(m_LocalModel->data(currentIndex,ctkDICOMModel::TypeRole)==static_cast<int>(ctkDICOMModel::SeriesType))
     {
         QString seriesUID = m_LocalModel->data(currentIndex,ctkDICOMModel::UIDRole).toString();
+        QString seriesName = m_LocalModel->data(currentIndex).toString();
         
         QModelIndex studyIndex = m_LocalModel->parent(currentIndex);
         QString studyUID = m_LocalModel->data(studyIndex,ctkDICOMModel::UIDRole).toString();
+        QString studyName = m_LocalModel->data(studyIndex).toString();
+
+        QModelIndex patientIndex = m_LocalModel->parent(studyIndex);
+        QString patientName = m_LocalModel->data(patientIndex).toString();        
 
         QString filePath;
         filePath.append(m_LocalDatabase->databaseDirectory());
         filePath.append("/dicom/");
         filePath.append(studyUID);
         filePath.append("/");
         filePath.append(seriesUID);
         filePath.append("/");
 
         QStringList eventProperties;
-        eventProperties << seriesUID << filePath;
+        eventProperties << patientName << studyUID <<studyName << seriesUID << seriesName << filePath;
         MITK_INFO << filePath.toStdString();
         emit SignalDicomToDataManager(eventProperties);
     }
 }
 
 void QmitkDicomLocalStorageWidget::OnSearchParameterChanged()
 { 
     m_LocalModel->setDatabase(m_LocalDatabase->database(),m_Controls->SearchOption->parameters());
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabaseDirectory(QString newDatatbaseDirectory)
 {
     QDir databaseDirecory = QDir(newDatatbaseDirectory);
     if(!databaseDirecory.exists())
     {
         databaseDirecory.mkpath(databaseDirecory.absolutePath());
     }
     QString newDatatbaseFile = databaseDirecory.absolutePath() + QString("/ctkDICOM.sql");
     this->SetDatabase(newDatatbaseFile);
 }
 
 void QmitkDicomLocalStorageWidget::SetDatabase(QString databaseFile)
 {
     m_LocalDatabase = new ctkDICOMDatabase(databaseFile);
     m_LocalModel->setEndLevel(ctkDICOMModel::SeriesType);
     m_LocalModel->setDatabase(m_LocalDatabase->database());
 }
\ No newline at end of file