From a5085cf7e23ccf28697f5cf602f2ca486c87faf3 Mon Sep 17 00:00:00 2001 From: bsongis Date: Fri, 18 Apr 2014 17:20:46 +0200 Subject: [PATCH] Refactoring continued --- companion/src/comparedialog.cpp | 89 +++++++++--------- companion/src/comparedialog.h | 22 ++--- companion/src/comparedialog.ui | 4 +- companion/src/mainwindow.cpp | 5 +- companion/src/mdichild.cpp | 15 +-- companion/src/printdialog.cpp | 159 ++++++++++++++++---------------- companion/src/printdialog.h | 17 ++-- companion/src/printdialog.ui | 4 +- 8 files changed, 159 insertions(+), 156 deletions(-) diff --git a/companion/src/comparedialog.cpp b/companion/src/comparedialog.cpp index fbbbc0cba..85e34f7cc 100644 --- a/companion/src/comparedialog.cpp +++ b/companion/src/comparedialog.cpp @@ -24,39 +24,38 @@ public: uint8_t models[C9X_MAX_MODELS]; }; -compareDialog::compareDialog(QWidget *parent, GeneralSettings *gg) : - QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), - ui(new Ui::compareDialog) +CompareDialog::CompareDialog(QWidget * parent): + QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), + model1(0), + model2(0), + ui(new Ui::CompareDialog) { ui->setupUi(this); this->setWindowIcon(CompanionIcon("compare.png")); - g_eeGeneral = gg; - eepromInterface = GetEepromInterface(); te = ui->textEdit; this->setAcceptDrops(true); - model1=0; - model2=0; + + // TODO this is really horrible g_model1=(ModelData *)malloc(sizeof(ModelData)); g_model2=(ModelData *)malloc(sizeof(ModelData)); modeltemp=(ModelData *)malloc(sizeof(ModelData)); - //setDragDropOverwriteMode(true); - //setDropIndicatorShown(true); -/* - printFrSky(); -*/ - te->scrollToAnchor("1"); + + //setDragDropOverwriteMode(true); + //setDropIndicatorShown(true); + te->scrollToAnchor("1"); } -void compareDialog::dragMoveEvent(QDragMoveEvent *event) +void CompareDialog::dragMoveEvent(QDragMoveEvent *event) { if (event->mimeData()->hasFormat("application/x-companion")) { event->acceptProposedAction(); - } else { + } + else { event->ignore(); } } -void compareDialog::dragEnterEvent(QDragEnterEvent *event) +void CompareDialog::dragEnterEvent(QDragEnterEvent *event) { // accept just text/uri-list mime format if (event->mimeData()->hasFormat("application/x-companion")) { @@ -66,12 +65,12 @@ void compareDialog::dragEnterEvent(QDragEnterEvent *event) } } -void compareDialog::dragLeaveEvent(QDragLeaveEvent *event) +void CompareDialog::dragLeaveEvent(QDragLeaveEvent *event) { event->accept(); } -void compareDialog::printDiff() +void CompareDialog::printDiff() { te->clear(); printSetup(); @@ -89,7 +88,7 @@ void compareDialog::printDiff() te->scrollToAnchor("1"); } -void compareDialog::dropEvent(QDropEvent *event) +void CompareDialog::dropEvent(QDropEvent *event) { QLabel *child = qobject_cast(childAt(event->pos())); const QMimeData *mimeData = event->mimeData(); @@ -153,7 +152,7 @@ void compareDialog::dropEvent(QDropEvent *event) } } -void compareDialog::closeEvent(QCloseEvent *event) +void CompareDialog::closeEvent(QCloseEvent *event) { QByteArray ba = curvefile5.toLatin1(); char *name = ba.data(); @@ -163,12 +162,12 @@ void compareDialog::closeEvent(QCloseEvent *event) unlink(name); } -compareDialog::~compareDialog() +CompareDialog::~CompareDialog() { delete ui; } -QString compareDialog::doTC(const QString s, const QString color="", bool bold=false) +QString CompareDialog::doTC(const QString s, const QString color="", bool bold=false) { QString str = s; if(bold) str = "" + str + ""; @@ -176,7 +175,7 @@ QString compareDialog::doTC(const QString s, const QString color="", bool bold=f return "" + str + ""; } -QString compareDialog::doTR(const QString s, const QString color="", bool bold=false) +QString CompareDialog::doTR(const QString s, const QString color="", bool bold=false) { QString str = s; if(bold) str = "" + str + ""; @@ -184,7 +183,7 @@ QString compareDialog::doTR(const QString s, const QString color="", bool bold=f return "" + str + ""; } -QString compareDialog::doTL(const QString s, const QString color="", bool bold=false) +QString CompareDialog::doTL(const QString s, const QString color="", bool bold=false) { QString str = s; if(bold) str = "" + str + ""; @@ -192,14 +191,14 @@ QString compareDialog::doTL(const QString s, const QString color="", bool bold=f return "" + str + ""; } -QString compareDialog::fv(const QString name, const QString value, const QString color="green") +QString CompareDialog::fv(const QString name, const QString value, const QString color="green") { return "" + name + ": " + value + "
"; } -int compareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused) +int CompareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused) { for (int i=0; i< C9X_MAX_EXPOS; i++) { if ((memcmp(&expo,&ExpoArray[i],sizeof(ExpoData))==0) && (expoused[i]==false)) { @@ -209,7 +208,7 @@ int compareDialog::ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expo return -1; } -bool compareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh) +bool CompareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh) { for (int i=0; i< C9X_MAX_EXPOS; i++) { if ((expoArray[i].chn==destCh)&&(expoArray[i].mode!=0)) { @@ -219,7 +218,7 @@ bool compareDialog::ChannelHasExpo(ExpoData * expoArray, uint8_t destCh) return false; } -int compareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused) +int CompareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused) { for (int i=0; i< C9X_MAX_MIXERS; i++) { if ((memcmp(&mix,&mixArray[i],sizeof(MixData))==0) && (mixused[i]==false)) { @@ -229,7 +228,7 @@ int compareDialog::ModelHasMix(MixData * mixArray, MixData mix, bool * mixused) return -1; } -bool compareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh) +bool CompareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh) { for (int i=0; i< C9X_MAX_MIXERS; i++) { if (mixArray[i].destCh==destCh) { @@ -239,7 +238,7 @@ bool compareDialog::ChannelHasMix(MixData * mixArray, uint8_t destCh) return false; } -void compareDialog::printSetup() +void CompareDialog::printSetup() { QString color; QString str = ""; @@ -247,8 +246,8 @@ void compareDialog::printSetup() str.append("
"); color=getColor1(g_model1->name,g_model2->name); str.append(fv(tr("Name"), g_model1->name, color)); - color=getColor1(eepromInterface->getSize(*g_model1),eepromInterface->getSize(*g_model2)); - str.append(""+tr("EEprom Size")+QString(": %1
").arg(eepromInterface->getSize(*g_model1)).arg(color)); + color=getColor1(GetEepromInterface()->getSize(*g_model1), GetEepromInterface()->getSize(*g_model2)); + str.append(""+tr("EEprom Size")+QString(": %1
").arg(GetEepromInterface()->getSize(*g_model1)).arg(color)); color=getColor1(getTimerStr(g_model1->timers[0]), getTimerStr(g_model2->timers[0])); str.append(fv(tr("Timer1"), getTimerStr(g_model1->timers[0]), color)); //value, mode, count up/down color=getColor1(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1])); @@ -270,8 +269,8 @@ void compareDialog::printSetup() str.append("
"); color=getColor2(g_model1->name,g_model2->name); str.append(fv(tr("Name"), g_model2->name, color)); - color=getColor2(eepromInterface->getSize(*g_model1),eepromInterface->getSize(*g_model2)); - str.append(""+tr("EEprom Size")+QString(": %1
").arg(eepromInterface->getSize(*g_model2)).arg(color)); + color=getColor2(GetEepromInterface()->getSize(*g_model1), GetEepromInterface()->getSize(*g_model2)); + str.append(""+tr("EEprom Size")+QString(": %1
").arg(GetEepromInterface()->getSize(*g_model2)).arg(color)); color=getColor2(getTimerStr(g_model1->timers[0]), getTimerStr(g_model2->timers[0])); str.append(fv(tr("Timer1"), getTimerStr(g_model2->timers[0]),color)); //value, mode, count up/down color=getColor2(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1])); @@ -293,7 +292,7 @@ void compareDialog::printSetup() te->append(str); } -void compareDialog::printPhases() +void CompareDialog::printPhases() { QString color; int i,k; @@ -491,7 +490,7 @@ void compareDialog::printPhases() te->append(str); } -void compareDialog::printLimits() +void CompareDialog::printLimits() { QString color; QString str = "
"; @@ -557,7 +556,7 @@ void compareDialog::printLimits() te->append(str); } -void compareDialog::printGvars() +void CompareDialog::printGvars() { QString color; int gvars=0; @@ -605,7 +604,7 @@ void compareDialog::printGvars() } } -void compareDialog::printExpos() +void CompareDialog::printExpos() { QString color; bool expoused[C9X_MAX_EXPOS]={false}; @@ -778,7 +777,7 @@ void compareDialog::printExpos() te->append(str); } -void compareDialog::printMixers() +void CompareDialog::printMixers() { QString color; QString str = "
"; } -QString printDialog::fv(const QString name, const QString value) +QString PrintDialog::fv(const QString name, const QString value) { return "" + name + ": " + value + "
"; } -void printDialog::printSetup() +void PrintDialog::printSetup() { int gvars=0; - if (GetCurrentFirmware()->getCapability(HasVariants)) { + if (firmware->getCapability(HasVariants)) { if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) { gvars=1; } @@ -123,15 +124,15 @@ void printDialog::printSetup() gvars=1; } QString str = "

"; @@ -953,7 +952,7 @@ void compareDialog::printMixers() te->append(str); } -void compareDialog::printCurves() +void CompareDialog::printCurves() { #if 0 int i,r,g,b,c; @@ -1033,7 +1032,7 @@ void compareDialog::printCurves() #endif } -void compareDialog::printSwitches() +void CompareDialog::printSwitches() { int sc=0; QString color; @@ -1063,7 +1062,7 @@ void compareDialog::printSwitches() te->append(str); } -void compareDialog::printFSwitches() +void CompareDialog::printFSwitches() { QString color1; QString color2; @@ -1142,7 +1141,7 @@ void compareDialog::printFSwitches() te->append(str); } -void compareDialog::printFrSky() +void CompareDialog::printFrSky() { QString color; float value1,value2; @@ -1391,7 +1390,7 @@ void compareDialog::printFrSky() te->append(str); } -void compareDialog::on_printButton_clicked() +void CompareDialog::on_printButton_clicked() { QPrinter printer; printer.setPageMargins(10.0,10.0,10.0,10.0,printer.Millimeter); @@ -1402,7 +1401,7 @@ void compareDialog::on_printButton_clicked() te->print(&printer); } -void compareDialog::on_printFileButton_clicked() +void CompareDialog::on_printFileButton_clicked() { QPrinter printer; QString filename = QFileDialog::getSaveFileName(this,tr("Select PDF output file"),QString(),"Pdf File(*.pdf)"); diff --git a/companion/src/comparedialog.h b/companion/src/comparedialog.h index e955ea2db..6f1c83875 100644 --- a/companion/src/comparedialog.h +++ b/companion/src/comparedialog.h @@ -7,29 +7,27 @@ #include "eeprominterface.h" namespace Ui { - class compareDialog; + class CompareDialog; } -class compareDialog : public QDialog +class CompareDialog : public QDialog { Q_OBJECT -public: - explicit compareDialog(QWidget *parent = 0, GeneralSettings *gg = 0); - - ~compareDialog(); - void closeEvent(QCloseEvent *event); - + public: + CompareDialog(QWidget *parent); + ~CompareDialog(); + + protected: ModelData * g_model1; ModelData * g_model2; ModelData * modeltemp; int model1; int model2; - GeneralSettings *g_eeGeneral; - EEPROMInterface *eepromInterface; -private: - Ui::compareDialog *ui; + private: + void closeEvent(QCloseEvent *event); + Ui::CompareDialog *ui; QString doTC(const QString s, const QString color, bool bold); QString doTR(const QString s, const QString color, bool bold); QString doTL(const QString s, const QString color, bool bold); diff --git a/companion/src/comparedialog.ui b/companion/src/comparedialog.ui index 4a26482b0..8aece1ce2 100644 --- a/companion/src/comparedialog.ui +++ b/companion/src/comparedialog.ui @@ -1,7 +1,7 @@ - compareDialog - + CompareDialog + 0 diff --git a/companion/src/mainwindow.cpp b/companion/src/mainwindow.cpp index 14e573388..a139505fc 100644 --- a/companion/src/mainwindow.cpp +++ b/companion/src/mainwindow.cpp @@ -1489,8 +1489,9 @@ void MainWindow::burnFuses() void MainWindow::compare() { - compareDialog *fd = new compareDialog(this); - fd->show(); + CompareDialog *fd = new CompareDialog(this); + fd->show(); + delete fd; } void MainWindow::logFile() diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp index dc09e76cd..75dfc6af3 100644 --- a/companion/src/mdichild.cpp +++ b/companion/src/mdichild.cpp @@ -663,15 +663,18 @@ void MdiChild::simulate() void MdiChild::print(int model, QString filename) { + PrintDialog * pd = NULL; + if (model>=0 && !filename.isEmpty()) { - - printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[model], filename); - pd->show(); + pd = new PrintDialog(this, GetCurrentFirmware(), &radioData.generalSettings, &radioData.models[model], filename); } - else { - if(ui->modelsList->currentRow()<1) return; - printDialog *pd = new printDialog(this, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]); + else if (ui->modelsList->currentRow() > 0) { + pd = new PrintDialog(this, GetCurrentFirmware(), &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]); + } + + if (pd) { pd->show(); + delete pd; } } diff --git a/companion/src/printdialog.cpp b/companion/src/printdialog.cpp index 404f47185..39a16b360 100644 --- a/companion/src/printdialog.cpp +++ b/companion/src/printdialog.cpp @@ -14,16 +14,16 @@ #define ISIZE 200 // curve image size #define ISIZEW 400 // curve image size -printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QString filename) : - QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), - ui(new Ui::printDialog) +PrintDialog::PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralSettings *gg, ModelData *gm, QString filename) : + QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), + firmware(firmware), + g_eeGeneral(gg), + g_model(gm), + printfilename(filename), + ui(new Ui::PrintDialog) { ui->setupUi(this); this->setWindowIcon(CompanionIcon("print.png")); - g_model = gm; - g_eeGeneral = gg; - printfilename=filename; - eepromInterface = GetEepromInterface(); te = ui->textEdit; setWindowTitle(tr("Setup for: ") + g_model->name); @@ -32,13 +32,14 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS if (modelname.isEmpty()) { curvefile5=QString("%1/curve5.png").arg(qd->tempPath()); curvefile9=QString("%1/curve9.png").arg(qd->tempPath()); - } else { + } + else { curvefile5=QString("%1/%2-curve5.png").arg(qd->tempPath()).arg(modelname); curvefile9=QString("%1/%2-curve9.png").arg(qd->tempPath()).arg(modelname); } printSetup(); int gvars=0; - if (GetCurrentFirmware()->getCapability(HasVariants)) { + if (firmware->getCapability(HasVariants)) { if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) { gvars=1; } @@ -66,7 +67,7 @@ printDialog::printDialog(QWidget *parent, GeneralSettings *gg, ModelData *gm, QS } } -void printDialog::closeEvent(QCloseEvent *event) +void PrintDialog::closeEvent(QCloseEvent *event) { if (printfilename.isEmpty()) { QByteArray ba = curvefile5.toLatin1(); @@ -78,7 +79,7 @@ void printDialog::closeEvent(QCloseEvent *event) } } -printDialog::~printDialog() +PrintDialog::~PrintDialog() { delete ui; } @@ -107,15 +108,15 @@ QString doTL(const QString s, const QString color="", bool bold=false) return "

" + str + "
"; - str.append(QString("

").arg((GetCurrentFirmware()->getCapability(FlightPhases) && gvars==0) ? 2 : 1)); + str.append(QString("

").arg((firmware->getCapability(FlightPhases) && gvars==0) ? 2 : 1)); str.append(g_model->name); str.append(" ("); - str.append(eepromInterface->getName()); + str.append(firmware->getEepromInterface()->getName()); str.append(")

"+tr("printed on: %1").arg(QDateTime::currentDateTime().toString(Qt::SystemLocaleShortDate))+"
"); str.append(""); str.append("

"+tr("General Model Settings")+"

"); str.append(fv(tr("Name"), g_model->name)); - str.append(""+tr("EEprom Size")+QString(": %1
").arg(eepromInterface->getSize(*g_model))); + str.append(""+tr("EEprom Size")+QString(": %1
").arg(firmware->getEepromInterface()->getSize(*g_model))); str.append(fv(tr("Timer1"), getTimerStr(g_model->timers[0]))); //value, mode, count up/down str.append(fv(tr("Timer2"), getTimerStr(g_model->timers[1]))); //value, mode, count up/down str.append(fv(tr("Protocol"), getProtocol(g_model))); //proto, numch, delay, @@ -151,19 +152,19 @@ void printDialog::printSetup() te->append(str); } -QString printDialog::printPhases() +QString PrintDialog::printPhases() { int gvars=0; int gvarnum=0; - if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetCurrentFirmware()->getCapability(HasVariants) && GetCurrentFirmware()->getCapability(Gvars))) { - if (GetCurrentFirmware()->getCapability(GvarsFlightPhases)) { + if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!firmware->getCapability(HasVariants) && firmware->getCapability(Gvars))) { + if (firmware->getCapability(GvarsFlightPhases)) { gvars=1; - gvarnum=GetCurrentFirmware()->getCapability(Gvars); + gvarnum=firmware->getCapability(Gvars); } } QString str=""; - str.append(QString("

").arg(gvars==0 ? 8+GetCurrentFirmware()->getCapability(RotaryEncoders) : 8+gvarnum+GetCurrentFirmware()->getCapability(RotaryEncoders))); + str.append(QString(""); @@ -171,8 +172,8 @@ QString printDialog::printPhases() if (gvars) { str.append(QString(""); } - if (GetCurrentFirmware()->getCapability(RotaryEncoders)) { - str.append(QString(""); + if (firmware->getCapability(RotaryEncoders)) { + str.append(QString(""); } str.append(""); @@ -184,11 +185,11 @@ QString printDialog::printPhases() str.append(QString("").arg(i+1).arg(g_model->gvars_names[i])); } } - for (int i=0; igetCapability(RotaryEncoders); i++) { + for (int i=0; igetCapability(RotaryEncoders); i++) { str.append(QString("").arg((i==0 ? 'A': 'B'))); } str.append(""); - for (int i=0; igetCapability(FlightPhases); i++) { + for (int i=0; igetCapability(FlightPhases); i++) { PhaseData *pd=&g_model->phaseData[i]; str.append("").arg(i).arg(pd->name).arg(pd->fadeIn).arg(pd->fadeOut)); for (int k=0; k<4; k++) { @@ -210,7 +211,7 @@ QString printDialog::printPhases() } } } - for (int k=0; kgetCapability(RotaryEncoders); k++) { + for (int k=0; kgetCapability(RotaryEncoders); k++) { if (pd->rotaryEncoders[k]<=1024) { str.append(QString(""); } @@ -227,7 +228,7 @@ QString printDialog::printPhases() return(str); } -void printDialog::printExpo() +void PrintDialog::printExpo() { QString str = "

").arg(gvars==0 ? 8+firmware->getCapability(RotaryEncoders) : 8+gvarnum+firmware->getCapability(RotaryEncoders))); str.append(tr("Flight modes Settings")); str.append("

 "); str.append(tr("Fades")+"").arg(gvarnum)+tr("Gvars")+"").arg(GetCurrentFirmware()->getCapability(RotaryEncoders))+tr("Rot.Enc.")+"").arg(firmware->getCapability(RotaryEncoders))+tr("Rot.Enc.")+""+tr("Switch")+"
"+tr("Flight mode name")); str.append(""+tr("IN")+""+tr("OUT")+"GV%1
%2		RE%1
"+tr("FM")+QString("%1 %2%3%4%1").arg(pd->rotaryEncoders[k])+"

"; str.append(tr("Expo/Dr Settings")); @@ -264,12 +265,12 @@ void printDialog::printExpo() str += tr("Weight") + QString("%1").arg(getGVarString(ed->weight,true)).rightJustified(6, ' '); str += ed->curve.toString().replace("<", "<").replace(">", ">"); - if (GetCurrentFirmware()->getCapability(FlightPhases)) { + if (firmware->getCapability(FlightPhases)) { if(ed->phases) { - if (ed->phases!=(unsigned int)(1<getCapability(FlightPhases))-1) { + if (ed->phases!=(unsigned int)(1<getCapability(FlightPhases))-1) { int mask=1; int first=0; - for (int i=0; igetCapability(FlightPhases);i++) { + for (int i=0; igetCapability(FlightPhases);i++) { if (!(ed->phases & mask)) { first++; } @@ -282,7 +283,7 @@ void printDialog::printExpo() } mask=1; first=1; - for (int j=0; jgetCapability(FlightPhases);j++) { + for (int j=0; jgetCapability(FlightPhases);j++) { if (!(ed->phases & mask)) { PhaseData *pd = &g_model->phaseData[j]; if (!first) { @@ -303,7 +304,7 @@ void printDialog::printExpo() if (ed->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(ed->swtch.toString()); str += ed->curve.toString().replace("<", "<").replace(">", ">"); - if (GetCurrentFirmware()->getCapability(HasExpoNames)) { + if (firmware->getCapability(HasExpoNames)) { QString ExpoName; ExpoName.append(ed->name); if (!ExpoName.isEmpty()) { @@ -318,21 +319,21 @@ void printDialog::printExpo() } -void printDialog::printMixes() +void PrintDialog::printMixes() { QString str = "

"; str.append(tr("Mixers")); str.append("

"); unsigned int lastCHN = 255; - for(int i=0; igetCapability(Mixes); i++) { + for(int i=0; igetCapability(Mixes); i++) { MixData *md = &g_model->mixData[i]; - if(!md->destCh || md->destCh>(unsigned int)GetCurrentFirmware()->getCapability(Outputs) ) break; + if(!md->destCh || md->destCh>(unsigned int)firmware->getCapability(Outputs) ) break; str.append("
"); if(lastCHN!=md->destCh) { lastCHN=md->destCh; QString chname=tr("CH")+QString("%1 ").arg(lastCHN,2,10,QChar('0')); - if (GetCurrentFirmware()->getCapability(HasChNames)) { + if (firmware->getCapability(HasChNames)) { QString name=g_model->limitData[md->destCh-1].name; if (!name.isEmpty()) { name.append(" "); @@ -356,16 +357,16 @@ void printDialog::printMixes() if (md->carryTrim) str += " " + tr("noTrim"); if (md->sOffset) str += " "+ tr("Offset") + QString(" %1").arg(getGVarString(md->sOffset)); str += md->curve.toString().replace("<", "<").replace(">", ">"); - float scale=GetCurrentFirmware()->getCapability(SlowScale); + float scale=firmware->getCapability(SlowScale); if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale); if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale); if (md->mixWarn) str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn); - if (GetCurrentFirmware()->getCapability(FlightPhases)) { + if (firmware->getCapability(FlightPhases)) { if(md->phases) { - if (md->phases!=(unsigned int)(1<getCapability(FlightPhases))-1) { + if (md->phases!=(unsigned int)(1<getCapability(FlightPhases))-1) { int mask=1; int first=0; - for (int i=0; igetCapability(FlightPhases); i++) { + for (int i=0; igetCapability(FlightPhases); i++) { if (!(md->phases & mask)) { first++; } @@ -378,7 +379,7 @@ void printDialog::printMixes() } mask=1; first=1; - for (int j=0; jgetCapability(FlightPhases);j++) { + for (int j=0; jgetCapability(FlightPhases);j++) { if (!(md->phases & mask)) { PhaseData *pd = &g_model->phaseData[j]; if (!first) { @@ -396,7 +397,7 @@ void printDialog::printMixes() } } } - if (GetCurrentFirmware()->getCapability(HasMixerNames)) { + if (firmware->getCapability(HasMixerNames)) { QString MixerName; MixerName.append(md->name); if (!MixerName.isEmpty()) { @@ -409,41 +410,41 @@ void printDialog::printMixes() te->append(str); } -void printDialog::printLimits() +void PrintDialog::printLimits() { QString str = ""; int numcol; - numcol=(GetCurrentFirmware()->getCapability(Outputs)+1)>17 ? 17:GetCurrentFirmware()->getCapability(Outputs)+1; + numcol=(firmware->getCapability(Outputs)+1)>17 ? 17:firmware->getCapability(Outputs)+1; str.append(QString(""); str.append(""); - if (GetCurrentFirmware()->getCapability(Outputs)<17) { - for(int i=0; igetCapability(Outputs); i++) { + if (firmware->getCapability(Outputs)<17) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true)); } str.append(""); - if (GetCurrentFirmware()->getCapability(HasChNames)) { + if (firmware->getCapability(HasChNames)) { str.append(""); - for(int i=0; igetCapability(Outputs); i++) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTR(g_model->limitData[i].name,"green")); } } str.append(""); - for(int i=0; igetCapability(Outputs); i++) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTR(QString::number((qreal)g_model->limitData[i].offset/10, 'f', 1),"green")); } str.append(""); str.append(""); - for(int i=0; igetCapability(Outputs); i++) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTR(QString::number(g_model->limitData[i].min),"green")); } str.append(""); str.append(""); - for(int i=0; igetCapability(Outputs); i++) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTR(QString::number(g_model->limitData[i].max),"green")); } str.append(""); str.append(""); - for(int i=0; igetCapability(Outputs); i++) { + for(int i=0; igetCapability(Outputs); i++) { str.append(doTR(QString(g_model->limitData[i].revert ? tr("INV") : tr("NOR")),"green")); } } else { @@ -451,7 +452,7 @@ void printDialog::printLimits() str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true)); } str.append(""); - if (GetCurrentFirmware()->getCapability(HasChNames)) { + if (firmware->getCapability(HasChNames)) { str.append(""); for(int i=0; i<16; i++) { str.append(doTR(g_model->limitData[i].name,"green")); @@ -479,33 +480,33 @@ void printDialog::printLimits() str.append(""); str.append(QString(""); str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true)); } str.append(""); - if (GetCurrentFirmware()->getCapability(HasChNames)) { + if (firmware->getCapability(HasChNames)) { str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTR(g_model->limitData[i].name,"green")); } } str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTR(QString::number((qreal)g_model->limitData[i].offset/10, 'f', 1),"green")); } str.append(""); str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTR(QString::number(g_model->limitData[i].min),"green")); } str.append(""); str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTR(QString::number(g_model->limitData[i].max),"green")); } str.append(""); str.append(""); - for(int i=16; igetCapability(Outputs); i++) { + for(int i=16; igetCapability(Outputs); i++) { str.append(doTR(QString(g_model->limitData[i].revert ? tr("INV") : tr("NOR")),"green")); } } @@ -515,7 +516,7 @@ void printDialog::printLimits() te->append(str); } -void printDialog::printCurves() +void PrintDialog::printCurves() { int i,r,g,b,c,count; char buffer[16]; @@ -524,7 +525,7 @@ void printDialog::printCurves() QString str = "

").arg(numcol)+tr("Limits")+"

 
"+tr("Name")+"
"+tr("Offset")+"
"+tr("Min")+"
"+tr("Max")+"
"+tr("Invert")+"
"+tr("Name")+"
 ").arg(numcol)+"
 
"+tr("Name")+"
"+tr("Offset")+"
"+tr("Min")+"
"+tr("Max")+"
"+tr("Invert")+"

"; str.append(tr("Curves")); str.append("

"); - int numcurves=GetCurrentFirmware()->getCapability(NumCurves); + int numcurves=firmware->getCapability(NumCurves); if (numcurves==0) { numcurves=16; } @@ -622,14 +623,14 @@ void printDialog::printCurves() te->append(str); } -void printDialog::printSwitches() +void PrintDialog::printSwitches() { int sc=0; QString str = ""; str.append(""); str.append("

"+tr("Logical Switches")+"

"); - for (int i=0; igetCapability(LogicalSwitches); i++) { + for (int i=0; igetCapability(LogicalSwitches); i++) { if (g_model->customSw[i].func) { str.append(""); if (i<9) { @@ -649,15 +650,15 @@ void printDialog::printSwitches() te->append(str); } -void printDialog::printGvars() +void PrintDialog::printGvars() { int gvars=0; int gvarnum=0; - if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetCurrentFirmware()->getCapability(HasVariants) && GetCurrentFirmware()->getCapability(Gvars))) { + if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!firmware->getCapability(HasVariants) && firmware->getCapability(Gvars))) { gvars=1; - gvarnum=GetCurrentFirmware()->getCapability(Gvars); + gvarnum=firmware->getCapability(Gvars); } - if (!GetCurrentFirmware()->getCapability(GvarsFlightPhases) && (gvars==1 && GetCurrentFirmware()->getCapability(Gvars))) { + if (!firmware->getCapability(GvarsFlightPhases) && (gvars==1 && firmware->getCapability(Gvars))) { QString str = "
"; str.append(""); str.append("

"+tr("Global Variables")+"

"); @@ -679,7 +680,7 @@ void printDialog::printGvars() } } -void printDialog::printFSwitches() +void PrintDialog::printFSwitches() { int sc=0; QString str = "
"; @@ -691,7 +692,7 @@ void printDialog::printFSwitches() str.append(doTL(tr("Repeat"), "", true)); str.append(doTL(tr("Enabled"), "", true)); str.append(""); - for(int i=0; igetCapability(CustomFunctions); i++) { + for(int i=0; igetCapability(CustomFunctions); i++) { if (g_model->funcSw[i].swtch.type!=SWITCH_TYPE_NONE) { str.append(""); str.append(doTC(g_model->funcSw[i].swtch.toString(),"green")); @@ -718,7 +719,7 @@ void printDialog::printFSwitches() te->append(str); } -void printDialog::printFrSky() +void PrintDialog::printFrSky() { int tc=0; QString str = "
"; @@ -756,10 +757,10 @@ void printDialog::printFrSky() str.append(""); str.append("
"+tr("Blades")+""+fd->blades+"
"); #if 0 - if (GetCurrentFirmware()->getCapability(TelemetryBars) || (GetCurrentFirmware()->getCapability(TelemetryCSFields))) { - int cols=GetCurrentFirmware()->getCapability(TelemetryColsCSFields); + if (firmware->getCapability(TelemetryBars) || (firmware->getCapability(TelemetryCSFields))) { + int cols=firmware->getCapability(TelemetryColsCSFields); if (cols==0) cols=2; - for (int j=0; jgetCapability(TelemetryCSFields)/(4*cols); j++ ) { + for (int j=0; jgetCapability(TelemetryCSFields)/(4*cols); j++ ) { if (fd->screens[j].type==0) { if (cols==2) { str.append(""); @@ -804,7 +805,7 @@ void printDialog::printFrSky() te->append(str); } -void printDialog::on_printButton_clicked() +void PrintDialog::on_printButton_clicked() { QPrinter printer; printer.setPageMargins(10.0,10.0,10.0,10.0,printer.Millimeter); @@ -815,7 +816,7 @@ void printDialog::on_printButton_clicked() te->print(&printer); } -void printDialog::on_printFileButton_clicked() +void PrintDialog::on_printFileButton_clicked() { QString fn = QFileDialog::getSaveFileName(this,tr("Select PDF output file"),QString(),tr("ODF files (*.odt);;PDF Files(*.pdf);;HTML-Files (*.htm *.html);;All Files (*)")); if (fn.isEmpty()) @@ -835,7 +836,7 @@ void printDialog::on_printFileButton_clicked() } } -void printDialog::printToFile() +void PrintDialog::printToFile() { if (printfilename.isEmpty()) return; @@ -854,7 +855,7 @@ void printDialog::printToFile() } } -void printDialog::autoClose() +void PrintDialog::autoClose() { this->close(); } diff --git a/companion/src/printdialog.h b/companion/src/printdialog.h index 81e59b24d..8209db326 100644 --- a/companion/src/printdialog.h +++ b/companion/src/printdialog.h @@ -7,26 +7,27 @@ #include "eeprominterface.h" namespace Ui { - class printDialog; + class PrintDialog; } -class printDialog : public QDialog +class PrintDialog : public QDialog { Q_OBJECT public: - explicit printDialog(QWidget *parent = 0, GeneralSettings *gg = 0, ModelData *gm = 0, QString filename=""); + explicit PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralSettings *gg, ModelData *gm, QString filename=""); - ~printDialog(); + ~PrintDialog(); void closeEvent(QCloseEvent *event); - ModelData *g_model; - GeneralSettings *g_eeGeneral; - EEPROMInterface *eepromInterface; + FirmwareInterface * firmware; + GeneralSettings * g_eeGeneral; + ModelData * g_model; + QString printfilename; private: - Ui::printDialog *ui; + Ui::PrintDialog *ui; void printSetup(); QString printPhases(); diff --git a/companion/src/printdialog.ui b/companion/src/printdialog.ui index b87534676..0f4b05111 100644 --- a/companion/src/printdialog.ui +++ b/companion/src/printdialog.ui @@ -1,7 +1,7 @@ - printDialog - + PrintDialog + 0
"+tr("Custom Telemetry View")+"