Merge branch 'T24059-IGTRelease-2018.03'
bf3d24fa6209
Actions

Description

Merge branch 'T24059-IGTRelease-2018.03'

Details

Provenance

seitela	Authored on Mar 22 2018, 2:26 PM
seitela	Pushed on Mar 22 2018, 2:28 PM

Parents

rMITK33a83b659680: Merge branch 'T24495-CrashWhenTryingToEditRemovedUSVideoDevice' into T24059…
rMITKa6c827ed0265: Merge branch 'T24438-ImproveMTimeCheckForMultilabelSegmentations'

Branches

Unknown

Tags

Unknown

Event Timeline

seitela committed rMITKbf3d24fa6209: Merge branch 'T24059-IGTRelease-2018.03' (authored by seitela).Mar 22 2018, 2:26 PM

Merged Changes

33a83b659680 Merge branch 'T24495-CrashWhenTryingToEditRemovedUSVideoDevice' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
8bfb8aa6ca4e Disable edit button if no device is available
Author
seitela
Browse Repository
No Builds
No Audits
cd12abe36ebe Added error handling if no device is present
Author
seitela
Browse Repository
No Builds
No Audits
f79ab2697f0f Merge branch 'T23729-MakeCheckboxShowToolAxisInTrackingToolBoxClickableAgain'…
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
c3c14e263e99 Made the checkbox "Show Tool Axis" clickable again.
Author
Benjamin Mittmann <b.mittmann@dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
a86bc1ab38a7 Merge branch 'T24461-FixWarningTreatedAsError' into T24059-IGTRelease-2018.03
Author
eisenman
Browse Repository
No Builds
No Audits
8bcab2b58a3f Add static cast to compare same types
Author
eisenman
Browse Repository
No Builds
No Audits
c7bc284c6484 Adapt local variable name
Author
eisenman
Browse Repository
No Builds
No Audits
ff21083c3592 Remove warning
Author
eisenman
Browse Repository
No Builds
No Audits
1644d0e7d431 Merge branch 'T24455-IGTToolManager_SelectToolstorageNotRefreshed' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
f623d7ffc91a Reverted code emitting the ServiceSelectionChanged signal in the MODIFIED case
Author
seitela
Browse Repository
No Builds
No Audits
6d9d096bbf8c Merge branch 'T24455-IGTToolManager_SelectToolstorageNotRefreshed' into T24059…
Author
• sridhara
Browse Repository
No Builds
No Audits
2220b7ba0eb5 Merge branch 'T24059-IGTRelease-2018.03' of ssh://phabricator.mitk.org…
Author
• sridhara
Browse Repository
No Builds
No Audits
36fc56bc6b84 A signal is caught when there is changes in the ServiceListWidget and the…
Author
• sridhara
Browse Repository
No Builds
No Audits
3c4b9d960add Revert "Revert "Merge branch 'T24455-IGTToolManager_SelectToolstorageNotRefresh…
Author
• sridhara
Browse Repository
No Builds
No Audits
d5baa39c8f4d Revert "Merge branch 'T24455-IGTToolManager_SelectToolstorageNotRefreshed' into…
Author
• sridhara
Browse Repository
No Builds
No Audits
5602d9c6bae6 Merge branch 'T24455-IGTToolManager_SelectToolstorageNotRefreshed' into T24059…
Author
• sridhara
Browse Repository
No Builds
No Audits
ffc464bd3592 added a emit signal to update the Tool storage list whenever add new tool…
Author
• sridhara
Browse Repository
No Builds
No Audits
e2b7f047818c Merge branch 'T24354-ShowToolProjectionForSelectedTool' into T24059-IGTRelease…
Author
• sridhara
Browse Repository
No Builds
No Audits
c31af9ef4e58 Show tool projection only for selected tool
Author
Sridharan <sridhara@ad.dkfz-heidelberg.de>
Browse Repository
No Builds
No Audits
17987ab62377 Merge branch 'T24375-MicrontrackerError' into T24059-IGTRelease-2018.03
Author
seitela
Browse Repository
No Builds
No Audits
ff185394fce7 Merge branch 'T24347-FixWarningsOnStartupOfNavigationToolCalibration' into…
Author
seitela
Browse Repository
No Builds
No Audits
d37db4827631 Fix time step display
Author
seitela
Browse Repository
No Builds
No Audits
7a18ec8a34cc Merge branch 'T23730-RemoveOrientationFromPivotCalibration' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
f9c3bc3fbddd Remove pivot rotation from pivotCalibration
Author
seitela
Browse Repository
No Builds
No Audits
2538ff5480d4 Merge branch 'T24198-CorrectlyCategorizeUSAndToFPlugins' into T24059-IGTRelease…
Author
seitela
Browse Repository
No Builds
No Audits
ac4c4a536f72 Categorized US and ToF plugins into IGT category
Author
seitela
Browse Repository
No Builds
No Audits
5449c5864132 replaced "nullptr" by 0 in the claron interface -> seems to work
Author
franza
Browse Repository
No Builds
No Audits
153af5c537f9 Merge branch 'T24355-SetDefaultFocusToBasicInformationTab' into T24059…
Author
eisenman
Browse Repository
No Builds
No Audits
0add9d03d04e Set current index to "Basic Information" tab
Author
eisenman
Browse Repository
No Builds
No Audits
7f5d3fab6ec3 Merge branch 'T24331-ToolProjectionAlongZAxis' into T24059-IGTRelease-2018.03
Author
eisenman
Browse Repository
No Builds
No Audits
c8bd2122ebc7 Set z-axis as default axis for tool projection
Author
eisenman
Browse Repository
No Builds
No Audits
11445122e716 Merge branch 'T24227-IGTDocumentation' into T24059-IGTRelease-2018.03
Author
seitela
Browse Repository
No Builds
No Audits
26af2f71cd15 Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits
7bf04c44b10d Merge branch 'T24338-TimeStepLableNotFullyShown' into T24059-IGTRelease-2018.03
Author
seitela
Browse Repository
No Builds
No Audits
15d15bc573db Fixed initialization list, changed maximum size of time step label
Author
seitela
Browse Repository
No Builds
No Audits
faf3637d3e6f Merge branch 'T24178-CrashOnStartupWhenUSSupportIsEnabled' into T24059…
Author
seitela
Browse Repository
No Builds
No Audits

Changes (16)

Path

Size

Modules/

IGT/

Algorithms/

mitkNeedleProjectionFilter.cpp

mitkNeedleProjectionFilter.h

mitkPivotCalibration.cpp

mitkPivotCalibration.h

TrackingDevices/

mitkClaronInterface.cpp

IGTUI/

Qmitk/

QmitkNavigationToolCreationWidget.ui

QmitkNavigationToolStorageSelectionWidget.cpp

USUI/

Qmitk/

QmitkUSDeviceManagerWidget.cpp

QmitkUSNewVideoDeviceWidget.cpp

Plugins/

org.mitk.gui.qt.igttracking/

src/

internal/

QmitkIGTNavigationToolCalibration.cpp

QmitkMITKIGTTrackingToolboxView.cpp

QmitkMITKIGTTrackingToolboxView.h

QmitkMITKIGTTrackingToolboxViewControls.ui

org.mitk.gui.qt.toftutorial/

plugin.xml

org.mitk.gui.qt.tofutil/

plugin.xml

org.mitk.gui.qt.ultrasound/

plugin.xml

rMITKbf3d24fa6209

View Options

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.cpp

View Options

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.h

View Options

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

View Options

Modules/IGT/Algorithms/mitkPivotCalibration.h

View Options

Modules/IGT/TrackingDevices/mitkClaronInterface.cpp

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

View Options

Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

View Options

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

View Options

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

View Options

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

View Options

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

Merge branch 'T24059-IGTRelease-2018.03'bf3d24fa6209Actions

Description

Details

Event Timeline

Merged Changes

Changes (16)

rMITKbf3d24fa6209

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.cpp

Modules/IGT/Algorithms/mitkNeedleProjectionFilter.h

Modules/IGT/Algorithms/mitkPivotCalibration.cpp

Modules/IGT/Algorithms/mitkPivotCalibration.h

Modules/IGT/TrackingDevices/mitkClaronInterface.cpp

Modules/IGTUI/Qmitk/QmitkNavigationToolCreationWidget.ui

Modules/IGTUI/Qmitk/QmitkNavigationToolStorageSelectionWidget.cpp

Modules/USUI/Qmitk/QmitkUSDeviceManagerWidget.cpp

Modules/USUI/Qmitk/QmitkUSNewVideoDeviceWidget.cpp

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

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

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

Plugins/org.mitk.gui.qt.igttracking/src/internal/QmitkMITKIGTTrackingToolboxViewControls.ui

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

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

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

Merge branch 'T24059-IGTRelease-2018.03'
bf3d24fa6209
Actions