Merge branch 'develop' into feature/T27923-python-dev
1a1c524430a3Unpublished
Actions

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

Merge branch 'develop' into feature/T27923-python-dev

Details

Provenance

kislinsk	Authored on Jan 15 2021, 5:55 AM
kislinsk	Pushed on Jan 15 2021, 7:00 AM

Parents

rMITK46eee069a4bf: Merge branch 'feature/T28155-MakeQtLogMessagesOptional' into develop
rMITKc5eafd23b1cd: add wrapping/swig dependency to Python service

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

46eee069a4bf Merge branch 'feature/T28155-MakeQtLogMessagesOptional' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
8aeabe996f16 Make Qt log messages optional
Author
kislinsk
Browse Repository
No Builds
No Audits
da3e2af67311 Merge branch 'bugfix/T28151-FixVTKOnMacOSXCode12' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
c0ad4f1441a1 Exclude unistd.h from Windows builds
Author
kislinsk
Browse Repository
No Builds
No Audits
bce1eaddb837 Merge branch 'bugfix/T28151-FixVTKOnMacOSXCode12' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
ca75fe9867c2 Fix compiler errors with XCode 12
Author
kislinsk
Browse Repository
No Builds
No Audits
6617af527acd Patch (and upgrade) VTK
Author
kislinsk
Browse Repository
No Builds
No Audits
35cc4be67bda Merge branch 'bugfix/T27717-FixMacOSInstallerOpenApp' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
ff9ca2f439c0 Fix num of chars in strncmp()
Author
kislinsk
Browse Repository
No Builds
No Audits
2e864760744f Merge branch 'bugfix/T28137-FixMissingContextMenuEntries' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
1aa2efd2c474 Add missing context menu extension point line
Author
kislinsk
Browse Repository
No Builds
No Audits
5dc9bf8b39f9 Merge branch 'master' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
bd9ce02f928c 2020 Week 52 (Late December)
Author
kislinsk
Browse Repository
No Builds
No Audits
dc76958e5051 Merge branch 'bugfix/T26237-ImprovePerformance' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
754b4e125e92 Use active layer and label for live wire
Author
kalali
Browse Repository
No Builds
No Audits
5b214745c789 Merge branch 'bugfix/T28101-CMake3.19' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
eab123b123ea Early out if CMake version is [3.19, 3.19.2)
Author
kislinsk
Browse Repository
No Builds
No Audits
dbbf947882f4 Improve ITK patch
Author
kislinsk
Browse Repository
No Builds
No Audits
d05bd6a2660b Merge remote-tracking branch 'origin/develop' into bugfix/T26237…
Author
kislinsk
Browse Repository
No Builds
No Audits
ccbaf060bde7 Merge branch 'bugfix/T28081-ShortcutsInWindowsInstallers' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
7ba5ffbb2e50 Create shortcuts in Windows installers/packages
Author
kislinsk
Browse Repository
No Builds
No Audits
a9f7c91fd852 Remove redist part
Author
kislinsk
Browse Repository
No Builds
No Audits
b9f6499dd3f3 Merge branch 'bugfix/T28080-RedistPackagingAndNSISGenerator' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
c63dd0997faa Rely on InstallRequiredSystemLibraries to handle runtime DLLs
Author
kislinsk
Browse Repository
No Builds
No Audits
106261292196 Fix T28076 by using the new function for retrieving the active pixel value
Author
kalali
Browse Repository
No Builds
No Audits
7d013e1fd185 Provide single function for retrieving the active pixel value
Author
kalali
Browse Repository
No Builds
No Audits
b2d2a87ebd29 Clear preview segmentation in fast marching 3D
Author
kalali
Browse Repository
No Builds
No Audits
bf264ce891b8 Improve performance
Author
kislinsk
Browse Repository
No Builds
No Audits
0fe048a6581e Make sure the code of different tools is consistent
Author
kalali
Browse Repository
No Builds
No Audits
8c26ebc9309f Check for labelsetimage and use the correct pixel value
Author
kalali
Browse Repository
No Builds
No Audits
2e6b97654f2c Update also if the seed points are empty
Author
kalali
Browse Repository
No Builds
No Audits

Changes (26)

Path

Size

Packages

CMake/

NSIS.template.in

O1: MITK Reviewer Group I

RunInstalledApp.bat

O1: MITK Reviewer Group I

mitkFunctionCreateBlueBerryApplication.cmake

O1: MITK Reviewer Group I

mitkInstallRules.cmake

O1: MITK Reviewer Group I

mitkSetupCPack.cmake

O1: MITK Reviewer Group I

CMakeExternals/

ITK-4.13.3.patch

O1: MITK Reviewer Group I

ITK.cmake

O1: MITK Reviewer Group I

VTK-9.0.0.patch

O1: MITK Reviewer Group I

VTK-9.0.1.patch

O1: MITK Reviewer Group I

VTK.cmake

O1: MITK Reviewer Group I

CMakeLists.txt

O1: MITK Reviewer Group I

Modules/

AppUtil/

include/

mitkBaseApplication.h

src/

mitkBaseApplication.cpp

ContourModel/

Algorithms/

mitkContourModelUtils.cpp

O3: MITK Reviewer Group II

mitkContourModelUtils.h

O3: MITK Reviewer Group II

QtWidgets/

src/

QmitkMultiWidgetLayoutSelectionWidget.cpp

O3: MITK Reviewer Group II

Segmentation/

Interactions/

mitkContourTool.cpp

O1: MITK Reviewer Group I

mitkContourTool.h

O1: MITK Reviewer Group I

mitkCorrectorTool2D.cpp

O1: MITK Reviewer Group I

mitkFastMarchingTool3D.cpp

O1: MITK Reviewer Group I

mitkLiveWireTool2D.cpp

O1: MITK Reviewer Group I

mitkPaintbrushTool.cpp

O1: MITK Reviewer Group I

mitkRegionGrowingTool.cpp

O1: MITK Reviewer Group I

mitkSetRegionTool.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.datamanager/

plugin.xml

O1: MITK Reviewer Group I

Utilities/

IpPic/

ipFRead.c

rMITK1a1c524430a3

View Options

CMake/NSIS.template.in

View Options

CMake/RunInstalledApp.bat

View Options

CMake/mitkFunctionCreateBlueBerryApplication.cmake

View Options

CMake/mitkInstallRules.cmake

View Options

CMake/mitkSetupCPack.cmake

View Options

CMakeExternals/ITK-4.13.3.patch

View Options

CMakeExternals/ITK.cmake

View Options

CMakeExternals/VTK-9.0.0.patch

View Options

CMakeExternals/VTK-9.0.1.patch

View Options

CMakeExternals/VTK.cmake

View Options

CMakeLists.txt

View Options

Modules/AppUtil/include/mitkBaseApplication.h

View Options

Modules/AppUtil/src/mitkBaseApplication.cpp

View Options

Modules/ContourModel/Algorithms/mitkContourModelUtils.cpp

View Options

Modules/ContourModel/Algorithms/mitkContourModelUtils.h

View Options

Modules/QtWidgets/src/QmitkMultiWidgetLayoutSelectionWidget.cpp

View Options

Modules/Segmentation/Interactions/mitkContourTool.cpp

View Options

Modules/Segmentation/Interactions/mitkContourTool.h

View Options

Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.cpp

View Options

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

View Options

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

View Options

Modules/Segmentation/Interactions/mitkSetRegionTool.cpp

View Options

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

View Options

Merge branch 'develop' into feature/T27923-python-dev1a1c524430a3UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (26)

rMITK1a1c524430a3

CMake/NSIS.template.in

CMake/RunInstalledApp.bat

CMake/mitkFunctionCreateBlueBerryApplication.cmake

CMake/mitkInstallRules.cmake

CMake/mitkSetupCPack.cmake

CMakeExternals/ITK-4.13.3.patch

CMakeExternals/ITK.cmake

CMakeExternals/VTK-9.0.0.patch

CMakeExternals/VTK-9.0.1.patch

CMakeExternals/VTK.cmake

CMakeLists.txt

Modules/AppUtil/include/mitkBaseApplication.h

Modules/AppUtil/src/mitkBaseApplication.cpp

Modules/ContourModel/Algorithms/mitkContourModelUtils.cpp

Modules/ContourModel/Algorithms/mitkContourModelUtils.h

Modules/QtWidgets/src/QmitkMultiWidgetLayoutSelectionWidget.cpp

Modules/Segmentation/Interactions/mitkContourTool.cpp

Modules/Segmentation/Interactions/mitkContourTool.h

Modules/Segmentation/Interactions/mitkCorrectorTool2D.cpp

Modules/Segmentation/Interactions/mitkFastMarchingTool3D.cpp

Modules/Segmentation/Interactions/mitkLiveWireTool2D.cpp

Modules/Segmentation/Interactions/mitkPaintbrushTool.cpp

Modules/Segmentation/Interactions/mitkRegionGrowingTool.cpp

Modules/Segmentation/Interactions/mitkSetRegionTool.cpp

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

Utilities/IpPic/ipFRead.c

Merge branch 'develop' into feature/T27923-python-dev
1a1c524430a3Unpublished
Actions