Redesign/qtcompatibility

examples/CMakeLists.txt

@@ -12,6 +12,9 @@ add_subdirectory(schnakenberg)
 # A retinotectal model published by Simpson and Goodhill, 2011
 add_subdirectory(SimpsonGoodhill)
 
+# Examples showing how to use morphologica with Qt
+add_subdirectory(qt)
+
 # All #includes in test programs have to be #include <morph/header.h>
 include_directories(BEFORE ${PROJECT_SOURCE_DIR})
 

examples/Ermentrout2009/erm.cpp

@@ -160,7 +160,8 @@ int main (int argc, char **argv)
 
     // Set up a 3D map of the surface RD.n[0] using a morph::HexGridVisual
     spatOff[0] -= 0.6 * (RD.hg->width());
-    auto hgv1 = std::make_unique<morph::HexGridVisual<FLT>> (v.shaders, RD.hg, spatOff);
+    auto hgv1 = std::make_unique<morph::HexGridVisual<FLT>> (RD.hg, spatOff);
+    v.bindmodel (hgv1);
     hgv1->setSizeScale (myscale, myscale);
     hgv1->setScalarData (&RD.n[0]);
     // You can directly set VisualDataModel::zScale and ::colourScale:
@@ -176,7 +177,8 @@ int main (int argc, char **argv)
 
     // Set up a 3D map of the surface RD.c[0]
     spatOff[0] *= -1;
-    auto hgv2 = std::make_unique<morph::HexGridVisual<FLT>> (v.shaders, RD.hg, spatOff);
+    auto hgv2 = std::make_unique<morph::HexGridVisual<FLT>> (RD.hg, spatOff);
+    v.bindmodel (hgv2);
     hgv2->setSizeScale (myscale, myscale);
     hgv2->setScalarData (&RD.c[0]);
     hgv2->zScale.setParams (_m/10.0f, _c/10.0f);
@@ -190,7 +192,8 @@ int main (int argc, char **argv)
 
     // Set up a 2D graph with morph::GraphVisual
     spatOff = {0.5f, -2.0f, 0.0f};
-    auto graph1 = std::make_unique<morph::GraphVisual<FLT>> (v.shaders, spatOff);
+    auto graph1 = std::make_unique<morph::GraphVisual<FLT>> (spatOff);
+    v.bindmodel (graph1);
     graph1->setdarkbg(); // colours axes and text
     graph1->twodimensional = true;
     graph1->setlimits (0, steps*RD.get_dt(), 0, conf.getFloat("graph_ymax", 40000.0f));
@@ -248,7 +251,7 @@ int main (int argc, char **argv)
         // rendering the graphics.
         std::chrono::steady_clock::duration sincerender = std::chrono::steady_clock::now() - lastrender;
         if (std::chrono::duration_cast<std::chrono::milliseconds>(sincerender).count() > 17) { // 17 is about 60 Hz
-            glfwPollEvents();
+            v.poll();
             v.render();
             lastrender = std::chrono::steady_clock::now();
         }

examples/LotkaVolterra/lv.cpp

@@ -252,7 +252,8 @@ int main (int argc, char **argv)
     // A. Offset in x direction to the left.
     xzero -= 0.5*RD.hg->width();
     spatOff = { xzero, 0.0, 0.0 };
-    auto uvm = std::make_unique<morph::HexGridVisual<FLT>> (v1.shaders, RD.hg, spatOff);
+    auto uvm = std::make_unique<morph::HexGridVisual<FLT>> (RD.hg, spatOff);
+    v1.bindmodel (uvm);
     uvm->setScalarData (&(RD.u));
     uvm->zScale.setParams (0.2f, 0.0f);
     uvm->addLabel ("Population u", { -0.2f, RD.ellipse_b*-1.4f, 0.01f },
@@ -263,7 +264,8 @@ int main (int argc, char **argv)
     // B. Offset in x direction to the right.
     xzero += RD.hg->width();
     spatOff = { xzero, 0.0, 0.0 };
-    auto vvm = std::make_unique<morph::HexGridVisual<FLT>> (v1.shaders, RD.hg, spatOff);
+    auto vvm = std::make_unique<morph::HexGridVisual<FLT>> (RD.hg, spatOff);
+    v1.bindmodel (vvm);
     vvm->setScalarData (&(RD.v));
     vvm->zScale.setParams (0.2f, 0.0f);
     vvm->addLabel ("Population v", { -0.2f, RD.ellipse_b*-1.4f, 0.01f },
@@ -302,7 +304,7 @@ int main (int argc, char **argv)
         // has elapsed for it to be necessary to call v1.render().
         steady_clock::duration sincerender = steady_clock::now() - lastrender;
         if (duration_cast<milliseconds>(sincerender).count() > 17) { // 17 is about 60 Hz
-            glfwPollEvents();
+            v1.poll();
             v1.render();
             lastrender = steady_clock::now();
         }

examples/SimpsonGoodhill/branchvisual.h

@@ -29,12 +29,9 @@ template <typename Flt>
 class BranchVisual : public morph::VisualModel
 {
 public:
-    BranchVisual(morph::gl::shaderprogs& sp,
-                 const morph::vec<float, 3> _offset,
-                 std::vector<branch<Flt>>* _branches)
+    BranchVisual(const morph::vec<float, 3> _offset, std::vector<branch<Flt>>* _branches)
     {
         this->branches = _branches;
-        this->shaders = sp;
         this->mv_offset = _offset;
         this->viewmatrix.translate (this->mv_offset);
     }
@@ -43,7 +40,6 @@ class BranchVisual : public morph::VisualModel
 
     void initializeVertices()
     {
-        VBOint idx = 0;
         // For each branch, draw lines for the path history and a sphere for teh current
         // location, with a second colour for the EphA expression.
         for (auto b : *this->branches) {
@@ -58,11 +54,11 @@ class BranchVisual : public morph::VisualModel
                 last[1] = b.path[i-1][1];
                 cur[0] = b.path[i][0];
                 cur[1] = b.path[i][1];
-                this->computeFlatLineRnd (idx, last, cur, this->uz, clr, this->linewidth, 0.0f, true, false);
+                this->computeFlatLineRnd (this->idx, last, cur, this->uz, clr, this->linewidth, 0.0f, true, false);
             }
             // Finally, a sphere at the last location. Tune number of rings (second last
             // arg) in sphere to change size of clr2 disc at top
-            this->computeSphere (idx, cur, clr, clr2, this->radiusFixed, 14, 12);
+            this->computeSphere (this->idx, cur, clr, clr2, this->radiusFixed, 14, 12);
         }
     }
 

examples/SimpsonGoodhill/netvisual.h

@@ -28,28 +28,26 @@ template <typename Flt>
 class NetVisual : public morph::VisualModel
 {
 public:
-    NetVisual(morph::gl::shaderprogs& sp, const morph::vec<float, 3> _offset, net<Flt>* _locations)
+    NetVisual(const morph::vec<float, 3> _offset, net<Flt>* _locations)
     {
         this->locations = _locations;
-        this->shaders = sp;
         this->mv_offset = _offset;
         this->viewmatrix.translate (this->mv_offset);
     }
 
     void initializeVertices()
     {
-        VBOint idx = 0;
         // Spheres at the net vertices
         for (unsigned int i = 0; i < this->locations->p.size(); ++i) {
-            this->computeSphere (idx, this->locations->p[i], this->locations->clr[i], this->radiusFixed, 14, 12);
+            this->computeSphere (this->idx, this->locations->p[i], this->locations->clr[i], this->radiusFixed, 14, 12);
         }
         // Connections
         for (auto c : this->locations->c) {
             morph::vec<Flt, 3> c1 = this->locations->p[c[0]];
             morph::vec<Flt, 3> c2 = this->locations->p[c[1]];
             std::array<float, 3> clr1 = this->locations->clr[c[0]];
             std::array<float, 3> clr2 = this->locations->clr[c[1]];
-            this->computeLine (idx, c1, c2, this->uz, clr1, clr2, this->linewidth, this->linewidth/Flt{4});
+            this->computeLine (this->idx, c1, c2, this->uz, clr1, clr2, this->linewidth, this->linewidth/Flt{4});
         }
     }
 

examples/SimpsonGoodhill/sg.cpp

@@ -45,9 +45,9 @@ struct SimpsonGoodhill
     void vis(unsigned int stepnum)
     {
         if (this->goslow == true) {
-            glfwWaitEventsTimeout (0.1); // to add artificial slowing
+            v->waitevents (0.1); // to add artificial slowing
         } else {
-            glfwPollEvents();
+            v->poll();
         }
         this->bv->reinit();
         this->cv->reinit();
@@ -149,22 +149,25 @@ struct SimpsonGoodhill
         morph::vec<float> offset = { -1.5f, -0.5f, 0.0f };
 
         // Visualise the branches with a custom VisualModel
-        auto bvup = std::make_unique<BranchVisual<T>> (v->shaders, offset, &this->branches);
+        auto bvup = std::make_unique<BranchVisual<T>> (offset, &this->branches);
+        v->bindmodel (bvup);
         bvup->EphA_scale.compute_autoscale (EphA_min, EphA_max);
         bvup->addLabel ("Branches", {0.0f, 1.1f, 0.0f});
         bvup->finalize();
         this->bv = v->addVisualModel (bvup);
 
         // Centroids of branches viewed with a NetVisual
         offset[0] += 1.3f;
-        auto cvup = std::make_unique<NetVisual<T>> (v->shaders, offset, &this->ax_centroids);
+        auto cvup = std::make_unique<NetVisual<T>> (offset, &this->ax_centroids);
+        v->bindmodel (cvup);
         cvup->addLabel ("Axon centroids", {0.0f, 1.1f, 0.0f});
         cvup->finalize();
         this->cv = v->addVisualModel (cvup);
 
         // Show a vis of the retina, to compare positions/colours
         offset[0] += 1.3f;
-        auto cgv = std::make_unique<morph::CartGridVisual<float>>(v->shaders, retina, offset);
+        auto cgv = std::make_unique<morph::CartGridVisual<float>>(retina, offset);
+        v->bindmodel (cgv);
         cgv->cartVisMode = morph::CartVisMode::RectInterp;
         std::vector<morph::vec<float, 3>> points = this->retina->getCoordinates3();
         cgv->setVectorData (&points);

examples/anneal_asa.cpp

@@ -96,7 +96,8 @@ int main (int argc, char** argv)
     v.lightingEffects (true);
 
     morph::vec<float, 3> offset = { 0.0, 0.0, 0.0 };
-    auto hgv = std::make_unique<morph::HexGridVisual<F>>(v.shaders, hg, offset);
+    auto hgv = std::make_unique<morph::HexGridVisual<F>>(hg, offset);
+    v.bindmodel (hgv);
     hgv->setScalarData (&obj_f);
 #ifdef USE_BOHACHEVSKY_FUNCTION
     hgv->addLabel ("Objective: See Bohachevsky et al.", { -0.5f, -0.75f, -0.1f }, morph::colour::black);
@@ -110,20 +111,27 @@ int main (int argc, char** argv)
 
     // One object for the 'candidate' position
     std::array<float, 3> col = { 0, 1, 0 };
-    auto cand_up = std::make_unique<morph::PolygonVisual>(v.shaders, offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.4f, col, 20);
-
+    auto cand_up = std::make_unique<morph::PolygonVisual>(offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.4f, col, 20);
+    v.bindmodel (cand_up);
+    cand_up->finalize();
     // A second object for the 'best' position
     col = { 1, 0, 0 };
-    auto best_up = std::make_unique<morph::PolygonVisual>(v.shaders, offset, polypos, morph::vec<float>({1,0,0}), 0.001f, 0.8f, col, 10);
+    auto best_up = std::make_unique<morph::PolygonVisual>(offset, polypos, morph::vec<float>({1,0,0}), 0.001f, 0.8f, col, 10);
+    v.bindmodel (best_up);
+    best_up->finalize();
 
     // A third object for the currently accepted position
     col = { 1, 0, 0.7f };
-    auto curr_up = std::make_unique<morph::PolygonVisual> (v.shaders, offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.6f, col, 20);
+    auto curr_up = std::make_unique<morph::PolygonVisual> (offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.6f, col, 20);
+    v.bindmodel (curr_up);
+    curr_up->finalize();
 
     // Fourth object marks the starting place
     col = { .5f, .5f, .5f };
     polypos[2] = objective(p);
-    auto sp = std::make_unique<morph::PolygonVisual> (v.shaders, offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.6f, col, 20);
+    auto sp = std::make_unique<morph::PolygonVisual> (offset, polypos, morph::vec<float>({1,0,0}), 0.005f, 0.6f, col, 20);
+    v.bindmodel (sp);
+    sp->finalize();
 
     auto candp = v.addVisualModel (cand_up);
     auto bestp = v.addVisualModel (best_up);
@@ -132,7 +140,8 @@ int main (int argc, char** argv)
 
     // Add a graph to track T_i and T_cost
     morph::vec<float> spatOff = {1.2f, -0.5f, 0.0f};
-    auto graph1 = std::make_unique<morph::GraphVisual<F>> (v.shaders, spatOff);
+    auto graph1 = std::make_unique<morph::GraphVisual<F>> (spatOff);
+    v.bindmodel (graph1);
     graph1->twodimensional = true;
     graph1->setlimits (0, 1000, -10, 1);
     graph1->policy = morph::stylepolicy::lines;
@@ -144,7 +153,8 @@ int main (int argc, char** argv)
     auto graph1p = v.addVisualModel (graph1);
 
     spatOff[0] += 1.1f;
-    auto graph2 = std::make_unique<morph::GraphVisual<F>> (v.shaders, spatOff);
+    auto graph2 = std::make_unique<morph::GraphVisual<F>> (spatOff);
+    v.bindmodel (graph2);
     graph2->twodimensional = true;
     graph2->setlimits (0, 1000, -1.0f, 1.0f);
     graph2->policy = morph::stylepolicy::lines;
@@ -201,7 +211,7 @@ int main (int argc, char** argv)
         graph2p->append ((float)anneal.steps, anneal.f_x_cand+0.2, 2);
 
 
-        glfwWaitEventsTimeout (0.0166);
+        v.waitevents (0.0166);
         v.render();
 #endif
         // Finally, you need to ask the algorithm to do its stuff for one step

examples/cartgrid.cpp

@@ -59,15 +59,16 @@ int main()
 
     // Add a CartGridVisual to display the CartGrid within the morph::Visual scene
     morph::vec<float, 3> offset = { 0.0f, -0.05f, 0.0f };
-    auto cgv = std::make_unique<morph::CartGridVisual<float>>(v.shaders, &cg, offset);
+    auto cgv = std::make_unique<morph::CartGridVisual<float>>(&cg, offset);
+    v.bindmodel (cgv);
     cgv->cartVisMode = morph::CartVisMode::RectInterp;
     cgv->setScalarData (&data);
     cgv->cm.setType (morph::ColourMapType::Twilight);
     cgv->finalize();
     v.addVisualModel (cgv);
 
     while (v.readyToFinish == false) {
-        glfwWaitEventsTimeout (0.018);
+        v.waitevents (0.018);
         v.render();
     }
 

examples/convolve.cpp

@@ -72,7 +72,8 @@ int main()
 
     // Visualize the 3 maps
     morph::vec<float, 3> offset = { -0.5, 0.0, 0.0 };
-    auto hgv = std::make_unique<morph::HexGridVisual<float>>(v.shaders, &hg, offset);
+    auto hgv = std::make_unique<morph::HexGridVisual<float>>(&hg, offset);
+    v.bindmodel (hgv);
     hgv->setScalarData (&data);
     hgv->cm.setType(morph::ColourMapType::Viridis);
     hgv->addLabel ("Input", { -0.3f, -0.45f, 0.01f }, morph::colour::white);
@@ -81,7 +82,8 @@ int main()
     auto hgvp = v.addVisualModel (hgv);
 
     offset[1] += 0.6f;
-    auto kgv = std::make_unique<morph::HexGridVisual<float>>(v.shaders, &kernel, offset);
+    auto kgv = std::make_unique<morph::HexGridVisual<float>>(&kernel, offset);
+    v.bindmodel (kgv);
     kgv->setScalarData (&kerneldata);
     kgv->cm.setType(morph::ColourMapType::Viridis);
     kgv->finalize();
@@ -92,11 +94,13 @@ int main()
 
     offset[1] -= 0.6f;
     offset[0] += 1.0f;
-    auto rgv = std::make_unique<morph::HexGridVisual<float>>(v.shaders, &hg, offset);
+    auto rgv = std::make_unique<morph::HexGridVisual<float>>(&hg, offset);
+    v.bindmodel (rgv);
     rgv->setScalarData (&convolved);
     rgv->cm.setType(morph::ColourMapType::Viridis);
     rgv->finalize();
     rgv->addLabel ("Output", { -0.3f, -0.45f, 0.01f }, morph::colour::white);
+    rgv->finalize();
     auto rgvp = v.addVisualModel (rgv);
 
     // Demonstrate how to divide existing scale by 10:
@@ -108,7 +112,7 @@ int main()
     rgvp->updateZScale (zscale);
 
     while (v.readyToFinish == false) {
-        glfwWaitEventsTimeout (0.018);
+        v.waitevents (0.018);
         v.render();
     }
 

examples/convolve_rect.cpp

@@ -69,7 +69,8 @@ int main()
     morph::Visual v(800,600,"Convolution window");
 
     morph::vec<float, 3> offset = { 0.0f, 0.0f, 0.0f };
-    auto cgv = std::make_unique<morph::CartGridVisual<float>>(v.shaders, &cg, offset);
+    auto cgv = std::make_unique<morph::CartGridVisual<float>>(&cg, offset);
+    v.bindmodel (cgv);
     cgv->cartVisMode = morph::CartVisMode::RectInterp;
     cgv->setScalarData (&data);
     cgv->cm.setType (morph::ColourMapType::GreyscaleInv);
@@ -80,7 +81,8 @@ int main()
     v.addVisualModel (cgv);
 
     offset = { 0.0f, -0.3f, 0.0f };
-    auto cgvk = std::make_unique<morph::CartGridVisual<float>>(v.shaders, &kernel, offset);
+    auto cgvk = std::make_unique<morph::CartGridVisual<float>>(&kernel, offset);
+    v.bindmodel (cgvk);
     cgvk->cartVisMode = morph::CartVisMode::RectInterp;
     cgvk->setScalarData (&kdata);
     cgvk->cm.setType (morph::ColourMapType::GreyscaleInv);
@@ -91,7 +93,8 @@ int main()
     v.addVisualModel (cgvk);
 
     offset = { 0.0f, -1.3f, 0.0f };
-    auto cgvr = std::make_unique<morph::CartGridVisual<float>>(v.shaders, &cg, offset);
+    auto cgvr = std::make_unique<morph::CartGridVisual<float>>(&cg, offset);
+    v.bindmodel (cgvr);
     cgvr->cartVisMode = morph::CartVisMode::RectInterp;
     cgvr->setScalarData (&convolved);
     cgvr->cm.setType (morph::ColourMapType::GreyscaleInv);

examples/duochrome.cpp

@@ -43,7 +43,8 @@ int main (int argc, char** argv)
             }
         }
 
-        auto sv = std::make_unique<morph::ScatterVisual<float>> (v.shaders, offset);
+        auto sv = std::make_unique<morph::ScatterVisual<float>> (offset);
+        v.bindmodel (sv);
         sv->setDataCoords (&points);
         sv->setScalarData (&data);
         // Set the vector data to the coordinates - we'll visualize duochrome based on x and y
@@ -58,7 +59,7 @@ int main (int argc, char** argv)
 
         v.render();
         while (v.readyToFinish == false) {
-            glfwWaitEventsTimeout (0.018);
+            v.waitevents (0.018);
             v.render();
         }
 

examples/fps.cpp

@@ -45,7 +45,8 @@ int main()
 
     // Add a HexGridVisual to display the HexGrid within the morph::Visual scene
     morph::vec<float, 3> offset = { 0.0, -0.05, 0.0 };
-    auto hgv = std::make_unique<morph::HexGridVisual<float>>(v.shaders, &hg, offset);
+    auto hgv = std::make_unique<morph::HexGridVisual<float>>(&hg, offset);
+    v.bindmodel (hgv);
     hgv->setScalarData (&data);
     hgv->hexVisMode = morph::HexVisMode::Triangles;
     hgv->finalize();
@@ -57,7 +58,7 @@ int main()
     auto tstart = steady_clock::now();
     unsigned int fcount = 0;
     while (v.readyToFinish == false) {
-        glfwWaitEventsTimeout (0.00001);
+        v.waitevents (0.00001);
         if (k > 8.0f) { k = 1.0f; }
 
 #pragma omp parallel for shared(r,k,data)