resloved merge conflicts
7b307a3277ab
Actions

Description

resloved merge conflicts

Details

Provenance

Authored on Feb 3 2012, 10:07 AM

Parents

rMITK1c0a52960613: cleaned up methods and added comments
rMITK58c0e69fbfbb: Merge branch 'bug-10860-CreateOulinePolyData-consider-plane-bounds'

Branches

Unknown

Tags

Unknown

Event Timeline

• schroedt committed rMITK7b307a3277ab: resloved merge conflicts (authored by • schroedt).Feb 3 2012, 10:07 AM

Merged Changes

1c0a52960613 cleaned up methods and added comments
Author
• schroedt
Browse Repository
No Builds
No Audits
83f506c30b73 spacing in z direction of a plane change to default value 1.0
Author
• schroedt
Browse Repository
No Builds
No Audits
0124b5c48548 turn off debug outputs
Author
• schroedt
Browse Repository
No Builds
No Audits
e1c153abb277 moved ExtractSliceFilterTest to testfolder of mitk core
Author
• schroedt
Browse Repository
No Builds
No Audits
443caf5966fb don't use the new mitkExtractSliceFilter for segmentation until the…
Author
• schroedt
Browse Repository
No Builds
No Audits
b04293df7b86 added test condition for requested vtkOutput and some docu
Author
• schroedt
Browse Repository
No Builds
No Audits
40a8cd5de635 Fixing initialization of image by vtkImageData
Author
• hering
Browse Repository
No Builds
No Audits
e5fc68bace3a Merge remote-tracking branch 'origin/bug-10804-mitkImageRefactoring' into…
Author
• schroedt
Browse Repository
No Builds
No Audits
2f1dd2c9acb7 some changes because an error occurs in debug for 2D images but not in release…
Author
• schroedt
Browse Repository
No Builds
No Audits
fc6ed5af5af0 fixed an issue with 2D images and vtk error outputs.
Author
• schroedt
Browse Repository
No Builds
No Audits
a96349cc51e7 Merge branch 'bug-9318-Move-ImageExtraction-From-mitkVtkMapper2D-To…
Author
• schroedt
Browse Repository
No Builds
No Audits
5150cc3a8de9 fixed getVtkOutput method
Author
• schroedt
Browse Repository
No Builds
No Audits
cb6044cdd335 fixed vtk error outputs by simple call of UpdateWholeExtent on vtkImageReslice
Author
• schroedt
Browse Repository
No Builds
No Audits
034070966513 enabled thickslice filtering, but with vtk error by now
Author
• schroedt
Browse Repository
No Builds
No Audits
45ceddb5f78f disabled showing render window of oblique slice according to a previous commit
Author
• schroedt
Browse Repository
No Builds
No Audits
ce9215ae5c4c Merge branch 'bug-9318-Move-ImageExtraction-From-mitkVtkMapper2D-To…
Author
• schroedt
Browse Repository
No Builds
No Audits
4e6a2a564703 Fixed gcc compiler issues
Author
• fetzer
Browse Repository
No Builds
No Audits
48e7f9425d82 added method static New(vtkReslice) returning an itk smartPointer to realize…
Author
• schroedt
Browse Repository
No Builds
No Audits
8bbf67541e5e typename keyword for templated class types added
Author
• schroedt
Browse Repository
No Builds
No Audits
8bd83c0fed89 added vtk render window for a oblique plane in filter test - should be disabled…
Author
• schroedt
Browse Repository
No Builds
No Audits
ce377a48b95a using vtkSmartPointer for vtk object vtkGeneralTransform
Author
• schroedt
Browse Repository
No Builds
No Audits
cefd5cb74c96 sphere test volume is created on the fly
Author
• schroedt
Browse Repository
No Builds
No Audits
c9c022b592cc cleaned up classes
Author
• schroedt
Browse Repository
No Builds
No Audits
dd78e3cacda0 transform correspond to unitspacingfilter
Author
• schroedt
Browse Repository
No Builds
No Audits
81fd58a0b3de Some documention of extractslicefilter
Author
• schroedt
Browse Repository
No Builds
No Audits
f3c7562bda7a slice rending is working, just the crosshair is not center based
Author
• schroedt
Browse Repository
No Builds
No Audits
7e58d0ef2777 stripped all code from imagemapper depending on reslicing, imagemapper just…
Author
• schroedt
Browse Repository
No Builds
No Audits
579c8ac2cd93 added a property for interpolation mode used from reslicing, can be either…
Author
• schroedt
Browse Repository
No Builds
No Audits
c6a2659f4fa3 testing only orthogonal planes, oblique planes not tested yet#
Author
• schroedt
Browse Repository
No Builds
No Audits
bd1c16fd8d26 implemented pixel value based test, but with a index shift problem
Author
• schroedt
Browse Repository
No Builds
No Audits
6520bd90bdea repaired broken mapper code. plane for mapping was not initialized properly. 2D…
Author
• schroedt
Browse Repository
No Builds
No Audits
78b81186f522 Moved the filter to Core/Code/Algorithms/ and added it to the image mapper. 2D…
Author
• schroedt
Browse Repository
No Builds
No Audits
a1a8beace87c added test for exact pixelvalue slicing
Author
• schroedt
Browse Repository
No Builds
No Audits
30721d72ff61 # This is a combination of 2 commits. # The first commit's message is:
Author
• schroedt
Browse Repository
No Builds
No Audits
8f43a9e1c1af implemented testmethod for slice comparing
Author
• schroedt
Browse Repository
No Builds
No Audits
8586826c120c sliceExtractor works on given timestep. the timestep is also checked if it is…
Author
• schroedt
Browse Repository
No Builds
No Audits
a7d3993fa6d2 reslicesAxesCosines set from plane
Author
• schroedt
Browse Repository
No Builds
No Audits
cb2076b9723b sliceExtractor uses origin of geometry2D
Author
• schroedt
Browse Repository
No Builds
No Audits
d44edf6b3bc1 created new filter class based on vtkImageReslice to build image extraction…
Author
• schroedt
Browse Repository
No Builds
No Audits
d6976831baf3 created simple testclass for image extraction
Author
• schroedt
Browse Repository
No Builds
No Audits
7685e25c1ccc test class for image extraction expanded
Author
• schroedt
Browse Repository
No Builds
No Audits
92ea8fcb3c99 added testclass stub for image extraction
Author
• schroedt
Browse Repository
No Builds
No Audits
b35aa74420c4 mitkExtractDirectedPlaneImageFilter is working with vtkImageReslice now (for…
Author
• schroedt
Browse Repository
No Builds
No Audits

Changes (13)

Path

Size

Core/

Code/

Algorithms/

mitkExtractSliceFilter.cpp

mitkExtractSliceFilter.h

Rendering/

mitkImageVtkMapper2D.cpp

mitkImageVtkMapper2D.h

Testing/

files.cmake

mitkExtractSliceFilterTest.cpp

files.cmake

Modules/

ImageExtraction/

Testing/

files.cmake

mitkExtractDirectedPlaneImageFilterTest.cpp

files.cmake

mitkExtractDirectedPlaneImageFilter.cpp

mitkExtractDirectedPlaneImageFilter.h

MitkExt/

Interactions/

mitkSegTool2D.cpp

rMITK7b307a3277ab

View Options

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

View Options

Core/Code/Algorithms/mitkExtractSliceFilter.h

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

View Options

Core/Code/Rendering/mitkImageVtkMapper2D.h

View Options

Core/Code/Testing/files.cmake

View Options

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

View Options

Core/Code/files.cmake

View Options

Modules/ImageExtraction/Testing/files.cmake

View Options

Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp

View Options

Modules/ImageExtraction/files.cmake

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

View Options

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.h

View Options

Modules/MitkExt/Interactions/mitkSegTool2D.cpp

resloved merge conflicts7b307a3277abActions

Description

Details

Event Timeline

Merged Changes

Changes (13)

rMITK7b307a3277ab

Core/Code/Algorithms/mitkExtractSliceFilter.cpp

Core/Code/Algorithms/mitkExtractSliceFilter.h

Core/Code/Rendering/mitkImageVtkMapper2D.cpp

Core/Code/Rendering/mitkImageVtkMapper2D.h

Core/Code/Testing/files.cmake

Core/Code/Testing/mitkExtractSliceFilterTest.cpp

Core/Code/files.cmake

Modules/ImageExtraction/Testing/files.cmake

Modules/ImageExtraction/Testing/mitkExtractDirectedPlaneImageFilterTest.cpp

Modules/ImageExtraction/files.cmake

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.cpp

Modules/ImageExtraction/mitkExtractDirectedPlaneImageFilter.h

Modules/MitkExt/Interactions/mitkSegTool2D.cpp

resloved merge conflicts
7b307a3277ab
Actions