Hi Ralf,

[bbbc10]: Merge branch 'bug-19452-specify-DICOM-tags-in-image'

Merged commits:

2015-12-10 14:22:35 Markus Engel [6b8bf0]
updated documentation and removed unnecessary method

I have developed and pushed an initial version of the changes.

[9d855c]: COMP: Merge branch 'bug-19452-specify-DICOM-tags-in-image'

Merged commits:

2015-12-14 08:26:39 Markus Engel [937017]
using std::make_pair instead of initializer-list to be compatible to vs2012

Have you had any time to take a look at the code?

[de4c82]: COMP: Merge branch 'bug-19445-pf-annotation-configuration'

Merged commits:

2015-11-26 13:29:18 Markus Engel [dd322b]
fixed copy-paste error in defining color for annotations

[b0b18f]: Merge branch 'bug-19445-pf-annotation-configuration'

Merged commits:

2015-11-24 16:33:21 Markus Engel [b98306]
restored default behaviour if new properties are not set

[5aa8cc]: Merge branch 'bug-19389-improve-high-dpi'

Merged commits:

2015-10-22 13:38:37 Markus Engel [2bb038]
Merge branch 'master' into bug-19389-improve-high-dpi

ooopps, T14643 ist the correct issue

[ce327d]: Merge branch 'bug-19382-improve-deleting-of-PlanarFigures'

Merged commits:

2015-10-22 13:56:05 Markus Engel [fa9361]
improved const-correctness in module PlanarFigure

I have modified the interactor to check if the figure can actually be removed before doing so.

[722a73]: Merge branch 'bug-19378-set-absolute-zoomlevel'

Merged commits:

2015-10-19 15:21:12 Markus Engel [8544c6]
added method to set absolute zoomlevel on CameraController

The method has been implemented as proposed by Christoph in an EMail on the MITK-Mailinglist.

I extended the CameraController with a 'Modified()' in the method AdjustCameraToPlane() in order to get a callback when the zoom-level or displayed position has changed.

[42373a]: Merge branch 'bug-19377-add-callback-on-CameraController-rebased'

Merged commits:

2015-10-20 16:28:30 Markus Engel [109b13]
moved itk::Modified to methods where it's not triggered on each rendering

I have added a new method mitk::CameraController::SetScaleFactorInMMPerDisplayUnit() that can be used to apply an absolute zoom-level.

[9acc32]: COMP: Merge branch 'bug-19377-add-callback-on-CameraController-rebased

Merged commits:

2015-10-20 16:59:25 Markus Engel [21a8bc]
gcc cannot handle const-iterators in erase

It's now possible to set a specific zoom level on the CameraController

[9907bf]: Merge branch 'bug-19368-make-planarfigureannotations-configurable'

Merged commits:

2015-10-14 14:26:51 Markus Engel [d0320f]
PlanarFigureMapper now configures the TextOverlay according to its own properties

[7035f4]: Merge branch 'bug-19172-fix-color-of-pf-controlpoints'

Merged commits:

2015-07-13 16:21:32 Markus Engel [35b491]
swapped order of rendering of markers and quantities

[291465]: COMP: Merge branch 'bug-19088-fix-clippedsurfaceboundscalculator-rebas

Merged commits:

2015-10-27 10:52:24 Markus Engel [8c1efd]
fixed memory leaks in mitkClippedSurfaceBoundsCalculatorTest

Integration completed.

Integration into master completed.

Has been integrated into master.

[140bc8]: Merge branch 'bug-19016-error-in-fixup-spacing-rebased'

Merged commits:

2015-06-26 13:43:54 Markus Engel [75cc33]
not attempting to fixup the pixelspacing if it's not correctly set

The issue has been resolved by using the correct geoemtry for checking if the two points are on the same slice.

[6b40ae]: Merge branch 'bug-19012-wrong-geometry-check-for-controlpoints'

Merged commits:

2015-04-17 09:35:04 Markus Engel [16e6d8]
using distance from correct geometry to check if the correct slice is displayed

Has been integrated in master.

[35f539]: Merge branch 'bug-18955-mutex-lock-DICOMITKSeriesGDCMReader-rebased'

Merged commits:

2015-06-26 14:04:07 Markus Engel [ff2a27]
protecting setLocale with Mutex

[b94a3e]: Merge branch 'bug-18859-fix-interaction-with-interpolated-planarfigure

Merged commits:

2015-07-10 11:45:44 Markus Engel [c903ea]
removed unnecessary implementation of destructors

[27e73b]: COMP: Merge branch 'bug-18859-fix-interaction-with-interpolated-planar

Merged commits:

2015-07-10 13:05:40 Markus Engel [af534a]
fixed warnings treated as errors

I have implemented a new method GetControlPointForPolylinePoint() that does just that.

[8d0067]: Merge branch 'bug-18832-increase-tolerance-of-image-statistics-rebased

Merged commits:

2016-02-03 09:32:43 Markus Engel [b31fc2]
setting tolerances for coordinates and direction on relevant filters of ImageStatistics

Seems to be fine.. closing this issue

I simply removed the include that does not belong in the cpp of QmitkTransferFunctionGeneratorWidget.

[5d1640]: Merge branch 'bug-18613-make-QmitkTransferFunctionGeneratorWidget-comp

Merged commits:

2015-01-14 12:56:10 Markus Engel [819183]
removed unnecessary include that prevents compilation without SceneSerialization

[64f5c6]: COMP: Merge branch 'bug-18556-add-copydeep-for-planarFigure'

Merged commits:

2014-12-19 14:28:42 Markus Engel [814a0f]
fixed warnings treated as error

Looking good now =)

[48342d]: COMP: Merge branch 'bug-18556-add-copydeep-for-planarFigure'

Merged commits:

2014-12-19 14:44:23 Markus Engel [60e769]
fixed another warning

Oops, that explains why I wasn't able to find the method.

New method PlanarFigure::DeepCopy() has been implemented.

[ecfb75]: Merge branch 'bug-18556-add-copydeep-for-planarFigure'

Merged commits:

2014-12-17 16:19:00 Markus Engel [1b4ace]
added copyDeep for PlanarFigures

[786c26]: Merge branch 'bug-18556-add-copydeep-for-planarFigure'

Merged commits:

2014-12-18 13:36:56 Markus Engel [71535c]
extended unittest for PlanarArrow with cloning

This is a bug in the core of the toolkit. Could be worth integrating into the release if it's not too late.

Integration into master has been completed.

• Documentation missing on why skewness and kurtosis are stored in outputs 7 and 8
  • use itkFactorylessNewMacro & itkCloneMacro instead of itkNewMacro
  • Variables for the coefficients are initialized with different values in c'tor and ComputeTheSkewnessAndKurtosis() -> unify

Well, we actually do block scrolling through slices while creating a PlanarFigure.

Cause of the crash is, that the NumberOfRows are set to 7 in the ui-file although there are actually 10 rows in the TableWidget.

[1acca6]: Merge branch 'bug-18193-statistics-plugin-crashes'

Merged commits:

2014-10-15 13:20:02 Markus Engel [9c922c]
corrected number of rows of the TableView in the UI file

This is no longer an issue

[45660f]: Merge branch 'bug-18085-dicom-multiframesupport-master'

Merged commits:

2014-09-11 16:57:22 Markus Engel [c9cd36]
removed unnecessary check that prevented multiframe support

The changes I made allow the loading of all multiframe DICOM images I had available for testing.

[2681f6]: Merge branch 'bug-17976-make-sorting-independent-of-number-of-digits'

Merged commits:

2015-10-28 08:49:40 Markus Engel [fcab88]
improved const-correctness and fixed typos

[6c1576]: COMP: Merge branch 'bug-17976-make-sorting-independent-of-number-of-di

Merged commits:

2015-10-30 09:36:44 Markus Engel [5d253a]
Revert "numerical dicom tags are handled numerically"

[0a5711]: Merge branch 'bug-17960-store-modality-in-mitkimage-master'

Merged commits:

2014-07-29 13:24:11 Markus Engel [dddfd6]
adding property with image modality

No it does not, you're right. Sorry..

A plan on how this issue can be adressed can be found in the wiki-specification

[121925]: Merge branch 'bug-17903-thickslices-unittest-master'

Merged commits:

2014-07-07 13:02:00 Markus Engel [4f04fa]
extended unittest for thickslices filter

[250e76]: Merge branch 'bug-17904-fixed-mean-projection-mode-master'

Merged commits:

2014-07-07 12:59:10 Markus Engel [31b273]
fixed copy-paste error in mean projection mode

[9fa09f]: COMP: Merge branch 'bug-17903-thickslices-unittest-master'

Merged commits:

2014-07-07 14:16:03 Markus Engel [56173b]
adapted unittest to new VTK

[fff1d4]: Merge branch 'bug-17879-planarfigures-editable'

Merged commits:

2014-06-24 13:26:00 Markus Engel [2c5eae]
fixed check if planarfigure is on current geometry

Integration complete

[50a84c]: Merge branch 'bug-17838-planarfigure-events-falsely-invoked-master'

Merged commits:

2014-06-04 15:46:30 Markus Engel [4a33d5]
moved invocation of event to more suitable method

We thought about the approach you have proposed. The 'problem' is that the user defines how many slices he wants to display using the thick-slice mode. If you simply reduce the number of visible slices at the border of the image, it's no longer what the user defined.

[6b68bf]: Merge branch 'bug-17738-new-thickslice-projection-types-master'

Merged commits:

2014-04-24 16:35:29 Markus Engel [9a199b]
added projection types MEAN and MinIP

[b3110c]: Merge branch 'bug-17453-planarfigure-contextmenu-master'

Merged commits:

2014-03-11 10:47:12 Markus Engel [a9c397]
added new helper state when requesting contextmenu from PlanarFigureInteractor

The changes have been merged into my snapshot with commit db6236d91ee15437cfaf05f38b962ab019fab278