Minor fixes

fair-acc · Apr 23, 2024 · 524c437 · 524c437
1 parent c34644e
commit 524c437
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/ui/blocks/ImPlotSink.hpp b/src/ui/blocks/ImPlotSink.hpp
@@ -14,8 +14,8 @@
 namespace opendigitizer {
 
 template<typename T>
-    requires std::is_floating_point_v<T> || (meta::is_dataset_v<T> && std::is_floating_point_v<typename T::value_type>)
-struct ImPlotSink : public gr::Block<ImPlotSink<T>, gr::BlockingIO<false>, gr::SupportedTypes<float, double, gr::DataSet_float, gr::DataSet_double>, gr::Drawable<gr::UICategory::ChartPane, "Dear ImGui">> {
+struct ImPlotSink : public gr::Block<ImPlotSink<T>,
+                            gr::BlockingIO<false>, gr::SupportedTypes<float, double, gr::DataSet<float>, gr::DataSet<double>>, gr::Drawable<gr::UICategory::ChartPane, "Dear ImGui">> {
     gr::PortIn<T> in;
     uint32_t      color = 0xff0000; ///< RGB color for the plot // TODO use better type, support configurable colors for datasets?
     std::string   signal_name;

diff --git a/src/ui/flowgraph.cpp b/src/ui/flowgraph.cpp
@@ -482,12 +482,14 @@ static std::unique_ptr<gr::BlockModel> createGRBlock(gr::PluginLoader &loader, c
     auto params    = block.parameters();
     params["name"] = block.name;
     auto grBlock   = loader.instantiate(block.typeName(), DataType::name(t));
-    grBlock->settings().set(params);
-    grBlock->settings().applyStagedParameters();
 
     if (!grBlock) {
         fmt::println(std::cerr, "Could not create GR Block for {} ({}<{}>)\n", block.name, block.typeName(), DataType::name(t));
+        return nullptr;
     }
+
+    grBlock->settings().set(params);
+    grBlock->settings().applyStagedParameters();
     return grBlock;
 }
 } // namespace