Page MenuHomePhabricator

Integrate DICOM plugin bug-10050 into MITK
Closed, ResolvedPublic


Integrate DICOM plugin bug-10050 into MITK.
Integrate DICOM plugin with old MITK Bundles structure into current MITK version.

Event Timeline

[bf1870]: Merge branch 'bug-12235-integrate-dicom-plugin'

Merged commits:

2012-07-03 19:12:23 Michael Bauer [6ea650]
tabulator fix

2012-07-03 18:42:16 Sascha Zelzer [a86e36]
Several bug fixes fixing seg faults on Linux.

2012-07-03 17:27:37 Marco Nolden [1e12f6]
Added CTKDICOMCore to preloaded libraries

2012-07-03 17:26:57 Marco Nolden [0bd665]
Style fixed

2012-07-03 17:26:45 Marco Nolden [b4edfc]
Fixed some includes

2012-07-03 14:18:43 Michael Bauer [a2db6c]
Use QT Sql include dirs

2012-07-03 10:38:48 Michael Bauer [b6786b]
Updated CTK version to official one

2012-07-02 18:08:04 Michael Bauer [677b98]
removed tabs

2012-07-02 17:39:40 Michael Bauer [81560f]
removed tabulators

2012-07-02 17:34:43 Michael Bauer [4cd60d]
basic progressbar implimentation

2012-07-02 17:34:15 Michael Bauer [061405]
converted debug messageboxes into MITK_INFO

2012-07-02 17:33:23 Michael Bauer [7032fe]
fixed memory leak

2012-06-25 13:14:07 Michael Bauer [eaabd9]
working ctk with corrected brackets in indexer

2012-06-25 12:36:21 Michael Bauer [5398c1]
ctk with no dicomdir support

2012-06-18 19:36:11 Michael Bauer [1572e4]
adjust includes and path

2012-06-18 14:35:33 Michael Bauer [af922c]
Merge branch 'bug-10050-ctk-dicom-plugin' into bug-12235-integrate-dicom-plugin


2012-06-18 14:01:43 Michael Bauer [0c8959]
stage file

2012-06-18 12:42:27 Michael Bauer [531516]
use working ctk version for mitk

2012-06-18 12:16:46 Michael Bauer [38f0ee]
Merge remote-tracking branch 'origin/master'

2012-05-18 18:30:38 Michael Bauer [6d589d]
applay changes from ctk to disable the ctk progress dialog

2012-05-18 15:57:39 Michael Bauer [52452f]

2012-05-18 15:57:12 Michael Bauer [2b91fd]
implemented storescp parameters configuration

2012-05-11 15:19:06 Michael Bauer [0646e9]
apply ctk changes

2012-05-07 18:16:43 Michael Bauer [7f2ed1]
exclude preference page

2012-05-07 15:29:12 Michael Bauer [52bf81]
added radio button to switch storescp process on and of

2012-05-07 15:28:07 Michael Bauer [0e8413]
improve code of dicom editor

2012-05-07 15:27:19 Michael Bauer [2d752b]
exclude preference page from project

2012-04-30 16:58:01 Michael Bauer [b55635]
changed preference page [not working yet]

2012-04-30 16:56:41 Michael Bauer [4cc9f0]
get server parameters from ctk widget

2012-04-30 16:55:38 Michael Bauer [6aea56]
changed ctk added getter for server parameters

2012-04-20 18:30:44 Michael Bauer [2d45c7]
added preference Page

2012-04-02 16:16:27 Michael Bauer [dd05b1]
added cast

2012-04-02 15:42:34 Michael Bauer [36f8f3]
implemented some methods of preference page

2012-04-02 15:41:21 Michael Bauer [2323f8]
adjusted includes

2012-03-26 11:59:12 Michael Bauer [7cdfb5]
added preference page

2012-03-26 11:30:53 Michael Bauer [6e0166]
add preference page

2012-03-26 11:30:04 Michael Bauer [a6e6e6]
cleaned up some code and includes

2012-03-05 15:29:30 Michael Bauer [8bda19]
changed datastoragetreemodel:
if dicom date is added the name will be composed from patient name,
study name and series name and will no longer be editable.

2012-03-05 15:27:44 Michael Bauer [245bcb]
changed eventbus from normal events to publish signal slot

2012-02-29 14:12:01 Michael Bauer [88d80c]
new handler

2012-02-27 14:58:33 Michael Bauer [b2ca73]
event handler test

2012-02-24 18:00:49 Michael Bauer [d1cc92]
added functions for registration, handle event, set the context

2012-02-24 16:07:40 Michael Bauer [58b643]
add DicomEventHandler for testing purposes

2012-02-24 16:06:40 Michael Bauer [fc7678]
changed variable from pointer to class

2012-02-24 15:21:02 Michael Bauer [cafc8e]
adjust include path

2012-02-24 15:20:45 Michael Bauer [3bd650]
deleted target_libraries.cmake

2012-02-24 15:04:42 Michael Bauer [f771e9]
changed cmakelists

2012-02-24 15:01:27 Michael Bauer [36bf40]
added ctkpluginframework to cmakelists

2012-02-24 14:48:43 Michael Bauer [485fd5]
added file target_libraries.cmake

2012-02-24 14:48:15 Michael Bauer [3b75a8]
added publisher

2012-02-23 18:01:42 Michael Bauer [f62e5e]
added new files to files.cmake

2012-02-23 18:01:00 Michael Bauer [81a454]
added QmitkDicomDataEventPublisher

2012-02-22 14:04:31 Michael Bauer [5a4fad]
changed database directory

2012-02-22 13:14:23 Michael Bauer [206735]
don't start process detached

2012-02-22 13:13:44 Michael Bauer [a3962a]
No Mutex needed

2012-02-21 16:50:51 Michael Bauer [b2add7]
tried another algorithm

2012-02-21 16:50:17 Michael Bauer [cf53f7]
changed signatures and connection

2012-02-21 16:49:09 Michael Bauer [42d024]
changed signature of signal

2012-02-21 16:48:31 Michael Bauer [1f6845]
changed signatures of start/add methods and signal

2012-02-20 18:11:55 Michael Bauer [12755c]
improved methods and style

2012-02-20 18:11:34 Michael Bauer [a6f9fa]
added a StoreSCP launcher

2012-02-17 15:49:04 Michael Bauer [f2ea01]
added class QmitkStoreSCPLauncher. It will start a dcmtk storescp in another process

2012-02-17 15:47:39 Michael Bauer [185fd7]
improved code by deleting some comments and unused methods

2012-02-17 15:44:17 Michael Bauer [6b8e2b]
added search functionality

2012-02-16 15:06:21 Michael Bauer [590364]
added a default setup method

2012-02-16 15:04:49 Michael Bauer [9cf556]
change the handling of the database

2012-02-16 15:04:07 Michael Bauer [3431e5]
refactor big methods to small meaningfull methods

2012-02-16 10:04:15 Michael Bauer [8740ab]
added method to get plugin context

2012-02-13 16:29:08 Michael Bauer [d9a57f]
added Get method for m_DicomListenerDirectory

2012-02-10 12:00:06 Michael Bauer [5bd653]
Merge remote-tracking branch 'origin/bug-10050-ctk-dicom-plugin' into bug-10050-ctk-dicom-plugin

2012-02-10 11:50:34 Michael Bauer [a26963]
Changed some CTK issues and changed CTK version to my github ctk version

2012-02-09 16:14:21 Marco Nolden [ee3117]
Fixed case sensitive include file names in UI file

2012-02-09 11:31:26 Michael Bauer [95be79]
changed tabs to whitespaces

2012-02-07 17:54:04 Michael Bauer [bf026f]
finished directory listener

2012-02-03 11:02:39 Michael Bauer [1597ca]
added QmitkDirectoryListener

2012-02-03 11:02:05 Michael Bauer [e73057]
added QmitkDirectoryListener

2012-02-01 13:25:14 Michael Bauer [d1591b]
threading added to the some funtionality

2012-01-18 13:46:27 Michael Bauer [8c98c8]
added threading to local import

2012-01-17 17:46:19 Michael Bauer [61bcdd]
added base database functionality add delete download

2012-01-03 14:33:25 Michael Bauer [1825fc]
added new gui class for external dicom data

2012-01-03 12:54:42 Michael Bauer [164ba6]
changed wrong classnames

2012-01-03 12:52:59 Michael Bauer [b8508a]
modify classnames

2012-01-03 12:15:16 Michael Bauer [70b630]
changed CmakeLists.txt

2012-01-02 17:26:27 Michael Bauer [94a856]
changed CmakeLists.txt

2012-01-02 17:25:22 Michael Bauer [aca55b]
changed CmakeLists.txt

2012-01-02 17:22:29 Michael Bauer [f87986]
changed CmakeLists.txt

2012-01-02 17:11:22 Michael Bauer [694cb0]
changed CmakeLists.txt

2012-01-02 17:07:43 Michael Bauer [264b53]
changed CmakeLists.txt

2012-01-02 17:04:32 Michael Bauer [64e295]
changed CmakeLists.txt

2012-01-02 17:02:57 Michael Bauer [dd7434]
deleted Testing

2012-01-02 16:55:57 Michael Bauer [acbbca]
added bundle to cmake

2012-01-02 16:37:41 Michael Bauer [dc9544]
removed unused classes from files.cmake

2012-01-02 16:29:57 Michael Bauer [e50844]
removed unused classes

2012-01-02 16:21:06 Michael Bauer [94b03b]
added new DicomUI to seperate different UI parts

2011-12-27 14:14:18 Michael Bauer [58ec71]
added class mitkAbstractDicomDataHandler

2011-12-27 13:58:41 Michael Bauer [d2b041]
added class mitkAbstractDicomDataHandler

2011-12-27 13:57:18 Michael Bauer [c2dce4]
added mitkAbstractDicomHandler

2011-12-23 16:44:34 Michael Bauer [d6cda8]
working editor with different gui

2011-12-21 14:42:12 Michael Bauer [762ce8]
added new Action to cmake

2011-12-21 14:38:08 Michael Bauer [1b6a8f]
fixed previous changes no includes needed

2011-12-21 13:42:44 Michael Bauer [692d95]
added new Button for qmitkdicomeditor to mitk toolbar

2011-12-20 19:15:34 Michael Bauer [5bfd6c]
changes for editor

2011-12-20 17:54:29 Michael Bauer [f5ed62]
added new renamed editor files

2011-12-20 17:52:23 Michael Bauer [47e6f2]
changed dicom view to dicom editor

2011-12-16 16:29:30 Michael Bauer [6b6b6a]
Generate first GUI

2011-12-12 17:01:17 Michael Bauer [306cdb]
changed ctk version to the newest one

2011-11-23 13:47:43 Michael Bauer [14be36]
Signal startet to work after rbuild

2011-11-18 13:36:35 Michael Bauer [d727a6]
aadded cnnection to ui cml

2011-11-18 13:02:30 Michael Bauer [c8b63c]
added connection between seriesDoubleClicked and on onSeriesModelSelected to header cpp and ui file

2011-11-17 17:38:17 Michael Bauer [e18a64]
changed signal seriesDoubleClicked(const QModelIndex&) to seriesDoubleClicked(QModelIndex) to receive changed signal from ctkAppWidget

2011-11-16 12:32:33 Michael Bauer [947f28]
mitk with dicom plugin ready for ctk signals

2011-11-15 14:41:27 Michael Bauer [12c99e]
tries to add dicom data to data manager

2011-11-11 17:41:13 Michael Bauer [a4914e]
Created a Dicom plugin and included ctkDICOMAppWidget

Changed CMakeList file of org.mitk.qt.dicom so that ctk files can be found
CMakeExternals/CTK.cmake changed repository to my github ctk

Succesfully integrated branches

[f19ca3]: Merge branch 'bug-12235-integrate-dicom-plugin'

Merged commits:

2012-07-05 17:01:40 Michael Bauer [cb3488]
COMP: fixed dashboard