resolved merge conflicts
b661165768d0
Actions

Description

resolved merge conflicts

Details

Provenance

Authored on May 31 2012, 6:14 PM

Parents

rMITK5d4813259362: adapting the bounds of the slice
rMITKfb424be15aa8: Merge branch 'bug-12082-paint-tool-saves-segmentation'

Branches

Unknown

Tags

Unknown

Event Timeline

• schroedt committed rMITKb661165768d0: resolved merge conflicts (authored by • schroedt).May 31 2012, 6:14 PM

Merged Changes

5d4813259362 adapting the bounds of the slice
Author
• schroedt
Browse Repository
No Builds
No Audits
3ee2494152d5 resolved conflicts
Author
• schroedt
Browse Repository
No Builds
No Audits
5f14b1015031 moved origin recalculation to extractslicefilter
Author
• schroedt
Browse Repository
No Builds
No Audits
b60761f14324 renamed overwrite filter
Author
• schroedt
Browse Repository
No Builds
No Audits
900475a2c85a change interpoltion to nearest neighbor
Author
• schroedt
Browse Repository
No Builds
No Audits
6296e8672458 Removed unused include
Author
• fetzer
Browse Repository
No Builds
No Audits
1cb9db59367d Merge branch 'bug-10333-implement-an-overwriteImageFilter-based-on…
Author
• fetzer
Browse Repository
No Builds
No Audits
d62712e16814 Merge branch 'bug-10333-implement-an-overwriteImageFilter-based-on…
Author
• fetzer
Browse Repository
No Builds
No Audits
20cd5025f533 Merge branch 'bug-10333-implement-an-overwriteImageFilter-based-on…
Author
• schroedt
Browse Repository
No Builds
No Audits
30575b06cbbd removed alternaitve method for overwriting by map
Author
• schroedt
Browse Repository
No Builds
No Audits
03fef9b0fa3e cleaned up tests
Author
• schroedt
Browse Repository
No Builds
No Audits
a3fa0c3dba53 overwrite property as a member of the class
Author
• schroedt
Browse Repository
No Builds
No Audits
5d02116cc8b5 documentation for overfilter class
Author
• schroedt
Browse Repository
No Builds
No Audits
4f86338da7cb documentation
Author
• schroedt
Browse Repository
No Builds
No Audits
0c8e27a2e9c0 use an overwritefilter inherited from vtkimagereslice
Author
• schroedt
Browse Repository
No Builds
No Audits
dd11459ed111 forgot to delete
Author
• schroedt
Browse Repository
No Builds
No Audits
ea2a355a9993 overwrite property as a member of the class
Author
• schroedt
Browse Repository
No Builds
No Audits
200409554827 documentation for overfilter class
Author
• schroedt
Browse Repository
No Builds
No Audits
e8798b3c0300 documentation
Author
• schroedt
Browse Repository
No Builds
No Audits
a21429960a04 use an overwritefilter inherited from vtkimagereslice
Author
• schroedt
Browse Repository
No Builds
No Audits
9e19da98f757 overwriting slices for segmentation is working for oblique planes now. just if…
Author
• schroedt
Browse Repository
No Builds
No Audits
3b6ad1b92a07 added override method for setoutputextent and setoutputorigin
Author
• schroedt
Browse Repository
No Builds
No Audits
8dd2f5d90a1f added a test for overwriting in oblique directions
Author
• schroedt
Browse Repository
No Builds
No Audits
17c109d25067 map image with type unsigned int
Author
• schroedt
Browse Repository
No Builds
No Audits
c6fc01001700 SegTool2D uses the new Filters, everything is working except for a shift in…
Author
• schroedt
Browse Repository
No Builds
No Audits
e0313662917e call only one overloaded mehtod
Author
• schroedt
Browse Repository
No Builds
No Audits
ed9fba736367 reset startindex in destructor
Author
• schroedt
Browse Repository
No Builds
No Audits
5fd56b440f37 test large volume to make map reslice fail if type overflow
Author
• schroedt
Browse Repository
No Builds
No Audits
c931187afcae reset overwrite mode in destructor
Author
• schroedt
Browse Repository
No Builds
No Audits
059d2c8f0fa3 reset to default - mitkImageVtkMapper2D
Author
• schroedt
Browse Repository
No Builds
No Audits
d4ea238dbebd Test new pointer based variant with setter for slice
Author
• schroedt
Browse Repository
No Builds
No Audits
c4748eae041a Renamed classes
Author
• schroedt
Browse Repository
No Builds
No Audits
f52eace1defc Test for map reslice
Author
• schroedt
Browse Repository
No Builds
No Audits
c9c93666a80d added extract filter creating maps of memory
Author
• schroedt
Browse Repository
No Builds
No Audits
bb1312581412 vtkImageMapReslice is working by setting a mode - changing the inPtr with the…
Author
• schroedt
Browse Repository
No Builds
No Audits
391e9729e11a improved testing method
Author
• schroedt
Browse Repository
No Builds
No Audits
17bb9aca8834 tests expanded, not working
Author
• schroedt
Browse Repository
No Builds
No Audits
a84495550ad2 init overwrite filter
Author
• schroedt
Browse Repository
No Builds
No Audits
749a9b51df8a init testmethod
Author
• schroedt
Browse Repository
No Builds
No Audits
a87f90718a2f setter for both mitk::Image and vtkImageData
Author
• schroedt
Browse Repository
No Builds
No Audits
5330ba834fa8 intial class documentation
Author
• schroedt
Browse Repository
No Builds
No Audits
632bd28666b2 added required includes
Author
• schroedt
Browse Repository
No Builds
No Audits
7c6680c0a15f seems to be a merging failure
Author
• schroedt
Browse Repository
No Builds
No Audits
ca9ef27c1785 init testfile for mitkOverwriteSliceFilter
Author
• schroedt
Browse Repository
No Builds
No Audits
fbf21bbdb222 strategy pattern is working with mitkImageVtkMapper2D
Author
• schroedt
Browse Repository
No Builds
No Audits
50ac1c9fdc9c added new classes related to overwirte slices
Author
• schroedt
Browse Repository
No Builds
No Audits
7b307a3277ab resloved merge conflicts
Author
• schroedt
Browse Repository
No Builds
No Audits

Changes (10)

Path

Size

Packages

Core/

Code/

Algorithms/

mitkExtractSliceFilter.cpp

mitkVtkImageOverwrite.cpp

mitkVtkImageOverwrite.h

Testing/

files.cmake

mitkOverwriteSliceFilterTest.cpp

files.cmake

Modules/

ImageExtraction/

Testing/

files.cmake

Segmentation/

Interactions/

mitkSegTool2D.cpp

O1: MITK Reviewer Group I

mitkSegTool2D.h

O1: MITK Reviewer Group I

Plugins/

org.mitk.gui.qt.segmentation/

src/

internal/

QmitkSegmentationView.cpp

O1: MITK Reviewer Group I

rMITKb661165768d0

View Options

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

View Options

Core/Code/Algorithms/mitkVtkImageOverwrite.cpp

View Options

Core/Code/Algorithms/mitkVtkImageOverwrite.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkOverwriteSliceFilterTest.cpp

View Options

Core/Code/files.cmake

View Options

Modules/ImageExtraction/Testing/files.cmake

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

View Options

Modules/Segmentation/Interactions/mitkSegTool2D.h

View Options

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

resolved merge conflictsb661165768d0Actions

Description

Details

Event Timeline

Merged Changes

Changes (10)

rMITKb661165768d0

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

Core/Code/Algorithms/mitkVtkImageOverwrite.cpp

Core/Code/Algorithms/mitkVtkImageOverwrite.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkOverwriteSliceFilterTest.cpp

Core/Code/files.cmake

Modules/ImageExtraction/Testing/files.cmake

Modules/Segmentation/Interactions/mitkSegTool2D.cpp

Modules/Segmentation/Interactions/mitkSegTool2D.h

Plugins/org.mitk.gui.qt.segmentation/src/internal/QmitkSegmentationView.cpp

resolved merge conflicts
b661165768d0
Actions