From 3e651316d2140eae4b4d8f444e0db6661133c42a Mon Sep 17 00:00:00 2001 From: Chris Esposito Date: Sun, 5 Jul 2020 15:12:19 +1000 Subject: [PATCH] Degobindarification --- Desktop_Interface/genericusbdriver.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Desktop_Interface/genericusbdriver.cpp b/Desktop_Interface/genericusbdriver.cpp index 3d6c4e70..4938ccc0 100644 --- a/Desktop_Interface/genericusbdriver.cpp +++ b/Desktop_Interface/genericusbdriver.cpp @@ -25,6 +25,8 @@ private: GobindarDialog::GobindarDialog() : QWidget() { + setWindowFlags(Qt::Window); + QPalette palette; palette.setColor(QPalette::Background, Qt::white); setPalette(palette); @@ -45,7 +47,7 @@ GobindarDialog::GobindarDialog() QPixmap pixmap(":/bitmap/diagram.png"); m_image.setPixmap(pixmap); - m_image.setAlignment(Qt::AlignHCenter | Qt::AlignTop); + m_image.setAlignment(Qt::AlignTop); m_layout.addWidget(&m_largeText); m_layout.addWidget(&m_smallText); @@ -409,10 +411,9 @@ void genericUsbDriver::deGobindarise() { GobindarDialog gobindarDialog; gobindarDialog.show(); - while(1) - { - QApplication::processEvents(); - } + QApplication::processEvents(); + flashFirmware(); + gobindarDialog.close(); } void genericUsbDriver::saveState(int *_out_deviceMode, double *_out_scopeGain, double *_out_currentPsuVoltage, int *_out_digitalPinState){