From: tbaudier <thomas.baudier@creatis.insa-lyon.fr>
Date: Fri, 5 Feb 2016 15:57:24 +0000 (+0100)
Subject: Merge branch 'VTK6_Qt5' into VTK6_Qt5_LineProfile
X-Git-Tag: v1.4.0~71
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=eab384b4509ea170c55a307b9eb484e70c636bba;p=clitk.git

Merge branch 'VTK6_Qt5' into VTK6_Qt5_LineProfile

Conflicts:
	vv/vvToolProfile.cxx
---

eab384b4509ea170c55a307b9eb484e70c636bba
diff --cc vv/vvToolProfile.cxx
index f0c47d5,ff0e220..e269fff
--- a/vv/vvToolProfile.cxx
+++ b/vv/vvToolProfile.cxx
@@@ -127,8 -109,6 +128,7 @@@ void vvToolProfile::selectPoint1(
  {
    QString position = "";
    
 +  if(mCurrentSlicerManager) {
-       cout << mCurrentSlicerManager->GetSelectedSlicer() << endl;
      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) {