Using std::vector instead of removed vtksys_stl::vector

[modules/paravis.git] / src / Plugins / DifferenceTimesteps / vtkDifferenceTimestepsFilter.cxx

diff --git a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx
index 7749f9c15e56bbfb9561cd479f88c2c753104f9f..7d6aedd3df8b1bf47123a99e88208e69fe5446f7 100644 (file)
--- a/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx
+++ b/src/Plugins/DifferenceTimesteps/vtkDifferenceTimestepsFilter.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2014  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2015  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -215,7 +215,14 @@ int vtkDifferenceTimestepsFilter::RequestInformation(
   // Update range of indices of the time steps
   this->RangeIndicesTimeSteps[0] = 0;
   this->RangeIndicesTimeSteps[1] = this->NumberTimeSteps - 1;
-
+  
+  /*
+   * RNV: Temporary commented:
+   *      This piece of the code removes all time steps from the output object, 
+   *      but this leads to the strange side effect in the ParaView: time steps also disappears 
+   *      from the animation scene of the input (parent) object of this filter.
+   *      Seems it is a bug of the ParaView, to be investigated ...
+   *
   // The output data of this filter has no time associated with it.
   // It is the result of computation difference between two time steps.
   // Unset the time steps
@@ -225,7 +232,7 @@ int vtkDifferenceTimestepsFilter::RequestInformation(
   // Unset the time range
   if(anOutInfo->Has(vtkStreamingDemandDrivenPipeline::TIME_RANGE()))
     anOutInfo->Remove(vtkStreamingDemandDrivenPipeline::TIME_RANGE());
-
+  */
   return 1;
 }
 
@@ -418,12 +425,13 @@ vtkDataSet* vtkDifferenceTimestepsFilter::DifferenceDataSet(vtkDataSet* theInput
 
     anOutputArray = this->DifferenceDataArray(&anArrays[0], anArrays[0]->GetNumberOfTuples());
     // Determine a field association
-    if (this->GetInputFieldAssociation() == vtkDataObject::FIELD_ASSOCIATION_POINTS)
+    int aTypeFieldAssociation = this->GetInputFieldAssociation();
+    if (aTypeFieldAssociation == vtkDataObject::FIELD_ASSOCIATION_POINTS)
     {
       // For point data
       anOutput->GetPointData()->AddArray(anOutputArray);
     }
-    else if (this->GetInputFieldAssociation() == vtkDataObject::FIELD_ASSOCIATION_CELLS)
+    else if (aTypeFieldAssociation == vtkDataObject::FIELD_ASSOCIATION_CELLS)
     {
       // For cell data
       anOutput->GetCellData()->AddArray(anOutputArray);