diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp
index f362604cd0..137b295c9f 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/QmitkPartialVolumeAnalysisWidget.cpp
@@ -1,127 +1,156 @@
 /*=========================================================================
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 #include "QmitkPartialVolumeAnalysisWidget.h"
 
 #include "mitkHistogramGenerator.h"
 #include "mitkPartialVolumeAnalysisClusteringCalculator.h"
 
 #include <qlabel.h>
 #include <qpen.h>
 #include <qgroupbox.h>
 
 
 #include <vtkQtChartArea.h>
 #include <vtkQtChartTableSeriesModel.h>
 #include <vtkQtChartStyleManager.h>
 #include <vtkQtChartColorStyleGenerator.h>
 
 #include <vtkQtChartMouseSelection.h>
 #include <vtkQtChartInteractorSetup.h>
 #include <vtkQtChartSeriesSelectionHandler.h>
 #include <vtkQtChartAxisLayer.h>
 #include <vtkQtChartAxis.h>
 #include <vtkQtChartAxisOptions.h>
 #include <vtkQtChartLegend.h>
 #include <vtkQtChartLegendManager.h>
 
 //#include <iostream>
 
 QmitkPartialVolumeAnalysisWidget::QmitkPartialVolumeAnalysisWidget( QWidget * parent )
   : QmitkPlotWidget(parent)
 {
 //  this->SetAxisTitle( QwtPlot::xBottom, "Grayvalue" );
   //  this->SetAxisTitle( QwtPlot::yLeft, "Probability" );
 //  this->Replot();
   m_Plot->setCanvasLineWidth(0);
   m_Plot->setMargin(0);
 }
 
 
 
 QmitkPartialVolumeAnalysisWidget::~QmitkPartialVolumeAnalysisWidget()
 {
 }
 
 
 void QmitkPartialVolumeAnalysisWidget::DrawGauss()
 {
 
 }
 
 
 void QmitkPartialVolumeAnalysisWidget::ClearItemModel()
 {
 
 }
 
 void QmitkPartialVolumeAnalysisWidget::SetParameters( ParamsType *params, ResultsType *results, HistType *hist )
 {
   this->Clear();
 
   if(params != 0 && results != 0)
   {
+    hist->Print();
     params->Print();
+    results->Print();
+
 
     for(unsigned int i=0; i<m_Vals.size(); i++)
     {
       delete m_Vals[i];
     }
 
     m_Vals.clear();
     m_Vals.push_back(hist->GetXVals());
     m_Vals.push_back(hist->GetHVals());
 
+
+    std::vector<double> *xVals = hist->GetXVals();
+    std::vector<double> *yVals = hist->GetHVals();
+    std::vector<double> *fiberVals = new std::vector<double>(results->GetFiberVals());
+    std::vector<double> *nonFiberVals = new std::vector<double>(results->GetNonFiberVals());
+    std::vector<double> *mixedVals = new std::vector<double>(results->GetMixedVals());
+    std::vector<double> *combiVals = new std::vector<double>(results->GetCombiVals());
+
+
+    double fiberFA = 0.0;
+    double weights = 0.0;
+
+    std::cout << "x, y, fiber, nonFiber, mixed, combi" << std::endl;
+    for(int i=0; i<xVals->size(); ++i)
+    {
+
+      fiberFA += xVals->at(i) * fiberVals->at(i);
+      weights += fiberVals->at(i);
+
+      std::cout << xVals->at(i) << " " << yVals->at(i) << " " << fiberVals->at(i)
+          << " " << nonFiberVals->at(i) << " " << mixedVals->at(i) << " " << combiVals->at(i) << std::endl;
+
+    }
+
+    fiberFA = fiberFA / weights;
+
+
     QPen pen( Qt::SolidLine );
     pen.setWidth(2);
 
     pen.setColor(Qt::black);
     int curveId = this->InsertCurve( "histogram" );
     this->SetCurveData( curveId, (*m_Vals[0]), (*m_Vals[1]) );
     this->SetCurvePen( curveId, pen );
     //  this->SetCurveTitle( curveId, "Image Histogram" );
 
-    std::vector<double> *fiberVals = new std::vector<double>(results->GetFiberVals());
+
     curveId = this->InsertCurve( "fiber" );
-    this->SetCurveData( curveId, (*hist->GetXVals()), (*fiberVals) );
+    this->SetCurveData(curveId, (*hist->GetXVals()), (*fiberVals));
     this->SetCurvePen( curveId, QPen( Qt::NoPen ) );
     this->SetCurveBrush(curveId, QBrush(QColor::fromRgbF(0,1,0,.5), Qt::SolidPattern));
     m_Vals.push_back(fiberVals);
 
-    std::vector<double> *nonFiberVals = new std::vector<double>(results->GetNonFiberVals());
+
     curveId = this->InsertCurve( "nonfiber" );
     this->SetCurveData( curveId, (*hist->GetXVals()), (*nonFiberVals) );
     this->SetCurvePen( curveId, QPen( Qt::NoPen ) );
     this->SetCurveBrush(curveId, QBrush(QColor::fromRgbF(1,0,0,.5), Qt::SolidPattern));
     m_Vals.push_back(nonFiberVals);
 
-    std::vector<double> *mixedVals = new std::vector<double>(results->GetMixedVals());
+
     curveId = this->InsertCurve( "mixed" );
     this->SetCurveData( curveId, (*hist->GetXVals()), (*mixedVals) );
     this->SetCurvePen( curveId, QPen( Qt::NoPen ) );
     this->SetCurveBrush(curveId, QBrush(QColor::fromRgbF(.7,.7,.7,.5), Qt::SolidPattern));
     m_Vals.push_back(mixedVals);
 
     pen.setColor(Qt::blue);
-    std::vector<double> *combiVals = new std::vector<double>(results->GetCombiVals());
     curveId = this->InsertCurve( "combi" );
     this->SetCurveData( curveId, (*hist->GetXVals()), (*combiVals) );
     this->SetCurvePen( curveId, pen );
     m_Vals.push_back(combiVals);
 
 
 
   }
 
   this->Replot();
 
 }
 
diff --git a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui
index 62f1529a98..0056f380df 100644
--- a/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui
+++ b/Modules/Bundles/org.mitk.gui.qt.diffusionimaging/src/internal/QmitkPartialVolumeAnalysisViewControls.ui
@@ -1,762 +1,762 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>QmitkPartialVolumeAnalysisViewControls</class>
  <widget class="QWidget" name="QmitkPartialVolumeAnalysisViewControls">
   <property name="enabled">
    <bool>true</bool>
   </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
-    <height>427</height>
+    <width>343</width>
+    <height>434</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <property name="spacing">
     <number>0</number>
    </property>
    <property name="margin">
     <number>0</number>
    </property>
    <item>
     <widget class="QLineEdit" name="m_ErrorMessageLabel">
      <property name="frame">
       <bool>false</bool>
      </property>
      <property name="readOnly">
       <bool>true</bool>
      </property>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_2">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QFrame" name="frame_2">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_4">
          <property name="spacing">
           <number>0</number>
          </property>
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QFrame" name="frame_6">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QFormLayout" name="formLayout">
             <property name="horizontalSpacing">
              <number>6</number>
             </property>
             <property name="verticalSpacing">
              <number>0</number>
             </property>
             <property name="leftMargin">
              <number>0</number>
             </property>
             <property name="topMargin">
              <number>0</number>
             </property>
             <property name="rightMargin">
              <number>9</number>
             </property>
             <property name="bottomMargin">
              <number>0</number>
             </property>
             <item row="0" column="0">
              <widget class="QLabel" name="label_4">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Image:</string>
               </property>
              </widget>
             </item>
             <item row="0" column="1">
              <widget class="QLineEdit" name="m_SelectedImageLabel">
               <property name="frame">
                <bool>false</bool>
               </property>
               <property name="readOnly">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item row="1" column="0">
              <widget class="QLabel" name="label_2">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
                 <horstretch>0</horstretch>
                 <verstretch>0</verstretch>
                </sizepolicy>
               </property>
               <property name="text">
                <string>Mask:</string>
               </property>
              </widget>
             </item>
             <item row="1" column="1">
              <widget class="QLineEdit" name="m_SelectedMaskLabel">
               <property name="frame">
                <bool>false</bool>
               </property>
               <property name="readOnly">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item>
           <widget class="QFrame" name="m_PlanarFigureButtonsFrame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_5">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
              <widget class="QPushButton" name="m_CircleButton">
               <property name="maximumSize">
                <size>
                 <width>30</width>
                 <height>30</height>
                </size>
               </property>
               <property name="text">
                <string/>
               </property>
               <property name="icon">
-               <iconset resource="../../resources/QmitkDiffusionImagingInternal.qrc">
-                <normaloff>:/QmitkPartialVolumeAnalysisView/circle.png</normaloff>:/QmitkPartialVolumeAnalysisView/circle.png</iconset>
+               <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+                <normaloff>:/QmitkDiffusionImaging/circle.png</normaloff>:/QmitkDiffusionImaging/circle.png</iconset>
               </property>
               <property name="iconSize">
                <size>
                 <width>32</width>
                 <height>32</height>
                </size>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="flat">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="m_RectangleButton">
               <property name="maximumSize">
                <size>
                 <width>30</width>
                 <height>30</height>
                </size>
               </property>
               <property name="text">
                <string/>
               </property>
               <property name="icon">
-               <iconset resource="../../resources/QmitkDiffusionImagingInternal.qrc">
-                <normaloff>:/QmitkPartialVolumeAnalysisView/rectangle.png</normaloff>:/QmitkPartialVolumeAnalysisView/rectangle.png</iconset>
+               <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+                <normaloff>:/QmitkDiffusionImaging/rectangle.png</normaloff>:/QmitkDiffusionImaging/rectangle.png</iconset>
               </property>
               <property name="iconSize">
                <size>
                 <width>32</width>
                 <height>32</height>
                </size>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="flat">
                <bool>true</bool>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QPushButton" name="m_PolygonButton">
               <property name="maximumSize">
                <size>
                 <width>30</width>
                 <height>30</height>
                </size>
               </property>
               <property name="text">
                <string/>
               </property>
               <property name="icon">
-               <iconset resource="../../resources/QmitkDiffusionImagingInternal.qrc">
-                <normaloff>:/QmitkPartialVolumeAnalysisView/polygon.png</normaloff>:/QmitkPartialVolumeAnalysisView/polygon.png</iconset>
+               <iconset resource="../../resources/QmitkDiffusionImaging.qrc">
+                <normaloff>:/QmitkDiffusionImaging/polygon.png</normaloff>:/QmitkDiffusionImaging/polygon.png</iconset>
               </property>
               <property name="iconSize">
                <size>
                 <width>32</width>
                 <height>32</height>
                </size>
               </property>
               <property name="checkable">
                <bool>true</bool>
               </property>
               <property name="flat">
                <bool>true</bool>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QFrame" name="m_ResampleOptionsFrame">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QFormLayout" name="formLayout_2">
          <property name="margin">
           <number>0</number>
          </property>
          <item row="0" column="0">
           <widget class="QLabel" name="label">
            <property name="text">
             <string>Upsampling</string>
            </property>
           </widget>
          </item>
          <item row="0" column="1">
           <widget class="QFrame" name="frame_bla">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <property name="frameShadow">
             <enum>QFrame::Raised</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
              <widget class="QSlider" name="m_UpsamplingSlider">
               <property name="maximum">
                <number>40</number>
               </property>
               <property name="singleStep">
                <number>1</number>
               </property>
               <property name="value">
                <number>25</number>
               </property>
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="m_Upsampling">
               <property name="minimumSize">
                <size>
                 <width>50</width>
                 <height>0</height>
                </size>
               </property>
               <property name="text">
                <string>2.5</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
          <item row="1" column="0">
           <widget class="QLabel" name="m_SimilarAnglesLabel">
            <property name="text">
             <string>Similar angles</string>
            </property>
           </widget>
          </item>
          <item row="1" column="1">
           <widget class="QFrame" name="m_SimilarAnglesFrame">
            <property name="frameShape">
             <enum>QFrame::NoFrame</enum>
            </property>
            <layout class="QHBoxLayout" name="horizontalLayout_7">
             <property name="margin">
              <number>0</number>
             </property>
             <item>
              <widget class="QSlider" name="m_SimilarAnglesSlider">
               <property name="maximum">
                <number>90</number>
               </property>
               <property name="value">
                <number>0</number>
               </property>
               <property name="orientation">
                <enum>Qt::Horizontal</enum>
               </property>
               <property name="tickPosition">
                <enum>QSlider::NoTicks</enum>
               </property>
              </widget>
             </item>
             <item>
              <widget class="QLabel" name="m_SimilarAngles">
               <property name="minimumSize">
                <size>
                 <width>50</width>
                 <height>0</height>
                </size>
               </property>
               <property name="text">
                <string>90°</string>
               </property>
              </widget>
             </item>
            </layout>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="frame_5">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_4">
       <property name="spacing">
        <number>0</number>
       </property>
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QCheckBox" name="m_DisplayHistogramCheckbox">
         <property name="text">
          <string>display histogram</string>
         </property>
        </widget>
       </item>
       <item>
        <widget class="QmitkPartialVolumeAnalysisWidget" name="m_HistogramWidget" native="true">
         <property name="enabled">
          <bool>true</bool>
         </property>
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
           <horstretch>0</horstretch>
           <verstretch>0</verstretch>
          </sizepolicy>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <widget class="QFrame" name="m_BottomControls">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout_3">
       <property name="margin">
        <number>0</number>
       </property>
       <item>
        <widget class="QFrame" name="m_ClassSelector">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_6">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QPushButton" name="m_TextureIntON">
            <property name="maximumSize">
             <size>
              <width>20</width>
              <height>20</height>
             </size>
            </property>
            <property name="text">
             <string/>
            </property>
            <property name="checkable">
             <bool>true</bool>
            </property>
            <property name="flat">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="m_GreenRadio">
            <property name="text">
             <string>Green</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="m_PartialVolumeRadio">
            <property name="toolTip">
             <string comment="Partial Volume" extracomment="Partial Volume">Partial Volume</string>
            </property>
            <property name="statusTip">
             <string comment="Partial Volume" extracomment="Partial Volume">Partial Volume</string>
            </property>
            <property name="whatsThis">
             <string>Partial Volume</string>
            </property>
            <property name="accessibleName">
             <string comment="Partial Volume" extracomment="Partial Volume">Partial Volume</string>
            </property>
            <property name="text">
             <string>PV</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="m_BlueRadio">
            <property name="text">
             <string>Red</string>
            </property>
            <property name="checked">
             <bool>true</bool>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QRadioButton" name="m_AllRadio">
            <property name="text">
             <string>All</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item>
        <widget class="QFrame" name="m_OpacityFrame">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_8">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QLabel" name="m_OpacityLabel">
            <property name="text">
             <string>Opacity</string>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QSlider" name="m_OpacitySlider">
            <property name="maximum">
             <number>10</number>
            </property>
            <property name="value">
             <number>5</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="tickPosition">
             <enum>QSlider::TicksBelow</enum>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout_7">
      <item row="0" column="0">
       <widget class="QPushButton" name="m_ButtonCopyHistogramToClipboard">
        <property name="text">
         <string>Histogram to Clipboard</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QCheckBox" name="m_AdvancedCheckbox">
      <property name="text">
       <string>Advanced</string>
      </property>
     </widget>
    </item>
    <item>
     <spacer name="spacer2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeType">
       <enum>QSizePolicy::Preferred</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>10</width>
        <height>1</height>
       </size>
      </property>
     </spacer>
    </item>
    <item>
     <widget class="QFrame" name="frame_7">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
      </property>
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
      <layout class="QFormLayout" name="formLayout_3">
       <property name="fieldGrowthPolicy">
        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
       </property>
       <property name="margin">
        <number>0</number>
       </property>
       <item row="1" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
          <string>Blurring</string>
         </property>
        </widget>
       </item>
       <item row="1" column="1">
        <widget class="QFrame" name="frame_3">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_2">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QSlider" name="m_GaussianSigmaSlider">
            <property name="maximum">
             <number>200</number>
            </property>
            <property name="singleStep">
             <number>1</number>
            </property>
            <property name="value">
             <number>0</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="m_GaussianSigma">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>0.0</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="2" column="0">
        <widget class="QLabel" name="label_3">
         <property name="text">
          <string># Bins</string>
         </property>
        </widget>
       </item>
       <item row="2" column="1">
        <widget class="QFrame" name="frame_4">
         <property name="frameShape">
          <enum>QFrame::NoFrame</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QSlider" name="m_NumberBinsSlider">
            <property name="maximum">
             <number>100</number>
            </property>
            <property name="value">
             <number>10</number>
            </property>
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
            </property>
            <property name="tickPosition">
             <enum>QSlider::NoTicks</enum>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QLabel" name="m_NumberBins">
            <property name="minimumSize">
             <size>
              <width>50</width>
              <height>0</height>
             </size>
            </property>
            <property name="text">
             <string>50</string>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="4" column="0">
        <widget class="QCheckBox" name="m_Quantiles">
         <property name="text">
          <string>quantiles</string>
         </property>
        </widget>
       </item>
       <item row="4" column="1">
        <widget class="QFrame" name="frame_8">
         <property name="frameShape">
          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Raised</enum>
         </property>
         <layout class="QHBoxLayout" name="horizontalLayout_9">
          <property name="margin">
           <number>0</number>
          </property>
          <item>
           <widget class="QDoubleSpinBox" name="m_q1">
            <property name="maximum">
             <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.010000000000000</double>
            </property>
            <property name="value">
             <double>0.250000000000000</double>
            </property>
           </widget>
          </item>
          <item>
           <widget class="QDoubleSpinBox" name="m_q2">
            <property name="maximum">
             <double>1.000000000000000</double>
            </property>
            <property name="singleStep">
             <double>0.010000000000000</double>
            </property>
            <property name="value">
             <double>0.750000000000000</double>
            </property>
           </widget>
          </item>
         </layout>
        </widget>
       </item>
       <item row="3" column="1">
        <widget class="QPushButton" name="m_EstimateCircle">
         <property name="text">
          <string>Estimate circle from binary image</string>
         </property>
        </widget>
       </item>
      </layout>
     </widget>
    </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
      <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>40</height>
       </size>
      </property>
     </spacer>
    </item>
   </layout>
  </widget>
  <customwidgets>
   <customwidget>
    <class>QmitkPartialVolumeAnalysisWidget</class>
    <extends>QWidget</extends>
    <header>QmitkPartialVolumeAnalysisWidget.h</header>
    <container>1</container>
   </customwidget>
  </customwidgets>
  <resources>
-  <include location="../../resources/QmitkDiffusionImagingInternal.qrc"/>
+  <include location="../../resources/QmitkDiffusionImaging.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/Modules/DiffusionImaging/Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h b/Modules/DiffusionImaging/Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h
index ff1040ffc9..0f395dadce 100644
--- a/Modules/DiffusionImaging/Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h
+++ b/Modules/DiffusionImaging/Algorithms/mitkPartialVolumeAnalysisClusteringCalculator.h
@@ -1,521 +1,521 @@
 /*========================================================================
 Copyright (c) German Cancer Research Center, Division of Medical and
 Biological Informatics. All rights reserved.
 See MITKCopyright.txt or http://www.mitk.org/copyright.html for details.
 
 This software is distributed WITHOUT ANY WARRANTY; without even
 the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
 PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
 
 
 #ifndef _MITK_PartialVolumeAnalysisClusteringCalculator_H
 #define _MITK_PartialVolumeAnalysisClusteringCalculator_H
 
 #include "MitkDiffusionImagingExports.h"
 
 #include "mitkCommon.h"
 #include "mitkImage.h"
 
 #include <itkObject.h>
 #include <itkObjectFactory.h>
 #include <itkImage.h>
 #include <itkRGBAPixel.h>
 
 #include <vnl/vnl_vector.h>
 
 namespace mitk
 {
 
   class MitkDiffusionImaging_EXPORT PartialVolumeAnalysisClusteringCalculator : public itk::Object
   {
   public:
 
     typedef vnl_vector<double> VecType;
     typedef mitk::Image::HistogramType MitkHistType;
 
     class HistType
     {
     public:
 
       HistType()
       {
       }
 
       HistType(const HistType& p)
       {
         this->xVals = p.xVals;
         this->hVals = p.hVals;
       }
 
       ~HistType()
       {
       }
 
       HistType operator= (const HistType& p)
                          {
         if (this != &p) // protect against invalid self-assignment
         {
           this->xVals = p.xVals;
           this->hVals = p.hVals;
         }
         return *this;
       }
 
       void InitByMitkHistogram(const MitkHistType* histogram)
       {
         xVals.set_size(histogram->GetSize()[0]);
         hVals.set_size(histogram->GetSize()[0]);
         double sum = histogram->GetTotalFrequency();
         MitkHistType::ConstIterator endIt = histogram->End();
         MitkHistType::ConstIterator it;
         bool firstNonEmptyBinFound = false;
         it = histogram->Begin();
         //++it;
         int i=0;
         while (it != endIt)
         {
           if(it.GetFrequency() || firstNonEmptyBinFound)
           {
             firstNonEmptyBinFound = true;
             xVals(i) = it.GetMeasurementVector().GetElement(0);
             hVals(i) = it.GetFrequency()/sum;
           }
           ++i;
           ++it;
         }
 
       }
 
       void SetXVals(VecType x)
       {xVals = x;}
 
       void SetHVals(VecType h)
       {hVals = h;}
 
       void SetXVals(std::vector<double> x)
       {
         int s = x.size();
         xVals.set_size(s);
         for(int i=0; i<s; i++)
         {
           xVals(i) = x[i];
         }
       }
 
       void SetHVals(std::vector<double> h)
       {
         int s = h.size();
         hVals.set_size(s);
         for(int i=0; i<s; i++)
         {
           hVals(i) = h[i];
         }
       }
 
       std::vector<double>* GetXVals()
       {
         int s = xVals.size();
         std::vector<double>* retval = new std::vector<double>(s);
         for(int i=0; i<s; i++)
         {
           (*retval)[i] = xVals(i);
         }
         return retval;
       }
 
       std::vector<double>* GetHVals()
       {
         int s = hVals.size();
         std::vector<double>* retval = new std::vector<double>(s);
         for(int i=0; i<s; i++)
         {
           (*retval)[i] = hVals(i);
         }
         return retval;
       }
 
       void Print(int nr=10)
       {
         int sz = xVals.size();
         int incr = (int)((1.0*sz)/(1.0*nr));
         MITK_INFO << "HISTOGRAM" << std::endl;
         MITK_INFO << "xVals: ";
         for(int i=0; i<sz; i = i+incr)
         {
           std::cout << xVals(i) << " ";
         }
         MITK_INFO << std::endl;
         MITK_INFO << "hVals: ";
         for(int i=0; i<sz; i = i+incr)
         {
           std::cout << hVals(i) << " ";
         }
         MITK_INFO << std::endl;
       }
 
       VecType xVals;
       VecType hVals;
     };
 
     class ClusterResultType
     {
     public:
 
       //      ClusterResultType()
       //      {
       //        vals.push_back(VecType());
       //        vals.push_back(VecType());
       //        mixedVals.push_back(VecType());
       //      }
 
       ClusterResultType(int sz)
       {
         vals.push_back(VecType(sz));
         vals.push_back(VecType(sz));
         mixedVals.push_back(VecType(sz));
         combiVals.set_size(sz);
       }
 
       ~ClusterResultType()
       {
       }
 
 //      ClusterResultType operator= (const ClusterResultType *p)
 //      {
 
 //        MITK_INFO << "AOJHIFAHFOF";
 //        if (this != &p) // protect against invalid self-assignment
 //        {
 //          MITK_INFO << "HRRRHRHRR";
 //          this->vals.clear();
 //          this->mixedVals.clear();
 
 //          int s = p.vals.size();
 //          for(int i=0; i<s;i++)
 //          {
 //            VecType v = p.vals[i];
 //            this->vals.push_back(v);
 //          }
 
 //          s = p.mixedVals.size();
 //          for(int i=0; i<s;i++)
 //          {
 //            VecType v = p.mixedVals[i];
 //            this->mixedVals.push_back(v);
 //          }
 
 //          this->combiVals = p.combiVals;
 //        }
 //        return *this;
 //      }
 
       void Initialize (const ClusterResultType *p)
       {
         if (this != p) // protect against invalid self-assignment
         {
           this->vals.clear();
           this->mixedVals.clear();
 
           int s = p->vals.size();
           for(int i=0; i<s;i++)
           {
             VecType v = p->vals[i];
             this->vals.push_back(v);
           }
 
           s = p->mixedVals.size();
           for(int i=0; i<s;i++)
           {
             VecType v = p->mixedVals[i];
             this->mixedVals.push_back(v);
           }
 
           this->combiVals = p->combiVals;
         }
       }
 
       std::vector<double> GetFiberVals()
       {
-        if(vals.size()==2 && vals[0].data_block())
+        if(vals.size()==2 && vals[1].data_block())
         {
-          int s = vals[0].size();
+          int s = vals[1].size();
           std::vector<double> retval(s);
           for(int i=0; i<s; i++)
           {
-            retval[i] = vals[0](i);
+            retval[i] = vals[1](i);
           }
           return retval;
         }
         else
         {
           MITK_ERROR << "GetFiberVals() struct not initialized!!";
           return std::vector<double>(0);
         }
       }
 
       std::vector<double> GetNonFiberVals()
       {
-        if(vals.size()==2 && vals[1].data_block())
+        if(vals.size()==2 && vals[0].data_block())
         {
-          int s = vals[1].size();
+          int s = vals[0].size();
           std::vector<double> retval(s);
           for(int i=0; i<s; i++)
           {
-            retval[i] = vals[1](i);
+            retval[i] = vals[0](i);
           }
           return retval;
         }
         else
         {
           MITK_ERROR << "GetNonFiberVals() struct not initialized!!";
           return std::vector<double>(0);
         }
       }
 
       std::vector<double> GetMixedVals()
       {
         if(mixedVals.size()==1 && mixedVals[0].data_block())
         {
           int s = mixedVals[0].size();
           std::vector<double> retval(s);
           for(int i=0; i<s; i++)
           {
             retval[i] = mixedVals[0](i);
           }
           return retval;
         }
         else
         {
           MITK_ERROR << "GetMixedVals() struct not initialized!!";
           return std::vector<double>(0);
         }
       }
 
       std::vector<double> GetCombiVals()
       {
         if(combiVals.data_block())
         {
           int s = combiVals.size();
           std::vector<double> retval(s);
           for(int i=0; i<s; i++)
           {
             retval[i] = combiVals(i);
           }
           return retval;
         }
         else
         {
           MITK_ERROR << "GetCombiVals() struct not initialized!!";
           return std::vector<double>(0);
         }
       }
 
 
       void Print(VecType vec, int nr=10)
       {
         int sz = vec.size();
         int incr = (int)((1.0*sz)/(1.0*nr));
         for(int i=0; i<sz; i = i+incr)
         {
           std::cout << vec(i) << " ";
         }
         std::cout << std::endl;
       }
 
       void Print(int nr=10)
       {
         MITK_INFO << "CURVES" << std::endl;
         MITK_INFO << "Fiber Vals: ";
         Print(vals[0],nr);
         MITK_INFO << "Non-Fiber Vals: ";
         Print(vals[1],nr);
         MITK_INFO << "Mixed Vals: ";
         Print(mixedVals[0],nr);
         MITK_INFO << "Combined Vals: ";
         Print(combiVals,nr);
       }
 
       std::vector<VecType> vals;
       std::vector<VecType> mixedVals;
       VecType combiVals;
 
     };
 
     class ParamsType
     {
     public:
       ParamsType()
       {
       }
 
       ~ParamsType()
       {
       }
 
       void Initialize(const ParamsType *p)
                            {
         if (this != p) // protect against invalid self-assignment
         {
           means[0] = p->means[0];
           means[1] = p->means[1];
           sigmas[0] = p->sigmas[0];
           sigmas[1] = p->sigmas[1];
           ps[0] = p->ps[0];
           ps[1] = p->ps[1];
         }
       }
 
       void Print()
       {
         MITK_INFO << "PARAMS" << std::endl;
         MITK_INFO << "Class 1:     " << means[0] << " +- " << sqrt(sigmas[0]) << " (p=" << ps[0] << ")" << std::endl;
         MITK_INFO << "Class 2:     " << means[1] << " +- " << sqrt(sigmas[1]) << " (p=" << ps[1] << ")" << std::endl;
         MITK_INFO << "Partial V: p=" << 1.0-ps[0]-ps[1] << std::endl;
       }
 
       double means[2];
       double sigmas[2];
       double ps[2];
     };
 
     struct HelperStructClusteringResults
     {
       MitkHistType *interestingHist;
       MitkHistType *totalHist;
       double p_interesting;
     };
 
     struct HelperStructRGBChannels
     {
       mitk::Image::Pointer r;
       mitk::Image::Pointer g;
       mitk::Image::Pointer b;
 
       ~HelperStructRGBChannels()
       {
         r = 0;
         g = 0;
         b = 0;
       }
     };
 
     struct HelperStructPerformRGBClusteringRetval
     {
       HelperStructRGBChannels *rgbChannels;
       mitk::Image::Pointer rgb;
 
       ParamsType *params;
       ClusterResultType *result;
       HistType *hist;
 
       HelperStructPerformRGBClusteringRetval() :
           rgbChannels(0), params(0), result(0), hist(0)
       {
       }
 
       ~HelperStructPerformRGBClusteringRetval()
       {
         rgb = 0;
         delete rgbChannels;
       }
     };
 
     struct HelperStructPerformClusteringRetval
     {
       mitk::Image::Pointer clusteredImage;
       mitk::Image::Pointer displayImage;
 
       ParamsType *params;
       ClusterResultType *result;
       HistType *hist;
 
       HelperStructPerformClusteringRetval() :
           clusteredImage(0), displayImage(0),
           params(0), result(0), hist(0)
       {
       }
 
       ~HelperStructPerformClusteringRetval()
       {
         clusteredImage = 0;
         displayImage = 0;
       }
     };
 
     mitkClassMacro( PartialVolumeAnalysisClusteringCalculator, itk::Object )
         itkNewMacro( PartialVolumeAnalysisClusteringCalculator )
 
         ParamsType *InitialGuess(HistType h) const;
 
     ParamsType *Cluster(const HistType h, ParamsType* initialGuess) const;
 
     ClusterResultType CalculateCurves(ParamsType params, VecType xVals) const;
 
     void Normalize(ParamsType params, ClusterResultType* curves) const;
 
     HelperStructPerformClusteringRetval* PerformClustering(mitk::Image::ConstPointer image, const MitkHistType *histogram, int classIdent, HelperStructPerformClusteringRetval* precResult = 0) const;
 
     HelperStructPerformRGBClusteringRetval* PerformRGBClustering(mitk::Image::ConstPointer image, const MitkHistType *histogram) const;
 
     HelperStructPerformClusteringRetval* PerformQuantiles(mitk::Image::ConstPointer image, const MitkHistType *histogram, double p1, double p2) const;
 
     HelperStructPerformRGBClusteringRetval* PerformRGBQuantiles(mitk::Image::ConstPointer image, const MitkHistType *histogram, double p1, double p2 ) const;
 
     double* PerformQuantification(mitk::Image::ConstPointer image, mitk::Image::Pointer clusteredImage, mitk::Image::Pointer mask = 0) const;
 
     mitk::Image::Pointer CaculateAngularErrorImage(
         mitk::Image::Pointer comp1, mitk::Image::Pointer comp2, mitk::Image::Pointer probImg) const;
 
     template < typename TPixel, unsigned int VImageDimension >
         void InternalGenerateRGB(
             const itk::Image< TPixel, VImageDimension > *image,
             HelperStructRGBChannels *rgb, mitk::Image::Pointer retval ) const;
 
     template < typename TPixel, unsigned int VImageDimension >
         void InternalGenerateProbabilityImage(
             const itk::Image< TPixel, VImageDimension > *image,
             const HelperStructClusteringResults clusterResults,
             mitk::Image::Pointer outImage1, mitk::Image::Pointer outImage2 ) const;
 
     template < typename TPixel, unsigned int VImageDimension >
         void InternalQuantify(
             const itk::Image< TPixel, VImageDimension > *image,
             mitk::Image::ConstPointer clusteredImage, double* retval, mitk::Image::Pointer mask ) const;
 
     template < typename TPixel, unsigned int VImageDimension >
         void InternalGenerateQuantileImage(
             const itk::Image< TPixel, VImageDimension > *image,
             double* q,
             mitk::Image::Pointer outImage1, mitk::Image::Pointer outImage2 ) const;
 
     ParamsType* Cluster(const HistType h) const
     {return Cluster(h, InitialGuess(h));}
 
     void SetMaxIt(unsigned int it)
     { m_MaxIt = it; }
 
     unsigned int GetMaxIt()
     { return m_MaxIt; }
 
     void SetStepsNumIntegration(unsigned int n)
     { m_StepsNumIntegration = n; }
 
     unsigned int GetStepsNumIntegration()
     { return m_StepsNumIntegration; }
 
   protected:
 
     PartialVolumeAnalysisClusteringCalculator();
 
     virtual ~PartialVolumeAnalysisClusteringCalculator();
 
     unsigned int m_MaxIt;
     unsigned int m_StepsNumIntegration;
 
   };
 
 }
 
 #endif // #define _MITK_PartialVolumeAnalysisClusteringCalculator_H