Diffusion MITK c5540a155543

Merge branch 'T19855-DiPhASAPI' into T19855-DiPhASAPIintegrationBranch
c5540a155543
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T19855-DiPhASAPI' into T19855-DiPhASAPIintegrationBranch

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

Details

Provenance

• sattler	Authored on Oct 11 2016, 3:12 PM
• sattler	Pushed on Oct 11 2016, 3:12 PM

Parents

rMITKc7fade110c0e: T19855 -the Bmode filter works flawlessly -laser images are displayed with a…
rMITK9725f7af24fc: Merge branch 'T20023-update-hdf5-for-msvs2015'

Branches

Unknown

Tags

Unknown

Tasks

Restricted Maniphest Task

Event Timeline

• sattler committed rMITKc5540a155543: Merge branch 'T19855-DiPhASAPI' into T19855-DiPhASAPIintegrationBranch (authored by • sattler).Oct 11 2016, 3:12 PM

• sattler added a task: Restricted Maniphest Task.Oct 18 2016, 2:35 PM

Merged Changes

c7fade110c0e T19855 -the Bmode filter works flawlessly -laser images are displayed with a…
Author
• sattler
Browse Repository
No Builds
No Audits
3fa7f2e0cca9 T19855 -The BMode Envelope filter can be checked on and off in the GUI, and…
Author
• sattler
Browse Repository
No Builds
No Audits
0a69822f01b8 T19855 Added the BModeFilter for creating envelopes for the beamformed images…
Author
• sattler
Browse Repository
No Builds
No Audits
99d752da4653 T19855
Author
• sattler
Browse Repository
No Builds
No Audits
1d85ba048adc T19855 The nodes show now correctly two images; todo: -fix spacing -check if…
Author
• sattler
Browse Repository
No Builds
No Audits
d6f7adeb4fd1 T19855 -interleaved Mode and changing between interleaved and ultrasound works…
Author
• sattler
Browse Repository
No Builds
No Audits
f43ef0897ac5 T19855 -the beamformed now displays correctly; to achieve this I modified the…
Author
• sattler
Browse Repository
No Builds
No Audits
c75e5c6e9f68 T19855 -It is now possible to switch between beamformed and image data. however…
Author
• sattler
Browse Repository
No Builds
No Audits
60ef010a58c3 T19855 Most of the GUI works, except: -changing the mode or data type crashes…
Author
• sattler
Browse Repository
No Builds
No Audits
10f00015e9b1 T19855 -GUI is now avaiable and is almost completely connected -TGC setting…
Author
• sattler
Browse Repository
No Builds
No Audits
d8c843516c22 T19855 Set up Everything for connecting the GUI to the DiPhAS Device
Author
• sattler
Browse Repository
No Builds
No Audits
522f5af93ac9 T19855 -Small Fixes -Started working on Control GUI
Author
• sattler
Browse Repository
No Builds
No Audits
fa1e5769366b T19855 -Added a new Custom Control Interface for the DiPhAS Implementation…
Author
• sattler
Browse Repository
No Builds
No Audits
f0c29ffe0faf Implemented correct spacing of the image. Added Probe Controls.
Author
• sattler
Browse Repository
No Builds
No Audits
cf1285f319be The Image is now nice and correctly displayed
Author
• sattler
Browse Repository
No Builds
No Audits
1cc3273bebd1 Made the callback functions avaible to the API, but a less ugly implementation…
Author
• sattler
Browse Repository
No Builds
No Audits
1e870934ea63 Possible Fix for CMake errors while building SKD
Author
• sattler
Browse Repository
No Builds
No Audits
6b3ba9e88a7c Renamed everything from "Fraunhofer" to "DiPhAS" and wrote the OnConnection()…
Author
• sattler
Browse Repository
No Builds
No Audits
5c4cc3ba94e3 The Fraunhofer Module can be activated in workbench and does not crash
Author
• sattler
Browse Repository
No Builds
No Audits
6004dc0c6ade Created the module for the US Fraunhofer Device and setup its base inherited…
Author
• sattler
Browse Repository
No Builds
No Audits
3fa1299fb394 HAAAA!
Author
• sattler
Browse Repository
No Builds
No Audits

Changes (45)

Path

Size

Modules/

US/

USControlInterfaces/

mitkUSDiPhASDeviceCustomControls.cpp

mitkUSDiPhASDeviceCustomControls.h

USHardwareDiPhAS

itkAnalyticSignalImageFilter.h

itkAnalyticSignalImageFilter.hxx

itkFFT1DComplexToComplexImageFilter.h

itkFFT1DComplexToComplexImageFilter.hxx

itkFFT1DRealToComplexConjugateImageFilter.h

itkFFT1DRealToComplexConjugateImageFilter.hxx

itkRegionFromReferenceImageFilter.h

itkRegionFromReferenceImageFilter.hxx

itkVnlFFT1DComplexConjugateToRealImageFilter.h

itkVnlFFT1DComplexConjugateToRealImageFilter.hxx

itkVnlFFT1DComplexToComplexImageFilter.h

itkVnlFFT1DComplexToComplexImageFilter.hxx

itkVnlFFT1DRealToComplexConjugateImageFilter.h

itkVnlFFT1DRealToComplexConjugateImageFilter.hxx

mitkUSDiPhASActivator.cpp

mitkUSDiPhASActivator.h

mitkUSDiPhASBModeImageFilter.h

mitkUSDiPhASBModeImageFilter.hxx

mitkUSDiPhASCustomControls.cpp

mitkUSDiPhASCustomControls.h

mitkUSDiPhASDevice.cpp

mitkUSDiPhASDevice.h

mitkUSDiPhASImageSource.cpp

mitkUSDiPhASImageSource.h

mitkUSDiPhASProbe.cpp

mitkUSDiPhASProbe.h

mitkUSDiPhASProbesControls.cpp

mitkUSDiPhASProbesControls.h

USModel/

mitkUSDevice.cpp

USUI/

Qmitk/

QmitkUSControlsCustomDiPhASDeviceWidget.cpp

QmitkUSControlsCustomDiPhASDeviceWidget.h

QmitkUSControlsCustomDiPhASDeviceWidget.ui

mitkUSUIActivator.cpp

mitkUSUIActivator.h

Plugins/

org.mitk.gui.qt.ultrasound/

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

rMITKc5540a155543

Modules/US/CMakeLists.txt

Loading...

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.cpp

Loading...

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.h

Loading...

Modules/US/USHardwareDiPhAS/CMakeLists.txt

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/files.cmake

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASActivator.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASActivator.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.hxx

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbe.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbe.h

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.cpp

Loading...

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.h

Loading...

Modules/US/USModel/mitkUSDevice.cpp

Loading...

Modules/US/files.cmake

Loading...

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Loading...

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

Loading...

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.ui

Loading...

Modules/USUI/files.cmake

Loading...

Modules/USUI/mitkUSUIActivator.cpp

Loading...

Modules/USUI/mitkUSUIActivator.h

Loading...

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

Loading...

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

Loading...