aaron/discoverpixy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Drawcircle added (emulator)

Browse Source
This commit is contained in:
id101010
2015-04-27 18:36:58 +02:00
parent 6c97e6fc24
commit aed90ef956
8 changed files with 27 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emulator/qt/ll_tft.cpp
View File

@@ -5,7 +5,6 @@ extern "C" {
#include "ll_tft.h"
}
MainWindow* mainwindow;
bool ll_tft_init() {
@@ -20,7 +19,6 @@ void ll_tft_draw_line(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16
mainwindow->draw_line(x1,y1,x2,y2,color);
}
void ll_tft_clear(uint16_t color) {
mainwindow->clear(color);
}
@@ -41,4 +39,8 @@ void ll_tft_draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_
mainwindow->draw_bitmap_unscaled(x,y,width,height,dat);
}
void ll_tft_draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color) {
mainwindow->draw_circle(x,y,r,color);
}

16
emulator/qt/mainwindow.cpp
View File

@@ -26,11 +26,7 @@ QRgb QRgbFromRGB565(uint16_t color) {
}
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
image(DISPLAY_WIDTH,DISPLAY_HEIGHT,QImage::Format_RGB16),
ui(new Ui::MainWindow)
{
MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), image(DISPLAY_WIDTH,DISPLAY_HEIGHT, QImage::Format_RGB16), ui(new Ui::MainWindow){
ui->setupUi(this);
image.fill(Qt::black);
}
@@ -99,6 +95,16 @@ void MainWindow::draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, ui
update();
}
void MainWindow::draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color)
{
//render_mutex.lock();
QPainter painter(&(image));
painter.setPen(QColorFromRGB565(color));
painter.drawEllipse(QPoint(x,y), r, r);
//render_mutex.unlock();
update();
}
void MainWindow::paintEvent(QPaintEvent *)
{
//render_mutex.lock();

1
emulator/qt/mainwindow.h
View File

@@ -21,6 +21,7 @@ public:
void draw_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void fill_rectangle(uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2, uint16_t color);
void draw_bitmap_unscaled(uint16_t x, uint16_t y, uint16_t width, uint16_t height, const uint16_t *dat);
void draw_circle(uint16_t x, uint16_t y, uint16_t r, uint16_t color);
protected: