caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dummy imgui processing

Browse Source
This commit is contained in:
Miodrag Milanovic 2018-10-21 10:20:50 +02:00
parent f796716b83
commit e2e9db52a2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gui/fpgaviewwidget.cc
View File

@ -25,6 +25,9 @@
#include <QMouseEvent> #include <QMouseEvent>
#include <QWidget> #include <QWidget>
#include "QtImGui.h"
#include "imgui.h"
#include "fpgaviewwidget.h" #include "fpgaviewwidget.h"
#include "log.h" #include "log.h"
#include "mainwindow.h" #include "mainwindow.h"
@ -57,7 +60,7 @@ FPGAViewWidget::FPGAViewWidget(QWidget *parent)
auto fmt = format(); auto fmt = format();
fmt.setMajorVersion(3); fmt.setMajorVersion(3);
fmt.setMinorVersion(1); fmt.setMinorVersion(2);
setFormat(fmt); setFormat(fmt);
fmt = format(); fmt = format();
@ -65,8 +68,8 @@ FPGAViewWidget::FPGAViewWidget(QWidget *parent)
printf("Could not get OpenGL 3.0 context. Aborting.\n"); printf("Could not get OpenGL 3.0 context. Aborting.\n");
log_abort(); log_abort();
} }
if (fmt.minorVersion() < 1) { if (fmt.minorVersion() < 2) {
printf("Could not get OpenGL 3.1 context - trying anyway...\n "); printf("Could not get OpenGL 3.2 context - trying anyway...\n ");
} }
connect(&paintTimer_, SIGNAL(timeout()), this, SLOT(update())); connect(&paintTimer_, SIGNAL(timeout()), this, SLOT(update()));
@ -103,6 +106,7 @@ void FPGAViewWidget::initializeGL()
log_error("Could not compile shader.\n"); log_error("Could not compile shader.\n");
} }
initializeOpenGLFunctions(); initializeOpenGLFunctions();
QtImGui::initialize(this);
glClearColor(colors_.background.red() / 255, colors_.background.green() / 255, glClearColor(colors_.background.red() / 255, colors_.background.green() / 255,
colors_.background.blue() / 255, 0.0); colors_.background.blue() / 255, 0.0);
@ -362,6 +366,8 @@ void FPGAViewWidget::paintGL()
} }
} }
} }
QtImGui::newFrame();
ImGui::Render();
} }
void FPGAViewWidget::pokeRenderer(void) { renderRunner_->poke(); } void FPGAViewWidget::pokeRenderer(void) { renderRunner_->poke(); }
@ -798,7 +804,7 @@ void FPGAViewWidget::zoomSelected()
{ {
{ {
QMutexLocker lock(&rendererDataLock_); QMutexLocker lock(&rendererDataLock_);
zoomToBB(rendererData_->bbSelected, 0.5f, true); zoomToBB(rendererData_->bbSelected, 0.5f, true);
} }
update(); update();
} }