From 4b9517a148bcd6f47cc2f20a83355093811cc04b Mon Sep 17 00:00:00 2001 From: Vasile Vilvoiu Date: Thu, 21 Oct 2021 23:12:06 +0300 Subject: Renderer does not cache colromap and valuemap. * Renderer build colormap from configuration. * Renderer builds (temporary) valuemap from configuration. * LiveOutput no longer needs cmap/vmap parameters. --- test/test-renderer.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/test-renderer.cpp') diff --git a/test/test-renderer.cpp b/test/test-renderer.cpp index be8d49c..2fd6df9 100644 --- a/test/test-renderer.cpp +++ b/test/test-renderer.cpp @@ -13,8 +13,8 @@ class ExposedRenderer : public Renderer public: using AxisTick = Renderer::AxisTick; - ExposedRenderer(const Configuration& conf, const ColorMap& cmap, const ValueMap& vmap, std::size_t fft_count) - : Renderer(conf, cmap, vmap, fft_count) { }; + ExposedRenderer(const Configuration& conf, std::size_t fft_count) + : Renderer(conf, fft_count) { }; static std::string EValueToShortString(double value, int scale, const std::string& unit) { @@ -148,9 +148,9 @@ TEST(TestRenderer, GetNiceTicks) EXPECT_FALSE(exit); /* renderer */ - EXPECT_THROW_MATCH(ExposedRenderer(conf.GetForLive(), JetColorMap(), DecibelValueMap(-120.0, 0.0, "FS"), 0), + EXPECT_THROW_MATCH(ExposedRenderer(conf.GetForLive(), 0), std::runtime_error, "positive number of FFT windows required by renderer"); - ExposedRenderer renderer(conf.GetForLive(), JetColorMap(), DecibelValueMap(-120.0, 0.0, "FS"), 128); + ExposedRenderer renderer(conf.GetForLive(), 128); EXPECT_THROW_MATCH(renderer.EGetNiceTicks(1.0, 1.0, "", 100, 30, false), std::runtime_error, "minimum and maximum values are not in order"); @@ -194,4 +194,4 @@ TEST(TestRenderer, GetNiceTicks) EXPECT_EQ(std::get<1>(*it), std::get<1>(test.ticks[i])); } } -} \ No newline at end of file +} -- cgit v1.2.3