Merge branch 'bug-10825-python-wrapping-rework'
61ce4f3d66fe
Actions

Description

Merge branch 'bug-10825-python-wrapping-rework'

Conflicts:
Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox
Documentation/Doxygen/UserManual/MITKPluginManualsList.dox
Modules/CMakeLists.txt

Merge branch 'bug-10825-python-wrapping-rework'61ce4f3d66feActions

Description

Details

Event Timeline

Merged Changes

Changes (382)Show All Changes

Very Large Commit

rMITK61ce4f3d66fe

CMake/PackageDepends/MITK_PythonLibs_Config.cmake

CMakeExternals/CTK.cmake

CMakeExternals/ITK.cmake

CMakeExternals/OpenCV.cmake

CMakeExternals/VTK.cmake

CMakeLists.txt

Core/Code/Controllers/mitkReferenceCountWatcher.h

Core/Code/DataManagement/mitkTimeSlicedGeometry.h

Core/Code/IO/mitkIOUtil.cpp

Documentation/Doxygen/DeveloperManual/Toolkit/ModuleManuals/MITKModuleManualsList.dox

Documentation/Doxygen/UserManual/MITKPluginManualsList.dox

Modules/CMakeLists.txt

Modules/MitkExt/Controllers/mitkIPythonService.cpp

Modules/MitkExt/Controllers/mitkIPythonService.h

Modules/MitkExt/files.cmake

Modules/Python/CMakeLists.txt

Modules/Python/PythonPath.h.in

Modules/Python/QmitkCtkPythonShell.cpp

Modules/Python/QmitkCtkPythonShell.h

Modules/Python/QmitkPythonScriptEditorHighlighter.cpp

Modules/Python/QmitkPythonScriptEditorHighlighter.h

Modules/Python/QmitkPythonSnippets.cpp

Modules/Python/QmitkPythonSnippets.h

Modules/Python/QmitkPythonSnippets.ui

Modules/Python/QmitkPythonTextEditor.cpp

Modules/Python/QmitkPythonTextEditor.h

Modules/Python/QmitkPythonVariableStackTableModel.cpp

Modules/Python/QmitkPythonVariableStackTableModel.h

Modules/Python/QmitkPythonVariableStackTableView.cpp

Modules/Python/QmitkPythonVariableStackTableView.h

Modules/Python/Testing/CMakeLists.txt

Modules/Python/Testing/files.cmake

Modules/Python/Testing/mitkPythonTest.cpp

Modules/Python/documentation/mitkPython.dox

Modules/Python/documentation/slides.tex

Modules/Python/files.cmake

Modules/Python/mitkPythonActivator.cpp

Modules/Python/mitkPythonService.cpp

Modules/Python/mitkPythonService.h

Modules/Python/resources/PythonSnippets.xml

Modules/Python/resources/document-new.png

Modules/Python/resources/document-open.png

Modules/Python/resources/document-save.png

Modules/Python/resources/edit-clear.png

Modules/Python/resources/edit-delete.png

Modules/Python/resources/edit-find-replace.png

Modules/Python/resources/edit-paste.png

Modules/Python/resources/media-playback-start.png

Modules/Python/resources/mitkPython.qrc

Plugins/PluginList.cmake

Plugins/org.mitk.gui.qt.dicom/resources/dicom.qrc

Plugins/org.mitk.gui.qt.python.console

Plugins/org.mitk.gui.qt.python.console/CMakeLists.txt

Plugins/org.mitk.gui.qt.python.console/documentation

Plugins/org.mitk.gui.qt.python.console/documentation/doxygen

Plugins/org.mitk.gui.qt.python.console/documentation/doxygen/modules.dox

Plugins/org.mitk.gui.qt.python.console/files.cmake

Plugins/org.mitk.gui.qt.python.console/manifest_headers.cmake

Plugins/org.mitk.gui.qt.python.console/mitkPythonPath.h.in

Plugins/org.mitk.gui.qt.python.console/plugin.xml

Plugins/org.mitk.gui.qt.python.console/resources

Plugins/org.mitk.gui.qt.python.console/resources/QmitkPythonConsoleView.qrc

Plugins/org.mitk.gui.qt.python.console/resources/icon.xpm

Plugins/org.mitk.gui.qt.python.console/resources/py.png

Plugins/org.mitk.gui.qt.python.console/src

Plugins/org.mitk.gui.qt.python.console/src/internal

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.cpp

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkCTKPythonShell.h

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.cpp

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistory.h

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.cpp

Plugins/org.mitk.gui.qt.python.console/src/internal/QmitkPythonCommandHistoryTreeWidget.h

Merge branch 'bug-10825-python-wrapping-rework'
61ce4f3d66fe
Actions

Changes (382)
Show All Changes