Diffusion MITK 2e171c1b5cfc

Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup
2e171c1b5cfc
Actions

Tags

None

Referenced Files

None

Subscribers

None

Description

Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup

Conflicts:
Modules/Overlays/mitkScaleLegendOverlay.cpp

Details

Provenance

• sattler	Authored on Jan 23 2017, 1:40 PM
• sattler	Pushed on Jan 23 2017, 4:11 PM

Parents

rMITK77830adf9cd1: Merge branch 'T22088-disable-color-for-labelsetimages'
rMITKf734baaa1780: T19932 -added a way to switch energy compensation on and off

Branches

Unknown

Tags

Unknown

Event Timeline

• sattler committed rMITK2e171c1b5cfc: Merge branch 'T19932-hardwareControlUnited' into T19932-labSetup (authored by • sattler).Jan 23 2017, 1:40 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

f734baaa1780 T19932 -added a way to switch energy compensation on and off
Author
• sattler
Browse Repository
No Builds
No Audits
5de4cd58105c T19932 -opening and closing the PausViewer Plugin while running the US Module…
Author
• sattler
Browse Repository
No Builds
No Audits
ed4b9e12d100 T19932 -Removed the seperate windows for US and PA images -PAUSViewer Plugin…
Author
• sattler
Browse Repository
No Builds
No Audits
f19ff5fef667 removed disfunct pausmultiwidgeteditor
Author
• sattler
Browse Repository
No Builds
No Audits
c570726f373a created plugins for simultaneous viewing of PAT and US ... the pausmultiwidget…
Author
• sattler
Browse Repository
No Builds
No Audits
e918891b66b1 fixed a typo
Author
• sattler
Browse Repository
No Builds
No Audits
33f60d538f86 these are uncomitted changes by franz ... tztztz
Author
• sattler
Browse Repository
No Builds
No Audits
d62bfb4fb073 -made some code look nicer
Author
• sattler
Browse Repository
No Builds
No Audits
a265558bb823 T19932 -just small fixes
Author
• sattler
Browse Repository
No Builds
No Audits
d0667204eec2 T19932 -made the windows look much nicer -added a nice levelwindow! but it's…
Author
• sattler
Browse Repository
No Builds
No Audits
2bb6da52940d T19932 - made beamformed and raw seperately saveable (finished) - removed…
Author
• sattler
Browse Repository
No Builds
No Audits
e14248890379 T19932 -added a scale (needs some serious tuning) -saving the raw images works…
Author
• sattler
Browse Repository
No Builds
No Audits
6734e5af8276 new default values for qpat purposes
Author
• sattler
Browse Repository
No Builds
No Audits
e76f52f0be04 T19932 -we now have seperate windows for PA and US images -did some setup for…
Author
• sattler
Browse Repository
No Builds
No Audits
ed4e4f2628f8 T19932 -GUI updates -implemented overlays -setup new RenderWindows
Author
• sattler
Browse Repository
No Builds
No Audits
d749029ee6b4 T19932
Author
• sattler
Browse Repository
No Builds
No Audits
323e88b5e2d3 T19932 -fixed bugs -found out how to add overlays and set up some stuff -found…
Author
• sattler
Browse Repository
No Builds
No Audits
240f5b693a5a T19932 -compensation works now as it should, and places the fluence…
Author
• sattler
Browse Repository
No Builds
No Audits
bb098f4413a8 T19932 -fixed error when resizing fluence images
Author
• sattler
Browse Repository
No Builds
No Audits
df2427f3894c T19932 - correction for energy values is now being done
Author
• sattler
Browse Repository
No Builds
No Audits
18ba3e7fcdfb T19932 -fixed the saving of the energy values and timestamps of ophir
Author
• sattler
Browse Repository
No Builds
No Audits
63436025e76a T19932 - Fluence compensation works now, only thing left to do is to load all…
Author
• sattler
Browse Repository
No Builds
No Audits
44f92e15f837 T19932 -resampling can be set now in the gui -set up lots of things so…
Author
• sattler
Browse Repository
No Builds
No Audits
296d4ae20b04 Finished T19939 calibrated tuning
Author
• sattler
Browse Repository
No Builds
No Audits
a968e7ad95cc gui stuff
Author
• sattler
Browse Repository
No Builds
No Audits
1ca2ad51d85b T19855 -the timestamps of the pyro get saved now
Author
• sattler
Browse Repository
No Builds
No Audits
9a2ec38fa13c T19855 -saving works now
Author
• sattler
Browse Repository
No Builds
No Audits
9636a62c38fc T19855 -all sound images get a logfilter -saving fixed
Author
• sattler
Browse Repository
No Builds
No Audits
862b8f585b67 T19855
Author
• sattler
Browse Repository
No Builds
No Audits
9c9f36c1111d this might now work but is really ugly
Author
• sattler
Browse Repository
No Builds
No Audits
2b8c801a9b05 matching still wip
Author
• sattler
Browse Repository
No Builds
No Audits
0c9bb4c860d8 We moved the pyro to diphasImageSource and began to work on the matching
Author
• sattler
Browse Repository
No Builds
No Audits
a1c17baae23e Cleaned up a few things and exporting Pyro measurments correctly now
Author
• sattler
Browse Repository
No Builds
No Audits
7e3104ffa60a Fixed and issue where the controller would skip wavelengths (or rather do…
Author
• sattler
Browse Repository
No Builds
No Audits
c768e7e42a5f T19855
Author
• sattler
Browse Repository
No Builds
No Audits
13c0d1a02684 gui improvements and thats it.
Author
• sattler
Browse Repository
No Builds
No Audits
0f58a4c14c3a diphas api also has a debug version ... using it now
Author
• sattler
Browse Repository
No Builds
No Audits
84b43d7cc8a5 a bit of refactoring and cleanup - this version works in the lab
Author
• sattler
Browse Repository
No Builds
No Audits
064775cf9608 Merge branch 'T19855-DiPhASAPIintegrationBranchLabSystem' into T19932…
Author
• kirchnth
Browse Repository
No Builds
No Audits
372a2c6a83ea this actually works now ... in reality and with all the bells and whistles
Author
• sattler
Browse Repository
No Builds
No Audits
f9fa2ddb758e recording works again - it done stoped workin' did a bit of refactoring (lots…
Author
• sattler
Browse Repository
No Builds
No Audits
453cf0852b87 easier configuration!
Author
• sattler
Browse Repository
No Builds
No Audits
049e48c6a0ea many things ... basic integration of the wrapper ... also: it still wont work…
Author
• sattler
Browse Repository
No Builds
No Audits
6e8b674480b0 minor logging fixed in PumpLaser using the correct ports for the Lab System
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

Changes (142)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

Path

Size

Packages

CMake/

BuildConfigurations/

camiPhotoacousticsSetup.cmake

O1: MITK Reviewer Group I

Modules/

IGT/

Common/

mitkSerialCommunication.cpp

mitkSerialCommunication.h

ModuleList.cmake

PhotoacousticsHardware

OphirCppWrapper

ConsoleExample.cpp

OphirPyroWrapper.cpp

OphirPyroWrapper.h

OpotekPhocusMobile.xml

configFastTuneOPO.dmc

configSlowTuneOPO.dmc

executeFastTuneOPO.dmc

executeSlowTuneOPO.dmc

fastTuneOPO.dmc

fastTuneOPO700to900.dmc

opotekPhocusMobileDkfz160907.ini

tuneOPOto700.dmc

mitkGalilMotor.cpp

mitkGalilMotor.h

mitkOphirPyro.cpp

mitkOphirPyro.h

mitkQuantelLaser.cpp

mitkQuantelLaser.h

US/

USControlInterfaces/

mitkUSDiPhASDeviceCustomControls.cpp

mitkUSDiPhASDeviceCustomControls.h

USHardwareDiPhAS

FranzTissue.nrrd

itkAnalyticSignalImageFilter.h

itkAnalyticSignalImageFilter.hxx

itkBModeImageFilter.h

itkBModeImageFilter.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/

PluginList.cmake

org.mitk.gui.qt.imagenavigator/

src/

internal/

QmitkImageNavigatorViewControls.ui

O1: MITK Reviewer Group I

org.mitk.gui.qt.lasercontrol

manifest_headers.cmake

QmitkLaserControl.cpp

QmitkLaserControl.h

QmitkLaserControlControls.ui

mitkLaserControlPluginActivator.cpp

mitkLaserControlPluginActivator.h

org.mitk.gui.qt.photoacoustics.pausviewer

manifest_headers.cmake

QmitkPAUSViewerView.cpp

QmitkPAUSViewerView.h

QmitkPAUSViewerViewControls.ui

org_mitk_gui_qt_photoacoustics_pausviewer_Activator.cpp

org_mitk_gui_qt_photoacoustics_pausviewer_Activator.h

org.mitk.gui.qt.ultrasound/

manifest_headers.cmake

src/

internal/

UltrasoundSupport.cpp

UltrasoundSupport.h

UltrasoundSupportControls.ui

rMITK2e171c1b5cfc

CMake/BuildConfigurations/camiPhotoacousticsSetup.cmake

Modules/IGT/Common/mitkSerialCommunication.cpp

Modules/IGT/Common/mitkSerialCommunication.h

Modules/ModuleList.cmake

Modules/PhotoacousticsHardware/CMakeLists.txt

Modules/PhotoacousticsHardware/OphirCppWrapper/ConsoleExample.cpp

Modules/PhotoacousticsHardware/OphirCppWrapper/OphirPyroWrapper.cpp

Modules/PhotoacousticsHardware/OphirCppWrapper/OphirPyroWrapper.h

Modules/PhotoacousticsHardware/OphirCppWrapper/readme.txt

Modules/PhotoacousticsHardware/Resources/FTUNE.dmc

Modules/PhotoacousticsHardware/Resources/GHOME.dmc

Modules/PhotoacousticsHardware/Resources/OpotekPhocusMobile.xml

Modules/PhotoacousticsHardware/Resources/STUNE.dmc

Modules/PhotoacousticsHardware/Resources/configFastTuneOPO.dmc

Modules/PhotoacousticsHardware/Resources/configSlowTuneOPO.dmc

Modules/PhotoacousticsHardware/Resources/executeFastTuneOPO.dmc

Modules/PhotoacousticsHardware/Resources/executeSlowTuneOPO.dmc

Modules/PhotoacousticsHardware/Resources/fastTuneOPO.dmc

Modules/PhotoacousticsHardware/Resources/fastTuneOPO700to900.dmc

Modules/PhotoacousticsHardware/Resources/homeOPO.dmc

Modules/PhotoacousticsHardware/Resources/opotekPhocusMobileDkfz160907.ini

Modules/PhotoacousticsHardware/Resources/test.dmc

Modules/PhotoacousticsHardware/Resources/tuneOPOto700.dmc

Modules/PhotoacousticsHardware/files.cmake

Modules/PhotoacousticsHardware/mitkGalilMotor.cpp

Modules/PhotoacousticsHardware/mitkGalilMotor.h

Modules/PhotoacousticsHardware/mitkOphirPyro.cpp

Modules/PhotoacousticsHardware/mitkOphirPyro.h

Modules/PhotoacousticsHardware/mitkQuantelLaser.cpp

Modules/PhotoacousticsHardware/mitkQuantelLaser.h

Modules/US/CMakeLists.txt

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.cpp

Modules/US/USControlInterfaces/mitkUSDiPhASDeviceCustomControls.h

Modules/US/USHardwareDiPhAS/CMakeLists.txt

Modules/US/USHardwareDiPhAS/FranzTissue.nrrd

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkAnalyticSignalImageFilter.hxx

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkBModeImageFilter.h

Modules/US/USHardwareDiPhAS/ITKUltrasound/itkBModeImageFilter.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/Resources/Fluence05.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence06.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence07.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence08.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence09.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence10.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence11.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence12.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence13.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence14.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence15.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence16.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence17.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence18.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence19.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence20.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence21.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence22.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence23.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence24.nrrd

Modules/US/USHardwareDiPhAS/Resources/Fluence25.nrrd

Modules/US/USHardwareDiPhAS/files.cmake

Modules/US/USHardwareDiPhAS/mitkUSDiPhASActivator.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASActivator.h

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/mitkUSDiPhASProbe.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbe.h

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.cpp

Modules/US/USHardwareDiPhAS/mitkUSDiPhASProbesControls.h

Modules/US/USModel/mitkUSDevice.cpp

Modules/US/files.cmake

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.cpp

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.h

Modules/USUI/Qmitk/QmitkUSControlsCustomDiPhASDeviceWidget.ui

Modules/USUI/files.cmake

Modules/USUI/mitkUSUIActivator.cpp

Modules/USUI/mitkUSUIActivator.h

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.imagenavigator/src/internal/QmitkImageNavigatorViewControls.ui

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

Plugins/org.mitk.gui.qt.lasercontrol/documentation/UserManual/Manual.dox

Plugins/org.mitk.gui.qt.lasercontrol/documentation/UserManual/icon.xpm

Plugins/org.mitk.gui.qt.lasercontrol/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.lasercontrol/files.cmake

Plugins/org.mitk.gui.qt.lasercontrol/manifest_headers.cmake

Plugins/org.mitk.gui.qt.lasercontrol/plugin.xml

Plugins/org.mitk.gui.qt.lasercontrol/resources/iconLaser.xpm

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/QmitkLaserControl.cpp

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/QmitkLaserControl.h

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/QmitkLaserControlControls.ui

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/mitkLaserControlPluginActivator.cpp

Plugins/org.mitk.gui.qt.lasercontrol/src/internal/mitkLaserControlPluginActivator.h

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/CMakeLists.txt

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/files.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/manifest_headers.cmake

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/plugin.xml

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/resources/PAUSViewer.png

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.cpp

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/QmitkPAUSViewerView.h

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/internal/QmitkPAUSViewerViewControls.ui

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/internal/org_mitk_gui_qt_photoacoustics_pausviewer_Activator.cpp

Plugins/org.mitk.gui.qt.photoacoustics.pausviewer/src/internal/org_mitk_gui_qt_photoacoustics_pausviewer_Activator.h

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

Plugins/org.mitk.gui.qt.ultrasound/manifest_headers.cmake

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