From d1f55e8b45df2dfd84bdde3e2566ef14c9ba40f1 Mon Sep 17 00:00:00 2001 From: XaviDCR92 Date: Sun, 11 Jun 2017 13:58:33 +0200 Subject: * Tried to get some work done in MapEditor with no success so far. * Timers with no repeat flag were being set to NULL, but this is not actually desired! * Reenabled transparency for aircraft shadow. * Deprecated NotificationRequest flags, and replaced by system timer handling. --- Source/MapEditor/mainwindow.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'Source/MapEditor/mainwindow.cpp') diff --git a/Source/MapEditor/mainwindow.cpp b/Source/MapEditor/mainwindow.cpp index 58c37f6..2632429 100644 --- a/Source/MapEditor/mainwindow.cpp +++ b/Source/MapEditor/mainwindow.cpp @@ -1,4 +1,6 @@ #include "mainwindow.h" +#include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -8,8 +10,6 @@ MainWindow::MainWindow(QWidget *parent) : connect(ui->LoadMap_Btn, SIGNAL(released()), this, SLOT(onLoadMap())); - ui->openGLWidget-> - appSettings(); } @@ -34,7 +34,6 @@ void MainWindow::onLoadMap(void) QDataStream txt(&f); - } bool MainWindow::checkFile(QFile& f) @@ -55,6 +54,21 @@ bool MainWindow::checkFile(QFile& f) _last_dir = d.absolutePath(); + QPixmap pix; + + if(pix.load("C:\\cygwin\\home\\Xavier\\Airport\\Sprites\\Tileset1.bmp") == false) + { + qDebug() << "Error loading bitmap."; + } + + QPainter p; + + p.begin(&pix); + + p.setWindow(ui->widget->geometry()); + + p.drawPixmap(ui->widget->x(), ui->widget->y(), pix); + return true; } -- cgit v1.2.3