Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932…
064775cf9608
Actions

Description

Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932-hardwareControlUnited

Details

Provenance

• kirchnth	Authored on Nov 14 2016, 5:59 PM
• kirchnth	Pushed on Nov 14 2016, 6:01 PM

Parents

rMITK372a2c6a83ea: this actually works now ... in reality and with all the bells and whistles
rMITKf9fa2ddb758e: recording works again - it done stoped workin' did a bit of refactoring (lots…

Branches

Unknown

Tags

Unknown

Event Timeline

• kirchnth committed rMITK064775cf9608: Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932… (authored by • kirchnth).Nov 14 2016, 5:59 PM

Merged Changes

f9fa2ddb758e recording works again - it done stoped workin' did a bit of refactoring (lots…
Author
• sattler
Browse Repository
No Builds
No Audits
a737738f5f26 ApplyBModeFilter is now applied in the right direction and downsampling is…
Author
• sattler
Browse Repository
No Builds
No Audits
5af7767622e9 basically commented out the useGUIOutPut Block ... getSystemInfo…
Author
• sattler
Browse Repository
No Builds
No Audits
a2a90fd0774b T19855 massively simplified ImageSource by using a buffer to write images into…
Author
• sattler
Browse Repository
No Builds
No Audits
0b1dd0a58024 this now works ... until it doesnt at least when including fixed Fraunhofer API…
Author
• sattler
Browse Repository
No Builds
No Audits
2ad82a309a1d T19855
Author
• sattler
Browse Repository
No Builds
No Audits
d8c855bc152f T19855 -Spacing works again -Made code better readable -fixed one mutex…
Author
• sattler
Browse Repository
No Builds
No Audits
a13c6186d06d implemented showing beamformed data instead of image data. fortified…
Author
• sattler
Browse Repository
No Builds
No Audits
cfd4bfb9485a Completely removed mutexes. Seems to run stable now when not running in debug…
Author
• sattler
Browse Repository
No Builds
No Audits
13250dc2a8e2 205!
Author
• sattler
Browse Repository
No Builds
No Audits
b20c840fcd46 This works ... apperently ONLY 512x512 works
Author
• sattler
Browse Repository
No Builds
No Audits
2a771d8a9202 T19855 -fixed bug in gui that crashes mitk when closing
Author
• sattler
Browse Repository
No Builds
No Audits
ac20723cf16a T19855 -Minimal Changes
Author
• sattler
Browse Repository
No Builds
No Audits
27185e1a54f7 T19855 -changed some ScanMode variables and we get an actual image! yay
Author
• sattler
Browse Repository
No Builds
No Audits
0a00d3ff39b9 T19855 -image seems to be displayed correctly! -added all changes done at the…
Author
• sattler
Browse Repository
No Builds
No Audits
3e8e67a8e4ff T19855 -cmake copies the needed dlls into the bin directory -it works with the…
Author
• sattler
Browse Repository
No Builds
No Audits
c4e5f37fa6be T19855 -created better saving - but a bug exists so that not all US images are…
Author
• sattler
Browse Repository
No Builds
No Audits
c5540a155543 Merge branch 'T19855-DiPhASAPI' into T19855-DiPhASAPIintegrationBranch
Author
• sattler
Browse Repository
No Builds
No Audits
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

Changes (36)

Path

Size

Modules/

US/

USControlInterfaces/

mitkUSDiPhASDeviceCustomControls.cpp

mitkUSDiPhASDeviceCustomControls.h

USHardwareDiPhAS/

ITKUltrasound

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

files.cmake

mitkUSDiPhASBModeImageFilter.h

mitkUSDiPhASBModeImageFilter.hxx

mitkUSDiPhASCustomControls.cpp

mitkUSDiPhASCustomControls.h

mitkUSDiPhASDevice.cpp

mitkUSDiPhASDevice.h

mitkUSDiPhASImageSource.cpp

mitkUSDiPhASImageSource.h

mitkUSDiPhASProbesControls.cpp

USModel/

mitkUSDevice.cpp

USUI/

Qmitk/

QmitkUSControlsCustomDiPhASDeviceWidget.cpp

QmitkUSControlsCustomDiPhASDeviceWidget.h

QmitkUSControlsCustomDiPhASDeviceWidget.ui

Plugins/

org.mitk.gui.qt.ultrasound/

CMakeLists.txt

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

	UltrasoundSupportControls.ui.autosave
	UltrasoundSupportControls.ui

rMITK064775cf9608

View Options

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.cpp

View Options

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/files.cmake

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.h

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.hxx

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.h

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.h

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

View Options

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.cpp

View Options

Modules/US/USModel/mitkUSDevice.cpp

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

View Options

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.ui

View Options

Plugins/org.mitk.gui.qt.ultrasound/CMakeLists.txt

View Options

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

View Options

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

View Options

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

View Options

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

Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932…064775cf9608Actions

Description

Details

Event Timeline

Merged Changes

Changes (36)

rMITK064775cf9608

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.cpp

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DComplexToComplexImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkFFT1DRealToComplexConjugateImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkRegionFromReferenceImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexConjugateToRealImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DComplexToComplexImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkVnlFFT1DRealToComplexConjugateImageFilter.hxx

Modules/US/USHardwareDiPhAS/files.cmake

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASBModeImageFilter.hxx

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASCustomControls.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASDevice.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASImageSource.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.cpp

Modules/US/USModel/mitkUSDevice.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.ui

Plugins/org.mitk.gui.qt.ultrasound/CMakeLists.txt

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

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

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

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

Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932…
064775cf9608
Actions