Merge branch 'VTK6_Qt5' into VTK6_Qt5_LineProfile

Conflicts:
	vv/vvToolProfile.cxx

diff --cc vv/CMakeLists.txt
Simple merge

diff --cc vv/vvMainWindow.cxx
Simple merge

diff --cc vv/vvSlicer.cxx
Simple merge

diff --cc vv/vvToolProfile.cxx
index f0c47d56e377748ec962bf247f492943cdc374ea,ff0e220a7e9a70b81cee564d8eb08dee4ea44201..e269fff7aeacbd9f65c1a8fd259a747ee37650d8
--- 1/vv/vvToolProfile.cxx
--- 2/vv/vvToolProfile.cxx
+++ b/vv/vvToolProfile.cxx
@@@ -127,8 -109,6 +128,7 @@@ void vvToolProfile::selectPoint1(
  {
    QString position = "";
    
-       cout << mCurrentSlicerManager->GetSelectedSlicer() << endl;
 +  if(mCurrentSlicerManager) {
      if (mPoint1Selected) {
        ProfileWidget->hide();
        vtkSmartPointer<vtkChartXY> chart = vtkSmartPointer<vtkChartXY>::New();
@@@ -265,14 -242,15 +265,16 @@@ void vvToolProfile::computeProfile(
      mFilter->SetInputVVImage(mCurrentImage);
      mFilter->SetArgsInfo(mArgsInfo);
      mFilter->Update();
 -    //mImageLine = mFilter->GetOutputVVImage();
      
++    //Creation of the XY chart
      vtkSmartPointer<vtkTable> table = vtkSmartPointer<vtkTable>::New();
      vtkSmartPointer<vtkFloatArray> arrX = vtkSmartPointer<vtkFloatArray>::New();
      vtkSmartPointer<vtkFloatArray> arrY = vtkSmartPointer<vtkFloatArray>::New();
      arrX = mFilter->GetArrayX();
      arrY = mFilter->GetArrayY();
-     arrX->SetName("Voxel");
+     arrX->SetName("Distance (mm)");
      arrY->SetName("Intensity");
++    
      table->AddColumn(arrX);
      table->AddColumn(arrY);
      
@@@ -505,7 -480,7 +509,7 @@@ void vvToolProfile::SaveAs(
          fileOpen << endl;
     
          while (i<arrX->GetNumberOfTuples()) {
--            fileOpen << arrX->GetTuple(i)[0] << "\t" << arrY->GetTuple(i)[0] << "\t" ;
++            fileOpen << i << "\t" << arrY->GetTuple(i)[0] << "\t" ;
        
              coords->GetTuple(i, tuple);
              for (int j=0; j<mCurrentSlicerManager->GetImage()->GetNumberOfDimensions() ; ++j) {

diff --cc vv/vvToolProfile.h
Simple merge