X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FcreaVtkStreamLineScalarSeg.cpp;h=2106ece6befb68b6d6007049cc92dfd7796a6192;hb=refs%2Fheads%2Fvtk9itk5wx3-macos;hp=95fd4c5f3b11bc5946e311e8f7b9544ffd847ab7;hpb=74204f5cada1add842ffc8488fef62c616ca63e9;p=creaVtk.git

diff --git a/lib/creaVtk/creaVtkStreamLineScalarSeg.cpp b/lib/creaVtk/creaVtkStreamLineScalarSeg.cpp
index 95fd4c5..2106ece 100644
--- a/lib/creaVtk/creaVtkStreamLineScalarSeg.cpp
+++ b/lib/creaVtk/creaVtkStreamLineScalarSeg.cpp
@@ -34,7 +34,7 @@
 // ------------------------------------------------------------------------
 creaVtkStreamLineScalarSeg::creaVtkStreamLineScalarSeg()
 {
-	_vtkidlist 			= vtkIdList::New();
+	_vtkidlist 		= vtkIdList::New();
    _newvtkpolydata	= vtkPolyData::New();	
    _newvtkcellarray	= vtkCellArray::New();	
 }
@@ -79,31 +79,25 @@ void creaVtkStreamLineScalarSeg::Process()
 		printf(".\n ");
 		printf(".\n ");
 	}
-
 	if ((_StreamLinesIn!=NULL) && (_ScalarArrayName!="") )
 	{
 		int iLine;
-
 		_newvtkcellarray->Initialize();
-
-   	vtkCellArray 	*vtkcellarray 		= _StreamLinesIn->GetLines();
-   	int 				nLinesCell 			= vtkcellarray->GetNumberOfCells(); 
+   		vtkCellArray 	*vtkcellarray 		= _StreamLinesIn->GetLines();
+   		int 			nLinesCell 			= vtkcellarray->GetNumberOfCells(); 
 //   	int				vtkcellarraysize 	= vtkcellarray->GetSize();
-   	int 				numberofids; 
-   	int 				ii;
-		vtkDataArray	*scalarArray = _StreamLinesIn->GetPointData()->GetArray( _ScalarArrayName.c_str() );
-
-
-		vtkDoubleArray	*newScalarArray 			= vtkDoubleArray::New();
+   		int 			numberofids; 
+   		int 			ii;
+		vtkDataArray	*scalarArray 		= _StreamLinesIn->GetPointData()->GetArray( _ScalarArrayName.c_str() );
+		vtkDoubleArray	*newScalarArray 	= vtkDoubleArray::New();
 		newScalarArray->SetName( _ScalarArrayName.c_str() );  		
 		newScalarArray->SetNumberOfComponents(1); 
-
   	// FOR EACH LINE
 		double scalarValue;
-		long int iLineNew=0;
-   	ii=0;
-   	for ( iLine=0 ; iLine<nLinesCell ; iLine++ )
-   	{
+		long int iLineNew = 0;
+   		ii=0;
+	   	for ( iLine=0 ; iLine<nLinesCell ; iLine++ )
+	   	{
 			vtkcellarray->GetCell(ii, _vtkidlist );
 			numberofids = _vtkidlist->GetNumberOfIds();
 			scalarValue = scalarArray->GetTuple1(iLine);
@@ -112,24 +106,27 @@ void creaVtkStreamLineScalarSeg::Process()
 				_newvtkcellarray->InsertNextCell( _vtkidlist );
 				newScalarArray->InsertTuple1( iLineNew, scalarValue );
 				iLineNew++;
-			}
-
+			} // if Threshold
 			ii=ii+numberofids+1;
-   	} // for iLine
-
+	   	} // for iLine
 		_newvtkpolydata->SetPoints( _StreamLinesIn->GetPoints() );
 		_newvtkpolydata->SetLines( _newvtkcellarray );
 		int iArrays,arraysSize = _StreamLinesIn->GetPointData()->GetNumberOfArrays();
 		for ( iArrays=0 ; iArrays<arraysSize ; iArrays++ )
 		{	
 			_newvtkpolydata->GetPointData()->AddArray( _StreamLinesIn->GetPointData()->GetArray(iArrays) );
-		}		
+		} // iArrays
 		_newvtkpolydata->GetPointData()->RemoveArray( _ScalarArrayName.c_str() );
 		_newvtkpolydata->GetPointData()->AddArray( newScalarArray );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		_newvtkpolydata->Update();
-
-   	_StreamLinesOut = _newvtkpolydata;
-
+#else
+		_newvtkcellarray->Modified();
+		_newvtkpolydata->Modified();
+//		_newvtkpolydata->BuildCells();
+#endif
+	   	_StreamLinesOut = _newvtkpolydata;
 	} // _StreamLinesIn
 
 }