User riecker has pushed new remote branch:

bug-17844-dicomrt

In the remote branch all refactoring branches were merged based on v2014.03.0:

• 17846-rt-refactoring-structureset
• 17847-rt-refactoring-dose
• 17845-RTDoseMapper

User webechr has pushed new remote branch:

bug-17844-RT-Refactoring-IntMarch2015

pushed an integration branch.
fixed some things to make it fit to new Module structures,
but still isn't compiling.

User riecker has pushed new remote branch:

bug-17844-RT-Refactoring-PluginIntegrationQt5

Core modification is already in master:

diff --git a/Core/Code/Rendering/vtkNeverTranslucentTexture.h b/Core/Code/Rendering/vtkNeverTranslucentTexture.h
index 2dd2d51..9ccd551 100644

• a/Core/Code/Rendering/vtkNeverTranslucentTexture.h

+++ b/Core/Code/Rendering/vtkNeverTranslucentTexture.h
@@ -50,7 +50,7 @@ See LICENSE.txt or http://www.mitk.org for details.
*/
/* NOT exported, this is a 2D image mapper helper */

-class vtkNeverTranslucentTexture : public vtkOpenGLTexture
+class MITK_CORE_EXPORT vtkNeverTranslucentTexture : public vtkOpenGLTexture
{
public:
...

this branch includes an other branch which has the core change, but the core change was already merged in a different branch

[8662a9]: Merge branch 'bug-17844-RT-Refactoring-PluginIntegrationQt5-Integratio

Merged commits:

2015-06-09 14:48:40 Nico Riecker [0deb51]
Merge remote-tracking branch 'origin/bug-17844-RT-Refactoring-PluginIntegrationQt5' into bug-17844-RT-Refactoring-PluginIntegrationQt5-Integration

2015-06-09 14:19:15 Nico Riecker [5fbcde]
replaced the deprecated MACRO_CREATE_MITK_CTK_PLUGIN macro

2015-06-09 14:05:18 Nico Riecker [56a30b]
individual global visibilities for each node

2015-06-09 14:02:20 Nico Riecker [a61c3d]
on changing the global visibilities in the preferences the plugin will be updated

2015-06-02 14:24:06 Nico Riecker [b2ae21]
toggle the visibility of the free isolevel sliders on changing the global visiblity of isolines

2015-06-02 14:10:51 Nico Riecker [08d868]
added the rt loading functionality to the local storage of the dicom browser

2015-05-28 18:44:27 Nico Riecker [76fc98]
fixed a pixel type error in the rt mapper

2015-05-21 17:11:53 Nico Riecker [fe7da9]
integration of Ralf Flocas Patch

2015-05-21 16:20:49 Nico Riecker [13edac]
Merge branch 'bug-17844-RT-Refactoring-PluginIntegrationQt5' of mitk.org:MITK into bug-17844-RT-Refactoring-PluginIntegrationQt5

2015-05-21 16:14:59 Nico Riecker [7e91d9]
fixed some visibility problems of the isolines

2015-05-21 14:46:01 Nico Riecker [e98cc5]
fixed the visiblity toggling within the preferences

2015-05-21 14:24:06 Nico Riecker [8bef4c]
fix for blueberry deadlock error

2015-05-21 11:13:01 Andreas Fetzer [46875a]
Avoid preferences deadlock by directly accessing the child page instead
of parsing the whole preferences tree again

2015-05-21 11:11:44 Andreas Fetzer [fae550]
Fixed build errors and a warning

2015-05-21 11:11:15 Andreas Fetzer [db0492]
Maintain qt4 compatibility for Mac OS X

2015-05-19 14:47:53 Nico Riecker [db9051]
Merge branch 'bug-17844-RT-Refactoring-PluginIntegration' into bug-17844-RT-Refactoring-PluginIntegrationQt5

2015-05-19 14:06:12 Nico Riecker [0e56a9]
integration for qt5 and bluberry update

2015-05-05 14:03:09 Nico Riecker [265663]
Merge branch 'bug-18052-RTPluginRefactoringNew' into bug-17844-RT-Refactoring-PluginIntegration

2015-04-21 17:07:40 Nico Riecker [8e3406]
added the missing file in the files.cmake

2015-03-19 17:03:12 Christian Weber [bdb430]
Merge remote-tracking branch 'origin/bug-17845-RTDoseMapper' into bug-17844-RT-Refactoring-IntMarch2015

1. Conflicts:
2. Modules/Core/include/vtkNeverTranslucentTexture.h
3. Modules/DicomRT/CMakeLists.txt
4. Modules/DicomRT/files.cmake

2014-09-12 15:54:43 Jasmin Metzger [412ec0]
Add free iso lines rendering.

2014-09-12 15:42:28 Jasmin Metzger [83f28c]
Add functionality to add/remove/change free iso lines.
Remove old representation (surface)and extra rendering methods.
The free iso lines are handled in the property and rendered by DoseImageVtkMapper2D.

2014-09-10 17:04:27 Jasmin Metzger [f6b721]
Change reinit behavior. The global reinit is replaced by request update all.

2014-09-10 00:01:45 Jasmin Metzger [14ac5e]
Core Fast Fix: Set OpacityPiecwiseFunction. See T15899
Is needed to set colorwash visibility for each iso dose level

2014-09-10 00:00:04 Jasmin Metzger [de86e8]
Changed the property check from binary outline to showIsoLines.
If nothing should be rendered the PolyData is set NULL.

2014-09-09 22:33:32 Jasmin Metzger [a3ec76]
Activate enable/disable functionality for iso dose contour and colorwash.

2014-09-09 18:19:28 Jasmin Metzger [ca4006]
Activate the global iso dose contour and colorwash visibility check boxes.
Remove redundant code (e.g. convert Button, slicing,...)

2014-09-09 14:27:24 Jasmin Metzger [8cfcad]
Merge remote-tracking branch 'origin/bug-18053-RT-extension' into bug-18052-RTPluginRefactoring

2014-09-09 14:23:01 Jasmin Metzger [19fc56]
Remove rt namespace from dose visualization plugin.
Rename some files and folder and use the refactored constants from RTUI Module.
Remove LoadingRTView

2014-09-09 11:02:33 Jasmin Metzger [e11684]
Copy old dicom rt plugin. Attention: Only a copy, not an integration.
contributed by Ralf Floca

2014-09-08 14:54:24 Nico Riecker [888e19]
added a RT dose loading function in the dicom plugin

2014-09-08 12:46:21 Nico Riecker [59173c]
Merge branch 'bug-17844-dicomrt' into bug-18053-RT-extension

2014-09-08 11:55:50 Nico Riecker [1d85cb]
Merge branch 'bug-18065-RTUI-Module' into bug-17844-dicomrt

2014-09-08 11:54:22 Nico Riecker [9418e3]
integrated the RTUI Module, contributed by R.Floca

2014-09-04 16:34:30 Nico Riecker [40bca3]
new return type of struct reader handled

2014-09-04 16:13:50 Nico Riecker [9bd101]
Merge branch 'bug-17844-dicomrt' into bug-18053-RT-extension

2014-09-04 16:11:07 Nico Riecker [463324]
Merge remote-tracking branch 'origin/bug-17846-rt-refactoring-structureset' into bug-17844-dicomrt

2014-09-04 15:26:34 Nico Riecker [8086fe]
integrated the rt structureset reader

2014-09-04 14:20:14 Nico Riecker [e20fb3]
Merge branch 'bug-17844-dicomrt' into bug-18053-RT-extension

2014-09-04 14:15:18 Nico Riecker [46ffd4]
Merge branch 'bug-17844-dicomrt' into bug-18053-RT-extension

2014-09-04 11:57:49 Nico Riecker [7ae9cc]
changed the parameters for the dose loading method

2014-09-02 19:48:54 Jasmin Metzger [d80ca2]
Remove rt namespace

2014-09-02 17:03:42 Jasmin Metzger [daf2ac]
Copy of the ImageVtkMapper2D to change the outline functionality for the needs of dose images.
Changed "QT_Module" keyword to package dependency.

2014-09-04 14:05:34 Nico Riecker [97495f]
Merge remote-tracking branch 'origin/bug-17846-rt-refactoring-structureset' into bug-17844-dicomrt

2014-09-04 12:02:11 Nico Riecker [463eff]
Merge branch 'bug-17847-rt-refactoring-dose' into bug-17844-dicomrt

2014-09-02 19:50:07 Jasmin Metzger [be77b5]
Merge branch 'bug-17845-RTDoseMapper' into bug-17844-dicomrt

2014-09-02 19:48:54 Jasmin Metzger [bfa78e]
Remove rt namespace

2014-09-02 17:03:42 Jasmin Metzger [1c3955]
Copy of the ImageVtkMapper2D to change the outline functionality for the needs of dose images.
Changed "QT_Module" keyword to package dependency.

2014-09-02 16:56:20 Jasmin Metzger [353649]
Merge remote-tracking branch 'origin/bug-17847-rt-refactoring-dose' into bug-17845-RTDoseMapper

2014-09-02 15:08:04 Nico Riecker [5565a4]
Merge remote-tracking branch 'origin/bug-17847-rt-refactoring-dose' into bug-17844-dicomrt

User riecker has pushed new remote branch:

bug-17844-RT-Refactoring-PluginIntegrationQt5-Integration

[8d0e6b]: Merge branch 'bug-17844-RT-Refactoring-PluginIntegrationQt5-Integratio

Merged commits:

2015-06-09 15:47:41 Nico Riecker [ea5e75]
COMP: updated the test image in the mitk-data repository