Updates for splitting off Makie support

Author: barche

makie_viewport.cpp

@@ -33,14 +33,14 @@ class MakieRenderFunction : public RenderFunction
 
 jl_module_t* get_makie_support_module()
 {
-  // MakieViewport::m_qml_mod is set when initializing the Julia module `QtMakie`,
-  // corresponding to `JLCXX_MODULE define_julia_module_makie` in `wrap_qml.cpp`.
-  jl_module_t* mod = MakieViewport::m_qml_mod;
+  // MakieViewport::m_qmlmakie_mod is set when initializing the Julia module `QMLMakie`,
+  // by calling `define_julia_module_makie` in `wrap_qml.cpp`.
+  jl_module_t* mod = MakieViewport::m_qmlmakie_mod;
 
   // If `mod` is not initialized, you have not loaded the Julia module.
   if(mod == nullptr)
   {
-    throw std::runtime_error("Makie Support not initialized. Have you loaded QtMakie?");
+    throw std::runtime_error("Makie Support not initialized. Have you loaded QMLMakie?");
   }
 
   return mod;
@@ -75,6 +75,7 @@ struct MakieSupport
 
 MakieViewport::MakieViewport(QQuickItem *parent) : OpenGLViewport(parent, new MakieRenderFunction(m_screen))
 {
+  get_makie_support_module(); // Throw the possible error early
   QObject::connect(this, &QQuickItem::windowChanged, [this] (QQuickWindow* w)
   {
     if (w == nullptr)
@@ -111,6 +112,6 @@ void MakieViewport::setup_buffer(QOpenGLFramebufferObject* fbo)
   }
 }
 
-jl_module_t* MakieViewport::m_qml_mod = nullptr;
+jl_module_t* MakieViewport::m_qmlmakie_mod = nullptr;
 
 } // namespace qmlwrap

makie_viewport.hpp

@@ -14,7 +14,7 @@ class MakieViewport : public OpenGLViewport
 public:
   MakieViewport(QQuickItem* parent = 0);
   virtual ~MakieViewport();
-  static jl_module_t* m_qml_mod;
+  static jl_module_t* m_qmlmakie_mod;
 
 private:
   // Screen created and used on the Julia side

wrap_qml.cpp

@@ -282,12 +282,6 @@ struct WrapQtAssociativeContainer
 
 }
 
-JLCXX_MODULE define_julia_module_makie(jlcxx::Module& qml_module)
-{
-    using namespace jlcxx;
-    qmlwrap::MakieViewport::m_qml_mod = qml_module.julia_module();
-}
-
 JLCXX_MODULE define_julia_module(jlcxx::Module& qml_module)
 {
   using namespace jlcxx;
@@ -297,6 +291,11 @@ JLCXX_MODULE define_julia_module(jlcxx::Module& qml_module)
   qmlwrap::ApplicationManager::m_qml_mod = qml_module.julia_module();
   qmlwrap::JuliaItemModel::m_qml_mod = qml_module.julia_module();
 
+  qml_module.method("define_julia_module_makie", [](jl_value_t* mod)
+  {
+    qmlwrap::MakieViewport::m_qmlmakie_mod = reinterpret_cast<jl_module_t*>(mod);
+  });
+
   // Enums
   qml_module.add_bits<Qt::Orientation>("Orientation", jlcxx::julia_type("CppEnum"));
   qml_module.set_const("Horizontal", Qt::Horizontal);