Fixed two assertion bugs I caused yesterday

This commit is contained in:
Kjell Kernen
2014-02-23 11:44:27 +01:00
parent 6ea9b2c26a
commit eafc5b8359
2 changed files with 20 additions and 45 deletions
+18 -45
View File
@@ -9,6 +9,7 @@
#include "hexinterface.h" #include "hexinterface.h"
#include "appdata.h" #include "appdata.h"
// Type 1 = Burn EEPROM, Type 2= Burn Flash
burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * backupEE, QString DocName): burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * backupEE, QString DocName):
QDialog(parent), QDialog(parent),
ui(new Ui::burnDialog), ui(new Ui::burnDialog),
@@ -27,13 +28,11 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
imageSource=FIRMWARE; imageSource=FIRMWARE;
imageFile=""; imageFile="";
} }
updateUI();
ui->SplashFrame->hide(); ui->SplashFrame->hide();
ui->FramFWInfo->hide(); ui->FramFWInfo->hide();
ui->EEbackupCB->hide(); ui->EEbackupCB->hide();
ui->EEbackupCB->setCheckState(*backup ? Qt::Checked : Qt::Unchecked); ui->EEbackupCB->setCheckState(*backup ? Qt::Checked : Qt::Unchecked);
if (Type == 2) { if (Type == FLASH_FILE_TYPE ) {
ui->EEpromCB->hide(); ui->EEpromCB->hide();
ui->profile_label->hide(); ui->profile_label->hide();
ui->patchcalib_CB->hide(); ui->patchcalib_CB->hide();
@@ -68,7 +67,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
} }
if (!hexfileName->isEmpty()) { if (!hexfileName->isEmpty()) {
ui->FWFileName->setText(*hexfileName); ui->FWFileName->setText(*hexfileName);
if (Type==2) { if (Type==FLASH_FILE_TYPE) {
checkFw(*hexfileName); checkFw(*hexfileName);
} }
else { else {
@@ -109,7 +108,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
ui->FlashLoadButton->hide(); ui->FlashLoadButton->hide();
hexfileName->clear(); hexfileName->clear();
} }
else if (Type==2) { else if (Type==FLASH_FILE_TYPE) {
QString FileName; QString FileName;
FileName = g.lastFw(); FileName = g.lastFw();
QFile file(FileName); QFile file(FileName);
@@ -117,6 +116,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
checkFw(FileName); checkFw(FileName);
} }
} }
updateUI();
resize(0, 0); resize(0, 0);
} }
@@ -139,7 +139,7 @@ void burnDialog::on_FlashLoadButton_clicked()
ui->BurnFlashButton->setDisabled(true); ui->BurnFlashButton->setDisabled(true);
ui->EEbackupCB->hide(); ui->EEbackupCB->hide();
QTimer::singleShot(0, this, SLOT(shrink())); QTimer::singleShot(0, this, SLOT(shrink()));
if (hexType==2) { if (hexType==FLASH_FILE_TYPE) {
fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER); fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
checkFw(fileName); checkFw(fileName);
} }
@@ -177,6 +177,7 @@ void burnDialog::checkFw(QString fileName)
if (fileName.isEmpty()) { if (fileName.isEmpty()) {
return; return;
} }
if (!IS_TARANIS(GetEepromInterface()->getBoard())) { if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
ui->EEbackupCB->show(); ui->EEbackupCB->show();
} }
@@ -191,40 +192,17 @@ void burnDialog::checkFw(QString fileName)
ui->DateField->setText(flash.getDate() + " " + flash.getTime()); ui->DateField->setText(flash.getDate() + " " + flash.getTime());
ui->SVNField->setText(flash.getSvn()); ui->SVNField->setText(flash.getSvn());
ui->ModField->setText(flash.getBuild()); ui->ModField->setText(flash.getBuild());
ui->BurnFlashButton->setEnabled(true);
ui->BurnFlashButton->setText(tr("Write to TX")); ui->SplashFrame->hide();
if (flash.hasSplash()) { if (flash.hasSplash()) {
ui->SplashFrame->show(); ui->SplashFrame->show();
ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight()); ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
QString ImageStr = g.profile[g.id()].splashFile();
if (!ImageStr.isEmpty()) {
QImage Image;
Image.load(ImageStr);
ui->imageLabel->setPixmap(QPixmap::fromImage(Image.convertToFormat(flash.getSplashFormat())));
}
else {
QString fileName=imageFile;
if (!fileName.isEmpty()) {
QImage image(fileName);
if (!image.isNull()) {
ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(ui->imageLabel->width(), ui->imageLabel->height()).convertToFormat(flash.getSplashFormat())));
}
else {
}
}
else {
}
}
}
else {
ui->SplashFrame->hide();
} }
} }
else { else {
QMessageBox::warning(this, tr("Warning"), tr("%1 is not a known firmware").arg(fileName)); QMessageBox::warning(this, tr("Warning"), tr("%1 may not be a valid firmware file").arg(fileName));
ui->BurnFlashButton->setText(tr("Burn anyway !"));
ui->BurnFlashButton->setEnabled(true);
} }
ui->BurnFlashButton->setEnabled(true);
QTimer::singleShot(0, this, SLOT(shrink())); QTimer::singleShot(0, this, SLOT(shrink()));
g.flashDir( QFileInfo(fileName).dir().absolutePath() ); g.flashDir( QFileInfo(fileName).dir().absolutePath() );
} }
@@ -356,6 +334,9 @@ void burnDialog::displaySplash()
void burnDialog::updateUI() void burnDialog::updateUI()
{ {
if (hexType==EEPROM_FILE_TYPE)
return;
ui->useProfileImageCB->setChecked( imageSource == PROFILE ); ui->useProfileImageCB->setChecked( imageSource == PROFILE );
ui->useFwImageCB->setChecked( imageSource == FIRMWARE ); ui->useFwImageCB->setChecked( imageSource == FIRMWARE );
ui->useLibraryImageCB->setChecked( imageSource == LIBRARY ); ui->useLibraryImageCB->setChecked( imageSource == LIBRARY );
@@ -439,7 +420,7 @@ void burnDialog::on_useLibraryImageCB_clicked()
void burnDialog::on_BurnFlashButton_clicked() void burnDialog::on_BurnFlashButton_clicked()
{ {
if (hexType==2) { if (hexType==FLASH_FILE_TYPE) {
QString fileName=ui->FWFileName->text(); QString fileName=ui->FWFileName->text();
if (!fileName.isEmpty()) { if (!fileName.isEmpty()) {
g.flashDir( QFileInfo(fileName).dir().absolutePath() ); g.flashDir( QFileInfo(fileName).dir().absolutePath() );
@@ -475,7 +456,7 @@ void burnDialog::on_BurnFlashButton_clicked()
hexfileName->clear(); hexfileName->clear();
} }
} }
if (hexType==1) { if (hexType==EEPROM_FILE_TYPE) {
QString calib = g.profile[g.id()].stickPotCalib(); QString calib = g.profile[g.id()].stickPotCalib();
QString trainercalib = g.profile[g.id()].trainerCalib(); QString trainercalib = g.profile[g.id()].trainerCalib();
int potsnum=GetEepromInterface()->getCapability(Pots); int potsnum=GetEepromInterface()->getCapability(Pots);
@@ -626,11 +607,7 @@ void burnDialog::on_cancelButton_clicked()
void burnDialog::on_EEpromCB_toggled(bool checked) void burnDialog::on_EEpromCB_toggled(bool checked)
{ {
if (ui->EEpromCB->isChecked()) { *backup = ui->EEpromCB->isChecked();
*backup=true;
} else {
*backup=false;
}
} }
void burnDialog::shrink() void burnDialog::shrink()
@@ -640,9 +617,5 @@ void burnDialog::shrink()
void burnDialog::on_EEbackupCB_clicked() void burnDialog::on_EEbackupCB_clicked()
{ {
if (ui->EEbackupCB->isChecked()) { *backup = ui->EEbackupCB->isChecked();
*backup=true;
} else {
*backup=false;
}
} }
+2
View File
@@ -19,6 +19,8 @@
#define ER9X_EEPROM_FILE_TYPE "ER9X_EEPROM_FILE" #define ER9X_EEPROM_FILE_TYPE "ER9X_EEPROM_FILE"
#define EEPE_EEPROM_FILE_HEADER "EEPE EEPROM FILE" #define EEPE_EEPROM_FILE_HEADER "EEPE EEPROM FILE"
#define EEPE_MODEL_FILE_HEADER "EEPE MODEL FILE" #define EEPE_MODEL_FILE_HEADER "EEPE MODEL FILE"
#define EEPROM_FILE_TYPE 1
#define FLASH_FILE_TYPE 2
namespace Ui namespace Ui