Page MenuHomePhabricator

Implement a container for ContourModel objects.
Closed, ResolvedPublic

Description

Add a container class to contouring module for putting several contours together.

Event Timeline

New remote branch pushed: bug-16006-ContourModelSet

New remote branch pushed: bug-16006-ContourModelSet-integration

Added mitkContourModelSet containing a std::deque of ContourModel objects.

Also implemented additional classes:

  • Base class for filters (mitkContourModelSetSource)
  • Base class for 2D OpenGL mappers (mitkContourModelGLMapper2DBase)
  • IO classes (mitkContourModelSetReader and mitkContourModelSetWriter)
  • 2D and 3D mapper (mitkContourModelSetMapper3D and mitkContourModelSetGLMapper2D)

2D mappers are sharing an OpenGL based function inherit from base class for drawing a contour.
mitkContourModelSetWriter is using the Writer of mitkContourModel to write several contours to a single file. ContourModelSetReader is working in the same way for reading a ContourModelSet file.

[4280bd]: Merge branch 'bug-16006-ContourModelSet-integration'

Merged commits:

2013-09-11 09:57:43 Tobias Schroeder [e239ab]
Check access inside bounds.


2013-09-11 09:25:03 Tobias Schroeder [f351a8]
Fix 3D mapper.

Use the right property for contour color.


2013-09-11 09:21:48 Tobias Schroeder [858594]
Fixed ContourModel to Surface filter.

Add lines to polydata because otherwise no segments are drawn. If only
polygon is used a the ContourModel object shows up as a filled plane
object.


2013-09-10 14:00:32 Tobias Schroeder [d84d7d]
Initialize ContourModelSet


2013-09-10 14:00:15 Tobias Schroeder [52edb2]
Fix increment iterator


2013-09-10 13:59:52 Tobias Schroeder [b6c3cc]
IO classes


2013-09-10 13:58:49 Tobias Schroeder [437dc7]
New files


2013-09-10 10:10:27 Tobias Schroeder [c14a7d]
Merge branch 'bug-16006-ContourModelSet-integration' of mitk.org:MITK into bug-16006-ContourModelSet-integration


2013-09-10 10:08:57 Tobias Schroeder [439026]
Added 3D mapper for ContourModelSet.


2013-09-10 10:02:20 Tobias Schroeder [0fe153]
Added 3D mapper for ContourModelSet.


2013-09-10 09:17:23 Tobias Schroeder [0bbad5]
Use ContourModel_EXPORT.


2013-09-10 08:56:29 Tobias Schroeder [c0fa31]
Move classes to renamed ContourModel folder.


2013-09-10 08:48:56 Tobias Schroeder [200425]
Merge branch 'bug-16006-ContourModelSet' into bug-16006-ContourModelSet-integration

Conflicts:
Modules/ContourModel/Rendering/mitkContourModelGLMapper2D.h


2013-09-09 15:13:57 Tobias Schroeder [6c6290]
2D mapper.


2013-09-09 14:21:39 Tobias Schroeder [0c3d12]
GL based ContourModelSet mapper.


2013-09-09 14:21:00 Tobias Schroeder [5072d3]
Inherit from BaseData.


2013-09-09 13:28:14 Tobias Schroeder [51b0f5]
Fixed parameter types.


2013-09-09 13:12:15 Tobias Schroeder [4a80df]
Merge remote-tracking branch 'origin/bug-15763-move-classes-into-new-module' into bug-16006-ContourModelSet

Conflicts:
Modules/SegmentationContour/Testing/files.cmake


2013-09-09 13:10:44 Tobias Schroeder [c8aa4f]
Added container class.


2013-09-09 11:34:25 Tobias Schroeder [e6e129]
Merge branch 'bug-15763-move-classes-into-new-module' into bug-16006-ContourModelSet

[068da8]: Merge branch 'bug-16006-fix'

Merged commits:

2013-10-18 11:04:47 Tobias Schroeder [25d5a4]
COMP: fix use of TimeGeometry.