Diffusion MITK 6dfbdc6fa964

Merge branch 'bug-17911-TelemedImageGeometry'
6dfbdc6fa964
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'bug-17911-TelemedImageGeometry'

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

Details

Provenance

Authored on Jul 10 2014, 4:51 PM

Parents

rMITK717bb22f75af: finally works now
rMITKba280c2ccd59: Merge branch 'bug-17245-TimeGeometryExpandWithCloning'

Branches

Unknown

Tags

Unknown

Event Timeline

franza committed rMITK6dfbdc6fa964: Merge branch 'bug-17911-TelemedImageGeometry' (authored by franza).Jul 10 2014, 4:51 PM

Merged Changes

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

Changes (5)

Path

Size

Modules/

US/

USHardwareTelemed/

mitkUSTelemedImageSource.cpp

mitkUSTelemedImageSource.h

USModel/

mitkUSDevice.cpp

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

rMITK6dfbdc6fa964

Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.cpp

Loading...

Modules/US/USHardwareTelemed/mitkUSTelemedImageSource.h

Loading...

Modules/US/USModel/mitkUSDevice.cpp

Loading...

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

Loading...

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

Loading...