T27461-VTK9
32db5df3359f
Actions

Description

Merge branch 'feature/T27931-OpenMesh' into feature/T27461-VTK9

Details

Provenance

kislinsk	Authored on Nov 15 2020, 11:20 AM
kislinsk	Pushed on Nov 15 2020, 11:20 AM

Parents

rMITKd35d2721637b: Re-implement remeshing/decimation based on OpenMesh
rMITKb4f8a13c7b14: Use vtk_module_autoinit() CMake function

Branches

Unknown

Tags

Unknown

Event Timeline

kislinsk committed rMITK32db5df3359f: Merge branch 'feature/T27931-OpenMesh' into feature/T27461-VTK9 (authored by kislinsk).Nov 15 2020, 11:20 AM

kislinsk mentioned this in T27977: 2020 Week 47 (Mid November).Nov 19 2020, 2:50 PM

Merged Changes

d35d2721637b Re-implement remeshing/decimation based on OpenMesh
Author
kislinsk
Browse Repository
No Builds
No Audits
c7c374fe49e9 Merge remote-tracking branch 'origin/develop' into feature/T27931-OpenMesh
Author
kislinsk
Browse Repository
No Builds
No Audits
02c94fc04d39 Merge branch 'bugfix/T27945-Fix-VisualStudio2019-v16.8-Warnings' into develop
Author
kislinsk
Browse Repository
No Builds
No Audits
b10933bfdc1e Throw exceptions when input does not exist
Author
kislinsk
Browse Repository
No Builds
No Audits
ffbde114882f Fix last VTK 9 incompatibilities on Windows
Author
kislinsk
Browse Repository
No Builds
No Audits
499570d1de24 Replace ACVD by OpenMesh in documentation
Author
kislinsk
Browse Repository
No Builds
No Audits
0751488385ef Migrate example imaging plugin to VTK 9
Author
kislinsk
Browse Repository
No Builds
No Audits
f3eeced80227 Fix method names
Author
kislinsk
Browse Repository
No Builds
No Audits
8a664bc9f2c5 Add missing std namespace
Author
kislinsk
Browse Repository
No Builds
No Audits
a2467ba20ce9 Change wording from "mesh" to "surface"
Author
kislinsk
Browse Repository
No Builds
No Audits
587571b6c07c Remove isolated legacy code related to mitk::Mesh
Author
kislinsk
Browse Repository
No Builds
No Audits
8cd42a037beb Migrate Remeshing module and plugin
Author
kislinsk
Browse Repository
No Builds
No Audits
8029bb6b7d2a Replace ACVD dependency by OpenMesh dependency
Author
kislinsk
Browse Repository
No Builds
No Audits

Changes (56)

Path

Size

Packages

Applications/

PluginGenerator/

ProjectTemplate/

CMakeExternals/

MITK.cmake

CMake/

BuildConfigurations/

Default.cmake

O1: MITK Reviewer Group I

mitkNavigationModules.cmake

O1: MITK Reviewer Group I

PackageDepends/

MITK_ACVD_Config.cmake

O1: MITK Reviewer Group I

MITK_OpenMesh_Config.cmake

O1: MITK Reviewer Group I

mitkFunctionGetLibrarySearchPaths.cmake

O1: MITK Reviewer Group I

CMakeExternals/

ACVD.cmake

O1: MITK Reviewer Group I

ExternalProjectList.cmake

O1: MITK Reviewer Group I

	OpenMesh.cmake
	ACVD.cmake

O1: MITK Reviewer Group I

Documentation/

Doxygen/

3-DeveloperManual/

Starting/

SettingUpMITK/

BuildInstructions.dox

ThirdPartyLibs.dox

Examples/

Plugins/

org.mitk.example.gui.imaging/

CMakeLists.txt

src/

internal/

simpleexample/

QmitkSimpleExampleView.cpp

Modules/

Classification/

CLMiniApps/

CMakeLists.txt

Core/

include/

mitkPointSet.h

O1: MITK Reviewer Group I

src/

IO/

mitkSurfaceStlIO.cpp

O1: MITK Reviewer Group I

mitkSurfaceStlIO.h

O1: MITK Reviewer Group I

DataTypesExt/

include/

src/

test/

IOExt/

Internal/

mitkIOExtObjectFactory.cpp

ImageStatistics/

mitkExtendedLabelStatisticsImageFilter.hxx

O1: MITK Reviewer Group I

MapperExt/

files.cmake

include/

mitkMeshMapper2D.h

mitkMeshVtkMapper3D.h

src/

mitkMeshMapper2D.cpp

mitkMeshVtkMapper3D.cpp

PhotoacousticsLib/

include/

mitkPASpectralUnmixingFilterBase.h

Remeshing/

SceneSerializationBase/

test/

mitkPropertySerializationTest.cpp

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.photoacoustics.pausviewer/

src/

QmitkPAUSViewerView.cpp

org.mitk.gui.qt.remeshing/

CMakeLists.txt

O3: MITK Reviewer Group II

files.cmake

O3: MITK Reviewer Group II

src/

internal/

	QmitkPluginActivator.cpp
	org_mitk_gui_qt_remeshing_Activator.cpp

O3: MITK Reviewer Group II

	QmitkPluginActivator.h
	org_mitk_gui_qt_remeshing_Activator.h

O3: MITK Reviewer Group II

QmitkRemeshingView.cpp

O3: MITK Reviewer Group II

QmitkRemeshingView.h

O3: MITK Reviewer Group II

QmitkRemeshingViewControls.ui

O3: MITK Reviewer Group II

org_mitk_gui_qt_remeshing_Activator.cpp

O3: MITK Reviewer Group II

org_mitk_gui_qt_remeshing_Activator.h

O3: MITK Reviewer Group II

target_libraries.cmake

O3: MITK Reviewer Group II

org.mitk.gui.qt.tofutil/

src/

internal/

QmitkToFUtilView.cpp

rMITK32db5df3359f

View Options

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

View Options

CMake/BuildConfigurations/Default.cmake

View Options

CMake/BuildConfigurations/mitkNavigationModules.cmake

View Options

CMake/PackageDepends/MITK_ACVD_Config.cmake

View Options

CMake/PackageDepends/MITK_OpenMesh_Config.cmake

View Options

CMake/mitkFunctionGetLibrarySearchPaths.cmake

View Options

CMakeExternals/ACVD.cmake

View Options

CMakeExternals/ExternalProjectList.cmake

View Options

CMakeExternals/OpenMesh.cmake

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

View Options

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox

View Options

Examples/Plugins/org.mitk.example.gui.imaging/CMakeLists.txt

View Options

Examples/Plugins/org.mitk.example.gui.imaging/src/internal/simpleexample/QmitkSimpleExampleView.cpp

View Options

Modules/Classification/CLMiniApps/CMakeLists.txt

View Options

Modules/Core/include/mitkPointSet.h

View Options

Modules/Core/src/IO/mitkSurfaceStlIO.cpp

View Options

Modules/Core/src/IO/mitkSurfaceStlIO.h

View Options

Modules/DataTypesExt/files.cmake

View Options

Modules/DataTypesExt/include/mitkMesh.h

View Options

Modules/DataTypesExt/include/mitkMeshUtil.h

View Options

Modules/DataTypesExt/src/mitkMesh.cpp

View Options

Modules/DataTypesExt/test/files.cmake

View Options

Modules/DataTypesExt/test/mitkMeshTest.cpp

View Options

Modules/IOExt/Internal/mitkIOExtObjectFactory.cpp

View Options

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.hxx

View Options

Modules/MapperExt/files.cmake

View Options

Modules/MapperExt/include/mitkMeshMapper2D.h

View Options

Modules/MapperExt/include/mitkMeshVtkMapper3D.h

View Options

Modules/MapperExt/src/mitkMeshMapper2D.cpp

View Options

Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp

View Options

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterBase.h

View Options

Modules/Remeshing/CMakeLists.txt

View Options

Modules/Remeshing/Testing

View Options

Modules/Remeshing/Testing/CMakeLists.txt

View Options

Modules/Remeshing/Testing/files.cmake

View Options

Modules/Remeshing/Testing/mitkACVDTest.cpp

View Options

Modules/Remeshing/files.cmake

View Options

Modules/Remeshing/include/mitkRemeshing.h

View Options

Modules/Remeshing/mitkACVD.cpp

View Options

Modules/Remeshing/mitkACVD.h

View Options

Modules/Remeshing/src/mitkRemeshing.cpp

View Options

Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp

View Options

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

View Options

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

View Options

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

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkPluginActivator.cpp

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkPluginActivator.h

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingView.cpp

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingView.h

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingViewControls.ui

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/org_mitk_gui_qt_remeshing_Activator.cpp

View Options

Plugins/org.mitk.gui.qt.remeshing/src/internal/org_mitk_gui_qt_remeshing_Activator.h

View Options

Plugins/org.mitk.gui.qt.remeshing/target_libraries.cmake

View Options

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Merge branch 'feature/T27931-OpenMesh' into feature/T27461-VTK932db5df3359fActions

Description

Details

Event Timeline

Merged Changes

Changes (56)

rMITK32db5df3359f

Applications/PluginGenerator/ProjectTemplate/CMakeExternals/MITK.cmake

CMake/BuildConfigurations/Default.cmake

CMake/BuildConfigurations/mitkNavigationModules.cmake

CMake/PackageDepends/MITK_ACVD_Config.cmake

CMake/PackageDepends/MITK_OpenMesh_Config.cmake

CMake/mitkFunctionGetLibrarySearchPaths.cmake

CMakeExternals/ACVD.cmake

CMakeExternals/ExternalProjectList.cmake

CMakeExternals/OpenMesh.cmake

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/BuildInstructions.dox

Documentation/Doxygen/3-DeveloperManual/Starting/SettingUpMITK/ThirdPartyLibs.dox

Examples/Plugins/org.mitk.example.gui.imaging/CMakeLists.txt

Examples/Plugins/org.mitk.example.gui.imaging/src/internal/simpleexample/QmitkSimpleExampleView.cpp

Modules/Classification/CLMiniApps/CMakeLists.txt

Modules/Core/include/mitkPointSet.h

Modules/Core/src/IO/mitkSurfaceStlIO.cpp

Modules/Core/src/IO/mitkSurfaceStlIO.h

Modules/DataTypesExt/files.cmake

Modules/DataTypesExt/include/mitkMesh.h

Modules/DataTypesExt/include/mitkMeshUtil.h

Modules/DataTypesExt/src/mitkMesh.cpp

Modules/DataTypesExt/test/files.cmake

Modules/DataTypesExt/test/mitkMeshTest.cpp

Modules/IOExt/Internal/mitkIOExtObjectFactory.cpp

Modules/ImageStatistics/mitkExtendedLabelStatisticsImageFilter.hxx

Modules/MapperExt/files.cmake

Modules/MapperExt/include/mitkMeshMapper2D.h

Modules/MapperExt/include/mitkMeshVtkMapper3D.h

Modules/MapperExt/src/mitkMeshMapper2D.cpp

Modules/MapperExt/src/mitkMeshVtkMapper3D.cpp

Modules/PhotoacousticsLib/include/mitkPASpectralUnmixingFilterBase.h

Modules/Remeshing/CMakeLists.txt

Modules/Remeshing/Testing

Modules/Remeshing/Testing/CMakeLists.txt

Modules/Remeshing/Testing/files.cmake

Modules/Remeshing/Testing/mitkACVDTest.cpp

Modules/Remeshing/files.cmake

Modules/Remeshing/include/mitkRemeshing.h

Modules/Remeshing/mitkACVD.cpp

Modules/Remeshing/mitkACVD.h

Modules/Remeshing/src/mitkRemeshing.cpp

Modules/SceneSerializationBase/test/mitkPropertySerializationTest.cpp

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

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

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

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkPluginActivator.cpp

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkPluginActivator.h

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingView.cpp

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingView.h

Plugins/org.mitk.gui.qt.remeshing/src/internal/QmitkRemeshingViewControls.ui

Plugins/org.mitk.gui.qt.remeshing/src/internal/org_mitk_gui_qt_remeshing_Activator.cpp

Plugins/org.mitk.gui.qt.remeshing/src/internal/org_mitk_gui_qt_remeshing_Activator.h

Plugins/org.mitk.gui.qt.remeshing/target_libraries.cmake

Plugins/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp

Merge branch 'feature/T27931-OpenMesh' into feature/T27461-VTK9
32db5df3359f
Actions