diff --git a/Modules/XNAT/files.cmake b/Modules/XNAT/files.cmake index dc73aa11da..502c69c397 100644 --- a/Modules/XNAT/files.cmake +++ b/Modules/XNAT/files.cmake @@ -1,15 +1,21 @@ file(GLOB_RECURSE H_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/include/*") set(CPP_FILES mitkXnatSessionTracker.cpp QmitkXnatTreeModel.cpp + QmitkXnatUploadFromDataStorageDialog.cpp ) set(MOC_H_FILES include/mitkXnatSessionTracker.h include/QmitkXnatTreeModel.h + include/QmitkXnatUploadFromDataStorageDialog.h +) + +set(UI_FILES + src/QmitkXnatUploadFromDataStorageDialog.ui ) set(QRC_FILES resources/xnat.qrc ) diff --git a/Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h b/Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h new file mode 100644 index 0000000000..819621543a --- /dev/null +++ b/Modules/XNAT/include/QmitkXnatUploadFromDataStorageDialog.h @@ -0,0 +1,46 @@ +#ifndef QMITKXNATUPLOADFROMDATASTORAGEDIALOG_H +#define QMITKXNATUPLOADFROMDATASTORAGEDIALOG_H + +#include + +#include + +namespace Ui { +class QmitkXnatUploadFromDataStorageDialog; +} + +namespace mitk { +class DataStorage; +} + +class QmitkXnatUploadFromDataStorageDialog : public QDialog +{ + Q_OBJECT + +public: + explicit QmitkXnatUploadFromDataStorageDialog(QWidget *parent = 0); + ~QmitkXnatUploadFromDataStorageDialog(); + + void SetDataStorage(mitk::DataStorage* ds); + mitk::DataNode::Pointer GetSelectedNode(); + + enum + { + UPLOAD, CANCEL + }; + +protected slots: + + void OnUpload(); + void OnUploadSceneChecked(); + void OnCancel(); + + void OnMITKProjectFileNameEntered(const QString &text); + void OnDataSelected(const mitk::DataNode*); +private: + Ui::QmitkXnatUploadFromDataStorageDialog *ui; + + mitk::DataNode::Pointer m_SelectedNode; +}; + +#endif // QMITKXNATUPLOADFROMDATASTORAGEDIALOG_H diff --git a/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp b/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp new file mode 100644 index 0000000000..989dbfcb47 --- /dev/null +++ b/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.cpp @@ -0,0 +1,71 @@ +#include "QmitkXnatUploadFromDataStorageDialog.h" +#include "ui_QmitkXnatUploadFromDataStorageDialog.h" + +#include +#include +#include +#include + +QmitkXnatUploadFromDataStorageDialog::QmitkXnatUploadFromDataStorageDialog(QWidget *parent) : + QDialog(parent), + ui(new Ui::QmitkXnatUploadFromDataStorageDialog), + m_SelectedNode(0) +{ + ui->setupUi(this); + + // Not yet implemented + ui->cbUploadMITKProject->hide(); + ui->leMITKProjectFileName->hide(); + // + + connect(ui->btnCancel, SIGNAL(clicked()), this, SLOT(OnCancel())); + connect(ui->btnUpload, SIGNAL(clicked()), this, SLOT(OnUpload())); + connect(ui->cbUploadMITKProject, SIGNAL(checked()), this, SLOT(OnUploadSceneChecked())); + connect(ui->leMITKProjectFileName, SIGNAL(textEdited(const QString&)), this, SLOT(OnMITKProjectFileNameEntered(const QString&))); + connect(ui->cBDataSelection, SIGNAL(OnSelectionChanged(const mitk::DataNode*)), this, SLOT(OnDataSelected(const mitk::DataNode*))); + + mitk::NodePredicateNot::Pointer noHelper = mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("helper object")); + mitk::NodePredicateNot::Pointer noHidden = mitk::NodePredicateNot::New(mitk::NodePredicateProperty::New("hidden object")); + mitk::NodePredicateAnd::Pointer pred = mitk::NodePredicateAnd::New(noHelper, noHidden); + ui->cBDataSelection->SetPredicate(pred); +} + +QmitkXnatUploadFromDataStorageDialog::~QmitkXnatUploadFromDataStorageDialog() +{ + delete ui; +} + +void QmitkXnatUploadFromDataStorageDialog::SetDataStorage(mitk::DataStorage *ds) +{ + ui->cBDataSelection->SetDataStorage(ds); +} + +void QmitkXnatUploadFromDataStorageDialog::OnUpload() +{ + this->done(UPLOAD); +} + +void QmitkXnatUploadFromDataStorageDialog::OnUploadSceneChecked() +{ +} + +void QmitkXnatUploadFromDataStorageDialog::OnCancel() +{ + this->done(CANCEL); +} + +void QmitkXnatUploadFromDataStorageDialog::OnMITKProjectFileNameEntered(const QString& /*text*/) +{ +} + +void QmitkXnatUploadFromDataStorageDialog::OnDataSelected(const mitk::DataNode* node) +{ + m_SelectedNode = const_cast(node); + if (m_SelectedNode.IsNotNull()) + ui->btnUpload->setEnabled(true); +} + +mitk::DataNode::Pointer QmitkXnatUploadFromDataStorageDialog::GetSelectedNode() +{ + return m_SelectedNode; +} diff --git a/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.ui b/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.ui new file mode 100644 index 0000000000..d28dc01caa --- /dev/null +++ b/Modules/XNAT/src/QmitkXnatUploadFromDataStorageDialog.ui @@ -0,0 +1,89 @@ + + + QmitkXnatUploadFromDataStorageDialog + + + + 0 + 0 + 400 + 164 + + + + Dialog + + + + + + Select the data for upload: + + + + + + + + + + Uploads all data as MITK project file + + + Upload scene as MITK project file + + + + + + + Enter project file name + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Cancel + + + + + + + false + + + Upload + + + + + + + + + + QmitkDataStorageComboBox + QComboBox +
QmitkDataStorageComboBox.h
+ + + + + diff --git a/Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png index 5265d5f6c4..ca2e6ac091 100644 Binary files a/Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png and b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-download.png differ diff --git a/Plugins/org.mitk.gui.qt.xnat/resources/xnat-folder.png b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-folder.png new file mode 100644 index 0000000000..2adc69f865 Binary files /dev/null and b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-folder.png differ diff --git a/Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png index c8c8c3f231..068569e6bb 100644 Binary files a/Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png and b/Plugins/org.mitk.gui.qt.xnat/resources/xnat-upload.png differ diff --git a/Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc b/Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc index f26fdf5155..c0e23b477a 100644 --- a/Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc +++ b/Plugins/org.mitk.gui.qt.xnat/resources/xnat.qrc @@ -1,6 +1,7 @@ xnat-download.png xnat-upload.png + xnat-folder.png diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp index 736469ad07..a379cdf85d 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp @@ -1,514 +1,584 @@ /*=================================================================== 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 "QmitkXnatTreeBrowserView.h" // Qmitk #include "QmitkXnatObjectEditorInput.h" #include "QmitkXnatEditor.h" #include "org_mitk_gui_qt_xnatinterface_Activator.h" // Blueberry #include #include // CTK XNAT Core #include #include #include #include #include "ctkXnatFile.h" #include #include #include #include #include #include #include #include // Qt #include #include #include #include #include #include // MITK #include #include #include +#include const std::string QmitkXnatTreeBrowserView::VIEW_ID = "org.mitk.views.xnat.treebrowser"; QmitkXnatTreeBrowserView::QmitkXnatTreeBrowserView() : m_DataStorageServiceTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()), m_TreeModel(new QmitkXnatTreeModel()), m_Tracker(0), m_DownloadPath(berry::Platform::GetPreferencesService()->GetSystemPreferences()->Node("/XnatConnection")->Get("Download Path", "")) { m_DataStorageServiceTracker.open(); // Set DownloadPath if (m_DownloadPath.isEmpty()) { QString xnatFolder = "XNAT_DOWNLOADS"; QDir dir(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()->getDataFile("").absoluteFilePath()); dir.mkdir(xnatFolder); dir.setPath(dir.path() + "/" + xnatFolder); m_DownloadPath = dir.path() + "/"; } } QmitkXnatTreeBrowserView::~QmitkXnatTreeBrowserView() { delete m_TreeModel; delete m_Tracker; } void QmitkXnatTreeBrowserView::SetFocus() { } void QmitkXnatTreeBrowserView::CreateQtPartControl(QWidget *parent) { // Create GUI widgets from the Qt Designer's .ui file m_Controls.setupUi(parent); m_Controls.treeView->setModel(m_TreeModel); m_Controls.treeView->header()->hide(); m_Controls.treeView->setSelectionMode(QAbstractItemView::ExtendedSelection); m_Controls.treeView->setAcceptDrops(true); m_Controls.treeView->setDropIndicatorShown(true); m_Controls.labelError->setText("Please use the 'Connect' button in the Preferences."); m_Controls.labelError->setStyleSheet("QLabel { color: red; }"); m_SelectionProvider = new berry::QtSelectionProvider(); this->SetSelectionProvider(); m_Controls.treeView->setSelectionMode(QAbstractItemView::SingleSelection); m_Controls.treeView->setContextMenuPolicy(Qt::CustomContextMenu); m_Tracker = new mitk::XnatSessionTracker(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()); m_ContextMenu = new QMenu(m_Controls.treeView); connect(m_Controls.treeView, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnContextMenuRequested(const QPoint&))); connect(m_Tracker, SIGNAL(AboutToBeClosed(ctkXnatSession*)), this, SLOT(CleanTreeModel(ctkXnatSession*))); connect(m_Tracker, SIGNAL(Opened(ctkXnatSession*)), this, SLOT(UpdateSession(ctkXnatSession*))); m_Tracker->Open(); ctkXnatSession* session; try { session = mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetService( mitk::org_mitk_gui_qt_xnatinterface_Activator::GetXnatModuleContext()->GetServiceReference()); } catch (std::invalid_argument) { session = 0; } if (session != 0) { m_Controls.labelError->setVisible(false); } else { m_Controls.labelError->setVisible(true); } - connect(m_Controls.treeView, SIGNAL(activated(const QModelIndex&)), this, SLOT(OnActivatedNode(const QModelIndex&))); + connect(m_Controls.treeView, SIGNAL(doubleClicked(const QModelIndex&)), this, SLOT(OnActivatedNode(const QModelIndex&))); + connect(m_Controls.treeView, SIGNAL(clicked(const QModelIndex&)), this, SLOT(OnXnatNodeSelected(const QModelIndex&))); connect(m_TreeModel, SIGNAL(ResourceDropped(const QList&, ctkXnatObject*)), this, SLOT(OnUploadResource(const QList&, ctkXnatObject*))); + + connect(m_Controls.btnXnatUpload, SIGNAL(clicked()), this, SLOT(OnUploadFromDataStorage())); + connect(m_Controls.btnXnatDownload, SIGNAL(clicked()), this, SLOT(OnDownloadSelectedXnatFile())); + connect(m_Controls.btnCreateXnatFolder, SIGNAL(clicked()), this, SLOT(OnCreateResourceFolder())); +} + +void QmitkXnatTreeBrowserView::OnCreateResourceFolder() +{ + QModelIndex index = m_Controls.treeView->selectionModel()->currentIndex(); + + if(!index.isValid()) return; + + ctkXnatObject* parent = index.data(Qt::UserRole).value(); + + this->InternalAddResourceFolder(parent); +} + +void QmitkXnatTreeBrowserView::OnDownloadSelectedXnatFile() +{ + QModelIndex index = m_Controls.treeView->selectionModel()->currentIndex(); + + if(!index.isValid()) return; + + ctkXnatObject* selectedXnatObject = index.data(Qt::UserRole).value(); + + ctkXnatFile* selectedXnatFile = dynamic_cast(selectedXnatObject); + + if (selectedXnatFile != nullptr) + { + this->InternalFileDownload(index, true); + } + else + { + // Do something + } +} + +void QmitkXnatTreeBrowserView::OnUploadFromDataStorage() +{ + QmitkXnatUploadFromDataStorageDialog dialog; + dialog.SetDataStorage(this->GetDataStorage()); + int result = dialog.exec(); + + if (result == QmitkXnatUploadFromDataStorageDialog::UPLOAD) + { + QList nodes; + nodes << dialog.GetSelectedNode(); + this->OnUploadResource(); + } +} + +void QmitkXnatTreeBrowserView::OnXnatNodeSelected(const QModelIndex& index) +{ + // Enable download button + if (!index.isValid()) return; + + ctkXnatObject* selectedXnatObject = index.data(Qt::UserRole).value(); + + bool enableDownload = dynamic_cast(selectedXnatObject); + m_Controls.btnXnatDownload->setEnabled(enableDownload); + + bool enableCreateFolder = dynamic_cast(selectedXnatObject) != nullptr; + enableCreateFolder |= dynamic_cast(selectedXnatObject) != nullptr; + enableCreateFolder |= dynamic_cast(selectedXnatObject) != nullptr; + m_Controls.btnCreateXnatFolder->setEnabled(enableCreateFolder); + + bool enableUpload = dynamic_cast(selectedXnatObject) != nullptr; + m_Controls.btnXnatUpload->setEnabled(enableUpload); } void QmitkXnatTreeBrowserView::OnActivatedNode(const QModelIndex& index) { if (!index.isValid()) return; berry::IWorkbenchPage::Pointer page = GetSite()->GetPage(); QmitkXnatObjectEditorInput::Pointer oPtr(new QmitkXnatObjectEditorInput(index.data(Qt::UserRole).value())); berry::IEditorInput::Pointer editorInput(oPtr); berry::IEditorPart::Pointer reuseEditor = page->FindEditor(editorInput); if (reuseEditor) { // Just set it activ page->Activate(reuseEditor); } else { QList editors = page->FindEditors(berry::IEditorInput::Pointer(0), QmitkXnatEditor::EDITOR_ID, berry::IWorkbenchPage::MATCH_ID); if (editors.isEmpty()) { ctkXnatFile* file = dynamic_cast(oPtr->GetXnatObject()); if (file != NULL) { // If the selected node is a file, so show it in MITK InternalFileDownload(index, true); } else { // No XnatEditor is currently open, create a new one page->OpenEditor(editorInput, QmitkXnatEditor::EDITOR_ID); } } else { // Reuse an existing editor reuseEditor = editors.front()->GetEditor(true); page->ReuseEditor(reuseEditor.Cast(), editorInput); page->Activate(reuseEditor); } - } + } } void QmitkXnatTreeBrowserView::SetSelectionProvider() { GetSite()->SetSelectionProvider(m_SelectionProvider); } void QmitkXnatTreeBrowserView::UpdateSession(ctkXnatSession* session) { if (session != 0 && session->isOpen()) { m_Controls.labelError->setVisible(false); // Fill model and show in the GUI m_TreeModel->addDataModel(session->dataModel()); m_Controls.treeView->reset(); m_SelectionProvider->SetItemSelectionModel(m_Controls.treeView->selectionModel()); connect(session, SIGNAL(progress(QUuid,double)), this, SLOT(OnProgress(QUuid,double))); connect(session, SIGNAL(uploadFinished()), this, SLOT(OnProgress(QUuid,double))); } } void QmitkXnatTreeBrowserView::CleanTreeModel(ctkXnatSession* session) { if (session != 0) { m_TreeModel->removeDataModel(session->dataModel()); m_Controls.treeView->reset(); } } void QmitkXnatTreeBrowserView::OnProgress(QUuid /*queryID*/, double progress) { unsigned int currentProgress = progress*100; if (currentProgress < 1) mitk::ProgressBar::GetInstance()->AddStepsToDo(100); else mitk::ProgressBar::GetInstance()->Progress(); } void QmitkXnatTreeBrowserView::InternalFileDownload(const QModelIndex& index, bool loadData) { QVariant variant = m_TreeModel->data(index, Qt::UserRole); if (variant.isValid()) { ctkXnatFile* file = dynamic_cast(variant.value()); if (file != NULL) { QDir downDir(m_DownloadPath); QString filePath = m_DownloadPath + file->name(); // Testing if the file exists already if (downDir.exists(file->name())) { MITK_INFO << "File '" << file->name().toStdString() << "' already exists!"; } else { MITK_INFO << "Download started ..."; MITK_INFO << "..."; file->download(filePath); // Testing if the file exists now if (downDir.exists(file->name())) { MITK_INFO << "Download of " << file->name().toStdString() << " was completed!"; } else { MITK_INFO << "Download of " << file->name().toStdString() << " failed!"; } } if (downDir.exists(file->name())) { if (loadData) { mitk::IDataStorageService* dsService = m_DataStorageServiceTracker.getService(); mitk::DataStorage::Pointer dataStorage = dsService->GetDataStorage()->GetDataStorage(); QStringList list; list << (m_DownloadPath + file->name()); try { QmitkIOUtil::Load(list, *dataStorage); } catch (const mitk::Exception& e) { MITK_INFO << e; return; } mitk::RenderingManager::GetInstance()->InitializeViewsByBoundingObjects( dsService->GetDataStorage()->GetDataStorage()); } } } else { MITK_INFO << "Selection was not a file!"; } } } void QmitkXnatTreeBrowserView::OnContextMenuDownloadFile() { QModelIndex index = m_Controls.treeView->currentIndex(); InternalFileDownload(index, false); } void QmitkXnatTreeBrowserView::OnContextMenuDownloadAndOpenFile() { QModelIndex index = m_Controls.treeView->currentIndex(); InternalFileDownload(index, true); } void QmitkXnatTreeBrowserView::OnContextMenuCreateResourceFolder() { const QModelIndex index = m_Controls.treeView->selectionModel()->currentIndex(); ctkXnatObject* parentObject = m_TreeModel->xnatObject(index); if (parentObject != nullptr) { this->InternalAddResourceFolder(parentObject); } } ctkXnatResource* QmitkXnatTreeBrowserView::InternalAddResourceFolder(ctkXnatObject *parent) { bool ok; QString folderName = QInputDialog::getText(m_Controls.treeView, tr("Create XNAT resource folder"), tr("Folder name:"), QLineEdit::Normal, tr("data"), &ok); if (ok) { if (folderName.isEmpty()) folderName = "NO LABEL"; return parent->addResourceFolder(folderName); } else { return nullptr; } } void QmitkXnatTreeBrowserView::InternalFileUpload(ctkXnatFile* file) { try { file->save(); } catch (ctkXnatException &e) { QMessageBox msgbox; msgbox.setText(e.what()); msgbox.setIcon(QMessageBox::Critical); msgbox.exec(); } } void QmitkXnatTreeBrowserView::OnContextMenuUploadFile() { QString filename = QFileDialog::getOpenFileName(m_Controls.treeView, tr("Open File"), QDir::homePath()); const QModelIndex index = m_Controls.treeView->selectionModel()->currentIndex(); ctkXnatResource* resource = dynamic_cast(m_TreeModel->xnatObject(index)); if (resource) { ctkXnatFile* file = new ctkXnatFile(resource); file->setLocalFilePath(filename); QFileInfo fileInfo (filename); file->setName(fileInfo.fileName()); file->setFileFormat("some format"); file->setFileContent("some content"); file->setFileTags("some, tags"); file->save(); m_TreeModel->addChildNode(index, file); } } #include void QmitkXnatTreeBrowserView::OnUploadResource(const QList& droppedNodes, ctkXnatObject* parentObject) { if (parentObject == nullptr) return; if (dynamic_cast(parentObject)) MITK_INFO<<"SESSION"; else if (dynamic_cast(parentObject)) MITK_INFO<<"DATAMODEL"; else if (dynamic_cast(parentObject)) MITK_INFO<<"PROJECT"; else if (dynamic_cast(parentObject)) MITK_INFO<<"SUBJECT"; //1. If not dropped on a resource, create a new folder //2. Save file locally //3. Upload file ctkXnatResource* resource = dynamic_cast(parentObject); if (resource == nullptr) { resource = this->InternalAddResourceFolder(parentObject); } if (resource == nullptr) { MITK_WARN << "Could not upload file! No resource available!"; } mitk::DataNode* node = NULL; foreach (node, droppedNodes) { mitk::BaseData* data = node->GetData(); if (!data) return; QString fileName (QString::fromStdString(node->GetName())); ctkXnatFile* xnatFile = new ctkXnatFile(resource); if (dynamic_cast(data)) { fileName.append(".nrrd"); } else if (dynamic_cast(data)) { fileName.append(".vtk"); } else if (dynamic_cast(data)) { fileName.append(".mps"); } xnatFile->setName(fileName); QString xnatFolder = "XNAT_UPLOADS"; QDir dir(mitk::org_mitk_gui_qt_xnatinterface_Activator::GetContext()->getDataFile("").absoluteFilePath()); dir.mkdir(xnatFolder); fileName = dir.path().append("/" + fileName); mitk::IOUtil::Save (data, fileName.toStdString()); // TODO Check if file exists // AbstractFileReader::SetDefaultDataNodeProperties // und in die andere SetDefaultDataNodeProperties // PropertyName klein: mtime.initial + Kommentar mitk::StringProperty::Pointer orignalFilePath = mitk::StringProperty::New(); node->GetProperty(orignalFilePath, "path"); xnatFile->setLocalFilePath(fileName); // xnatFile->setFileFormat("some format"); xnatFile->setFileContent("some content"); xnatFile->setFileTags("some, tags"); // xnatFile->save(); m_TreeModel->addChildNode(m_Controls.treeView->currentIndex(), xnatFile); parentObject->fetch(); // The filename for uploading // QFileInfo fileInfo; // if (surface) // { // // Save surface // fileName.append(".stl"); // xnatFile->setName(fileName); // dir.setPath(dir.path().append("/" + fileName)); // QString origFile = QString::fromStdString(orignalFilePath->GetValueAsString()); // origFile.append("/" + fileName); // origFile.append(".stl"); // fileInfo.setFile(origFile); // if (!fileInfo.exists()) // mitk::IOUtil::SaveSurface(surface, dir.path().toStdString()); // } // this->uploadFileToXnat(xnatFile, dir.path()); // TODO delete file!!! } } void QmitkXnatTreeBrowserView::OnContextMenuRequested(const QPoint & pos) { m_ContextMenu->clear(); QModelIndex index = m_Controls.treeView->indexAt(pos); ctkXnatObject* xnatObject = m_TreeModel->xnatObject(index); bool downloadable = false; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; downloadable |= dynamic_cast(xnatObject)!=NULL; bool canHaveResourceFolder = false; canHaveResourceFolder |= dynamic_cast(xnatObject) != NULL; canHaveResourceFolder |= dynamic_cast(xnatObject) != NULL; canHaveResourceFolder |= dynamic_cast(xnatObject) != NULL; bool uploadFilePossible = false; uploadFilePossible |= dynamic_cast(xnatObject) != NULL; uploadFilePossible |= dynamic_cast(xnatObject) != NULL; uploadFilePossible |= dynamic_cast(xnatObject) != NULL; if (downloadable) { QAction* actDownload = new QAction("Download", m_ContextMenu); connect(actDownload, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadFile())); m_ContextMenu->addAction(actDownload); ctkXnatFile* file = dynamic_cast(xnatObject); if (file) { QAction* actView = new QAction("Download and Open", m_ContextMenu); connect(actView, SIGNAL(triggered()), this, SLOT(OnContextMenuDownloadAndOpenFile())); m_ContextMenu->addAction(actView); } } if (canHaveResourceFolder) { QAction* actCreateResource = new QAction("Add resource folder", m_ContextMenu); connect(actCreateResource, SIGNAL(triggered()), this, SLOT(OnContextMenuCreateResourceFolder())); m_ContextMenu->addAction(actCreateResource); } if (uploadFilePossible) { QAction* actUploadFile = new QAction("Upload File", m_ContextMenu); connect(actUploadFile, SIGNAL(triggered()), this, SLOT(OnContextMenuUploadFile())); m_ContextMenu->addAction(actUploadFile); } m_ContextMenu->popup(QCursor::pos()); } diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h index 10941321fc..0608abe77a 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h @@ -1,108 +1,113 @@ /*=================================================================== 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 QMITKXNATTREEBROWSERVIEW_H #define QMITKXNATTREEBROWSERVIEW_H #include #include #include "ui_QmitkXnatTreeBrowserViewControls.h" // ctkXnatCore #include "ctkXnatSession.h" // ctkXnatWidget #include "QmitkXnatTreeModel.h" // MitkXNAT Module #include "mitkXnatSessionTracker.h" #include #include class QMenu; /*! \brief QmitkXnatTreeBrowserView \warning This class is not yet documented. Use "git blame" and ask the author to provide basic documentation. \sa QmitkFunctionality \ingroup ${plugin_target}_internal */ class QmitkXnatTreeBrowserView : public QmitkAbstractView { // this is needed for all Qt objects that should have a Qt meta-object // (everything that derives from QObject and wants to have signal/slots) Q_OBJECT public: QmitkXnatTreeBrowserView(); ~QmitkXnatTreeBrowserView(); static const std::string VIEW_ID; virtual void CreateQtPartControl(QWidget *parent); - protected slots: +protected slots: /// \brief Opens or reuses the xnat editor with the activated node as root item. void OnActivatedNode(const QModelIndex& index); /// \brief Updates the ctkXnatSession and the user interface void UpdateSession(ctkXnatSession* session); /// \brief Cleans the tree model void CleanTreeModel(ctkXnatSession* session); void OnContextMenuRequested(const QPoint & pos); void OnContextMenuDownloadAndOpenFile(); void OnContextMenuDownloadFile(); void OnContextMenuCreateResourceFolder(); void OnContextMenuUploadFile(); void OnUploadResource(const QList& , ctkXnatObject *); void OnProgress(QUuid, double); + void OnUploadFromDataStorage(); protected: virtual void SetFocus(); Ui::QmitkXnatTreeBrowserViewControls m_Controls; -private: +private slots: + void OnXnatNodeSelected(const QModelIndex &index); + void OnDownloadSelectedXnatFile(); + void OnCreateResourceFolder(); +private: void InternalFileDownload(const QModelIndex& index, bool loadData); void InternalFileUpload(ctkXnatFile *file); ctkXnatResource* InternalAddResourceFolder(ctkXnatObject* parent); berry::QtSelectionProvider::Pointer m_SelectionProvider; void SetSelectionProvider(); ctkServiceTracker m_DataStorageServiceTracker; QmitkXnatTreeModel* m_TreeModel; mitk::XnatSessionTracker* m_Tracker; QString m_DownloadPath; QMenu* m_ContextMenu; }; #endif // QMITKXNATTREEBROWSERVIEW_H diff --git a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui index ad2e33dbea..0594dd850c 100644 --- a/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui +++ b/Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui @@ -1,109 +1,142 @@ QmitkXnatTreeBrowserViewControls 0 0 455 975 0 0 QmitkTemplate Qt::AlignCenter 5 0 + + false + + + Upload to XNAT + - - - + :/xnat/xnat-upload.png:/xnat/xnat-upload.png 32 32 + + false + + + Download File + :/xnat/xnat-download.png:/xnat/xnat-download.png 32 32 + + + + false + + + Create Folder + + + + + + + :/xnat/xnat-folder.png:/xnat/xnat-folder.png + + + + 32 + 32 + + + + Qt::Horizontal 40 20