diff --git a/src/Cxx/IO/TransientHDFReader.cxx b/src/Cxx/IO/TransientHDFReader.cxx index bd5328eb7015fb114ed0700c699d8865780f4fc9..53e86e729e6360dd492c72eabf04a4d5f7b4499e 100644 --- a/src/Cxx/IO/TransientHDFReader.cxx +++ b/src/Cxx/IO/TransientHDFReader.cxx @@ -1,4 +1,3 @@ -#include <cstdlib> #include <vtkCallbackCommand.h> #include <vtkCommand.h> #include <vtkDiscretizableColorTransferFunction.h> @@ -16,13 +15,16 @@ #include <vtkRenderWindowInteractor.h> #include <vtkRenderer.h> +#include <cstdlib> + namespace { vtkNew<vtkDiscretizableColorTransferFunction> GetCTF(); + void Animate(vtkObject* caller, unsigned long eid, void* clientdata, void* calldata); } // namespace -int main(int ac, char** av) +int main(int ac, char* av[]) { if (ac != 2) { @@ -37,7 +39,7 @@ int main(int ac, char** av) vtkNew<vtkHDFReader> reader; reader->SetFileName(av[1]); reader->Update(); - std::cout << "number of steps: " << reader->GetNumberOfSteps() << endl; + std::cout << "Number of steps: " << reader->GetNumberOfSteps() << endl; auto polydata = vtkPolyData::SafeDownCast(reader->GetOutput()); // Render the dataset. @@ -61,14 +63,15 @@ int main(int ac, char** av) renWin->SetSize(1024, 512); renWin->Render(); + // Add the interactor. + vtkNew<vtkRenderWindowInteractor> iren; + iren->SetRenderWindow(renWin); + // Add the animation callback. vtkNew<vtkCallbackCommand> command; command->SetCallback(&Animate); command->SetClientData(reader); - // Add the interactor. - vtkNew<vtkRenderWindowInteractor> iren; - iren->SetRenderWindow(renWin); iren->AddObserver(vtkCommand::TimerEvent, command); iren->CreateRepeatingTimer(50); diff --git a/src/Python/IO/TransientHDFReader.py b/src/Python/IO/TransientHDFReader.py index e1015b53fbeb99f39d3aebecfd11ef49e612fe38..1fc7e958447bc672f1f4e270012067f99fcabc6f 100755 --- a/src/Python/IO/TransientHDFReader.py +++ b/src/Python/IO/TransientHDFReader.py @@ -35,7 +35,7 @@ def main(): reader = vtkHDFReader() reader.SetFileName(fn) reader.Update() - print('number of steps: ', reader.GetNumberOfSteps()) + print('Number of steps: ', reader.GetNumberOfSteps()) polydata = reader.GetOutput() # Render the dataset @@ -63,6 +63,7 @@ def main(): iren = vtkRenderWindowInteractor() iren.SetRenderWindow(ren_win) iren.CreateRepeatingTimer(50) + # Add the animation callback observer = AnimationObserver(iren, reader) iren.AddObserver('TimerEvent', observer) @@ -137,8 +138,8 @@ class AnimationObserver(object): self.reader = reader def __call__(self, caller, ev): - x = 0 if (self.reader.GetStep() == self.reader.GetNumberOfSteps() - 1) else self.reader.GetStep() + 1 - self.reader.SetStep(x) + step = 0 if (self.reader.GetStep() == self.reader.GetNumberOfSteps() - 1) else self.reader.GetStep() + 1 + self.reader.SetStep(step) print('Current step: ', self.reader.GetStep()) self.reader.Update() self.interactor.Render()