HomePhabricator | MITK
Diffusion MITK 81d4807489f1

Merge remote-tracking branch 'remotes/origin/T24287-Integration-IGTRelease-2018…

Authored by franza on Aug 7 2018, 1:09 PM.

Description

Merge remote-tracking branch 'remotes/origin/T24287-Integration-IGTRelease-2018-03' into T24287-v2018.04-beta-integration

  1. Conflicts:
  2. Modules/US/USModel/mitkUSDevice.cpp
  3. Modules/US/USModel/mitkUSDevice.h
  4. Modules/US/USModel/mitkUSVideoDeviceCustomControls.h
  5. Modules/US/USNavigation/mitkUSCombinedModality.cpp
  6. Modules/US/USNavigation/mitkUSCombinedModality.h
  7. Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp
  8. Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.h
  9. Plugins/org.mitk.gui.qt.igt.app.echotrack/src/internal/QmitkUltrasoundCalibration.cpp

Details

Merged Changes

CommitAuthorDetailsCommitted
db6d3e9760d2franza
fixed a few bugs caused by last merge 
Aug 6 2018
b4d85d680925franza
Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound-v1… 
Aug 6 2018
2092cef5ebebfranza
Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02… 
Aug 6 2018
1b0f98cd88a2franza
clean up: removed class 
Aug 6 2018
fc03ecfcd0ecfranza
removed navigationProcessWidget from UI 
Aug 6 2018
c5fc671e44a3franza
removed navigationProcessWidget from code 
Aug 6 2018
19c3052f9086franza
some ui changes 
Aug 6 2018
73fa36ee6d4ffranza
Merge remote-tracking branch 'remotes/origin/T24287-MasterIntegration-2018-02… 
Aug 6 2018
10b5086aaa3eseitela
Fixed type mismatches 
Apr 17 2018
64f0cdcccd75mittmann
Added the feature "Writing a ultrasound (video) device configuration to a xml… 
Apr 12 2018
75435961da6dmittmann
1) Added feature "Reading USVideoDevice configuration from XML file" when… 
Apr 6 2018
67a979a040f2mittmann
Realized the logic between the mapping of different calculable spacing vectors… 
Mar 28 2018
137da872bd02mittmann
Added GenerateData()-method to the USVideoDevice class. 
Mar 25 2018
b3a3a9edb350mittmann
Adaptions concerning the new vector<ImageSource> structure of the US-Device +… 
Mar 21 2018
0f5d992edeebmittmann
Merge branch 'T24287-SupportTrackedUltrasound-v1' into T24287… 
Mar 15 2018
6c76e1a27e2fmittmann
Moved the spacing of the US image to the USDevice class. 
Mar 15 2018
91d566a791f1mittmann
1) Changed the order of calling modified and update on the combined modality… 
Mar 14 2018
3f62b92d2320mittmann
Decide between USCombinedModality and TrackedUltrasound concerning the applied… 
Feb 22 2018
d8b063446e74franza
removed old xml logging class 
Feb 22 2018
7cf4dca568ddfranza
unused UI elements are hidden now 
Feb 22 2018
3e68f7e54f55franza
changed exception to warning 
Feb 22 2018
baffe0f9b815franza
removed unused code 
Feb 22 2018
e2417aa4e372franza
Merge remote-tracking branch 'remotes/origin/T24287-SupportTrackedUltrasound… 
Feb 22 2018
0d7c05e24d5bmittmann
Now more than 2 tools can be used in combination with tracked ultrasound, as… 
Feb 22 2018
ca198d8d7bb8mittmann
Integrated TrackedUltrasound possibility into… 
Feb 22 2018
985249cf9b8cfranza
Merge branch 'T24287-PluginRestructuring' into T24287-MasterIntegration-2018-02… 
Feb 22 2018
399f9aa63aa9mittmann
Merge remote-tracking branch 'remotes/origin/T24287-PluginRestructuring' into… 
Feb 22 2018
7ed2b2ba5137franza
small workaround for bug 
Feb 22 2018
861b24dfa303mittmann
Added TrackedUltrasound class. Preparation steps for tracked ultrasound -->… 
Feb 22 2018
c7c5d5945ae1franza
fixed bug in US calibration (images was not updated, fix is a workaround) 
Feb 22 2018
73b2b5097887franza
removed more code 
Feb 21 2018
6c44ce8b384dfranza
removed unused code 
Feb 21 2018
23c9d96ffd17franza
connected signal of new settings widget 
Feb 21 2018
acab63dbe33cfranza
removed methods which are not in use 
Feb 21 2018
bd3137643ce6franza
removed listener 
Feb 21 2018
918c77401f54franza
now using new settings widget 
Feb 21 2018
be7d7ce63270franza
cleaned up 
Feb 21 2018
e21c248f1f70franza
first step of cleanup 
Feb 21 2018
f7f79ac4205cfranza
finally: working with new structure; still TODO: a lot of cleanup 
Feb 21 2018
25e5b21609a7franza
added setting widget to new part of the UI 
Feb 21 2018
a11d9968298cfranza
added image stream, navigation should work now (not tested yet) 
Feb 21 2018
7bb02fcf9eecfranza
navigation step working... 
Feb 21 2018
d4ed8b7f5826franza
critical structure marking also working 
Feb 21 2018
cb14a241491dfranza
tumor marking is working now 
Feb 21 2018
4fc022b9c7d2franza
UI restructuring 
Feb 21 2018
8d5303440cbffranza
renamed microservice to new abstract class, adapted code to renaming. Only… 
Feb 21 2018
d47cd36f6674franza
moved all microservice code to superclass except for method… 
Feb 21 2018
edded787e83bfranza
moved microservice to new superclass AbstractUltrasoundTrackerDevice 
Feb 21 2018
d3b75324ac81mittmann
Restructured the USCombinedModality class: Added new base class -->… 
Feb 21 2018
2cc1eb27e407mittmann
Changed the base class of the USCombinedModality: former base class was… 
Feb 20 2018