Rewrite rendering

Author: JulianThijssen

CMakeLists.txt

@@ -60,16 +60,18 @@ set(PLUGIN_SOURCES
 )
 
 set(RENDER_SOURCES
-    src/EMRenderer.h
-    src/EMRenderer.cpp
     src/LayerDrawing.h
     src/LayerDrawing.cpp
+    src/Rendering/MERenderer.h
+    src/Rendering/MERenderer.cpp
     src/Rendering/CellRenderObject.h
     src/Rendering/CellRenderObject.cpp
     src/Rendering/RenderObjectBuilder.h
     src/Rendering/RenderObjectBuilder.cpp
     src/Rendering/RenderState.h
     src/Rendering/RenderState.cpp
+    src/Rendering/RenderContext.h
+    src/Rendering/RenderContext.cpp
     src/Rendering/RenderRegion.h
     src/Rendering/RenderRegion.cpp
 )

src/EMRenderer.cpp

@@ -440,7 +440,7 @@ void EMRenderer::ComputeRenderLocations(const std::vector<CellRenderObject*>& ce
 
 void EMRenderer::BuildRenderObjects(const std::vector<Cell>& cells)
 {
-    _renderObjectBuilder.BuildCellRenderObjects(cells);
+    _renderObjectBuilder.BuildCellRenderObjects(cells, _renderState._cellRenderObjects);
 }
 
 void EMRenderer::BuildListOfCellRenderObjects(const std::vector<Cell>& cells, std::vector<CellRenderObject*>& cellRenderObjects)

src/LayerDrawing.cpp

@@ -84,6 +84,11 @@ void LayerDrawing::drawAxes(QPainter& painter, bool isCortical)
     painter.drawLine(MARGIN, topMargin, MARGIN, _parent->height() - bottomMargin);
 }
 
+void LayerDrawing::drawSeparations(QPainter& painter, bool isCortical)
+{
+    drawVerticalLine(painter, 200);
+}
+
 static qreal snapToDeviceRow(const QPainter& p, qreal y)
 {
     const QTransform dev = p.deviceTransform();
@@ -104,3 +109,24 @@ void LayerDrawing::drawHorizontalLine(QPainter& painter, float y)
 
     painter.restore();
 }
+
+void LayerDrawing::drawVerticalLine(QPainter& painter, float x)
+{
+    painter.save();
+    painter.setRenderHint(QPainter::Antialiasing, false);
+
+    int topMargin = 32; // Non-pixel ratio margin
+    int bottomMargin = _parent->height() / 3.0f; // Pixel ratio margin
+    int chartHeight = _parent->height() - topMargin - bottomMargin;
+
+    // Draw line centered at a pixel, so it doesn't bleed onto multiple pixels
+    const qreal px = snapToDeviceRow(painter, x);
+    QPen pen;
+    pen.setColor(Qt::gray);
+    pen.setWidth(2);
+    pen.setStyle(Qt::DashLine);
+    painter.setPen(pen);
+    painter.drawLine(QPointF(px, topMargin), QPointF(px, chartHeight + topMargin));
+
+    painter.restore();
+}

src/LayerDrawing.h

@@ -15,9 +15,11 @@ class LayerDrawing
     void setDepthRange(float minDepth, float maxDepth);
 
     void drawAxes(QPainter& painter, bool isCortical);
+    void drawSeparations(QPainter& painter, bool isCortical);
 
 private:
     void drawHorizontalLine(QPainter& painter, float y);
+    void drawVerticalLine(QPainter& painter, float x);
 
 private:
     QWidget* _parent;

src/MEView.cpp

@@ -46,7 +46,7 @@ void MEView::init()
     _primaryToolbarAction.addAction(&_settingsAction.getStimSetsAction());
 
     connect(&_settingsAction.getProcessesOption(), &OptionsAction::selectedOptionsChanged, this, [this](const QStringList& selectedOptions) { _meWidget->GetRenderer().SetEnabledProcesses(selectedOptions); });
-    connect(&_settingsAction.getStimSetsAction(), &OptionAction::currentIndexChanged, this, [this](const int32_t& index) { _meWidget->GetRenderer().setCurrentStimset(_settingsAction.getStimSetsAction().getCurrentText()); });
+    connect(&_settingsAction.getStimSetsAction(), &OptionAction::currentIndexChanged, this, [this](const int32_t& index) { _meWidget->GetRenderer().SetCurrentStimset(_settingsAction.getStimSetsAction().getCurrentText()); });
     connect(&_settingsAction.getShowNoMorphsAction(), &ToggleAction::toggled, this, [this](bool toggled) { onCellSelectionChanged(); });
     _meWidget->GetRenderer().SetEnabledProcesses({ "Axon", "Apical Dendrite", "Basal Dendrite" });
 

src/MEWidget.cpp

@@ -9,13 +9,13 @@ namespace
 
 MEWidget::MEWidget() :
     _scene(Scene::getInstance()),
-    _emRenderer(),
+    _meRenderer(),
     _layerDrawing(this),
     _width(1),
     _height(1),
     _isCortical(false)
 {
-    connect(&_emRenderer, &EMRenderer::requestNewAspectRatio, this, &MEWidget::onNewAspectRatioRequested);
+    connect(&_meRenderer, &MERenderer::RequestNewAspectRatio, this, &MEWidget::onNewAspectRatioRequested);
 
     //setMinimumSize(10, 10);
     setSizePolicy(QSizePolicy::Policy::Expanding, QSizePolicy::Policy::Expanding);
@@ -32,36 +32,30 @@ void MEWidget::setCells(const std::vector<Cell>& cells)
         return;
 
     makeCurrent();
-    _emRenderer.BuildRenderObjects(cells);
+    _meRenderer.BuildRenderObjects(cells);
 }
 
 void MEWidget::setSelectedCells(const std::vector<uint32_t>& indices)
 {
-    //if (!isWidgetInitialized()) // Shouldn't be necessary
-    //    return;
-
-    //_cells = cells;
-
     _scene.selectedCells.clear();
     for (uint32_t cellIndex : indices)
     {
         _scene.selectedCells.push_back(_scene.allCells[cellIndex]);
     }
 
-    // makeCurrent(); // Shouldn't be necessary
-    _emRenderer.SetSelectedCellIds(indices);
+    _meRenderer.SetSelectedCellIds(indices);
 }
 
 void MEWidget::SetCortical(bool isCortical)
 {
     _isCortical = isCortical;
 
-    _emRenderer.SetCortical(isCortical);
+    _meRenderer.SetCortical(isCortical);
 }
 
 void MEWidget::onWidgetInitialized()
 {
-    _emRenderer.init();
+    _meRenderer.Init();
 
     // Start 40 fps render timer
     QTimer* updateTimer = new QTimer();
@@ -72,7 +66,7 @@ void MEWidget::onWidgetInitialized()
 void MEWidget::onWidgetResized(int w, int h)
 {
     _width = w; _height = h;
-    _emRenderer.resize(w, h, devicePixelRatioF());
+    _meRenderer.Resize(w, h, devicePixelRatioF());
 }
 
 void MEWidget::onWidgetRendered()
@@ -93,30 +87,14 @@ void MEWidget::onWidgetRendered()
 
     _layerDrawing.setDepthRange(scene.getCortexStructure().getMinDepth(), scene.getCortexStructure().getMaxDepth());
     _layerDrawing.drawAxes(painter, _isCortical);
+    //_layerDrawing.drawSeparations(painter, _isCortical);
 
     painter.beginNativePainting();
-    _emRenderer.update(t);
+    _meRenderer.Update(t, painter);
     painter.endNativePainting();
 
-    std::vector<float> horizontalCellLocations = _emRenderer.GetHorizontalCellLocations();
-    for (int i = 0; i < horizontalCellLocations.size(); i++)
-    {
-        int xCoord = horizontalCellLocations[i] / devicePixelRatioF();
-        int yCoord = 16;
-
-        QFontMetrics fm(painter.font());
-        int textWidth = fm.horizontalAdvance(_scene.selectedCells[i].cluster);
-        int textHeight = fm.height();
-
-        // Calculate top-left corner to draw the text so that it is centered
-        int x = xCoord - textWidth / 2;
-        int y = yCoord + fm.ascent() - textHeight / 2;
-
-        const QRect boundingRect = QRect(xCoord - 50, yCoord - 12, 100, 28);
-        painter.drawText(boundingRect, Qt::AlignCenter | Qt::AlignTop | Qt::TextWordWrap, _scene.selectedCells[i].cluster);
-
-        //painter.drawText(x, y, _scene.selectedCells[i].cluster);
-    }
+    _meRenderer.RenderLabels(painter);
+    _meRenderer.RenderSeparations(painter);
 
     painter.end();
 }
@@ -132,7 +110,7 @@ void MEWidget::mousePressEvent(QMouseEvent* event)
         QPoint localPos = event->pos(); // position inside the widget
         QPoint globalPos = mapToGlobal(localPos);
 
-        std::vector<float> cellLocations = _emRenderer.GetHorizontalCellLocations();
+        std::vector<float> cellLocations = _meRenderer.GetHorizontalCellLocations();
         Cell* cell = nullptr;
         float closestDist = std::numeric_limits<float>::max();
         for (int i = 0; i < cellLocations.size(); i++)

src/MEWidget.h

@@ -3,7 +3,7 @@
 #include "Scene.h"
 
 #include "LayerDrawing.h"
-#include "EMRenderer.h"
+#include "Rendering/MERenderer.h"
 //#include "HoverPopup.h"
 #include "RoundedPopup.h"
 #include "CellCard/CellCard.h"
@@ -17,7 +17,7 @@ class MEWidget : public mv::gui::OpenGLWidget
 public:
     MEWidget();
 
-    EMRenderer& GetRenderer() { return _emRenderer; }
+    MERenderer& GetRenderer() { return _meRenderer; }
 
     /** Set the indices of which morphologies should be shown */
     void setCells(const std::vector<Cell>& cells);
@@ -46,7 +46,7 @@ public slots:
 
     bool _isCortical;
     LayerDrawing _layerDrawing;
-    EMRenderer _emRenderer;
+    MERenderer _meRenderer;
 
     float t = 0;