From f6a7e2f0bf8640259d0fdaca8c621ac88d2299b0 Mon Sep 17 00:00:00 2001 From: Lucas Givord Date: Mon, 23 Mar 2026 14:35:50 +0100 Subject: [PATCH 1/3] TransientHDFReader : use the correct mapper As warping_spheres file outputs a partitioned polydata, reader will output a vtkPartitionedDataSet. Update the pipeline to use the correct mapper which is vtkCompositePolyDataMapper. --- src/Cxx/IO/TransientHDFReader.cxx | 7 +++---- src/Python/IO/TransientHDFReader.py | 7 +++---- src/PythonicAPI/IO/TransientHDFReader.py | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/src/Cxx/IO/TransientHDFReader.cxx b/src/Cxx/IO/TransientHDFReader.cxx index 0bb465e2771..8bb736352be 100644 --- a/src/Cxx/IO/TransientHDFReader.cxx +++ b/src/Cxx/IO/TransientHDFReader.cxx @@ -10,7 +10,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,11 +42,10 @@ int main(int ac, char* av[]) reader->SetFileName(av[1]); reader->Update(); std::cout << "Number of steps: " << reader->GetNumberOfSteps() << endl; - auto polydata = vtkPolyData::SafeDownCast(reader->GetOutput()); // Render the dataset. - vtkNew mapper; - mapper->SetInputData(polydata); + vtkNew mapper; + mapper->SetInputConnection(reader->GetOutputPort()); mapper->SetLookupTable(GetCTF()); mapper->SetScalarModeToUsePointFieldData(); mapper->SelectColorArray("SpatioTemporalHarmonics"); diff --git a/src/Python/IO/TransientHDFReader.py b/src/Python/IO/TransientHDFReader.py index 63ab0e032c9..787a101154c 100755 --- a/src/Python/IO/TransientHDFReader.py +++ b/src/Python/IO/TransientHDFReader.py @@ -8,7 +8,7 @@ from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackballCamera from vtkmodules.vtkRenderingCore import ( vtkActor, vtkDiscretizableColorTransferFunction, - vtkPolyDataMapper, + vtkCompositePolyDataMapper, vtkRenderWindow, vtkRenderWindowInteractor, vtkRenderer @@ -36,11 +36,10 @@ def main(): reader.SetFileName(fn) reader.Update() print('Number of steps: ', reader.GetNumberOfSteps()) - polydata = reader.GetOutput() # Render the dataset. - mapper = vtkPolyDataMapper() - mapper.SetInputData(polydata) + mapper = vtkCompositePolyDataMapper() + mapper.SetInputConnection(reader.GetOutputPort()) mapper.SetLookupTable(get_ctf()) mapper.SetScalarModeToUsePointFieldData() mapper.SelectColorArray('SpatioTemporalHarmonics') diff --git a/src/PythonicAPI/IO/TransientHDFReader.py b/src/PythonicAPI/IO/TransientHDFReader.py index 2f1acd70375..a34a7c316cb 100755 --- a/src/PythonicAPI/IO/TransientHDFReader.py +++ b/src/PythonicAPI/IO/TransientHDFReader.py @@ -10,7 +10,7 @@ from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackballCamera from vtkmodules.vtkRenderingCore import ( vtkActor, vtkDiscretizableColorTransferFunction, - vtkPolyDataMapper, + vtkCompositePolyDataMapper, vtkRenderWindow, vtkRenderWindowInteractor, vtkRenderer @@ -39,7 +39,7 @@ def main(): print('Number of steps: ', reader.GetNumberOfSteps()) # Render the dataset. - mapper = vtkPolyDataMapper(lookup_table=get_ctf(), + mapper = vtkCompositePolyDataMapper(lookup_table=get_ctf(), scalar_mode=Mapper.ScalarMode.VTK_SCALAR_MODE_USE_POINT_FIELD_DATA) mapper.SelectColorArray('SpatioTemporalHarmonics') reader >> mapper -- GitLab From 7044160cce0d1cded465b81dc51782b68efe0bb5 Mon Sep 17 00:00:00 2001 From: Lucas Givord Date: Mon, 23 Mar 2026 15:14:22 +0100 Subject: [PATCH 2/3] TransientHDFReader: remove custom CTF use a native CTF from VTK instead of creating a new one to reduce effort needed to maintain this code. --- src/Cxx/IO/TransientHDFReader.cxx | 68 +++---------------- src/Python/IO/TransientHDFReader.py | 66 +++--------------- src/PythonicAPI/IO/TransientHDFReader.py | 64 +++-------------- .../Cxx/IO/TestTransientHDFReader.png | 4 +- 4 files changed, 26 insertions(+), 176 deletions(-) diff --git a/src/Cxx/IO/TransientHDFReader.cxx b/src/Cxx/IO/TransientHDFReader.cxx index 8bb736352be..e0aad11f554 100644 --- a/src/Cxx/IO/TransientHDFReader.cxx +++ b/src/Cxx/IO/TransientHDFReader.cxx @@ -1,6 +1,7 @@ #include +#include #include -#include +#include #include #include #include @@ -19,7 +20,7 @@ #include namespace { -vtkNew GetCTF(); +vtkLookupTable* GetCTF(); void Animate(vtkObject* caller, unsigned long /*eid*/, void* clientdata, void* /*calldata*/); @@ -54,7 +55,7 @@ int main(int ac, char* av[]) actor->SetMapper(mapper); vtkNew renderer; - renderer->SetBackground(colors->GetColor3d("Wheat").GetData()); + renderer->SetBackground(colors->GetColor3d("AntiqueWhite").GetData()); renderer->UseHiddenLineRemovalOn(); renderer->AddActor(actor); @@ -88,64 +89,11 @@ int main(int ac, char* av[]) } namespace { -vtkNew GetCTF() +vtkLookupTable* GetCTF() { - vtkNew ctf; - ctf->SetColorSpaceToLab(); - ctf->SetScaleToLinear(); - - ctf->AddRGBPoint(-30.3399130649763, 0.0862745098039216, 0.00392156862745098, - 0.298039215686275); - ctf->AddRGBPoint(-29.3502559661865, 0.113725, 0.0235294, 0.45098); - ctf->AddRGBPoint(-28.5283393859863, 0.105882, 0.0509804, 0.509804); - ctf->AddRGBPoint(-27.958028793335, 0.0392157, 0.0392157, 0.560784); - ctf->AddRGBPoint(-27.4044914245605, 0.0313725, 0.0980392, 0.6); - ctf->AddRGBPoint(-26.8677291870117, 0.0431373, 0.164706, 0.639216); - ctf->AddRGBPoint(-26.096134185791, 0.054902, 0.243137, 0.678431); - ctf->AddRGBPoint(-25.0729293823242, 0.054902, 0.317647, 0.709804); - ctf->AddRGBPoint(-23.8148933330084, 0.0509804, 0.396078, 0.741176); - ctf->AddRGBPoint(-22.9992658665124, 0.0392157, 0.466667, 0.768627); - ctf->AddRGBPoint(-22.1836384000164, 0.0313725, 0.537255, 0.788235); - ctf->AddRGBPoint(-21.3323650360107, 0.0313725, 0.615686, 0.811765); - ctf->AddRGBPoint(-20.4601268768311, 0.0235294, 0.709804, 0.831373); - ctf->AddRGBPoint(-19.5878868103027, 0.0509804, 0.8, 0.85098); - ctf->AddRGBPoint(-18.8666133880615, 0.0705882, 0.854902, 0.870588); - ctf->AddRGBPoint(-18.1956596374512, 0.262745, 0.901961, 0.862745); - ctf->AddRGBPoint(-17.6085758209229, 0.423529, 0.941176, 0.87451); - ctf->AddRGBPoint(-16.7027893066406, 0.572549, 0.964706, 0.835294); - ctf->AddRGBPoint(-16.0989303588867, 0.658824, 0.980392, 0.843137); - ctf->AddRGBPoint(-15.6628112792969, 0.764706, 0.980392, 0.866667); - ctf->AddRGBPoint(-15.1931447982788, 0.827451, 0.980392, 0.886275); - ctf->AddRGBPoint(-14.2705841064453, 0.913725, 0.988235, 0.937255); - ctf->AddRGBPoint(-13.9854288101196, 1, 1, 0.972549019607843); - ctf->AddRGBPoint(-13.7002735137939, 0.988235, 0.980392, 0.870588); - ctf->AddRGBPoint(-13.2809276580811, 0.992156862745098, 0.972549019607843, - 0.803921568627451); - ctf->AddRGBPoint(-12.9622249603271, 0.992157, 0.964706, 0.713725); - ctf->AddRGBPoint(-12.4254627227783, 0.988235, 0.956863, 0.643137); - ctf->AddRGBPoint(-11.5699977874756, 0.980392, 0.917647, 0.509804); - ctf->AddRGBPoint(-10.8487224578857, 0.968627, 0.87451, 0.407843); - ctf->AddRGBPoint(-10.1106739044189, 0.94902, 0.823529, 0.321569); - ctf->AddRGBPoint(-9.57391166687012, 0.929412, 0.776471, 0.278431); - ctf->AddRGBPoint(-8.78554153442383, 0.909804, 0.717647, 0.235294); - ctf->AddRGBPoint(-8.08104133605957, 0.890196, 0.658824, 0.196078); - ctf->AddRGBPoint(-7.50234400308847, 0.878431, 0.619608, 0.168627); - ctf->AddRGBPoint(-6.68671653659248, 0.870588, 0.54902, 0.156863); - ctf->AddRGBPoint(-5.87108907009648, 0.85098, 0.47451, 0.145098); - ctf->AddRGBPoint(-5.05546160360049, 0.831373, 0.411765, 0.133333); - ctf->AddRGBPoint(-4.23983413710449, 0.811765, 0.345098, 0.113725); - ctf->AddRGBPoint(-3.4242066706085, 0.788235, 0.266667, 0.0941176); - ctf->AddRGBPoint(-2.6085792041125, 0.741176, 0.184314, 0.0745098); - ctf->AddRGBPoint(-1.79295173761651, 0.690196, 0.12549, 0.0627451); - ctf->AddRGBPoint(-0.977324271120517, 0.619608, 0.0627451, 0.0431373); - ctf->AddRGBPoint(-0.214114964008331, 0.54902, 0.027451, 0.0705882); - ctf->AddRGBPoint(0.456838220357895, 0.470588, 0.0156863, 0.0901961); - ctf->AddRGBPoint(1.21166050434113, 0.4, 0.00392157, 0.101961); - ctf->AddRGBPoint(2.28518559486346, 0.188235294117647, 0, 0.0705882352941176); - - ctf->SetNumberOfValues(46); - ctf->DiscretizeOff(); - return ctf; + vtkNew series; + series->SetColorScheme(vtkColorSeries::WARM); + return series->CreateLookupTable(vtkColorSeries::ORDINAL); } void Animate(vtkObject* caller, unsigned long /*eid*/, void* clientdata, diff --git a/src/Python/IO/TransientHDFReader.py b/src/Python/IO/TransientHDFReader.py index 787a101154c..19cda976cbd 100755 --- a/src/Python/IO/TransientHDFReader.py +++ b/src/Python/IO/TransientHDFReader.py @@ -2,12 +2,12 @@ # noinspection PyUnresolvedReferences import vtkmodules.vtkRenderingContextOpenGL2 -from vtkmodules.vtkCommonColor import vtkNamedColors +from vtkmodules.vtkCommonColor import (vtkNamedColors, + vtkColorSeries) from vtkmodules.vtkIOHDF import vtkHDFReader from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackballCamera from vtkmodules.vtkRenderingCore import ( vtkActor, - vtkDiscretizableColorTransferFunction, vtkCompositePolyDataMapper, vtkRenderWindow, vtkRenderWindowInteractor, @@ -48,7 +48,7 @@ def main(): actor.SetMapper(mapper) renderer = vtkRenderer() - renderer.SetBackground(colors.GetColor3d('Wheat')) + renderer.SetBackground(colors.GetColor3d('AntiqueWhite')) renderer.UseHiddenLineRemovalOn() renderer.AddActor(actor) @@ -78,61 +78,11 @@ def main(): def get_ctf(): - ctf = vtkDiscretizableColorTransferFunction() - ctf.SetColorSpaceToLab() - ctf.SetScaleToLinear() - - ctf.AddRGBPoint(-30.3399130649763, 0.0862745098039216, 0.00392156862745098, 0.298039215686275) - ctf.AddRGBPoint(-29.3502559661865, 0.113725, 0.0235294, 0.45098) - ctf.AddRGBPoint(-28.5283393859863, 0.105882, 0.0509804, 0.509804) - ctf.AddRGBPoint(-27.958028793335, 0.0392157, 0.0392157, 0.560784) - ctf.AddRGBPoint(-27.4044914245605, 0.0313725, 0.0980392, 0.6) - ctf.AddRGBPoint(-26.8677291870117, 0.0431373, 0.164706, 0.639216) - ctf.AddRGBPoint(-26.096134185791, 0.054902, 0.243137, 0.678431) - ctf.AddRGBPoint(-25.0729293823242, 0.054902, 0.317647, 0.709804) - ctf.AddRGBPoint(-23.8148933330084, 0.0509804, 0.396078, 0.741176) - ctf.AddRGBPoint(-22.9992658665124, 0.0392157, 0.466667, 0.768627) - ctf.AddRGBPoint(-22.1836384000164, 0.0313725, 0.537255, 0.788235) - ctf.AddRGBPoint(-21.3323650360107, 0.0313725, 0.615686, 0.811765) - ctf.AddRGBPoint(-20.4601268768311, 0.0235294, 0.709804, 0.831373) - ctf.AddRGBPoint(-19.5878868103027, 0.0509804, 0.8, 0.85098) - ctf.AddRGBPoint(-18.8666133880615, 0.0705882, 0.854902, 0.870588) - ctf.AddRGBPoint(-18.1956596374512, 0.262745, 0.901961, 0.862745) - ctf.AddRGBPoint(-17.6085758209229, 0.423529, 0.941176, 0.87451) - ctf.AddRGBPoint(-16.7027893066406, 0.572549, 0.964706, 0.835294) - ctf.AddRGBPoint(-16.0989303588867, 0.658824, 0.980392, 0.843137) - ctf.AddRGBPoint(-15.6628112792969, 0.764706, 0.980392, 0.866667) - ctf.AddRGBPoint(-15.1931447982788, 0.827451, 0.980392, 0.886275) - ctf.AddRGBPoint(-14.2705841064453, 0.913725, 0.988235, 0.937255) - ctf.AddRGBPoint(-13.9854288101196, 1, 1, 0.972549019607843) - ctf.AddRGBPoint(-13.7002735137939, 0.988235, 0.980392, 0.870588) - ctf.AddRGBPoint(-13.2809276580811, 0.992156862745098, 0.972549019607843, 0.803921568627451) - ctf.AddRGBPoint(-12.9622249603271, 0.992157, 0.964706, 0.713725) - ctf.AddRGBPoint(-12.4254627227783, 0.988235, 0.956863, 0.643137) - ctf.AddRGBPoint(-11.5699977874756, 0.980392, 0.917647, 0.509804) - ctf.AddRGBPoint(-10.8487224578857, 0.968627, 0.87451, 0.407843) - ctf.AddRGBPoint(-10.1106739044189, 0.94902, 0.823529, 0.321569) - ctf.AddRGBPoint(-9.57391166687012, 0.929412, 0.776471, 0.278431) - ctf.AddRGBPoint(-8.78554153442383, 0.909804, 0.717647, 0.235294) - ctf.AddRGBPoint(-8.08104133605957, 0.890196, 0.658824, 0.196078) - ctf.AddRGBPoint(-7.50234400308847, 0.878431, 0.619608, 0.168627) - ctf.AddRGBPoint(-6.68671653659248, 0.870588, 0.54902, 0.156863) - ctf.AddRGBPoint(-5.87108907009648, 0.85098, 0.47451, 0.145098) - ctf.AddRGBPoint(-5.05546160360049, 0.831373, 0.411765, 0.133333) - ctf.AddRGBPoint(-4.23983413710449, 0.811765, 0.345098, 0.113725) - ctf.AddRGBPoint(-3.4242066706085, 0.788235, 0.266667, 0.0941176) - ctf.AddRGBPoint(-2.6085792041125, 0.741176, 0.184314, 0.0745098) - ctf.AddRGBPoint(-1.79295173761651, 0.690196, 0.12549, 0.0627451) - ctf.AddRGBPoint(-0.977324271120517, 0.619608, 0.0627451, 0.0431373) - ctf.AddRGBPoint(-0.214114964008331, 0.54902, 0.027451, 0.0705882) - ctf.AddRGBPoint(0.456838220357895, 0.470588, 0.0156863, 0.0901961) - ctf.AddRGBPoint(1.21166050434113, 0.4, 0.00392157, 0.101961) - ctf.AddRGBPoint(2.28518559486346, 0.188235294117647, 0, 0.0705882352941176) - - ctf.SetNumberOfValues(46) - ctf.DiscretizeOff() - - return ctf + + series = vtkColorSeries() + series.SetColorScheme(vtkColorSeries.WARM) + + return series.CreateLookupTable(vtkColorSeries.ORDINAL) class AnimationObserver(object): diff --git a/src/PythonicAPI/IO/TransientHDFReader.py b/src/PythonicAPI/IO/TransientHDFReader.py index a34a7c316cb..69e7052ec55 100755 --- a/src/PythonicAPI/IO/TransientHDFReader.py +++ b/src/PythonicAPI/IO/TransientHDFReader.py @@ -4,12 +4,12 @@ from dataclasses import dataclass # noinspection PyUnresolvedReferences import vtkmodules.vtkRenderingContextOpenGL2 -from vtkmodules.vtkCommonColor import vtkNamedColors +from vtkmodules.vtkCommonColor import (vtkNamedColors, + vtkColorSeries) from vtkmodules.vtkIOHDF import vtkHDFReader from vtkmodules.vtkInteractionStyle import vtkInteractorStyleTrackballCamera from vtkmodules.vtkRenderingCore import ( vtkActor, - vtkDiscretizableColorTransferFunction, vtkCompositePolyDataMapper, vtkRenderWindow, vtkRenderWindowInteractor, @@ -46,7 +46,7 @@ def main(): actor = vtkActor(mapper=mapper) - renderer = vtkRenderer(use_hidden_line_removal=True, background=colors.GetColor3d('Wheat')) + renderer = vtkRenderer(use_hidden_line_removal=True, background=colors.GetColor3d('AntiqueWhite')) renderer.AddActor(actor) ren_win = vtkRenderWindow(size=(1024, 512), window_name='TransientHDFReader') @@ -73,59 +73,11 @@ def main(): def get_ctf(): - ctf = vtkDiscretizableColorTransferFunction(color_space=ColorTransferFunction.ColorSpace.VTK_CTF_LAB, - scale=ColorTransferFunction.Scale.VTK_CTF_LINEAR, - number_of_values=46, discretize=False, - ) - - ctf.AddRGBPoint(-30.3399130649763, 0.0862745098039216, 0.00392156862745098, 0.298039215686275) - ctf.AddRGBPoint(-29.3502559661865, 0.113725, 0.0235294, 0.45098) - ctf.AddRGBPoint(-28.5283393859863, 0.105882, 0.0509804, 0.509804) - ctf.AddRGBPoint(-27.958028793335, 0.0392157, 0.0392157, 0.560784) - ctf.AddRGBPoint(-27.4044914245605, 0.0313725, 0.0980392, 0.6) - ctf.AddRGBPoint(-26.8677291870117, 0.0431373, 0.164706, 0.639216) - ctf.AddRGBPoint(-26.096134185791, 0.054902, 0.243137, 0.678431) - ctf.AddRGBPoint(-25.0729293823242, 0.054902, 0.317647, 0.709804) - ctf.AddRGBPoint(-23.8148933330084, 0.0509804, 0.396078, 0.741176) - ctf.AddRGBPoint(-22.9992658665124, 0.0392157, 0.466667, 0.768627) - ctf.AddRGBPoint(-22.1836384000164, 0.0313725, 0.537255, 0.788235) - ctf.AddRGBPoint(-21.3323650360107, 0.0313725, 0.615686, 0.811765) - ctf.AddRGBPoint(-20.4601268768311, 0.0235294, 0.709804, 0.831373) - ctf.AddRGBPoint(-19.5878868103027, 0.0509804, 0.8, 0.85098) - ctf.AddRGBPoint(-18.8666133880615, 0.0705882, 0.854902, 0.870588) - ctf.AddRGBPoint(-18.1956596374512, 0.262745, 0.901961, 0.862745) - ctf.AddRGBPoint(-17.6085758209229, 0.423529, 0.941176, 0.87451) - ctf.AddRGBPoint(-16.7027893066406, 0.572549, 0.964706, 0.835294) - ctf.AddRGBPoint(-16.0989303588867, 0.658824, 0.980392, 0.843137) - ctf.AddRGBPoint(-15.6628112792969, 0.764706, 0.980392, 0.866667) - ctf.AddRGBPoint(-15.1931447982788, 0.827451, 0.980392, 0.886275) - ctf.AddRGBPoint(-14.2705841064453, 0.913725, 0.988235, 0.937255) - ctf.AddRGBPoint(-13.9854288101196, 1, 1, 0.972549019607843) - ctf.AddRGBPoint(-13.7002735137939, 0.988235, 0.980392, 0.870588) - ctf.AddRGBPoint(-13.2809276580811, 0.992156862745098, 0.972549019607843, 0.803921568627451) - ctf.AddRGBPoint(-12.9622249603271, 0.992157, 0.964706, 0.713725) - ctf.AddRGBPoint(-12.4254627227783, 0.988235, 0.956863, 0.643137) - ctf.AddRGBPoint(-11.5699977874756, 0.980392, 0.917647, 0.509804) - ctf.AddRGBPoint(-10.8487224578857, 0.968627, 0.87451, 0.407843) - ctf.AddRGBPoint(-10.1106739044189, 0.94902, 0.823529, 0.321569) - ctf.AddRGBPoint(-9.57391166687012, 0.929412, 0.776471, 0.278431) - ctf.AddRGBPoint(-8.78554153442383, 0.909804, 0.717647, 0.235294) - ctf.AddRGBPoint(-8.08104133605957, 0.890196, 0.658824, 0.196078) - ctf.AddRGBPoint(-7.50234400308847, 0.878431, 0.619608, 0.168627) - ctf.AddRGBPoint(-6.68671653659248, 0.870588, 0.54902, 0.156863) - ctf.AddRGBPoint(-5.87108907009648, 0.85098, 0.47451, 0.145098) - ctf.AddRGBPoint(-5.05546160360049, 0.831373, 0.411765, 0.133333) - ctf.AddRGBPoint(-4.23983413710449, 0.811765, 0.345098, 0.113725) - ctf.AddRGBPoint(-3.4242066706085, 0.788235, 0.266667, 0.0941176) - ctf.AddRGBPoint(-2.6085792041125, 0.741176, 0.184314, 0.0745098) - ctf.AddRGBPoint(-1.79295173761651, 0.690196, 0.12549, 0.0627451) - ctf.AddRGBPoint(-0.977324271120517, 0.619608, 0.0627451, 0.0431373) - ctf.AddRGBPoint(-0.214114964008331, 0.54902, 0.027451, 0.0705882) - ctf.AddRGBPoint(0.456838220357895, 0.470588, 0.0156863, 0.0901961) - ctf.AddRGBPoint(1.21166050434113, 0.4, 0.00392157, 0.101961) - ctf.AddRGBPoint(2.28518559486346, 0.188235294117647, 0, 0.0705882352941176) - - return ctf + + series = vtkColorSeries() + series.SetColorScheme(vtkColorSeries.WARM) + + return series.CreateLookupTable(vtkColorSeries.ORDINAL) class AnimationObserver(object): diff --git a/src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png b/src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png index 6054c2757dc..72c7c067ae4 100644 --- a/src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png +++ b/src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d1448e1f0a15e01d7371731bcf1b0d72716af59ac62ff4a90626c9f4892956cb -size 53670 +oid sha256:04b5f5bc5c8a13706b851d5221a99e0a2d8e59ee63a6ef03993942546339ccc6 +size 59981 -- GitLab From 45cb7c77da60de257d99f9c00f2908c17dd338bf Mon Sep 17 00:00:00 2001 From: Lucas Givord Date: Mon, 23 Mar 2026 15:46:46 +0100 Subject: [PATCH 3/3] HDFReader: use temporal keyword instead of transient VTKHDF file format drops usage of "transient" keyword in favor of "temporal" to avoid misunderstanding. All file and documentation have been updated to follow this logic --- src/Admin/WASM/ArgsNeeded.json | 2 +- src/Cxx.md | 2 +- src/Cxx/IO/CMakeLists.txt | 6 +++--- .../IO/{TransientHDFReader.cxx => TemporalHDFReader.cxx} | 2 +- src/Cxx/IO/{TransientHDFReader.md => TemporalHDFReader.md} | 0 src/Python.md | 2 +- .../IO/{TransientHDFReader.md => TemporalHDFReader.md} | 0 .../IO/{TransientHDFReader.py => TemporalHDFReader.py} | 2 +- src/PythonicAPI.md | 2 +- .../IO/{TransientHDFReader.md => TemporalHDFReader.md} | 0 .../IO/{TransientHDFReader.py => TemporalHDFReader.py} | 2 +- ...TestTransientHDFReader.png => TestTemporalHDFReader.png} | 0 12 files changed, 10 insertions(+), 10 deletions(-) rename src/Cxx/IO/{TransientHDFReader.cxx => TemporalHDFReader.cxx} (98%) rename src/Cxx/IO/{TransientHDFReader.md => TemporalHDFReader.md} (100%) rename src/Python/IO/{TransientHDFReader.md => TemporalHDFReader.md} (100%) rename src/Python/IO/{TransientHDFReader.py => TemporalHDFReader.py} (98%) rename src/PythonicAPI/IO/{TransientHDFReader.md => TemporalHDFReader.md} (100%) rename src/PythonicAPI/IO/{TransientHDFReader.py => TemporalHDFReader.py} (97%) rename src/Testing/Baseline/Cxx/IO/{TestTransientHDFReader.png => TestTemporalHDFReader.png} (100%) diff --git a/src/Admin/WASM/ArgsNeeded.json b/src/Admin/WASM/ArgsNeeded.json index df6e9f157d0..c083d8f0038 100644 --- a/src/Admin/WASM/ArgsNeeded.json +++ b/src/Admin/WASM/ArgsNeeded.json @@ -1187,7 +1187,7 @@ "args":["cow.vtp"], "files":["cow.vtp"] }, - "TransientHDFReader":{ + "TemporalHDFReader":{ "args":["warping_spheres.vtkhdf"], "files":["warping_spheres.vtkhdf"] }, diff --git a/src/Cxx.md b/src/Cxx.md index ef1c87a6548..a94b4fea5cf 100644 --- a/src/Cxx.md +++ b/src/Cxx.md @@ -69,7 +69,7 @@ If you are new to VTK then these [tutorials](#tutorial) will help to get you sta [ReadSTL](/Cxx/IO/ReadSTL) | Read stereo lithography STL (.stl) files [ReadTextFile](/Cxx/IO/ReadTextFile) | Read a plain text file into a polydata. [SimplePointsReader](/Cxx/IO/SimplePointsReader) | Read a simple "xyz" file of points. -[TransientHDFReader](/Cxx/IO/TransientHDFReader) | Read transient data written inside a vtkhdf file. +[TemporalHDFReader](/Cxx/IO/TemporalHDFReader) | Read temporal data written inside a vtkhdf file. ###### Importers diff --git a/src/Cxx/IO/CMakeLists.txt b/src/Cxx/IO/CMakeLists.txt index 3b5677d4324..250b92d1ca0 100644 --- a/src/Cxx/IO/CMakeLists.txt +++ b/src/Cxx/IO/CMakeLists.txt @@ -124,7 +124,7 @@ if (BUILD_TESTING) SimplePointsReader StructuredPointsReader StructuredGridReader - TransientHDFReader + TemporalHDFReader VRMLImporter VRMLImporterDemo WriteBMP @@ -282,8 +282,8 @@ if (BUILD_TESTING) add_test(${KIT}-StructuredGridReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests TestStructuredGridReader ${DATA}/SampleStructGrid.vtk) - add_test(${KIT}-TransientHDFReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests - TestTransientHDFReader ${DATA}/warping_spheres.vtkhdf) + add_test(${KIT}-TemporalHDFReader ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests + TestTemporalHDFReader ${DATA}/warping_spheres.vtkhdf) add_test(${KIT}-VRMLImporter ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${KIT}CxxTests TestVRMLImporter ${DATA}/sextant.wrl -E 30) diff --git a/src/Cxx/IO/TransientHDFReader.cxx b/src/Cxx/IO/TemporalHDFReader.cxx similarity index 98% rename from src/Cxx/IO/TransientHDFReader.cxx rename to src/Cxx/IO/TemporalHDFReader.cxx index e0aad11f554..e8739219a8f 100644 --- a/src/Cxx/IO/TransientHDFReader.cxx +++ b/src/Cxx/IO/TemporalHDFReader.cxx @@ -61,7 +61,7 @@ int main(int ac, char* av[]) vtkNew renWin; renWin->AddRenderer(renderer); - renWin->SetWindowName("TransientHDFReader"); + renWin->SetWindowName("TemporalHDFReader"); renWin->SetSize(1024, 512); renWin->Render(); diff --git a/src/Cxx/IO/TransientHDFReader.md b/src/Cxx/IO/TemporalHDFReader.md similarity index 100% rename from src/Cxx/IO/TransientHDFReader.md rename to src/Cxx/IO/TemporalHDFReader.md diff --git a/src/Python.md b/src/Python.md index 77abb26af50..a23dba67ee3 100644 --- a/src/Python.md +++ b/src/Python.md @@ -49,7 +49,7 @@ If you are new to VTK then these [tutorials](#tutorial) will help to get you sta [ReadSTL](/Python/IO/ReadSTL) | Read an STL file. [ReadUnstructuredGrid](/Python/IO/ReadUnstructuredGrid) | Using vtkUnstructuredGridReader to read a (legacy) *.vtk file [ReadVTP](/Python/IO/ReadVTP) | Read a VTK XML PolyData file. -[TransientHDFReader](/Python/IO/TransientHDFReader) | Read transient data written inside a vtkhdf file. +[TemporalHDFReader](/Python/IO/TemporalHDFReader) | Read transient data written inside a vtkhdf file. ###### Importers diff --git a/src/Python/IO/TransientHDFReader.md b/src/Python/IO/TemporalHDFReader.md similarity index 100% rename from src/Python/IO/TransientHDFReader.md rename to src/Python/IO/TemporalHDFReader.md diff --git a/src/Python/IO/TransientHDFReader.py b/src/Python/IO/TemporalHDFReader.py similarity index 98% rename from src/Python/IO/TransientHDFReader.py rename to src/Python/IO/TemporalHDFReader.py index 19cda976cbd..d547f5f7866 100755 --- a/src/Python/IO/TransientHDFReader.py +++ b/src/Python/IO/TemporalHDFReader.py @@ -54,7 +54,7 @@ def main(): ren_win = vtkRenderWindow() ren_win.AddRenderer(renderer) - ren_win.SetWindowName('TransientHDFReader') + ren_win.SetWindowName('TemporalHDFReader') ren_win.SetSize(1024, 512) ren_win.Render() diff --git a/src/PythonicAPI.md b/src/PythonicAPI.md index 05bc609374b..febc156e807 100644 --- a/src/PythonicAPI.md +++ b/src/PythonicAPI.md @@ -75,7 +75,7 @@ This Python script, [SelectExamples](../PythonicAPI/Utilities/SelectExamples), w [ReadCML](/PythonicAPI/IO/ReadCML) | Read Chemistry Markup Language files. [ReadExodusData](/PythonicAPI/IO/ReadExodusData) | A simple script for reading and viewing ExodusII data interactively. [ReadSLC](/PythonicAPI/IO/ReadSLC) | Read an SLC file. -[TransientHDFReader](/PythonicAPI/IO/TransientHDFReader) | Read transient data written inside a vtkhdf file. +[TemporalHDFReader](/PythonicAPI/IO/TemporalHDFReader) | Read temporal data written inside a vtkhdf file. ###### Importers diff --git a/src/PythonicAPI/IO/TransientHDFReader.md b/src/PythonicAPI/IO/TemporalHDFReader.md similarity index 100% rename from src/PythonicAPI/IO/TransientHDFReader.md rename to src/PythonicAPI/IO/TemporalHDFReader.md diff --git a/src/PythonicAPI/IO/TransientHDFReader.py b/src/PythonicAPI/IO/TemporalHDFReader.py similarity index 97% rename from src/PythonicAPI/IO/TransientHDFReader.py rename to src/PythonicAPI/IO/TemporalHDFReader.py index 69e7052ec55..6b8912b78f3 100755 --- a/src/PythonicAPI/IO/TransientHDFReader.py +++ b/src/PythonicAPI/IO/TemporalHDFReader.py @@ -49,7 +49,7 @@ def main(): renderer = vtkRenderer(use_hidden_line_removal=True, background=colors.GetColor3d('AntiqueWhite')) renderer.AddActor(actor) - ren_win = vtkRenderWindow(size=(1024, 512), window_name='TransientHDFReader') + ren_win = vtkRenderWindow(size=(1024, 512), window_name='TemporalHDFReader') ren_win.AddRenderer(renderer) ren_win.Render() diff --git a/src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png b/src/Testing/Baseline/Cxx/IO/TestTemporalHDFReader.png similarity index 100% rename from src/Testing/Baseline/Cxx/IO/TestTransientHDFReader.png rename to src/Testing/Baseline/Cxx/IO/TestTemporalHDFReader.png -- GitLab