[med-svn] [itksnap] 02/04: Merge tag 'upstream/3.4.0'
Gert Wollny
gert-guest at moszumanska.debian.org
Tue Jan 19 19:54:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
gert-guest pushed a commit to branch master
in repository itksnap.
commit eb34f0c88996ee4d4506233335db25cacddd7cb8
Merge: 0c575b4 4a6bbfc
Author: Gert Wollny <gw.fossdev at gmail.com>
Date: Mon Jan 11 13:31:45 2016 +0100
Merge tag 'upstream/3.4.0'
Upstream version 3.4.0
.gitignore | 2 +-
CMake/GitBranch.cmake | 23 +
CMake/standalone.cmake | 69 +-
CMakeLists.txt | 203 +++-
CTestConfig.cmake | 12 +-
Common/IPCHandler.cxx | 27 +
Common/IPCHandler.h | 5 +
.../itkMaximumGradientMagnitudeImageFilter.h | 152 +++
.../itkMaximumGradientMagnitudeImageFilter.hxx | 266 +++++
Common/PropertyModel.h | 65 +-
Common/SNAPCommon.cxx.in | 1 +
Common/SNAPEventListenerCallbacks.h | 3 +-
Common/SNAPOpenGL.cxx | 34 +
Common/SNAPOpenGL.h | 3 +
GUI/Model/AnnotationModel.cxx | 778 ++++++++++++
GUI/Model/AnnotationModel.h | 149 +++
GUI/Model/CursorInspectionModel.cxx | 48 +-
GUI/Model/CursorInspectionModel.h | 6 +-
GUI/Model/DisplayLayoutModel.cxx | 91 ++
GUI/Model/DisplayLayoutModel.h | 40 +-
GUI/Model/GenericSliceModel.cxx | 342 +++++-
GUI/Model/GenericSliceModel.h | 107 +-
GUI/Model/GlobalUIModel.cxx | 101 +-
GUI/Model/GlobalUIModel.h | 35 +-
GUI/Model/ImageIOWizardModel.cxx | 122 +-
GUI/Model/ImageIOWizardModel.h | 92 ++
GUI/Model/ImageRegistrationManager.cxx | 175 +++
GUI/Model/ImageRegistrationManager.h | 70 ++
GUI/Model/LayerGeneralPropertiesModel.cxx | 50 +
GUI/Model/LayerGeneralPropertiesModel.h | 18 +-
GUI/Model/LayerTableRowModel.cxx | 87 +-
GUI/Model/LayerTableRowModel.h | 12 +
GUI/Model/NumericPropertyToggleAdaptor.h | 2 +-
GUI/Model/OrthogonalSliceCursorNavigationModel.cxx | 8 +-
GUI/Model/OrthogonalSliceCursorNavigationModel.h | 2 +-
GUI/Model/PaintbrushModel.cxx | 119 +-
GUI/Model/PaintbrushModel.h | 8 +-
GUI/Model/PolygonDrawingModel.cxx | 15 +-
GUI/Model/PolygonDrawingModel.h | 11 +-
GUI/Model/PolygonSettingsModel.cxx | 82 ++
GUI/Model/PolygonSettingsModel.h | 41 +
GUI/Model/SnakeWizardModel.cxx | 284 ++++-
GUI/Model/SnakeWizardModel.h | 76 +-
GUI/Model/SynchronizationModel.cxx | 3 +-
GUI/Model/UIReporterDelegates.h | 10 +
GUI/Model/UIState.h | 3 +-
GUI/Qt/Components/AnnotationToolPanel.cxx | 83 ++
GUI/Qt/Components/AnnotationToolPanel.h | 31 +
GUI/Qt/Components/AnnotationToolPanel.ui | 425 +++++++
GUI/Qt/Components/CursorInspector.cxx | 162 ++-
GUI/Qt/Components/CursorInspector.h | 20 +-
GUI/Qt/Components/CursorInspector.ui | 242 ++--
GUI/Qt/Components/DisplayLayoutInspector.cxx | 9 +
GUI/Qt/Components/DisplayLayoutInspector.ui | 119 +-
GUI/Qt/Components/FileChooserPanelWithHistory.cxx | 18 +-
GUI/Qt/Components/FileChooserPanelWithHistory.h | 1 +
GUI/Qt/Components/GeneralLayerInspector.cxx | 44 +-
GUI/Qt/Components/GeneralLayerInspector.h | 4 +
GUI/Qt/Components/GeneralLayerInspector.ui | 510 +++++++-
GUI/Qt/Components/HistoryQListModel.cxx | 146 ++-
GUI/Qt/Components/HistoryQListModel.h | 42 +-
GUI/Qt/Components/LabelInspector.cxx | 10 +-
GUI/Qt/Components/LabelInspector.ui | 531 ++++-----
GUI/Qt/Components/LabelSelectionButton.cxx | 20 +-
GUI/Qt/Components/LatentITKEventNotifier.cxx | 14 +-
GUI/Qt/Components/LayerInspectorRowDelegate.cxx | 248 +++-
GUI/Qt/Components/LayerInspectorRowDelegate.h | 59 +-
GUI/Qt/Components/LayerInspectorRowDelegate.ui | 570 +++++----
GUI/Qt/Components/PaintbrushToolPanel.cxx | 28 +
GUI/Qt/Components/PaintbrushToolPanel.h | 5 +-
GUI/Qt/Components/PaintbrushToolPanel.ui | 296 ++++-
GUI/Qt/Components/PolygonToolPanel.cxx | 51 +
GUI/Qt/Components/PolygonToolPanel.h | 27 +
GUI/Qt/Components/PolygonToolPanel.ui | 207 ++++
GUI/Qt/Components/QtHideOnDeactivateContainer.cxx | 24 +
GUI/Qt/Components/QtHideOnDeactivateContainer.h | 16 +
GUI/Qt/Components/QtRendererPlatformSupport.cxx | 49 +-
GUI/Qt/Components/QtRendererPlatformSupport.h | 8 +-
GUI/Qt/Components/QtReporterDelegates.cxx | 45 +-
GUI/Qt/Components/QtWidgetActivator.cxx | 18 +-
GUI/Qt/Components/QtWidgetActivator.h | 36 +-
GUI/Qt/Components/RecentHistoryItemsView.cxx | 6 +
GUI/Qt/Components/SNAPComponent.h | 4 +
GUI/Qt/Components/SNAPQtCommon.cxx | 50 +-
GUI/Qt/Components/SNAPQtCommon.h | 3 +
GUI/Qt/Components/SliceViewPanel.cxx | 156 ++-
GUI/Qt/Components/SliceViewPanel.h | 21 +-
GUI/Qt/Components/SliceViewPanel.ui | 391 +++++-
GUI/Qt/Components/SnakeToolROIPanel.cxx | 4 +
GUI/Qt/Components/SnakeToolROIPanel.ui | 227 ++--
GUI/Qt/Components/SnakeWizardPanel.cxx | 104 +-
GUI/Qt/Components/SnakeWizardPanel.h | 13 +-
GUI/Qt/Components/SnakeWizardPanel.ui | 382 ++++--
GUI/Qt/Components/SynchronizationInspector.cxx | 5 -
GUI/Qt/Components/SynchronizationInspector.ui | 107 +-
GUI/Qt/Components/ZoomInspector.ui | 200 ++--
GUI/Qt/Coupling/QtAbstractItemViewCoupling.h | 82 +-
GUI/Qt/Coupling/QtSliderCoupling.h | 5 +
GUI/Qt/Coupling/QtWidgetCoupling.h | 35 +-
GUI/Qt/Resources/SNAPResources.qrc | 57 +
GUI/Qt/Resources/SNAPResources_Linux.qrc | 2 +
GUI/Qt/Resources/SNAPResources_MacOS.qrc | 2 +
GUI/Qt/Resources/SNAPResources_Windows.qrc | 2 +
GUI/Qt/Resources/annotation_28.png | Bin 0 -> 1917 bytes
GUI/Qt/Resources/context_gray_10.png | Bin 0 -> 395 bytes
GUI/Qt/Resources/context_gray_10 at 2x.png | Bin 0 -> 690 bytes
GUI/Qt/Resources/context_gray_12.png | Bin 0 -> 448 bytes
GUI/Qt/Resources/context_gray_12 at 2x.png | Bin 0 -> 804 bytes
GUI/Qt/Resources/context_gray_16.png | Bin 0 -> 1730 bytes
GUI/Qt/Resources/context_gray_48.png | Bin 0 -> 1651 bytes
.../Resources/html/tooltips/ModeTipTemplate.html | 38 +
GUI/Qt/Resources/html/tooltips/TipTableRow.html | 6 +
GUI/Qt/Resources/icons8_cursor_16.png | Bin 0 -> 524 bytes
GUI/Qt/Resources/icons8_cursor_16 at 2x.png | Bin 0 -> 917 bytes
GUI/Qt/Resources/icons8_down_12.png | Bin 0 -> 415 bytes
GUI/Qt/Resources/icons8_down_12 at x2.png | Bin 0 -> 517 bytes
GUI/Qt/Resources/icons8_film_reel_12.png | Bin 0 -> 472 bytes
GUI/Qt/Resources/icons8_film_reel_12 at 2x.png | Bin 0 -> 870 bytes
GUI/Qt/Resources/icons8_generic_text_16.png | Bin 0 -> 465 bytes
GUI/Qt/Resources/icons8_generic_text_16 at 2x.png | Bin 0 -> 720 bytes
GUI/Qt/Resources/icons8_invisible_12.png | Bin 0 -> 424 bytes
GUI/Qt/Resources/icons8_invisible_12 at 2x.png | Bin 0 -> 672 bytes
GUI/Qt/Resources/icons8_layers_16.png | Bin 0 -> 563 bytes
GUI/Qt/Resources/icons8_layers_16 at 2x.png | Bin 0 -> 1018 bytes
GUI/Qt/Resources/icons8_mouse_left_click_16.png | Bin 0 -> 517 bytes
GUI/Qt/Resources/icons8_mouse_left_click_16 at 2x.png | Bin 0 -> 937 bytes
GUI/Qt/Resources/icons8_mouse_right_click_16.png | Bin 0 -> 517 bytes
.../Resources/icons8_mouse_right_click_16 at 2x.png | Bin 0 -> 923 bytes
GUI/Qt/Resources/icons8_mouse_scrolling_16.png | Bin 0 -> 532 bytes
GUI/Qt/Resources/icons8_mouse_scrolling_16 at 2x.png | Bin 0 -> 989 bytes
GUI/Qt/Resources/icons8_palette_16.png | Bin 0 -> 556 bytes
GUI/Qt/Resources/icons8_palette_16 at 2x.png | Bin 0 -> 931 bytes
GUI/Qt/Resources/icons8_pin-48.png | Bin 0 -> 716 bytes
GUI/Qt/Resources/icons8_pin_10.png | Bin 0 -> 708 bytes
GUI/Qt/Resources/icons8_pin_12.png | Bin 0 -> 436 bytes
GUI/Qt/Resources/icons8_pin_12 at 2x.png | Bin 0 -> 662 bytes
GUI/Qt/Resources/icons8_redo-48.png | Bin 0 -> 727 bytes
GUI/Qt/Resources/icons8_refresh-48.png | Bin 0 -> 741 bytes
GUI/Qt/Resources/icons8_ruler_16.png | Bin 0 -> 527 bytes
GUI/Qt/Resources/icons8_ruler_16 at 2x.png | Bin 0 -> 877 bytes
GUI/Qt/Resources/icons8_slr_camera_12.png | Bin 0 -> 451 bytes
GUI/Qt/Resources/icons8_slr_camera_12 at 2x.png | Bin 0 -> 723 bytes
GUI/Qt/Resources/icons8_slr_camera_16.png | Bin 0 -> 568 bytes
GUI/Qt/Resources/icons8_slr_camera_16 at 2x.png | Bin 0 -> 928 bytes
GUI/Qt/Resources/icons8_star-48.png | Bin 0 -> 661 bytes
GUI/Qt/Resources/icons8_star_12.png | Bin 0 -> 1769 bytes
GUI/Qt/Resources/icons8_star_8.png | Bin 0 -> 1631 bytes
GUI/Qt/Resources/icons8_undo-48.png | Bin 0 -> 707 bytes
GUI/Qt/Resources/icons8_unpin_12.png | Bin 0 -> 461 bytes
GUI/Qt/Resources/icons8_unpin_12 at 2x.png | Bin 0 -> 753 bytes
GUI/Qt/Resources/icons8_up_12.png | Bin 0 -> 416 bytes
GUI/Qt/Resources/icons8_up_12 at x2.png | Bin 0 -> 507 bytes
GUI/Qt/Resources/icons8_visible_12.png | Bin 0 -> 420 bytes
GUI/Qt/Resources/icons8_visible_12 at 2x.png | Bin 0 -> 655 bytes
GUI/Qt/Resources/icons8_whitepin_16.png | Bin 0 -> 1013 bytes
GUI/Qt/Resources/layout_thumb_16.png | Bin 0 -> 1238 bytes
GUI/Qt/Resources/menu-arrow_8.png | Bin 0 -> 1157 bytes
GUI/Qt/Resources/menu-arrow_8 at 2x.png | Bin 0 -> 1258 bytes
GUI/Qt/Resources/source/annotation_28.graffle | Bin 0 -> 2833 bytes
GUI/Qt/View/AnnotationInteractionMode.cxx | 137 +++
GUI/Qt/View/AnnotationInteractionMode.h | 45 +
GUI/Qt/View/CrosshairsInteractionMode.cxx | 140 ++-
GUI/Qt/View/CrosshairsInteractionMode.h | 4 +
GUI/Qt/View/GenericSliceView.cxx | 7 +
GUI/Qt/View/PaintbrushInteractionMode.cxx | 6 +-
GUI/Qt/View/PolygonDrawingInteractionMode.cxx | 6 +-
GUI/Qt/View/QtAbstractOpenGLBox.cxx | 20 +-
GUI/Qt/View/QtAbstractOpenGLBox.h | 19 +-
GUI/Qt/View/QtInteractionDelegateWidget.cxx | 89 +-
GUI/Qt/View/QtInteractionDelegateWidget.h | 25 +-
GUI/Qt/View/QtVTKInteractionDelegateWidget.cxx | 5 +-
GUI/Qt/View/QtVTKRenderWindowBox.cxx | 13 +-
.../View/SliceWindowInteractionDelegateWidget.cxx | 59 +-
GUI/Qt/View/SliceWindowInteractionDelegateWidget.h | 10 +
GUI/Qt/View/SnakeROIInteractionMode.cxx | 25 +-
GUI/Qt/View/ThumbnailInteractionMode.cxx | 117 +-
GUI/Qt/View/ThumbnailInteractionMode.h | 8 +
GUI/Qt/Windows/AboutDialog.ui | 102 +-
GUI/Qt/Windows/DropActionDialog.ui | 20 +-
GUI/Qt/Windows/ImageIOWizard.cxx | 166 ++-
GUI/Qt/Windows/ImageIOWizard.h | 22 +-
GUI/Qt/Windows/ImageIOWizard/OverlayRolePage.cxx | 56 +
GUI/Qt/Windows/ImageIOWizard/OverlayRolePage.h | 31 +
GUI/Qt/Windows/ImageIOWizard/OverlayRolePage.ui | 222 ++++
GUI/Qt/Windows/ImageIOWizard/RegistrationPage.cxx | 92 ++
GUI/Qt/Windows/ImageIOWizard/RegistrationPage.h | 58 +
GUI/Qt/Windows/ImageIOWizard/RegistrationPage.ui | 154 +++
GUI/Qt/Windows/LabelEditorDialog.cxx | 14 +-
GUI/Qt/Windows/LabelEditorDialog.ui | 13 +-
GUI/Qt/Windows/LayerInspectorDialog.cxx | 43 +-
GUI/Qt/Windows/LayerInspectorDialog.h | 3 +
GUI/Qt/Windows/LayerInspectorDialog.ui | 24 +-
GUI/Qt/Windows/MainControlPanel.cxx | 257 ++--
GUI/Qt/Windows/MainControlPanel.h | 15 +-
GUI/Qt/Windows/MainControlPanel.ui | 1247 +++++++++++++++-----
GUI/Qt/Windows/MainImageWindow.cxx | 562 ++++++++-
GUI/Qt/Windows/MainImageWindow.h | 14 +-
GUI/Qt/Windows/MainImageWindow.ui | 245 +++-
.../Windows/MeshExportWizard/MeshExportWizard.cxx | 4 +
GUI/Qt/Windows/PreferencesDialog.cxx | 5 +-
GUI/Qt/Windows/PreferencesDialog.ui | 8 +-
GUI/Qt/Windows/SaveModifiedLayersDialog.cxx | 8 +-
GUI/Qt/Windows/SimpleFileDialogWithHistory.cxx | 3 +
GUI/Qt/Windows/SpeedImageDialog.cxx | 40 +-
GUI/Qt/Windows/SpeedImageDialog.h | 4 +-
GUI/Qt/Windows/SpeedImageDialog.ui | 480 +++++++-
GUI/Qt/Windows/SplashPanel.ui | 2 +-
GUI/Qt/main.cxx | 144 ++-
GUI/Renderer/AbstractRenderer.h | 9 +-
GUI/Renderer/AbstractVTKRenderer.cxx | 12 +-
GUI/Renderer/AbstractVTKRenderer.h | 11 +-
GUI/Renderer/AbstractVTKSceneRenderer.cxx | 27 +
GUI/Renderer/AbstractVTKSceneRenderer.h | 5 +
GUI/Renderer/AnnotationRenderer.cxx | 322 +++++
GUI/Renderer/AnnotationRenderer.h | 33 +
GUI/Renderer/ColorMapRenderer.cxx | 4 +-
GUI/Renderer/ColorMapRenderer.h | 2 +-
GUI/Renderer/CrosshairsRenderer.cxx | 2 +-
GUI/Renderer/EdgePreprocessingSettingsRenderer.cxx | 5 +
GUI/Renderer/EdgePreprocessingSettingsRenderer.h | 2 +
GUI/Renderer/GMMRenderer.cxx | 5 +
GUI/Renderer/GMMRenderer.h | 2 +
GUI/Renderer/GenericSliceRenderer.cxx | 323 +++--
GUI/Renderer/GenericSliceRenderer.h | 21 +-
GUI/Renderer/IntensityCurveVTKRenderer.cxx | 10 +-
GUI/Renderer/IntensityCurveVTKRenderer.h | 2 +
GUI/Renderer/OptimizationProgressRenderer.cxx | 96 ++
GUI/Renderer/OptimizationProgressRenderer.h | 46 +
GUI/Renderer/PolygonDrawingRenderer.cxx | 5 +-
GUI/Renderer/PolygonScanConvert.cxx | 2 +-
GUI/Renderer/SliceWindowDecorationRenderer.cxx | 109 +-
GUI/Renderer/SliceWindowDecorationRenderer.h | 1 +
GUI/Renderer/SnakeModeRenderer.cxx | 3 +-
GUI/Renderer/SnakeParameterPreviewRenderer.cxx | 4 +-
GUI/Renderer/SnakeParameterPreviewRenderer.h | 2 +-
GUI/Renderer/SnakeROIRenderer.cxx | 2 +-
GUI/Renderer/ThresholdSettingsRenderer.cxx | 7 +
GUI/Renderer/ThresholdSettingsRenderer.h | 2 +
Logic/Common/ColorMap.cxx | 45 +-
Logic/Common/ColorMap.h | 5 +
Logic/Common/SNAPAppearanceSettings.cxx | 8 +
Logic/Common/SNAPAppearanceSettings.h | 5 +
Logic/Common/SNAPRegistryIO.cxx | 4 +
Logic/Common/SNAPSegmentationROISettings.cxx | 3 +-
Logic/Common/SNAPSegmentationROISettings.h | 10 +
Logic/Framework/GenericImageData.cxx | 250 +++-
Logic/Framework/GenericImageData.h | 59 +-
Logic/Framework/GlobalState.cxx | 15 +-
Logic/Framework/GlobalState.h | 50 +-
Logic/Framework/IRISApplication.cxx | 448 ++++---
Logic/Framework/IRISApplication.h | 50 +-
Logic/Framework/ImageAnnotationData.cxx | 196 +++
Logic/Framework/ImageAnnotationData.h | 181 +++
Logic/Framework/ImageIODelegates.cxx | 54 +-
Logic/Framework/ImageIODelegates.h | 47 +-
Logic/Framework/LayerIterator.cxx | 9 +
Logic/Framework/LayerIterator.h | 2 +
Logic/Framework/SNAPImageData.cxx | 63 +
Logic/Framework/SNAPImageData.h | 22 +
Logic/Framework/UndoDataManager.h | 5 +
Logic/ImageWrapper/DisplayMappingPolicy.cxx | 5 +
Logic/ImageWrapper/DisplayMappingPolicy.h | 6 +
Logic/ImageWrapper/GuidedNativeImageIO.cxx | 60 +-
Logic/ImageWrapper/ImageWrapper.cxx | 106 +-
Logic/ImageWrapper/ImageWrapper.h | 40 +-
Logic/ImageWrapper/ImageWrapperBase.h | 43 +-
Logic/ImageWrapper/NativeIntensityMappingPolicy.h | 15 +
Logic/ImageWrapper/ScalarImageWrapper.cxx | 64 +-
Logic/ImageWrapper/ScalarImageWrapper.h | 38 +-
Logic/ImageWrapper/VectorImageWrapper.cxx | 16 +-
Logic/ImageWrapper/VectorImageWrapper.h | 10 +-
Logic/Preprocessing/EdgePreprocessingImageFilter.h | 8 +-
Logic/Preprocessing/ImageCollectionToImageFilter.h | 71 ++
.../PreprocessingFilterConfigTraits.h | 8 +
.../RandomForest/RFClassificationEngine.cxx | 105 +-
.../RandomForest/RFClassificationEngine.h | 30 +-
.../RandomForest/RandomForestClassifier.cxx | 32 +-
.../RandomForest/RandomForestClassifier.h | 40 +-
.../RandomForestClassifyImageFilter.txx | 85 +-
Logic/Preprocessing/SlicePreviewFilterWrapper.h | 4 +-
Logic/Preprocessing/SlicePreviewFilterWrapper.txx | 2 +-
Logic/Preprocessing/Texture/MomentTextures.cxx | 172 +++
Logic/Preprocessing/Texture/MomentTextures.h | 83 ++
Logic/Slicing/IRISSlicer.h | 10 +
Logic/Slicing/IRISSlicer.txx | 18 +-
ReleaseNotes.txt | 196 ++-
Testing/GUI/Qt/SNAPTestQt.cxx | 175 +--
Testing/GUI/Qt/SNAPTestQt.h | 17 +-
Testing/GUI/Qt/Scripts/test_Library.js | 12 +-
Testing/GUI/Qt/Scripts/test_ProbeIntensity.js | 2 +-
Testing/GUI/Qt/Scripts/test_RandomForest.js | 8 +-
Testing/GUI/Qt/Scripts/test_RegionCompetition.js | 6 +-
Testing/GUI/Qt/Scripts/test_Workspace.js | 4 +-
Utilities/MacOS/BundleResources/dsstore.bin | Bin 15364 -> 12292 bytes
294 files changed, 15389 insertions(+), 3374 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/itksnap.git
More information about the debian-med-commit
mailing list