From 11944e679ee73e48c13630b47c40256a1f2623f1 Mon Sep 17 00:00:00 2001 From: djairoh Date: Wed, 29 May 2024 10:48:22 +0200 Subject: [PATCH] fix: wrong colour map --- particle-track-and-trace/src/Program.cpp | 2 -- .../src/layers/LColLayer.cpp | 2 +- particle-track-and-trace/src/layers/luts.cpp | 20 +++++++++---------- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/particle-track-and-trace/src/Program.cpp b/particle-track-and-trace/src/Program.cpp index fbbbd8b..9eb6336 100644 --- a/particle-track-and-trace/src/Program.cpp +++ b/particle-track-and-trace/src/Program.cpp @@ -22,7 +22,6 @@ #include #include "Program.h" -#include "commands/TimerCallbackCommand.h" #include "CartographicTransformation.h" #include "commands/CameraMoveCallback.h" @@ -81,7 +80,6 @@ void Program::requestRender() { } void Program::updateData(int t) { - // FIXME: think on how to update techniques; do we update all? just active? unsure. win->Render(); for (Technique *tech : this->techniques) { tech->updateData(t); diff --git a/particle-track-and-trace/src/layers/LColLayer.cpp b/particle-track-and-trace/src/layers/LColLayer.cpp index 486a590..3ca23ac 100644 --- a/particle-track-and-trace/src/layers/LColLayer.cpp +++ b/particle-track-and-trace/src/layers/LColLayer.cpp @@ -100,7 +100,7 @@ LColLayer::LColLayer(std::shared_ptr uvGrid, std::unique_ptrcellParticleDensity->SetName("cellParticleDensity"); this->cellParticleDensity->SetNumberOfComponents(1); this->cellParticleDensity->SetNumberOfTuples((numLats-1)*(numLons-1)); - + this->data->GetCellData()->AddArray(this->cellParticleDensity); this->data->GetCellData()->SetActiveScalars("cellParticleDensity"); diff --git a/particle-track-and-trace/src/layers/luts.cpp b/particle-track-and-trace/src/layers/luts.cpp index d7e0e8b..18eeff4 100644 --- a/particle-track-and-trace/src/layers/luts.cpp +++ b/particle-track-and-trace/src/layers/luts.cpp @@ -75,16 +75,16 @@ vtkSmartPointer buildCyclicComplementary() { int idx=0; for (double opacity=0.1; opacity <= 1.0; opacity+=0.1) { - lut->SetTableValue(idx++, 0, 1, 1, opacity); - lut->SetTableValue(idx++, 0, 0.9, 0.9, opacity); - lut->SetTableValue(idx++, 0, 0.8, 0.8, opacity); - lut->SetTableValue(idx++, 0, 0.7, 0.7, opacity); - lut->SetTableValue(idx++, 0, 0.6, 0.6, opacity); - lut->SetTableValue(idx++, 0, 0.5, 0.5, opacity); - lut->SetTableValue(idx++, 0, 0.4, 0.4, opacity); - lut->SetTableValue(idx++, 0, 0.3, 0.3, opacity); - lut->SetTableValue(idx++, 0, 0.2, 0.2, opacity); - lut->SetTableValue(idx++, 0, 0.1, 0.1, opacity); + lut->SetTableValue(idx++, 0.247059, 0.243137, 0.227451, opacity); + lut->SetTableValue(idx++, 0.243137, 0.266667, 0.364706, opacity); + lut->SetTableValue(idx++, 0.329412, 0.431373, 0.580392, opacity); + lut->SetTableValue(idx++, 0.517647, 0.619608, 0.729412, opacity); + lut->SetTableValue(idx++, 0.678431, 0.768627, 0.784314, opacity); + lut->SetTableValue(idx++, 0.631373, 0.768627, 0.65098, opacity); + lut->SetTableValue(idx++, 0.45098, 0.639216, 0.435294, opacity); + lut->SetTableValue(idx++, 0.309804, 0.45098, 0.231373, opacity); + lut->SetTableValue(idx++, 0.262745, 0.309804, 0.172549, opacity); + lut->SetTableValue(idx++, 0.247059, 0.243137, 0.227451, opacity); } lut->SetNanColor(0.0,0,0,0);