diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt
index 8462ed4..ed6a565 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/CMakeLists.txt
@@ -1,10 +1,10 @@
 # The project name must correspond to the directory name of your plug-in
 # and must not contain periods.
 project(org_mitk_gui_qt_diffusionimaging_fiberprocessing)
 
 mitk_create_plugin(
   SUBPROJECTS MITK-Diffusion
   EXPORT_DIRECTIVE DIFFUSIONIMAGING_FIBERPROCESSING_EXPORT
   EXPORTED_INCLUDE_SUFFIXES src
-  MODULE_DEPENDS MitkFiberTracking MitkMriSimulation MitkChart MitkMultilabel MitkModelFit
+  MODULE_DEPENDS MitkFiberTracking MitkMriSimulation MitkChart MitkMultilabel MitkModelFit MitkQtWidgetsExt
 )
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp
index bdf3d71..a1e80fc 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.cpp
@@ -1,15 +1,583 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center.
 
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
+
+
+
+// Blueberry
+#include <berryISelectionService.h>
+#include <berryIWorkbenchPart.h>
+#include <berryIWorkbenchWindow.h>
+
+// Qmitk
+#include "QmitkInteractiveFiberDissectionView.h"
+#include <QmitkRenderWindow.h> //Pointset
+#include <QmitkPointListWidget.h> //Pointset
+
+#include <QMessageBox>
+
+#include <mitkNodePredicateProperty.h>
+#include <mitkImageCast.h>
+#include <mitkPointSet.h>
+#include <mitkImageAccessByItk.h>
+#include <mitkDataNodeObject.h>
+#include <mitkTensorImage.h>
+
+#include <mitkInteractionConst.h>
+#include "usModuleRegistry.h"
+//#include <itkFiberCurvatureFilter.h>
+
+#include "mitkNodePredicateDataType.h"
+#include <mitkNodePredicateProperty.h>
+#include <mitkNodePredicateAnd.h>
+#include <mitkNodePredicateNot.h>
+#include <mitkNodePredicateOr.h>
+
+#include <itkResampleImageFilter.h>
+#include <itkGaussianInterpolateImageFunction.h>
+#include <itkImageRegionIteratorWithIndex.h>
+#include <itkTractsToFiberEndingsImageFilter.h>
+#include <itkTractDensityImageFilter.h>
+#include <itkImageRegion.h>
+#include <itkTractsToRgbaImageFilter.h>
+#include <itkFiberExtractionFilter.h>
+
+#include <mitkInteractionEventObserver.h>
+#include <vtkCellPicker.h>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+
+#include <vnl/vnl_sparse_matrix.h>
+
+const std::string QmitkInteractiveFiberDissectionView::VIEW_ID = "org.mitk.views.interactivefiberdissection";
+const std::string id_DataManager = "org.mitk.views.datamanager";
+using namespace mitk;
+
+QmitkInteractiveFiberDissectionView::QmitkInteractiveFiberDissectionView()
+  : QmitkAbstractView()
+  , m_Controls( 0 )
+  , m_IterationCounter(0)
+{
+
+}
+
+// Destructor
+QmitkInteractiveFiberDissectionView::~QmitkInteractiveFiberDissectionView()
+{
+
+}
+
+void QmitkInteractiveFiberDissectionView::CreateQtPartControl( QWidget *parent )
+{
+  // build up qt view, unless already done
+  if ( !m_Controls )
+  {
+    // create GUI widgets from the Qt Designer's .ui file
+    m_Controls = new Ui::QmitkInteractiveFiberDissectionViewControls;
+    m_Controls->setupUi( parent );
+    m_Controls->m_selectedPointSetWidget->SetDataStorage(GetDataStorage());//pointset
+    m_Controls->m_selectedPointSetWidget->SetNodePredicate(mitk::NodePredicateAnd::New(//pointset
+      mitk::TNodePredicateDataType<mitk::PointSet>::New(),//pointset
+      mitk::NodePredicateNot::New(mitk::NodePredicateOr::New(//pointset
+        mitk::NodePredicateProperty::New("helper object"),//pointset
+        mitk::NodePredicateProperty::New("hidden object")))));//pointset
+
+    m_Controls->m_selectedPointSetWidget->SetSelectionIsOptional(true);//pointset
+    m_Controls->m_selectedPointSetWidget->SetAutoSelectNewNodes(true);//pointset
+    m_Controls->m_selectedPointSetWidget->SetEmptyInfo(QString("Please select a point set"));//pointset
+    m_Controls->m_selectedPointSetWidget->SetPopUpTitel(QString("Select point set"));//pointset
+
+    connect(m_Controls->m_ErazorButton, SIGNAL( clicked() ), this, SLOT( RemovefromBundle() ) ); //need
+    connect(m_Controls->m_HighlighterButton, SIGNAL( clicked() ), this, SLOT( AddtoBundle() ) ); //need
+
+    connect(m_Controls->m_StreamlineCreation, SIGNAL( clicked() ), this, SLOT( CreateStreamline()));
+
+    connect(m_Controls->m_AddRandomFibers, SIGNAL( clicked() ), this, SLOT( ExtractRandomFibersFromTractogram() ) ); //need
+
+
+
+
+    connect(m_Controls->m_addPointSetPushButton, &QPushButton::clicked,//pointset
+      this, &QmitkInteractiveFiberDissectionView::OnAddPointSetClicked);//pointset
+    connect(m_Controls->m_selectedPointSetWidget, &QmitkSingleNodeSelectionWidget::CurrentSelectionChanged,//pointset
+      this, &QmitkInteractiveFiberDissectionView::OnCurrentSelectionChanged);//pointset
+
+
+
+
+    auto renderWindowPart = this->GetRenderWindowPart();//pointset
+    if (nullptr != renderWindowPart)//pointset
+      this->RenderWindowPartActivated(renderWindowPart);//pointset
+    this->OnCurrentSelectionChanged(m_Controls->m_selectedPointSetWidget->GetSelectedNodes());//pointset
+
+  }
+
+  UpdateGui();
+}
+
+
+void QmitkInteractiveFiberDissectionView::SetFocus()
+{
+  m_Controls->toolBoxx->setFocus();
+  //m_Controls->m_addPointSetPushButton->setFocus();//pointset
+}
+
+void QmitkInteractiveFiberDissectionView::UpdateGui()
+{
+  m_Controls->m_FibLabel->setText("<font color='red'>mandatory</font>");
+  m_Controls->m_InputData->setTitle("Please Select Input Data");
+
+   // disable alle frames
+
+  m_Controls->m_ErazorButton->setEnabled(false);
+  m_Controls->m_HighlighterButton->setEnabled(false);
+
+
+  m_Controls->m_addPointSetPushButton->setEnabled(false);
+  m_Controls->m_StreamlineCreation->setEnabled(false);
+  m_Controls->m_StreamtoTractogram->setEnabled(false);
+  m_Controls->m_TrainClassifier->setEnabled(false);
+  m_Controls->m_CreatePrediction->setEnabled(false);
+  m_Controls->m_CreateUncertantyMap->setEnabled(false);
+  m_Controls->m_Numtolabel->setEnabled(false);
+  m_Controls->m_addPointSetPushButton->setEnabled(false);
+  m_Controls->m_AddRandomFibers->setEnabled(false);
+
+  bool fibSelected = !m_SelectedFB.empty();
+  bool multipleFibsSelected = (m_SelectedFB.size()>1);
+  bool sthSelected = m_SelectedImageNode.IsNotNull();
+  bool psSelected = m_SelectedPS.IsNotNull();
+  bool nfibSelected = !m_negativeSelectedBundles.empty();
+
+  // toggle visibility of elements according to selected method
+
+
+  // are fiber bundles selected?
+  if ( fibSelected )
+  {
+    m_Controls->m_FibLabel->setText(QString(m_SelectedFB.at(0)->GetName().c_str()));
+    m_Controls->m_addPointSetPushButton->setEnabled(true);
+    m_Controls->m_AddRandomFibers->setEnabled(true);
+
+
+
+    // more than two bundles needed to join/subtract
+    if (multipleFibsSelected)
+    {
+      m_Controls->m_FibLabel->setText("multiple bundles selected");
+    }
+
+
+
+  }
+
+
+  // is image selected
+  if (sthSelected)
+  {
+    m_Controls->m_addPointSetPushButton->setEnabled(true);
+  }
+
+  if (psSelected)
+  {
+      m_Controls->m_StreamlineCreation->setEnabled(true);
+  }
+
+  if (nfibSelected)
+  {
+      m_Controls->m_HighlighterButton->setEnabled(true);
+      m_Controls->m_ErazorButton->setEnabled(true);
+  }
+
+
+
+}
+
+void QmitkInteractiveFiberDissectionView::OnEndInteraction()
+{
+
+}
+
+void QmitkInteractiveFiberDissectionView::OnAddPointSetClicked()//pointset
+{
+  // ask for the name of the point set
+  bool ok = false;
+  QString name = QInputDialog::getText(QApplication::activeWindow(),
+    tr("Add point set..."), tr("Enter name for the new point set"), QLineEdit::Normal, tr("PointSet").arg(++m_IterationCounter), &ok);
+//  QString name = "PointSet";
+  if (!ok || name.isEmpty())
+  {
+    return;
+  }
+  mitk::PointSet::Pointer pointSet = mitk::PointSet::New();
+  mitk::DataNode::Pointer pointSetNode = mitk::DataNode::New();
+  pointSetNode->SetData(pointSet);
+  pointSetNode->SetProperty("name", mitk::StringProperty::New(name.toStdString()));
+  pointSetNode->SetProperty("opacity", mitk::FloatProperty::New(1));
+  pointSetNode->SetColor(1.0, 1.0, 0.0);
+  this->GetDataStorage()->Add(pointSetNode, m_SelectedImageNode);
+
+  m_Controls->m_selectedPointSetWidget->SetCurrentSelectedNode(pointSetNode);
+}
+
+void QmitkInteractiveFiberDissectionView::OnCurrentSelectionChanged(QmitkSingleNodeSelectionWidget::NodeList /*nodes*/)//pointset
+{
+
+  m_Controls->m_poinSetListWidget->SetPointSetNode(m_Controls->m_selectedPointSetWidget->GetSelectedNode());
+  m_SelectedPS = m_Controls->m_selectedPointSetWidget->GetSelectedNode();
+
+  UpdateGui();
+
+}
+
+void QmitkInteractiveFiberDissectionView::OnSelectionChanged(berry::IWorkbenchPart::Pointer /*part*/, const QList<mitk::DataNode::Pointer>& nodes)
+{
+
+    m_SelectedFB.clear();
+
+    if (nodes.empty() || nodes.front().IsNull())
+    {
+      m_SelectedImageNode = nullptr;
+    }
+    else
+    {
+      m_SelectedImageNode = nodes.front();
+    }
+
+
+
+    for (auto node: nodes)
+    {
+      if (dynamic_cast<mitk::Image*>(node->GetData()))
+          m_SelectedImage = dynamic_cast<mitk::Image*>(node->GetData());
+      else if ( dynamic_cast<mitk::FiberBundle*>(node->GetData()) )
+          m_SelectedFB.push_back(node);
+    }
+
+
+
+    UpdateGui();
+}
+
+void QmitkInteractiveFiberDissectionView::RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart)//pointset
+{
+  if (nullptr != m_Controls)
+  {
+    m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController());
+    m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController());
+    m_Controls->m_poinSetListWidget->AddSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController());
+  }
+}
+
+void QmitkInteractiveFiberDissectionView::RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart)//pointset
+{
+  if (nullptr != m_Controls)
+  {
+    m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("axial")->GetSliceNavigationController());
+    m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("sagittal")->GetSliceNavigationController());
+    m_Controls->m_poinSetListWidget->RemoveSliceNavigationController(renderWindowPart->GetQmitkRenderWindow("coronal")->GetSliceNavigationController());
+  }
+}
+
+void QmitkInteractiveFiberDissectionView::CreateStreamline()
+{
+
+    if (m_positivSelectedBundles.empty())
+    {
+        mitk::DataNode::Pointer node = mitk::DataNode::New();
+
+        m_positiveFibersData = vtkSmartPointer<vtkPolyData>::New();
+        m_positiveFibersData->SetPoints(vtkSmartPointer<vtkPoints>::New());
+        m_positiveFibersData->SetLines(vtkSmartPointer<vtkCellArray>::New());
+        m_positiveBundle = mitk::FiberBundle:: New(m_positiveFibersData);
+
+        node->SetData( m_positiveBundle );
+        m_positivSelectedBundles.push_back(node);
+        MITK_INFO << m_positivSelectedBundles.size();
+        this->GetDataStorage()->Add(m_positivSelectedBundles.at(0));
+      MITK_INFO << "Create Bundle";
+    }
+
+    if (!m_positivSelectedBundles.empty())
+    {
+        this->GetDataStorage()->Remove(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1));
+        MITK_INFO << "Adding fibers";
+    }
+
+
+    mitk::PointSet::Pointer pointSet = dynamic_cast<mitk::PointSet *>(m_SelectedPS->GetData());
+
+    vnl_matrix<float> streamline;
+    streamline.set_size(3, pointSet->GetSize());
+    streamline.fill(0.0);
+
+
+    mitk::PointSet::PointsIterator begin = pointSet->Begin();
+    mitk::PointSet::PointsIterator end = pointSet->End();
+    unsigned int i;
+    mitk::PointSet::PointsContainer::Iterator it;
+
+    for (it = begin, i = 0; it != end; ++it, ++i)
+    {
+        PointSet::PointType pt = pointSet->GetPoint(it->Index());
+        vnl_vector_fixed< float, 3 > candV;
+        candV[0]=pt[0]; candV[1]=pt[1]; candV[2]=pt[2];
+        streamline.set_column(i, candV);
+    }
+
+
+
+
+    vtkSmartPointer<vtkPolyData> vNewPolyData = vtkSmartPointer<vtkPolyData>::New();
+    vtkSmartPointer<vtkCellArray> vNewLines = vtkSmartPointer<vtkCellArray>::New();
+    vtkSmartPointer<vtkPoints> vNewPoints = vtkSmartPointer<vtkPoints>::New();
+
+
+
+    unsigned int counter = 0;
+    for (unsigned int i=0; i<m_positiveFibersData->GetNumberOfCells(); ++i)
+    {
+      vtkCell* cell = m_positiveFibersData->GetCell(i);
+      auto numPoints = cell->GetNumberOfPoints();
+      vtkPoints* points = cell->GetPoints();
+
+      vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
+      for (unsigned int j=0; j<numPoints; ++j)
+      {
+        double p[3];
+        points->GetPoint(j, p);
+
+        vtkIdType id = vNewPoints->InsertNextPoint(p);
+        container->GetPointIds()->InsertNextId(id);
+      }
+
+      vNewLines->InsertNextCell(container);
+      counter++;
+    }
+
+      // build Fiber
+    vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
+
+
+      for (unsigned int j=0; j<streamline.cols(); j++)
+      {
+        double p[3];
+        p[0] = streamline.get(0,j);
+        p[1] = streamline.get(1,j);
+        p[2] = streamline.get(2,j);
+
+        vtkIdType id = vNewPoints->InsertNextPoint(p);
+        container->GetPointIds()->InsertNextId(id);
+      }
+      vNewLines->InsertNextCell(container);
+
+      vNewPolyData->SetPoints(vNewPoints);
+      vNewPolyData->SetLines(vNewLines);
+
+      m_positiveFibersData = vtkSmartPointer<vtkPolyData>::New();
+      m_positiveFibersData->SetPoints(vtkSmartPointer<vtkPoints>::New());
+      m_positiveFibersData->SetLines(vtkSmartPointer<vtkCellArray>::New());
+      m_positiveFibersData->SetPoints(vNewPoints);
+      m_positiveFibersData->SetLines(vNewLines);
+
+      m_positiveBundle = mitk::FiberBundle::New(vNewPolyData);
+      m_positiveBundle->SetTrackVisHeader(dynamic_cast<mitk::Image*>(m_SelectedImageNode->GetData())->GetGeometry());
+      m_positiveBundle->SetFiberColors(255, 255, 255);
+
+
+
+
+      mitk::DataNode::Pointer node = mitk::DataNode::New();
+      node->SetData(m_positiveBundle);
+      node->SetName("+Bundle");
+      m_positivSelectedBundles.push_back(node);
+      MITK_INFO << m_positivSelectedBundles.size();
+
+
+
+      this->GetDataStorage()->Add(m_positivSelectedBundles.at(m_positivSelectedBundles.size()-1));
+
+      UpdateGui();
+
+}
+
+void QmitkInteractiveFiberDissectionView::ExtractRandomFibersFromTractogram()
+{
+     MITK_INFO << "Number of Fibers to extract from Tractogram: ";
+     MITK_INFO << m_Controls->m_NumRandomFibers->value();
+     if (m_negativeSelectedBundles.empty())
+     {
+         mitk::DataNode::Pointer node = mitk::DataNode::New();
+
+         m_negativeFibersData = vtkSmartPointer<vtkPolyData>::New();
+         m_negativeFibersData->SetPoints(vtkSmartPointer<vtkPoints>::New());
+         m_negativeFibersData->SetLines(vtkSmartPointer<vtkCellArray>::New());
+         m_negativeBundle = mitk::FiberBundle:: New(m_negativeFibersData);
+
+         node->SetData( m_negativeBundle );
+         m_negativeSelectedBundles.push_back(node);
+         MITK_INFO << m_negativeSelectedBundles.size();
+    //     this->GetDataStorage()->Add(m_negativeSelectedBundles.at(0));
+    //     UpdateGui();
+       MITK_INFO << "Create Bundle";
+     }
+
+      mitk::FiberBundle::Pointer fib = dynamic_cast<mitk::FiberBundle*>(m_SelectedFB.at(0)->GetData());
+
+    //   mitk::DataNode::Pointer node = mitk::DataNode::New();
+    //   node ->SetData(pi);
+    //   this->GetDataStorage()->Add(cur_bundle);
+
+
+      vtkSmartPointer<vtkPolyData> vNewPolyData = vtkSmartPointer<vtkPolyData>::New();
+      vtkSmartPointer<vtkCellArray> vNewLines = vtkSmartPointer<vtkCellArray>::New();
+      vtkSmartPointer<vtkPoints> vNewPoints = vtkSmartPointer<vtkPoints>::New();
+
+
+      unsigned int counter = 0;
+      for ( int i=0; i<m_Controls->m_NumRandomFibers->value(); i++)
+      {
+        vtkCell* cell = fib->GetFiberPolyData()->GetCell(i);
+        auto numPoints = cell->GetNumberOfPoints();
+        vtkPoints* points = cell->GetPoints();
+
+        vtkSmartPointer<vtkPolyLine> container = vtkSmartPointer<vtkPolyLine>::New();
+        for (unsigned int j=0; j<numPoints; j++)
+        {
+          double p[3];
+          points->GetPoint(j, p);
+
+          vtkIdType id = vNewPoints->InsertNextPoint(p);
+          container->GetPointIds()->InsertNextId(id);
+        }
+    //    weights->InsertValue(counter, fib->GetFiberWeight(i));
+        vNewLines->InsertNextCell(container);
+        counter++;
+      }
+
+
+      vNewPolyData->SetPoints(vNewPoints);
+      vNewPolyData->SetLines(vNewLines);
+
+      m_negativeFibersData = vtkSmartPointer<vtkPolyData>::New();
+      m_negativeFibersData->SetPoints(vtkSmartPointer<vtkPoints>::New());
+      m_negativeFibersData->SetLines(vtkSmartPointer<vtkCellArray>::New());
+      m_negativeFibersData->SetPoints(vNewPoints);
+      m_negativeFibersData->SetLines(vNewLines);
+
+      m_negativeBundle = mitk::FiberBundle::New(vNewPolyData);
+      m_negativeBundle->SetFiberColors(255, 0, 0);
+
+      mitk::DataNode::Pointer node = mitk::DataNode::New();
+      node->SetData(m_negativeBundle);
+      node->SetName("-Bundle");
+      m_negativeSelectedBundles.push_back(node);
+      MITK_INFO << m_negativeSelectedBundles.size();
+
+      this->GetDataStorage()->Add(m_negativeSelectedBundles.at(m_negativeSelectedBundles.size()-1));
+
+    UpdateGui();
+
+
+}
+
+void QmitkInteractiveFiberDissectionView::RemovefromBundle()
+{
+
+//    BaseRenderer *renderer = positionEvent->GetSender();
+
+//    auto positionEvent = dynamic_cast<const InteractionPositionEvent *>(interactionEvent);
+//    MITK_INFO << positionEvent;
+
+//     if (interactionEvent->GetSender()->GetMapperID() == BaseRenderer::Standard2D)
+//     {
+//       MITK_INFO << "2d";
+//     }
+//     else
+//     {
+//       MITK_INFO << "3d";
+//     }
+
+//    auto mapper = GetDataNode()->GetMapper(BaseRenderer::Standard2D);
+//    auto gizmo_mapper = dynamic_cast<mitk::FiberBundle* >(mapper);
+//    auto &picker = m_Picker[renderer];
+
+//    if (picker == nullptr)
+//    {
+//      picker = vtkSmartPointer<vtkCellPicker>::New();
+//      picker->SetTolerance(0.005);
+
+//      if (gizmo_mapper)
+//      { // doing this each time is bizarre
+//        picker->AddPickList(gizmo_mapper->GetVtkProp(renderer));
+//        picker->PickFromListOn();
+//      }
+//    }
+
+//    auto displayPosition = positionEvent->GetPointerPositionOnScreen();
+//    picker->Pick(displayPosition[0], displayPosition[1], 0, positionEvent->GetSender()->GetVtkRenderer());
+
+//    vtkIdType pickedPointID = picker->GetPointId();
+//    if (pickedPointID == -1)
+//    {
+//      return Gizmo::NoHandle;
+//    }
+
+//    vtkPolyData *polydata = gizmo_mapper->GetVtkPolyData(renderer);
+
+//    if (polydata && polydata->GetPointData() && polydata->GetPointData()->GetScalars())
+//    {
+//      double dataValue = polydata->GetPointData()->GetScalars()->GetTuple1(pickedPointID);
+//      return m_Gizmo->GetHandleFromPointDataValue(dataValue);
+//    }
+
+//    return Gizmo::NoHandle;
+
+//    m_picker1 = vtkSmartPointer<vtkCellPicker>::New();
+//    m_picker1->PickFromListOn();
+//    m_picker1->SetTolerance(0.005);
+//    m_picker1->GetCellId();
+//    m_picker1->GetPickedPositions();
+
+////    selPt = m_picker1->GetSelectionPoint();
+////    x = *selPt;
+////    y = *(selPt + 1);
+////    pickPos = m_picker1->GetPickedPositions();
+////    xp = *(pickPos->GetPoint(0));
+////    yp = *(pickPos->GetPoint(0)+1);
+////    zp = *(pickPos->GetPoint(0)+2);
+////    double worldPos[3];
+
+
+//     double* worldPosition = m_picker1->GetPickPosition();
+//    MITK_INFO << m_picker1;
+//    MITK_INFO << m_picker1->GetCellId();
+//    MITK_INFO << m_picker1->GetPickPosition();
+//    MITK_INFO << m_picker1->GetSelectionPoint();
+//    MITK_INFO << worldPosition[0] ;
+//    MITK_INFO << worldPosition[1] ;
+
+//    vtkNew<vtkRenderWindowInteractor> iren;
+
+   UpdateGui();
+}
+
+void QmitkInteractiveFiberDissectionView::OnAddBundle()
+{
+
+  UpdateGui();
+
+}
diff --git a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h
index 0a9e1b6..32059b3 100644
--- a/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h
+++ b/Plugins/org.mitk.gui.qt.diffusionimaging.fiberprocessing/src/internal/QmitkInteractiveFiberDissectionView.h
@@ -1,16 +1,135 @@
 /*===================================================================
 
 The Medical Imaging Interaction Toolkit (MITK)
 
 Copyright (c) German Cancer Research Center.
 
 All rights reserved.
 
 This software is distributed WITHOUT ANY WARRANTY; without
 even the implied warranty of MERCHANTABILITY or FITNESS FOR
 A PARTICULAR PURPOSE.
 
 See LICENSE.txt or http://www.mitk.org for details.
 
 ===================================================================*/
 
+
+
+#ifndef QmitkInteractiveFiberDissectionView_h
+#define QmitkInteractiveFiberDissectionView_h
+#include "ui_QmitkInteractiveFiberDissectionViewControls.h"
+
+#include <QInputDialog> //Pointset
+#include <QmitkPointListWidget.h>//Pointset
+
+#include <QmitkAbstractView.h>//Pointset
+#include <QmitkSingleNodeSelectionWidget.h>//Pointset
+
+
+#include <mitkFiberBundle.h>
+#include <mitkDataInteractor.h>
+#include <mitkIRenderWindowPartListener.h> //Pointset
+
+#include <itkCastImageFilter.h>
+#include <itkVTKImageImport.h>
+#include <itkVTKImageExport.h>
+#include <itkRegionOfInterestImageFilter.h>
+
+#include <vtkLinearExtrusionFilter.h>
+#include <vtkPolyDataToImageStencil.h>
+#include <vtkSelectEnclosedPoints.h>
+#include <vtkImageImport.h>
+#include <vtkImageExport.h>
+#include <vtkImageStencil.h>
+#include <vtkSmartPointer.h>
+#include <vtkSelection.h>
+#include <vtkSelectionNode.h>
+#include <vtkExtractSelectedThresholds.h>
+#include <vtkFloatArray.h>
+#include <vtkCellPicker.h>
+
+/*!
+\brief View to process fiber bundles. Supplies methods to extract fibers from the bundle, fiber resampling, mirroring, join and subtract bundles and much more.
+*/
+class QmitkInteractiveFiberDissectionView : public QmitkAbstractView, public mitk::IRenderWindowPartListener
+{
+  // this is needed for all Qt objects that should have a Qt meta-object
+  // (everything that derives from QObject and wants to have signal/slots)
+  Q_OBJECT
+
+public:
+
+  typedef itk::Image< unsigned char, 3 >    ItkUCharImageType;
+  typedef itk::Image< float, 3 >            ItkFloatImageType;
+
+  static const std::string VIEW_ID;
+
+  QmitkInteractiveFiberDissectionView();
+  virtual ~QmitkInteractiveFiberDissectionView();
+
+  virtual void CreateQtPartControl(QWidget *parent) override;
+
+  ///
+  /// Sets the focus to an internal widget.
+  ///
+  virtual void SetFocus() override;
+
+protected slots:
+
+  void RenderWindowPartActivated(mitk::IRenderWindowPart* renderWindowPart) override; //Pointset
+  void RenderWindowPartDeactivated(mitk::IRenderWindowPart* renderWindowPart) override; //Pointset
+  void OnAddPointSetClicked();//Pointset
+  void CreateStreamline();
+//  void AddtoBundle();
+  void RemovefromBundle();
+  void ExtractRandomFibersFromTractogram();
+
+
+
+
+  void UpdateGui();     ///< update button activity etc. dpending on current datamanager selection
+
+
+
+
+protected:
+  void OnCurrentSelectionChanged(QmitkSingleNodeSelectionWidget::NodeList nodes);//Pointset
+
+
+  virtual void OnSelectionChanged(berry::IWorkbenchPart::Pointer part, const QList<mitk::DataNode::Pointer>& nodes) override;
+
+  void OnEndInteraction();
+  void OnAddBundle();
+
+
+  Ui::QmitkInteractiveFiberDissectionViewControls* m_Controls;
+
+
+
+  int m_IterationCounter;                                      ///< used for data node naming
+
+
+  std::vector<mitk::DataNode::Pointer>  m_SelectedFB;       ///< selected fiber bundle nodes
+
+  mitk::Image::Pointer                  m_SelectedImage;
+  mitk::DataNode::Pointer               m_SelectedPS;
+  mitk::DataNode::Pointer               m_SelectedImageNode;
+  mitk::FiberBundle::Pointer            m_positiveBundle;
+  mitk::FiberBundle::Pointer            m_negativeBundle;
+
+
+  std::vector< mitk::DataNode::Pointer> m_positivSelectedBundles;
+  std::vector< mitk::DataNode::Pointer> m_negativeSelectedBundles;
+  vtkSmartPointer<vtkPolyData>          m_positiveFibersData;
+  vtkSmartPointer<vtkPolyData>          m_negativeFibersData;
+
+  vtkSmartPointer<vtkCellPicker>        m_picker1;
+
+
+};
+
+
+
+#endif // _QMITKFIBERTRACKINGVIEW_H_INCLUDED
+