Diffusion MITK 7732f4ab0078

Merge branch 'bug-17713-TrackingFreeze' into personal/franza/US-Navigation…
7732f4ab0078
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17713-TrackingFreeze' into personal/franza/US-Navigation-Experiments-May2014

Details

Provenance

Authored on Jul 17 2014, 6:20 PM

Parents

rMITK67daedb8fc5e: small fix
rMITKbd0f446cf1d7: restored fix which was lost during merge

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK7732f4ab0078: Merge branch 'bug-17713-TrackingFreeze' into personal/franza/US-Navigation… (authored by franza).Jul 17 2014, 6:20 PM

Merged Changes

67daedb8fc5e small fix
Author
franza
Browse Repository
No Builds
No Audits
2750a2febaad added code to better isolate this bug
Author
franza
Browse Repository
No Builds
No Audits
7900947c8ab2 some runtime optimization / clean up of the DisplayImage method
Author
franza
Browse Repository
No Builds
No Audits
e9a4bc52dbde added workaround for visualization bug of tracking tools
Author
franza
Browse Repository
No Builds
No Audits
cefa858ba933 implemented change of color if tool is invalid. Also added IGT default color…
Author
franza
Browse Repository
No Builds
No Audits
1c917c4e8300 fixed a bug: reinit is now only performed if the image is shown
Author
franza
Browse Repository
No Builds
No Audits
df7ccc1767a4 fixed a small bug in tracking tool status widget which caused a crash at…
Author
franza
Browse Repository
No Builds
No Audits
4a4769665b36 adapted combined modality to possible changes of scaling
Author
franza
Browse Repository
No Builds
No Audits
1eeb4154c4d5 COMP (#17911): added upcast of geometry for linux compilers
Author
franza
Browse Repository
No Builds
No Audits
717bb22f75af finally works now
Author
franza
Browse Repository
No Builds
No Audits
76172fe392e3 works now... only reinit is still needed
Author
franza
Browse Repository
No Builds
No Audits
d0870b3f4e1e Geometry is triggered now... still needs to be adapted
Author
franza
Browse Repository
No Builds
No Audits
9c8bde4a6f41 started implementation of getting image geometry from the API. Not finished yet.
Author
franza
Browse Repository
No Builds
No Audits
3c74ab0ae9c3 cleaned up the code (deleted methods which are not used any more)
Author
franza
Browse Repository
No Builds
No Audits
23535492472e fixed a few initialization bugs... working now
Author
franza
Browse Repository
No Builds
No Audits
93d8376d94ad fixed the bug: first working version
Author
franza
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Modules/

IGT/

Common/

mitkTrackingTypes.h

IGTUI/

Qmitk/

QmitkToolTrackingStatusWidget.cpp

US/

USHardwareTelemed/

mitkUSTelemedImageSource.cpp

mitkUSTelemedImageSource.h

USModel/

mitkUSDevice.cpp

USNavigation/

mitkUSCombinedModality.cpp

USUI/

Qmitk/

QmitkUSDeviceManagerWidget.cpp

QmitkUSDeviceManagerWidget.h

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

rMITK7732f4ab0078

Modules/IGT/Common/mitkTrackingTypes.h

Loading...

Modules/IGTUI/Qmitk/QmitkToolTrackingStatusWidget.cpp

Loading...

Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp

Loading...

Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h

Loading...

Modules/US/USModel/mitkUSDevice.cpp

Loading...

Modules/US/USNavigation/mitkUSCombinedModality.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.h

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.cpp

Loading...

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxView.h

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.cpp

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupport.h

Loading...

Plugins/org.mitk.gui.qt.ultrasound/src/internal/UltrasoundSupportControls.ui

Loading...