[736b2c]: Merge branch 'bug-10116-FiberBundleXintegration'

Conflicts:
Modules/

Merged commits:

2012-01-11 16:48:51 Peter Neher [edd700]
Merge branch 'bug-10404-RadXmlToFibX' into bug-10116-FiberBundleXintegration

---

2012-01-11 16:39:59 Peter Neher [0dfd5f]
removed old fiber bundle

---

2011-12-28 19:09:20 Ignaz Reicht [b0ec3f]
colorcodings fixed

---

2011-12-28 14:24:50 Ignaz Reicht [26e01b]
fa colorcoding works now

---

2011-12-28 13:15:56 Ignaz Reicht [8804f0]
fa coloring works now for 3d

---

2011-12-25 22:44:47 Ignaz Reicht [50726f]
calling FA mapping via gui implemented

---

2011-12-24 15:50:21 Ignaz Reicht [bc3c72]
colorcoding shall behave as expected :-)

---

2011-12-24 15:49:52 Ignaz Reicht [db21f8]
colorcoding shall behave as expected :-)

---

2011-12-21 02:05:00 Ignaz Reicht [f170df]
fix color selection issues

---

2011-12-20 19:46:33 Ignaz Reicht [ae74d1]
method to reset opacity in Orientationbased colorarray v2

---

2011-12-20 19:44:29 Ignaz Reicht [5c7d74]
method to reset opacity in Orientationbased colorarray

---

2011-12-20 19:21:53 Ignaz Reicht [cf40e1]
enhance FBX with FA coloring methods

---

2011-12-20 00:55:19 Ignaz Reicht [72c159]
set opacity to 1 when loading fiberbundleX

---

2011-12-20 00:50:33 Ignaz Reicht [cd8021]
implemented OR/NOT

---

2011-12-19 17:53:42 Ignaz Reicht [5408b6]
fixing OR

---

2011-12-19 13:52:21 Ignaz Reicht [34b84b]
add transparency to fiber2D shader and mapper

---

2011-12-18 23:13:29 Ignaz Reicht [68ee04]
call orientationbased fibercoldoring and idGeneration in constructor of FBX

---

2011-12-18 16:24:31 Ignaz Reicht [266564]
removed fiberbundleX proprietary modification method

---

2011-12-18 15:29:29 Ignaz Reicht [4fe622]
introducing localstorage approach to fiberbundleXMapper3D

---

2011-12-18 13:49:38 Ignaz Reicht [491728]
individual color/opacity calls

---

2011-12-18 01:50:44 Ignaz Reicht [5fd673]
duplicate check of fiberIds implemented

---

2011-12-17 19:49:59 Ignaz Reicht [baaeba]
changing fiberbundle extraction from unsigned long to long

---

2011-12-16 14:40:01 Ignaz Reicht [d1300e]
implemented AND extractioin

---

2011-12-16 14:39:15 Ignaz Reicht [9850ee]
implemented AND extractioin

---

2011-12-15 17:51:50 Ignaz Reicht [b3f618]
fix bool

---

2011-12-15 15:36:34 Ignaz Reicht [308446]
improved fiber extraction

---

2011-12-14 23:28:09 Ignaz Reicht [de852d]
returning cutting fiberbundle, no passing of additional values like FA or color

---

2011-12-14 23:13:29 Ignaz Reicht [ed53f9]
returning cutting fiberbundle

---

2011-12-14 17:19:41 Ignaz Reicht [634cfc]
Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

---

2011-12-14 17:18:57 Ignaz Reicht [46f6c8]
generating fiberstructures including extra values

---

2011-12-12 22:57:01 Ignaz Reicht [4d3514]
final improvements for fibercutting

---

2011-12-12 19:53:23 Ignaz Reicht [211d48]
improved performance

---

2011-12-12 12:49:41 Peter Neher [ffcaad]
Merge branch 'bug-10428-TrilinearInterpol' into bug-10116-FiberBundleXintegration

---

2011-12-12 12:48:43 Peter Neher [dae47b]
fixed

---

2011-12-12 00:32:31 Ignaz Reicht [922987]
enhance performance for cutting

---

2011-12-09 20:03:01 Ignaz Reicht [24f5c8]
fix identify fibers

---

2011-12-09 14:08:07 Ignaz Reicht [dcc881]
Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

---

2011-12-09 14:07:28 Ignaz Reicht [8eb825]
fix calling wrong slots when executing thread for fiberextraction

---

2011-12-09 13:57:04 Ignaz Reicht [009db4]
fix calling wrong slots when executing thread for fiberextraction

---

2011-12-08 18:35:32 Peter Neher [8f7753]
Merge branch 'bug-10403-TractsToImageFilterGeometry' into bug-10116-FiberBundleXintegration

---

2011-12-08 18:33:48 Peter Neher [f0e171]
implemented

---

2011-12-08 16:47:52 Ignaz Reicht [6b2d49]
thread error while extracting

---

2011-12-07 21:55:31 Ignaz Reicht [4bdf9b]
calling current colorcoding of fiberbundle in mappers

---

2011-11-30 13:38:42 Peter Neher [14de8d]
intermediate

---

2011-11-25 15:57:06 Peter Neher [1745f9]
Merge branch 'bug-10253-Stochastic' into bug-10116-FiberBundleXintegration

---

2011-11-25 15:56:18 Peter Neher [e513df]
measurement frame is used. output is now processed as fiberbundlex. general cleanup.

---

2011-11-24 18:53:54 Peter Neher [dcab58]
Merge branch 'bug-10211-FiberProcessingX' into bug-10116-FiberBundleXintegration

Conflicts:
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.cpp
Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkFiberProcessingView.h
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

---

2011-11-24 18:37:51 Peter Neher [7783cc]
added join and subtract operator for fiberbundlex. updated filters to fiberbundlex.

---

2011-11-24 17:10:34 Ignaz Reicht [051649]
Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

---

2011-11-24 17:09:52 Ignaz Reicht [d77fe1]
plane sliceing implemented

---

2011-11-24 11:36:07 Ignaz Reicht [9897b3]
set highest thread priority for fiber extraction

---

2011-11-24 10:41:24 Ignaz Reicht [092b17]
implemented thread based executioin of fiberextraction

---

2011-11-23 13:56:59 Peter Neher [519d19]
view is working with fibx now. uncommented code blocks that use external resources that can't handle fibx yet

---

2011-11-23 10:23:01 Ignaz Reicht [8875c0]
Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

---

2011-11-22 18:08:25 Peter Neher [287794]
better performance. also extracting complement.

---

2011-11-22 17:09:27 Peter Neher [a36be4]
fiber extraction via mitk surface possible

---

2011-11-22 16:46:16 Ignaz Reicht [81bf55]
interim commit, support for circle ROI

---

2011-11-22 14:21:47 Peter Neher [6a1499]
intermediate

---

2011-11-22 11:22:50 Ignaz Reicht [22199e]
Merge branch 'bug-10048-fastFiberExtraction' into bug-10116-FiberBundleXintegration

Conflicts:
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.h

---

2011-11-22 11:06:53 Peter Neher [ccc48a]
Merge branch 'bug-8987-GibbsPolyData' into bug-10116-FiberBundleXintegration

---

2011-11-22 11:05:56 Peter Neher [41064f]
reperametrize arclength moved to fiberbundlex (resamplefibers)

---

2011-11-21 23:43:13 Ignaz Reicht [60201e]
interim updates

---

2011-11-21 15:04:07 Ignaz Reicht [bf9323]
prototype fiber extraction

---

2011-11-18 15:17:20 Peter Neher [d498dc]
filter output changed to polydata. todo: resample fibers

---

2011-11-18 11:01:12 Peter Neher [d37056]
Merge branch 'bug-10139-FiberBunldexReaderWriter' into bug-10116-FiberBundleXintegration

Conflicts:
Modules/DiffusionImaging/IODataStructures/FiberBundleX/mitkFiberBundleX.cpp

---

2011-11-18 10:50:51 Peter Neher [a0ca78]
old fiber bundle can only be written as polydata. old fiber bundle can be loaded if extension is changed to .fib_deprecated. new fiber bundle has file ending .fib. points are saved as world coordinates

---

2011-11-18 10:35:11 Peter Neher [358bde]
reader writer working. disabled old fiber bundle reader

---

2011-11-15 17:32:17 Ignaz Reicht [0d900c]
interim commit2, implement clipper

---

2011-11-15 17:30:04 Ignaz Reicht [7aac7f]
interim commit, implement clipper

---

2011-11-14 18:12:56 Ignaz Reicht [e0e007]
fixes in color management

---

2011-11-14 17:55:53 Ignaz Reicht [49232b]
Merge branch 'bug-10118-manageColorcodingFBX' into bug-10116-FiberBundleXintegration

---

2011-11-14 17:55:10 Ignaz Reicht [fedb20]
colorCoding management works

---

2011-11-14 12:56:47 Ignaz Reicht [7f73cc]
get available colorcoings in GUI

---

2011-11-14 11:39:03 Ignaz Reicht [ccdb20]
fix rendering calling after processing

---

2011-11-11 21:02:49 Ignaz Reicht [0c986e]
fix colorcoding calculation

---

2011-11-11 12:24:46 Ignaz Reicht [b58634]
repair colorcoding

---

2011-11-10 23:32:09 Ignaz Reicht [019d30]
interim commit for providing colorcoding

---

2011-11-10 22:30:33 Ignaz Reicht [8926d6]
Merge branch 'bug-10108-FiberBundleXMapper2D' into bug-10116-FiberBundleXintegration

---

2011-11-10 20:51:01 Ignaz Reicht [537b16]
2dmapping works-no colors so far