diff options
Diffstat (limited to 'gui/fpgaviewwidget.cc')
| -rw-r--r-- | gui/fpgaviewwidget.cc | 142 |
1 files changed, 93 insertions, 49 deletions
diff --git a/gui/fpgaviewwidget.cc b/gui/fpgaviewwidget.cc index f8fefd97..1d0e8b57 100644 --- a/gui/fpgaviewwidget.cc +++ b/gui/fpgaviewwidget.cc @@ -23,7 +23,6 @@ #include <QApplication> #include <QCoreApplication> #include <QMouseEvent> -#include <QTimer> #include <QWidget> #include "fpgaviewwidget.h" @@ -196,7 +195,7 @@ bool LineShader::compile(void) return true; } -void LineShader::draw(const LineShaderData &line, const QColor &color, const float thickness, const QMatrix4x4 &projection) +void LineShader::draw(const LineShaderData &line, const QColor &color, float thickness, const QMatrix4x4 &projection) { auto gl = QOpenGLContext::currentContext()->functions(); vao_.bind(); @@ -266,10 +265,6 @@ FPGAViewWidget::FPGAViewWidget(QWidget *parent) : QOpenGLWidget(parent), lineSha if (fmt.minorVersion() < 1) { printf("Could not get OpenGL 3.1 context - trying anyway...\n "); } - - QTimer *timer = new QTimer(this); - connect(timer, SIGNAL(timeout()), this, SLOT(update())); - timer->start(5000); } FPGAViewWidget::~FPGAViewWidget() {} @@ -293,6 +288,73 @@ void FPGAViewWidget::initializeGL() glClearColor(backgroundColor_.red() / 255, backgroundColor_.green() / 255, backgroundColor_.blue() / 255, 0.0); } +void FPGAViewWidget::drawDecal(LineShaderData &out, const DecalXY &decal) +{ + const float scale = 1.0; + float offsetX = 0.0, offsetY = 0.0; + + for (auto &el : ctx_->getDecalGraphics(decal.decal)) { + offsetX = decal.x; + offsetY = decal.y; + + if (el.type == GraphicElement::G_BOX) { + auto line = PolyLine(true); + line.point(offsetX + scale * el.x1, offsetY + scale * el.y1); + line.point(offsetX + scale * el.x2, offsetY + scale * el.y1); + line.point(offsetX + scale * el.x2, offsetY + scale * el.y2); + line.point(offsetX + scale * el.x1, offsetY + scale * el.y2); + line.build(out); + } + + if (el.type == GraphicElement::G_LINE) { + PolyLine(offsetX + scale * el.x1, offsetY + scale * el.y1, offsetX + scale * el.x2, offsetY + scale * el.y2) + .build(out); + } + } +} + +void FPGAViewWidget::drawDecal(LineShaderData out[], const DecalXY &decal) +{ + const float scale = 1.0; + float offsetX = 0.0, offsetY = 0.0; + + for (auto &el : ctx_->getDecalGraphics(decal.decal)) { + offsetX = decal.x; + offsetY = decal.y; + + if (el.type == GraphicElement::G_BOX) { + auto line = PolyLine(true); + line.point(offsetX + scale * el.x1, offsetY + scale * el.y1); + line.point(offsetX + scale * el.x2, offsetY + scale * el.y1); + line.point(offsetX + scale * el.x2, offsetY + scale * el.y2); + line.point(offsetX + scale * el.x1, offsetY + scale * el.y2); + switch (el.style) { + case GraphicElement::G_FRAME: + case GraphicElement::G_INACTIVE: + case GraphicElement::G_ACTIVE: + line.build(out[el.style]); + break; + default: + break; + } + } + + if (el.type == GraphicElement::G_LINE) { + auto line = PolyLine(offsetX + scale * el.x1, offsetY + scale * el.y1, offsetX + scale * el.x2, + offsetY + scale * el.y2); + switch (el.style) { + case GraphicElement::G_FRAME: + case GraphicElement::G_INACTIVE: + case GraphicElement::G_ACTIVE: + line.build(out[el.style]); + break; + default: + break; + } + } + } +} + QMatrix4x4 FPGAViewWidget::getProjection(void) { QMatrix4x4 matrix; @@ -326,44 +388,27 @@ void FPGAViewWidget::paintGL() } lineShader_.draw(grid, gridColor_, thick1Px, matrix); + LineShaderData shaders[4] = {[GraphicElement::G_FRAME] = LineShaderData(), + [GraphicElement::G_HIDDEN] = LineShaderData(), + [GraphicElement::G_INACTIVE] = LineShaderData(), + [GraphicElement::G_ACTIVE] = LineShaderData()}; + if (ctx_) { - auto &&proxy = ctx_->rwproxy(); - auto updates = proxy.getUIUpdatesRequired(); - - // Collapse all updates to a full redraw. - // TODO(q3k) fix this. - - bool redraw = (updates.allUIReload - || !updates.belUIReload.empty() - || !updates.wireUIReload.empty() - || !updates.pipUIReload.empty() - || !updates.groupUIReload.empty() - || updates.frameUIReload); - - if (redraw) { - shaders_[0].clear(); - shaders_[1].clear(); - shaders_[2].clear(); - shaders_[3].clear(); - - // Draw Bels. - for (auto bel : ctx_->getBels()) { - drawDecal(proxy, shaders_, ctx_->getBelDecal(bel)); - } - // Draw Wires. - for (auto wire : ctx_->getWires()) { - drawDecal(proxy, shaders_, ctx_->getWireDecal(wire)); - } - // Draw Pips. - for (auto pip : ctx_->getPips()) { - drawDecal(proxy, shaders_, ctx_->getPipDecal(pip)); - } - // Draw Groups. - for (auto group : ctx_->getGroups()) { - drawDecal(proxy, shaders_, ctx_->getGroupDecal(group)); - } - // Draw Frame Graphics. - drawDecal(proxy, shaders_, ctx_->getFrameDecal()); + // Draw Bels. + for (auto bel : ctx_->getBels()) { + drawDecal(shaders, ctx_->getBelDecal(bel)); + } + // Draw Wires. + for (auto wire : ctx_->getWires()) { + drawDecal(shaders, ctx_->getWireDecal(wire)); + } + // Draw Pips. + for (auto pip : ctx_->getPips()) { + drawDecal(shaders, ctx_->getPipDecal(pip)); + } + // Draw Groups. + for (auto group : ctx_->getGroups()) { + drawDecal(shaders, ctx_->getGroupDecal(group)); } if (selectedItemsChanged) @@ -371,17 +416,16 @@ void FPGAViewWidget::paintGL() selectedItemsChanged = false; selectedShader_.clear(); for (auto decal : selectedItems_) { - drawDecal(proxy, selectedShader_, decal); + drawDecal(selectedShader_, decal); } } } - lineShader_.draw(shaders_[0], gFrameColor_, thick11Px, matrix); - lineShader_.draw(shaders_[1], gHiddenColor_, thick11Px, matrix); - lineShader_.draw(shaders_[2], gInactiveColor_, thick11Px, matrix); - lineShader_.draw(shaders_[3], gActiveColor_, thick11Px, matrix); + lineShader_.draw(shaders[0], gFrameColor_, thick11Px, matrix); + lineShader_.draw(shaders[1], gHiddenColor_, thick11Px, matrix); + lineShader_.draw(shaders[2], gInactiveColor_, thick11Px, matrix); + lineShader_.draw(shaders[3], gActiveColor_, thick11Px, matrix); lineShader_.draw(selectedShader_, gSelectedColor_, thick11Px, matrix); - //lineShader_.draw(frame, matrix); } void FPGAViewWidget::onSelectedArchItem(std::vector<DecalXY> decals) |