Requesting Core-Modification flag.

[a4fd39]: Merge branch 'bug-10643-IpPicFreeCore-IntegrationBranch'

Conflicts:

Merged commits:

2012-01-17 10:25:03 Jan Hering [149998]
Adapting path to the test files

• the .nrrd test files were uploaded to MITK-Data, now pointing there

2012-01-11 17:25:09 Jan Hering [c8c41c]
Replacing old-style calls for PixelType creation

2012-01-11 16:42:47 Jan Hering [3754be]
Merge branch 'bug-10029-IpPicFreeCore_IntegrationBranch' into bug-10643-IpPicFreeCore-IntegrationBranch

Conflicts:
Core/Code/Rendering/mitkImageVtkMapper2D.cpp
Modules/Bundles/org.mitk.gui.qt.tofutil/src/internal/QmitkToFUtilView.cpp
Modules/IpPicSupport/mitkPicFileWriter.cpp
Modules/MitkExt/Interactions/mitkPaintbrushTool.cpp
Modules/ToFHardware/mitkToFImageGrabber.cpp
Modules/ToFProcessing/Testing/mitkToFVisualizationFilterTest.cpp
Modules/ToFProcessing/mitkToFVisualizationFilter.cpp

2011-12-06 17:20:16 Jan Hering [944a55]
Removed wrong string instantiation from constructor

2011-12-06 14:09:20 Jan Hering [8c1f72]
Adapted NrrdTbssRoiImageReader

• declared as friend in PixelType to enable access to constructor
• replaced call to PixelType::Initialize by call to constructor

2011-12-06 10:46:33 Jan Hering [589cc7]
Removing PixelType assignements since operator= private

• replaced assignement by construction

2011-12-05 11:34:00 Jan Hering [47933c]
Changed PixelType in ChannelDescritptor to ptr type

• to overcome the build problems with synthetized operator=

2011-12-01 18:05:19 Jan Hering [863375]
PixelType class code style cleanup

• constructor and operator= made private
• descturctor made non-virtual
• added private operator= to ChannelDescriptor to block its synthetization

2011-11-22 17:15:56 Jan Hering [6021e4]
COMP Taking static_cast instead of C-like cast

2011-11-22 16:47:29 Jan Hering [cdd975]
COMP Trying another casting notation

2011-11-22 16:24:47 Jan Hering [f1364c]
COMP Fixing casting notation

2011-11-22 16:05:46 Jan Hering [3ae40a]
COMP Explicit casting to int in LevelWindow

• since GetBpe returns a size_t (unsigned long) the windows compiler

complains about ambiguous pow() call

2011-11-18 11:47:11 Jan Hering [9e8d06]
Renaming MakeSimpleType<T> to MakeScalarPixelType<T>

2011-11-17 16:26:23 Jan Hering [9a7f7e]
Enhancing documentation for classes

2011-11-17 15:27:16 Jan Hering [6e5e07]
COMP Fixed wrong macro name

2011-11-17 15:24:28 Jan Hering [a5b551]
Changed tested data format for DataStorageTest

• now taking UC4DCyl.nrrd, and mitkItkImageFileReader instead of Pic

2011-11-17 14:17:57 Jan Hering [a80f3b]
Enabling previously disabled filters in MitkExt

• AngleCorrectByPointFilter
• DopplerToStrainRateFilter

2011-11-17 12:55:52 Jan Hering [842669]
Fixing ipPic casting in CylindricToCartesianFilter

2011-11-16 19:28:10 Jan Hering [d17ff9]
Enabling CylindricToCartesianFilter

2011-11-16 19:01:21 Jan Hering [846c40]
Changing url in DashboardScript

2011-11-15 17:56:20 Jan Hering [600f58]
Fixing dimension checking in GetPixelValue...

2011-11-15 15:34:14 Jan Hering [b01bfc]
Removing .pic from testing of ToFHardware since deprecated

2011-11-15 10:55:20 Jan Hering [ef2422]
Renaming mitkSceneIOTest

2011-11-15 10:18:10 Jan Hering [e02662]
Changing standard file format in BaseDataSerializer

• was previously .pic, is now .nrrd

2011-11-11 17:46:33 Jan Hering [11ad58]
Enhancing ImageToOpenCVImageFilterTest

2011-11-11 17:45:33 Jan Hering [0e1618]
Fixed PixelType constructor call

• when initialized from ITKImageType, the PixelType was not correctly
• passed through

2011-11-10 18:06:51 Jan Hering [283676]
Reducing warnings count.

2011-11-08 17:37:04 Jan Hering [2e2849]
Adapting ToF-related classes to new interface

2011-11-08 13:45:13 Jan Hering [049340]
Adapting ToF Module

• added dependency to LegacyAdaptors
• image initialization adapted to new PixelType interface

2011-11-08 11:59:49 Jan Hering [5f5887]
Merge branch 'bug-9266-ImageStatistics-CleanUp' into bug-10029-IpPicFreeCore_IntegrationBranch

Conflicts:
Core/Code/Testing/CMakeLists.txt
Modules/DiffusionImaging/IODataStructures/TbssImages/mitkNrrdTbssImageReader.cpp

2011-11-08 11:42:51 Jan Hering [ed9fc4]
Fixing CastToIpPicDescriptor

• copying of BpE was missing -> caused problems with segmentation

2011-11-04 19:08:01 Jan Hering [d7f8dc]
Overloading CastToIpPicDescriptor

• now callable also with mitk::ImageDataItem as input

2011-11-04 19:05:51 Jan Hering [d12b38]
Declaring all statistics-related methods const

• adapted mitkImageTest to the new statistics interface

2011-10-13 13:00:35 Jan Hering [9facc3]
Fixed casting from IpPic in LegacyAdaptors

2011-10-11 18:40:38 Jan Hering [47e750]
Changed AccessPixel<T>() method

• the offset is computed outside in GetPixelValueByIndex() method

2011-10-10 17:59:38 Jan Hering [5c1bb3]
Re-activating AccessPixel templated function

• added multiplexer for pixel type

2011-10-10 13:40:36 Jan Hering [20305e]
Re-enabling HistogramType typedef in mitk::Image

2011-10-10 11:32:13 Jan Hering [4b42b7]
Fixed if-condition in _ComputeExtremaInItkImage

2011-10-07 17:38:49 Jan Hering [187128]
Fixing initialization of ImageStatisticsHolder

2011-10-07 15:32:17 Jan Hering [83614e]
Fixing compile errors due to missing HistogramType typedef

2011-10-07 15:31:31 Jan Hering [f15519]
Re-enabling old interface for image statistics.

• all GetScalarValue... methods declared as deprecated

2011-10-07 10:49:42 Jan Hering [1adf90]
Fixing link errors.

2011-10-07 08:54:28 Jan Hering [bd92ac]
Declaring ComputeExtremaInItkImage new

• further adaptations in statisticsHolder class

2011-10-06 17:21:30 Jan Hering [e78ba6]
Fixing compile errors.

• added includes missing due to code removal
• adapted calls to m_Image->GetScalarValueMax etc. to the new interface
• adapted _ComputeExtremaInItkImage

2011-10-05 18:28:26 Jan Hering [f289e4]
Starting implementation of imageStatisticsHolder

2011-10-04 17:24:14 Jan Hering [f55797]
Merge branch 'bug-8977-IpPicFree-PixelType' into bug-9266-ImageStatistics-CleanUp

2011-10-04 17:20:23 Jan Hering [d0ed11]
Corrected initialization of dimension information

• one of the constructors of mitk::ImageDataItem was missing the correct
• initialization of the dimension-related members

2011-10-04 10:51:40 Jan Hering [a8de7c]
Correcting pic initialization

2011-09-27 16:13:03 Jan Hering [0857b2]
Temporarily replacing .pic test images for MitkExt Module

2011-09-27 15:49:03 Jan Hering [fb269e]
Fixed PixelType usage int CompressedImageContainer

2011-09-27 14:28:41 Jan Hering [0d8e30]
Adapting function calls in Modules to new interface

2011-09-26 17:38:06 Jan Hering [2502bf]
Fixed pic initialization in LegacyAdaptors

2011-09-23 17:37:08 Jan Hering [61767f]
Added missing multi-channel initialization.

2011-09-23 17:22:55 Jan Hering [30c30c]
Re-enabling statistics computations in Image

• exception issues with ItkAccesMacros were fixed recently

2011-09-23 16:38:11 Jan Hering [771d4c]
Setting FAST_TESTING also for 'experimental' dartclients

2011-09-23 16:09:44 Jan Hering [9a45ca]
Adapting Core-Tests

• reverted mitkAny declaration
• .pic.gz data replaced by equivalent .nrrd files
• removed .pic testing from ImageWriterTest

2011-09-22 18:42:13 Jan Hering [c76b9e]
Enhanced testing

• added more images to test images for IpPicSupport Module
• added condition to mitkDataNodeFactory test

2011-09-22 16:45:50 Jan Hering [e0f288]
Fixing assign operator in PixelType

• changed also return value for GetPixelType in mitk::Image

2011-09-21 10:30:09 Jan Hering [981204]
Moving custom tests from Core to IpPicSupport Module

2011-09-20 17:30:18 Jan Hering [a5ad74]
Fixed PixelType size computation

• added new interface for ComponentName
• changed AccesByItk-Macros

2011-09-20 15:06:33 Jan Hering [419c06]
Adapting colourimageprocessing calls to PixelType constructor

2011-09-20 14:08:15 Jan Hering [05a8c5]
Declaring NrrdTbssImageReader as friend

• similar to mitk::ItkImageFileReader, the Nrrd Reader needs access to
• the PixelType object constructor (private)

2011-09-20 13:49:06 Jan Hering [ff31c8]
Replaced calls to removed constructor ExtApp-wide

• the PixelType() constructor accessible only by MakePixelType<>()
• added simplifying MakeSimpleType< Type >() interface

2011-09-20 11:29:43 Jan Hering [94949a]
Fixed parameter values given to MakePixelType()

2011-09-19 17:54:33 Jan Hering [6c4a23]
Deactivating overloaded constructor for PixelType

• the method MakePixelType<...> is to be used instead
• replacing usage of the old constructor

2011-09-19 14:44:46 Jan Hering [e70464]
Fixed mitkPixelTypeTest

2011-09-19 14:43:57 Jan Hering [bcc85a]
Changed template initialization

• for MakePixelType<itkImageType>()

2011-09-19 11:45:46 Jan Hering [01b1f7]
Fixed data allocation error

• the ImageDataItem( ImageDescriptor ) method was missing the call for
• allocation in case the passed-in data is NULL

2011-09-16 14:04:09 Jan Hering [332907]
Fixing PixelType usage in ColourImageProcessing

2011-09-16 13:39:15 Jan Hering [3d2dd3]
Temporarily deactivating ToF-related Bundles and Modules

2011-09-16 11:39:40 Jan Hering [21a9fd]
Further adaptings in MitkExt

• deactivating mitkCylindricToCartesianFilterTest untill the CastToIpPic
• function's implementation is expanded to handle the pic-tags

2011-09-15 18:52:49 Jan Hering [63904c]
Adapting ExtApp-related classes to PixelType

2011-09-15 18:34:24 Jan Hering [b7113e]
Fixing mitkPixelTypeTest

• deactivating mitkDataStorageTest and mitkImageTest because of handling
• deprecated IpPic, which is no more available in core

2011-09-15 18:24:17 Jan Hering [142798]
Merge branch 'bug-9268-ExtraModule-For-IpPic-IO' into bug-8977-IpPicFree-PixelType

Conflicts:
Core/Code/files.cmake

2011-09-15 16:07:43 Jan Hering [8a44ee]
Moving IpPic I/O Tests to the respective module

2011-09-15 11:37:15 Jan Hering [d68512]
Fixing runtime errors due to CastToIpPic()

• adapting the function in LegacyAdaptors Module

2011-09-12 18:07:28 Jan Hering [ae4799]
Added registering of the IpPicIOFactory.

2011-09-12 14:50:28 Jan Hering [0ef321]
Fixing compile errors due to false export defines

• adapting the Modules-EXPORT to the new structure

2011-09-08 19:47:20 Jan Hering [87a615]
Adapted Pic classes to new interface

• now using the LegacyAdaptors module

2011-09-08 19:45:22 Jan Hering [9398bb]
Moved IpPic related classes to separate module

• all Pic related classes moved from Core to IpPicSupport
• adapted related CMakeLists.txt

2011-09-08 17:25:05 Jan Hering [aedee0]
Fixing CoreApp after branch merge.

• adapting classes from NewPixelType branch to new EXPORT-style
• adapting classes from Rendring branch to the new PixelType interface

2011-09-06 15:02:59 Jan Hering [6dc785]
Merge branch 'bug-9176-RenderingIntegrationTest' into bug-9268-ExtraModule-For-IpPic-IO

Conflicts:
Core/Code/Rendering/mitkImageMapperGL2D.cpp
Core/Code/Rendering/mitkImageMapperGL2D.h
Core/Code/files.cmake

2011-09-06 15:01:17 Jan Hering [86a6e3]
Merge branch 'bug-8977-NewPixelType' into bug-9268-ExtraModule-For-IpPic-IO

Conflicts:
Core/Code/DataManagement/mitkCommon.h
Core/Code/DataManagement/mitkImage.cpp
Core/Code/DataManagement/mitkImageDataItem.h
Core/Code/IO/mitkPixelType.h

2011-09-06 10:36:21 Jan Hering [b7d740]
Fixing build errors in mitkPixelType

• uncommenting falsely commented MakePixelType()

2011-09-05 16:46:36 Jan Hering [a362c0]
Corrected usage of PixelType in mitk::Image

• m_PixelType member moved from Image class to ChannelDescriptor
• adapted corresponding calls
• fixed constructor-error in ChannelDescriptor

2011-09-02 15:21:49 Jan Hering [397cd3]
Merge branch 'bug-9080-NewImageDescriptors' into bug-8977-NewPixelType

Conflicts:
Core/Code/IO/mitkPixelType.h
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkControlVisualizationPropertiesView.cpp
Modules/MitkExt/Algorithms/mitkDiffImageApplier.cpp
Modules/MitkExt/Algorithms/mitkOverwriteSliceImageFilter.cpp

2011-09-02 14:07:29 Jan Hering [5956d1]
Merge branch 'bug-9080-NewImageDescriptors' of mbits:MITK into bug-9080-NewImageDescriptors

Conflicts:
Core/Code/DataManagement/mitkImage.cpp

2011-09-02 10:28:59 Jan Hering [683bcd]
Fixing CoreApp functionality

• correct usage of the new PixelType interface in Image-related classes
• correcting initialization of PixelType class
• deactivating statistics computation (temporarily)

2011-09-02 10:28:59 Jan Hering [cdb37a]
Fixing CoreApp functionality

• correct usage of the new PixelType interface in Image-related classes
• correcting initialization of PixelType class

2011-08-19 14:21:58 Jan Hering [1479fb]
Removing deprecated ipPic code snippets

from mitk::ImageSource and mitk::LevelWindow classes

2011-08-19 14:17:26 Jan Hering [5e712d]
Enhancing class documentation

for mitk::ImageDescriptor and mitk::ChannelDescriptor classes

2011-08-19 09:49:50 Jan Hering [478331]
Fixing compile errors in MitkExt.

2011-08-18 11:42:17 Jan Hering [579e58]
Inserting legacy adaptor CastToIpPicDescriptor()

• added dependency from MitkExt to LegacyAdaptors
• in Modules/MitkExt/ replacing GetPicDescriptor() calls with the CastToIpPicDescriptor() calls

2011-08-18 11:25:43 Jan Hering [535f15]
Temporarily deactivating ipPic-dependent classes

• mitk::CylindricToCartesianFilter
• mitk::AngleCorrectByPointFilter
• mitk::DopplerToStrainRatiFilter

2011-08-18 11:12:27 Jan Hering [d66041]
New legacy adaptors MITK-Module

• added DEPRECATED(function_name) macro to mitkCommon.h
• new LegacyAdaptor for removed method Image::GetPicDescriptor()

2011-08-16 17:21:45 Jan Hering [eefd45]
Deactivating ipPic based IO Classes

• commenting files in files.cmake
• removed initialization from CoreObjectFactory

2011-08-16 17:16:49 Jan Hering [cc3ac1]
Removing IpPic-dependency from image-related

• removed all SetPic[Slice|Volume|Channel] methods
• replaced usage of ipPicDescriptor by ImageDescriptor in
  • mitk::Image
  • mitk::ImageDataItem

2011-08-16 17:13:41 Jan Hering [4ae1fb]
Added new descriptor classes.

• mitk::ChannelDescriptor
• mitk::ImageDescriptor
• enabling both in files.cmake

2011-08-15 15:25:58 Jan Hering [e6b043]
New access to PixelType for ITK ImageTypes

• overloading MakePixelType with <typename ItkImageType> parameter
• new PixelType Traits isPrimitiveType<T>, isVectorType<T> for compile-time analyse of the ItkImageType::PixelType
• new PixelTypeTrait<bool,T> to separate Component and Pixel type for compound ITK Image types (i.e. FixedArray< T, size> )

2011-08-13 20:00:02 Jan Hering [63fffa]
Adapted classes to the new PixelType interface

• classes in Modules/MitkExt/Algorithms
• classes in Modules/Bundles/

2011-08-13 19:58:08 Jan Hering [6269fe]
Adapting classes to the new PixelType interface

• classes in Core/Code

2011-08-13 19:54:17 Jan Hering [7ff32c]
Adapted classes to the new PixelType interface

• image-related classes in Core/Code/DataManagement

2011-08-13 19:47:13 Jan Hering [a17abd]
New interface and implementation of PixelType

• now storing m_PixelType and m_ComponentType
• removed dependency to mitkIpPicType
• new constructing method MakePixelType

Merged months ago. Issue solved. Closing bug.