Reframe render objects when showing or hiding axons

Author: JulianThijssen

src/EMRenderer.cpp

@@ -19,7 +19,7 @@ namespace
         float maxHeight = std::numeric_limits<float>::min();
         for (int i = 0; i < cellRenderObjects.size(); i++)
         {
-            CellMorphology::Extent extent = cellRenderObjects[i]->morphologyObject.ComputeExtents();
+            CellMorphology::Extent extent = cellRenderObjects[i]->morphologyObject.totalExtent;
             mv::Vector3f dimensions = extent.emax - extent.emin;
 
             if (dimensions.y > maxHeight)
@@ -56,11 +56,8 @@ void EMRenderer::resize(int w, int h)
     float aspectRatio = (float)w / h;
     qDebug() << "Resize called";
     _projMatrix.setToIdentity();
-    //_projMatrix.ortho(0, aspectRatio, 0, 1, -1, 1);
-
     _projMatrix.ortho(0, aspectRatio, 0, 1, 1, -1);
 
-    vx = 0; vy = 0; vw = w; vh = h;
     _fullViewport.Set(0, 0, w, h);
 
     int quarter = h / 4;
@@ -105,7 +102,7 @@ void EMRenderer::update(float t)
     _morphologyViewport.Begin();
     _projMatrix.setToIdentity();
     _projMatrix.ortho(0, _morphologyViewport.GetAspectRatio(), 0, 1, -1, 1);
-    qDebug() << "Aspect ratio: " << _morphologyViewport.GetAspectRatio();
+
     _lineShader.uniformMatrix4f("projMatrix", _projMatrix.constData());
 
     float xOffset = 0;
@@ -114,12 +111,17 @@ void EMRenderer::update(float t)
     //if (cortical)
     //    yToUnit = MapYRangeToUnit(-_scene.getCortexStructure().getMaxDepth(), -_scene.getCortexStructure().getMinDepth());
 
+    std::vector<CellMorphology::Type> ignoredTypes;
+    if (!_showAxons)
+        ignoredTypes.push_back(CellMorphology::Type::Axon);
+
     //qDebug() << "Rendering " << cellRenderObjects.size() << " objects.";
     for (int i = 0; i < cellRenderObjects.size(); i++)
     {
         CellRenderObject* cro = cellRenderObjects[i];
 
-        CellMorphology::Extent extent = cro->morphologyObject.ComputeExtents();
+        cro->morphologyObject.ComputeExtents(ignoredTypes);
+        const CellMorphology::Extent& extent = cro->morphologyObject.totalExtent;
 
         mv::Vector3f dimensions = extent.emax - extent.emin;
 
@@ -150,6 +152,8 @@ void EMRenderer::update(float t)
         for (auto it = cro->morphologyObject.processes.begin(); it != cro->morphologyObject.processes.end(); ++it)
         {
             CellMorphology::Type type = it.key();
+            if (type == CellMorphology::Type::Axon && !_showAxons)
+                continue;
             MorphologyProcessRenderObject mpro = it.value();
             _lineShader.uniform1i("type", (int)type);
             glBindVertexArray(mpro.vao);
@@ -179,7 +183,7 @@ void EMRenderer::update(float t)
     {
         CellRenderObject* cro = cellRenderObjects[i];
 
-        CellMorphology::Extent extent = cro->morphologyObject.ComputeExtents();
+        const CellMorphology::Extent& extent = cro->morphologyObject.totalExtent;
         mv::Vector3f dimensions = extent.emax - extent.emin;
         float maxWidth = sqrtf(powf(dimensions.x, 2) + powf(dimensions.z, 2)) * 1.5f;
 
@@ -246,6 +250,8 @@ void EMRenderer::showAxons(bool enabled)
     _showAxons = enabled;
 
     //RebuildMorphologies();
+
+    RequestNewWidgetWidth();
 }
 
 void EMRenderer::setCurrentStimset(const QString& stimSet)
@@ -262,20 +268,9 @@ void EMRenderer::SetCortical(bool isCortical)
 
 void EMRenderer::SetSelectedCellIds(const std::vector<Cell>& cells)
 {
-    std::vector<QString> cellIds;
-
     // Build list of selected cell render object references
     std::vector<CellRenderObject*> cellRenderObjects;
-    for (const Cell& cell : cells)
-    {
-        cellIds.push_back(cell.cellId);
-        auto it = _renderState._cellRenderObjects.find(cell.cellId);
-
-        if (it != _renderState._cellRenderObjects.end())
-            cellRenderObjects.push_back(&(*it));
-        else
-            qDebug() << "[EMRenderer] This should never happen, but cellId wasn't found in _cellRenderObjects";
-    }
+    BuildListOfCellRenderObjects(cells, cellRenderObjects);
 
     _renderState._selectedCells = cells;
 
@@ -313,13 +308,45 @@ void EMRenderer::SetSelectedCellIds(const std::vector<Cell>& cells)
         }
     }
 
+    RequestNewWidgetWidth();
+}
+
+void EMRenderer::BuildRenderObjects(const std::vector<Cell>& cells)
+{
+    _renderObjectBuilder.BuildCellRenderObjects(cells);
+}
+
+void EMRenderer::BuildListOfCellRenderObjects(const std::vector<Cell>& cells, std::vector<CellRenderObject*>& cellRenderObjects)
+{
+    // Build list of selected cell render object references
+    for (const Cell& cell : cells)
+    {
+        auto it = _renderState._cellRenderObjects.find(cell.cellId);
+
+        if (it != _renderState._cellRenderObjects.end())
+            cellRenderObjects.push_back(&(*it));
+        else
+            qDebug() << "[EMRenderer] This should never happen, but cellId wasn't found in _cellRenderObjects";
+    }
+}
+
+void EMRenderer::RequestNewWidgetWidth()
+{
+    std::vector<CellRenderObject*> cellRenderObjects;
+    BuildListOfCellRenderObjects(_renderState._selectedCells, cellRenderObjects);
+
+    std::vector<CellMorphology::Type> ignoredTypes;
+    if (!_showAxons)
+        ignoredTypes.push_back(CellMorphology::Type::Axon);
+
     // Compute new widget width
     float newWidgetWidthToRequest = 0;
     for (int i = 0; i < cellRenderObjects.size(); i++)
     {
-        CellMorphology::Extent extent = cellRenderObjects[i]->morphologyObject.ComputeExtents();
+        cellRenderObjects[i]->morphologyObject.ComputeExtents(ignoredTypes);
+        CellMorphology::Extent extent = cellRenderObjects[i]->morphologyObject.totalExtent;
         mv::Vector3f dimensions = extent.emax - extent.emin;
-        
+
         newWidgetWidthToRequest += sqrtf(powf(dimensions.x, 2) + powf(dimensions.z, 2)) * 1.2f;
     }
 
@@ -330,8 +357,3 @@ void EMRenderer::SetSelectedCellIds(const std::vector<Cell>& cells)
 
     emit requestNewAspectRatio(aspectRatioRequest);
 }
-
-void EMRenderer::BuildRenderObjects(const std::vector<Cell>& cells)
-{
-    _renderObjectBuilder.BuildCellRenderObjects(cells);
-}

src/EMRenderer.h

@@ -39,6 +39,10 @@ class EMRenderer : public QObject, protected QOpenGLFunctions_3_3_Core
     void showAxons(bool enabled);
     void setCurrentStimset(const QString& stimset);
 
+private:
+    void BuildListOfCellRenderObjects(const std::vector<Cell>& cells, std::vector<CellRenderObject*>& cellRenderObjects);
+    void RequestNewWidgetWidth();
+
 signals:
     void requestNewAspectRatio(float aspectRatio);
 
@@ -55,7 +59,6 @@ class EMRenderer : public QObject, protected QOpenGLFunctions_3_3_Core
 
     bool _isCortical = false;
 
-    int vx, vy, vw, vh;
     RenderRegion _fullViewport;
     RenderRegion _morphologyViewport;
     RenderRegion _traceViewport;

src/MEWidget.cpp

@@ -51,10 +51,10 @@ void MEWidget::onWidgetInitialized()
 {
     _emRenderer.init();
 
-    // Start 50 fps render timer
+    // Start 40 fps render timer
     QTimer* updateTimer = new QTimer();
     QObject::connect(updateTimer, &QTimer::timeout, this, [this]() { update(); });
-    updateTimer->start(1000.0f / 50);
+    updateTimer->start(1000.0f / 40);
 }
 
 void MEWidget::onWidgetResized(int w, int h)

src/Rendering/CellRenderObject.cpp

@@ -14,14 +14,16 @@ void CellRenderObject::Cleanup(QOpenGLFunctions_3_3_Core* f)
     //f->glDeleteVertexArrays(1, &acquisitionObject.vao);
 }
 
-CellMorphology::Extent MorphologyRenderObject::ComputeExtents()
+void MorphologyRenderObject::ComputeExtents(std::vector<CellMorphology::Type> ignoredTypes)
 {
-    CellMorphology::Extent totalExtent;
     totalExtent.emin = mv::Vector3f(std::numeric_limits<float>::max());
     totalExtent.emax = mv::Vector3f(-std::numeric_limits<float>::max());
 
     for (auto it = processes.constBegin(); it != processes.constEnd(); ++it)
-        totalExtent.Extend(it.value().extents);
+    {
+        if (std::find(ignoredTypes.begin(), ignoredTypes.end(), it.key()) != ignoredTypes.end())
+            continue;
 
-    return totalExtent;
+        totalExtent.Extend(it.value().extents);
+    }
 }

src/Rendering/CellRenderObject.h

@@ -26,13 +26,15 @@ struct MorphologyProcessRenderObject
 class MorphologyRenderObject
 {
 public:
-    CellMorphology::Extent ComputeExtents();
+    void ComputeExtents(std::vector<CellMorphology::Type> ignoredTypes);
 
     QHash<CellMorphology::Type, MorphologyProcessRenderObject> processes;
 
     mv::Vector3f somaPosition;
     float somaRadius;
 
+    CellMorphology::Extent totalExtent;
+
     ///* Centerpoint of the morphology, around which it will rotate */
     //mv::Vector3f _anchorPoint;
 };