Diffusion MITK 97ff251cc6d9

Merge branch 'bug-16294-XNATBrowsingEditor' into bug-16294-XNATIntegration
97ff251cc6d9
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-16294-XNATBrowsingEditor' into bug-16294-XNATIntegration

Conflicts:
CMakeExternals/CTK.cmake

Details

Provenance

Authored on Feb 21 2014, 5:18 PM

Parents

rMITKbd8271a8bf6c: Added QmitkXnatEditor.h again. (Merge Problem)
rMITKbcf1c97607fd: Merge branch 'bug-5912-fix-spaces-in-paths-configure-errors'

Branches

Unknown

Tags

Unknown

Event Timeline

• knorr committed rMITK97ff251cc6d9: Merge branch 'bug-16294-XNATBrowsingEditor' into bug-16294-XNATIntegration (authored by • knorr).Feb 21 2014, 5:18 PM

Merged Changes

bd8271a8bf6c Added QmitkXnatEditor.h again. (Merge Problem)
Author
• knorr
Browse Repository
No Builds
No Audits
7fccd7eae218 Renamed the plugin from xnatinterface to xnat. Changed CTK revision tag and MD5…
Author
• knorr
Browse Repository
No Builds
No Audits
417cc146a8a0 Fixed Linux compile issue and use the CTK master for XNAT support.
Author
zelzer
Browse Repository
No Builds
No Audits
4e11665e16be Deleted unnecessary files, methodes, includes and comments. Fixed the workbench…
Author
• knorr
Browse Repository
No Builds
No Audits
5ca4d5bf42b9 Inserted some comments and deleted outcommented code.
Author
• knorr
Browse Repository
No Builds
No Audits
3f4f246834fa Port try catch of seesion->open() to central position (ConnectionManager).
Author
• knorr
Browse Repository
No Builds
No Audits
9d7aa33ff247 Added relative default Download Path for XNAT. Took XnatSearchView out of Scope.
Author
• knorr
Browse Repository
No Builds
No Audits
a36da926fc47 Changed Preference Handling to have a own order in the QMap. Added Download…
Author
• knorr
Browse Repository
No Builds
No Audits
cec44c1bba42 Reimplemented the XnatEditorAction. Added a Semi-Global handling of xnat…
Author
• knorr
Browse Repository
No Builds
No Audits
159a2780f41b Added a preference page for xnat connection. Deleted some comments. Deleted the…
Author
• knorr
Browse Repository
No Builds
No Audits
4d79797fa348 Added Breadcrumb navigation to the XnatEditor.
Author
• knorr
Browse Repository
No Builds
No Audits
ce40e3242675 inserted icon. changed cmakelist -> delete poco
Author
• knorr
Browse Repository
No Builds
No Audits
9e60570b42ae Some additional changes to the renamed classes. And deleted old classes.
Author
• knorr
Browse Repository
No Builds
No Audits
c8999bc393cc Renamed classes. Communication between TreeBrowserView and Editor works, it is…
Author
• knorr
Browse Repository
No Builds
No Audits
fca041858f0c Now you can only see the next lower level.
Author
• knorr
Browse Repository
No Builds
No Audits
9a4fc38daf4d Implemented the Browsing through projects, subjects, experiments, scans…
Author
• knorr
Browse Repository
No Builds
No Audits
d805f4c53ec5 Changed xnat plugin from view to editor. Replaced Poco code with CTK:xnat…
Author
• knorr
Browse Repository
No Builds
No Audits
a2d2e5240023 Created new EditorAction Class. Prepared the change of the xnat plugin from…
Author
• knorr
Browse Repository
No Builds
No Audits
a8d0fccf973c New Plugin for Data-Browsing in a XNAT Rest-Server created. Changed Plugin: ON.
Author
• knorr
Browse Repository
No Builds
No Audits

Changes (45)

Path

Size

Packages

CMakeExternals/

O1: MITK Reviewer Group I

Plugins/

PluginList.cmake

org.mitk.gui.qt.ext/

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

resources/

org_mitk_gui_qt_ext.qrc

O1: MITK Reviewer Group I

O1: MITK Reviewer Group I

src/

QmitkExtWorkbenchWindowAdvisor.cpp

O1: MITK Reviewer Group I

QmitkExtWorkbenchWindowAdvisor.h

O1: MITK Reviewer Group I

QmitkOpenXnatEditorAction.cpp

O1: MITK Reviewer Group I

QmitkOpenXnatEditorAction.h

O1: MITK Reviewer Group I

org.mitk.gui.qt.xnat

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

manifest_headers.cmake

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

xnat_search_icon.xpm

O3: MITK Reviewer Group II

xnat_treebrowser_icon.xpm

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

O3: MITK Reviewer Group II

QmitkXnatConnectionManager.cpp

O3: MITK Reviewer Group II

QmitkXnatConnectionManager.h

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePage.cpp

O3: MITK Reviewer Group II

QmitkXnatConnectionPreferencePage.h

O3: MITK Reviewer Group II

QmitkXnatEditor.cpp

O3: MITK Reviewer Group II

QmitkXnatEditor.h

O3: MITK Reviewer Group II

QmitkXnatEditorControls.ui

O3: MITK Reviewer Group II

QmitkXnatObjectEditorInput.cpp

O3: MITK Reviewer Group II

QmitkXnatObjectEditorInput.h

O3: MITK Reviewer Group II

QmitkXnatSimpleSearchView.cpp

O3: MITK Reviewer Group II

QmitkXnatSimpleSearchView.h

O3: MITK Reviewer Group II

QmitkXnatSimpleSearchViewControls.ui

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.cpp

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserView.h

O3: MITK Reviewer Group II

QmitkXnatTreeBrowserViewControls.ui

O3: MITK Reviewer Group II

org_mitk_gui_qt_xnatinterface_Activator.cpp

O3: MITK Reviewer Group II

org_mitk_gui_qt_xnatinterface_Activator.h

O3: MITK Reviewer Group II

target_libraries.cmake

O3: MITK Reviewer Group II

rMITK97ff251cc6d9

CMakeExternals/CTK.cmake

Loading...

Plugins/PluginList.cmake

Loading...

Plugins/org.mitk.gui.qt.ext/files.cmake

Loading...

Plugins/org.mitk.gui.qt.ext/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.ext/resources/org_mitk_gui_qt_ext.qrc

Loading...

Plugins/org.mitk.gui.qt.ext/resources/xnat-icon.png

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkExtWorkbenchWindowAdvisor.h

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenXnatEditorAction.cpp

Loading...

Plugins/org.mitk.gui.qt.ext/src/QmitkOpenXnatEditorAction.h

Loading...

Plugins/org.mitk.gui.qt.xnat/CMakeLists.txt

Loading...

Plugins/org.mitk.gui.qt.xnat/documentation/UserManual/Manual.dox

Loading...

Plugins/org.mitk.gui.qt.xnat/documentation/UserManual/icon.xpm

Loading...

Plugins/org.mitk.gui.qt.xnat/documentation/doxygen/modules.dox

Loading...

Plugins/org.mitk.gui.qt.xnat/files.cmake

Loading...

Plugins/org.mitk.gui.qt.xnat/manifest_headers.cmake

Loading...

Plugins/org.mitk.gui.qt.xnat/plugin.xml

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/icon.xpm

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat_search_icon.xpm

Loading...

Plugins/org.mitk.gui.qt.xnat/resources/xnat_treebrowser_icon.xpm

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionManager.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionManager.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatConnectionPreferencePage.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditor.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatEditorControls.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatObjectEditorInput.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatObjectEditorInput.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSimpleSearchView.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSimpleSearchView.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatSimpleSearchViewControls.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserView.h

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/QmitkXnatTreeBrowserViewControls.ui

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/org_mitk_gui_qt_xnatinterface_Activator.cpp

Loading...

Plugins/org.mitk.gui.qt.xnat/src/internal/org_mitk_gui_qt_xnatinterface_Activator.h

Loading...

Plugins/org.mitk.gui.qt.xnat/target_libraries.cmake

Loading...