Merge pull request #161 from SubaruDieselCrew/own

add setWindowFlags(Qt::Window) to improve window management
This commit is contained in:
Collin Kidder
2019-02-13 20:47:57 -05:00
committed by GitHub
20 changed files with 33 additions and 14 deletions
+1
View File
@@ -13,6 +13,7 @@ BisectWindow::BisectWindow(const QVector<CANFrame> *frames, QWidget *parent) :
ui(new Ui::BisectWindow) ui(new Ui::BisectWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
+1
View File
@@ -14,6 +14,7 @@ ConnectionWindow::ConnectionWindow(QWidget *parent) :
ui(new Ui::ConnectionWindow) ui(new Ui::ConnectionWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
QSettings settings; QSettings settings;
+1
View File
@@ -7,6 +7,7 @@ DBCLoadSaveWindow::DBCLoadSaveWindow(const QVector<CANFrame> *frames, QWidget *p
QDialog(parent), QDialog(parent),
ui(new Ui::DBCLoadSaveWindow) ui(new Ui::DBCLoadSaveWindow)
{ {
setWindowFlags(Qt::Window);
dbcHandler = DBCHandler::getReference(); dbcHandler = DBCHandler::getReference();
referenceFrames = frames; referenceFrames = frames;
+5 -4
View File
@@ -8,7 +8,8 @@ FirmwareUploaderWindow::FirmwareUploaderWindow(const QVector<CANFrame> *frames,
QDialog(parent), QDialog(parent),
ui(new Ui::FirmwareUploaderWindow) ui(new Ui::FirmwareUploaderWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
transferInProgress = false; transferInProgress = false;
startedProcess = false; startedProcess = false;
@@ -25,7 +26,7 @@ FirmwareUploaderWindow::FirmwareUploaderWindow(const QVector<CANFrame> *frames,
updateProgress(); updateProgress();
timer = new QTimer(); timer = new QTimer();
timer->setInterval(100); //100ms without a reply will cause us to attempt a resend timer->setInterval(100); //100ms without a reply will cause us to attempt a resend
connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int))); connect(MainWindow::getReference(), SIGNAL(framesUpdated(int)), this, SLOT(updatedFrames(int)));
connect(ui->btnLoadFile, SIGNAL(clicked(bool)), this, SLOT(handleLoadFile())); connect(ui->btnLoadFile, SIGNAL(clicked(bool)), this, SLOT(handleLoadFile()));
@@ -136,7 +137,7 @@ void FirmwareUploaderWindow::sendFirmwareChunk()
output->data[4] = firmwareData[firmwareLocation++]; output->data[4] = firmwareData[firmwareLocation++];
output->data[5] = firmwareData[firmwareLocation++]; output->data[5] = firmwareData[firmwareLocation++];
for (int i = 0; i < 6; i++) xorByte = xorByte ^ output->data[i]; for (int i = 0; i < 6; i++) xorByte = xorByte ^ output->data[i];
output->data[6] = xorByte; output->data[6] = xorByte;
sendCANFrame(output); sendCANFrame(output);
timer->start(); timer->start();
} }
@@ -162,7 +163,7 @@ void FirmwareUploaderWindow::handleStartStopTransfer()
if (startedProcess) //start the process if (startedProcess) //start the process
{ {
ui->progressBar->setValue(0); ui->progressBar->setValue(0);
ui->btnStartStop->setText("Stop Upload"); ui->btnStartStop->setText("Stop Upload");
token = Utility::ParseStringToNum(ui->txtToken->text()); token = Utility::ParseStringToNum(ui->txtToken->text());
bus = ui->spinBus->value(); bus = ui->spinBus->value();
baseAddress = Utility::ParseStringToNum(ui->txtBaseAddr->text()); baseAddress = Utility::ParseStringToNum(ui->txtBaseAddr->text());
+3 -3
View File
@@ -25,7 +25,7 @@ FramePlaybackWindow::FramePlaybackWindow(const QVector<CANFrame> *frames, QWidge
ui(new Ui::FramePlaybackWindow) ui(new Ui::FramePlaybackWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
int numBuses = CANConManager::getInstance()->getNumBuses(); int numBuses = CANConManager::getInstance()->getNumBuses();
for (int n = 0; n < numBuses; n++) ui->comboCANBus->addItem(QString::number(n)); for (int n = 0; n < numBuses; n++) ui->comboCANBus->addItem(QString::number(n));
@@ -553,7 +553,7 @@ void FramePlaybackWindow::btnStopClick()
{ {
ui->tblSequence->setCurrentCell(0, 0); ui->tblSequence->setCurrentCell(0, 0);
refreshIDList(); refreshIDList();
} }
updateFrameLabel(); updateFrameLabel();
} }
@@ -594,7 +594,7 @@ void FramePlaybackWindow::changeSendingBus(int newIdx)
void FramePlaybackWindow::changeIDFiltering(QListWidgetItem *item) void FramePlaybackWindow::changeIDFiltering(QListWidgetItem *item)
{ {
qDebug() << "Changed ID filter " << item->text() << " : " << item->checkState(); qDebug() << "Changed ID filter " << item->text() << " : " << item->checkState();
int ID = Utility::ParseStringToNum(item->text()); int ID = Utility::ParseStringToNum(item->text());
currentSeqItem->idFilters[ID] = (item->checkState() == Qt::Checked) ? true : false; currentSeqItem->idFilters[ID] = (item->checkState() == Qt::Checked) ? true : false;
} }
+1
View File
@@ -20,6 +20,7 @@ FrameSenderWindow::FrameSenderWindow(const QVector<CANFrame> *frames, QWidget *p
ui(new Ui::FrameSenderWindow) ui(new Ui::FrameSenderWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
+1
View File
@@ -9,6 +9,7 @@ HelpWindow::HelpWindow(QWidget *parent) :
ui(new Ui::HelpWindow) ui(new Ui::HelpWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
m_helpEngine = new QHelpEngineCore(QApplication::applicationDirPath() +"/SavvyCAN.qhc", this); m_helpEngine = new QHelpEngineCore(QApplication::applicationDirPath() +"/SavvyCAN.qhc", this);
if (!m_helpEngine->setupData()) { if (!m_helpEngine->setupData()) {
+1
View File
@@ -9,6 +9,7 @@ MotorControllerConfigWindow::MotorControllerConfigWindow(const QVector<CANFrame>
ui(new Ui::MotorControllerConfigWindow) ui(new Ui::MotorControllerConfigWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
+1
View File
@@ -8,6 +8,7 @@ DiscreteStateWindow::DiscreteStateWindow(const QVector<CANFrame> *frames, QWidge
ui(new Ui::DiscreteStateWindow) ui(new Ui::DiscreteStateWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
operatingState = DWStates::IDLE; operatingState = DWStates::IDLE;
+4 -3
View File
@@ -8,6 +8,7 @@ FileComparatorWindow::FileComparatorWindow(QWidget *parent) :
ui(new Ui::FileComparatorWindow) ui(new Ui::FileComparatorWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
connect(ui->btnInterestedFile, SIGNAL(clicked(bool)), this, SLOT(loadInterestedFile())); connect(ui->btnInterestedFile, SIGNAL(clicked(bool)), this, SLOT(loadInterestedFile()));
connect(ui->btnLoadRefFile, SIGNAL(clicked(bool)), this, SLOT(loadReferenceFile())); connect(ui->btnLoadRefFile, SIGNAL(clicked(bool)), this, SLOT(loadReferenceFile()));
@@ -167,8 +168,8 @@ void FileComparatorWindow::calculateDetails()
//qDebug() << "bitmap: " << QString::number(newData->bitmap, 16); //qDebug() << "bitmap: " << QString::number(newData->bitmap, 16);
} }
interestedIDs.insert(frame.ID, *newData); interestedIDs.insert(frame.ID, *newData);
} }
} }
for (int x = 0; x < referenceFrames.count(); x++) for (int x = 0; x < referenceFrames.count(); x++)
{ {
@@ -227,7 +228,7 @@ void FileComparatorWindow::calculateDetails()
{ {
interestedHadUnique = false; interestedHadUnique = false;
sharedItem = new QTreeWidgetItem(); sharedItem = new QTreeWidgetItem();
sharedItem->setText(0, Utility::formatHexNum(keyone)); sharedItem->setText(0, Utility::formatHexNum(keyone));
//if the ID was in both files then we can use the data accumulated above in bitmap //if the ID was in both files then we can use the data accumulated above in bitmap
//and values to figure out what has changed between the two files //and values to figure out what has changed between the two files
+1
View File
@@ -12,6 +12,7 @@ FlowViewWindow::FlowViewWindow(const QVector<CANFrame> *frames, QWidget *parent)
ui(new Ui::FlowViewWindow) ui(new Ui::FlowViewWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
readSettings(); readSettings();
+1
View File
@@ -9,6 +9,7 @@ FrameInfoWindow::FrameInfoWindow(const QVector<CANFrame> *frames, QWidget *paren
ui(new Ui::FrameInfoWindow) ui(new Ui::FrameInfoWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
readSettings(); readSettings();
+3 -2
View File
@@ -11,6 +11,7 @@ FuzzingWindow::FuzzingWindow(const QVector<CANFrame> *frames, QWidget *parent) :
ui(new Ui::FuzzingWindow) ui(new Ui::FuzzingWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
@@ -185,7 +186,7 @@ void FuzzingWindow::setAllFilters()
void FuzzingWindow::calcNextID() void FuzzingWindow::calcNextID()
{ {
if (seqIDScan) if (seqIDScan)
{ {
if (rangeIDSelect) if (rangeIDSelect)
{ {
currentID++; currentID++;
@@ -368,7 +369,7 @@ void FuzzingWindow::refreshIDList()
int id; int id;
for (int i = 0; i < modelFrames->count(); i++) for (int i = 0; i < modelFrames->count(); i++)
{ {
CANFrame thisFrame = modelFrames->at(i); CANFrame thisFrame = modelFrames->at(i);
id = thisFrame.ID; id = thisFrame.ID;
if (!foundIDs.contains(id)) if (!foundIDs.contains(id))
+1
View File
@@ -10,6 +10,7 @@ GraphingWindow::GraphingWindow(const QVector<CANFrame> *frames, QWidget *parent)
ui(new Ui::GraphingWindow) ui(new Ui::GraphingWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
readSettings(); readSettings();
+1
View File
@@ -8,6 +8,7 @@ ISOTP_InterpreterWindow::ISOTP_InterpreterWindow(const QVector<CANFrame> *frames
ui(new Ui::ISOTP_InterpreterWindow) ui(new Ui::ISOTP_InterpreterWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
decoder = new ISOTP_HANDLER; decoder = new ISOTP_HANDLER;
+2 -1
View File
@@ -9,6 +9,7 @@ RangeStateWindow::RangeStateWindow(const QVector<CANFrame> *frames, QWidget *par
ui(new Ui::RangeStateWindow) ui(new Ui::RangeStateWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
@@ -225,7 +226,7 @@ void RangeStateWindow::recalcButton()
if (modelFrames->at(j).ID == id) frameCache.append(modelFrames->at(j)); if (modelFrames->at(j).ID == id) frameCache.append(modelFrames->at(j));
} }
//now we've got a list with all the same ID. Time to send it off for processing //now we've got a list with all the same ID. Time to send it off for processing
signalsFactory(); signalsFactory();
} }
} }
+1
View File
@@ -13,6 +13,7 @@ SnifferWindow::SnifferWindow(QWidget *parent) :
mFilter(false) mFilter(false)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
ui->treeView->setModel(&mModel); ui->treeView->setModel(&mModel);
/* set column width */ /* set column width */
+1
View File
@@ -11,6 +11,7 @@ UDSScanWindow::UDSScanWindow(const QVector<CANFrame> *frames, QWidget *parent) :
ui(new Ui::UDSScanWindow) ui(new Ui::UDSScanWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
modelFrames = frames; modelFrames = frames;
+1
View File
@@ -13,6 +13,7 @@ ScriptingWindow::ScriptingWindow(const QVector<CANFrame> *frames, QWidget *paren
ui(new Ui::ScriptingWindow) ui(new Ui::ScriptingWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
editor = new JSEdit(); editor = new JSEdit();
editor->setFrameShape(JSEdit::NoFrame); editor->setFrameShape(JSEdit::NoFrame);
+2 -1
View File
@@ -7,10 +7,11 @@ SignalViewerWindow::SignalViewerWindow(QWidget *parent) :
ui(new Ui::SignalViewerWindow) ui(new Ui::SignalViewerWindow)
{ {
ui->setupUi(this); ui->setupUi(this);
setWindowFlags(Qt::Window);
QStringList headers; QStringList headers;
headers << "Signal" << "Value"; headers << "Signal" << "Value";
ui->tableViewer->setHorizontalHeaderLabels(headers); ui->tableViewer->setHorizontalHeaderLabels(headers);
ui->tableViewer->setColumnWidth(0, 150); ui->tableViewer->setColumnWidth(0, 150);
ui->tableViewer->setColumnWidth(1, 300); ui->tableViewer->setColumnWidth(1, 300);
QHeaderView *HorzHdr = ui->tableViewer->horizontalHeader(); QHeaderView *HorzHdr = ui->tableViewer->horizontalHeader();