Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-24 08:45:24 +03:00
Code Issues Wiki Activity

comparedialog - compare curves and special functions

Browse source
This commit is contained in:
Romolo Manfredini 2015-04-22 19:05:22 +02:00 • committed by Romolo Manfredini
parent 27ee3e3ab4
commit 6e0eec364c
5 changed files with 184 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

253
companion/src/comparedialog.cpp
View file

@ -25,8 +25,9 @@ public:
uint8_t models[C9X_MAX_MODELS]; uint8_t models[C9X_MAX_MODELS];
}; };
CompareDialog::CompareDialog(QWidget * parent): CompareDialog::CompareDialog(QWidget * parent, Firmware * firmware):
QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint), QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
firmware(firmware),
model1(0), model1(0),
model2(0), model2(0),
ui(new Ui::CompareDialog) ui(new Ui::CompareDialog)
@ -80,6 +81,8 @@ void CompareDialog::printDiff()
if (GetCurrentFirmware()->getCapability(FlightModes)) { if (GetCurrentFirmware()->getCapability(FlightModes)) {
printPhases(); printPhases();
} }
curvefile1=generateProcessUniqueTempFileName("curve1.png");
curvefile2=generateProcessUniqueTempFileName("curve2.png");
printExpos(); printExpos();
printMixers(); printMixers();
printLimits(); printLimits();
@ -161,8 +164,8 @@ void CompareDialog::closeEvent(QCloseEvent *event)
CompareDialog::~CompareDialog() CompareDialog::~CompareDialog()
{ {
qunlink(curvefile5); qunlink(curvefile1);
qunlink(curvefile9); qunlink(curvefile2);
delete ui; delete ui;
} }
@ -220,10 +223,8 @@ void CompareDialog::printSetup()
str.append(fv(tr("Timer1"), getTimerStr(g_model1->timers[0]), color)); //value, mode, count up/down 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])); color=getColor1(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
str.append(fv(tr("Timer2"), getTimerStr(g_model1->timers[1]), color)); //value, mode, count up/down str.append(fv(tr("Timer2"), getTimerStr(g_model1->timers[1]), color)); //value, mode, count up/down
color=getColor1(getProtocol(g_model1),getProtocol(g_model2)); color=getColor1(getProtocol(g_model1->moduleData[0]),getProtocol(g_model2->moduleData[0]));
str.append(fv(tr("Protocol"), getProtocol(g_model1), color)); //proto, numch, delay, str.append(fv(tr("Protocol"), getProtocol(g_model1->moduleData[0]), color)); //proto, numch, delay,
color=getColor1(g_model1->moduleData[0].ppmPulsePol, g_model2->moduleData[0].ppmPulsePol);
str.append(fv(tr("Pulse Polarity"), g_model1->moduleData[0].polarityToString(), color));
color=getColor1(g_model1->thrTrim,g_model2->thrTrim); color=getColor1(g_model1->thrTrim,g_model2->thrTrim);
str.append(fv(tr("Throttle Trim"), g_model1->thrTrim ? tr("Enabled") : tr("Disabled"), color)); str.append(fv(tr("Throttle Trim"), g_model1->thrTrim ? tr("Enabled") : tr("Disabled"), color));
color=getColor1(getTrimInc(g_model1),getTrimInc(g_model2)); color=getColor1(getTrimInc(g_model1),getTrimInc(g_model2));
@ -240,10 +241,8 @@ void CompareDialog::printSetup()
str.append(fv(tr("Timer1"), getTimerStr(g_model2->timers[0]),color)); //value, mode, count up/down 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])); color=getColor2(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
str.append(fv(tr("Timer2"), getTimerStr(g_model2->timers[1]),color)); //value, mode, count up/down str.append(fv(tr("Timer2"), getTimerStr(g_model2->timers[1]),color)); //value, mode, count up/down
color=getColor2(getProtocol(g_model1),getProtocol(g_model2)); color=getColor2(getProtocol(g_model1->moduleData[0]),getProtocol(g_model2->moduleData[0]));
str.append(fv(tr("Protocol"), getProtocol(g_model2), color)); //proto, numch, delay, str.append(fv(tr("Protocol"), getProtocol(g_model2->moduleData[0]), color)); //proto, numch, delay,
color=getColor2(g_model1->moduleData[0].ppmPulsePol, g_model2->moduleData[0].ppmPulsePol);
str.append(fv(tr("Pulse Polarity"), g_model2->moduleData[0].polarityToString(), color));
color=getColor2(g_model1->thrTrim,g_model2->thrTrim); color=getColor2(g_model1->thrTrim,g_model2->thrTrim);
str.append(fv(tr("Throttle Trim"), g_model2->thrTrim ? tr("Enabled") : tr("Disabled"), color)); str.append(fv(tr("Throttle Trim"), g_model2->thrTrim ? tr("Enabled") : tr("Disabled"), color));
color=getColor2(getTrimInc(g_model1),getTrimInc(g_model2)); color=getColor2(getTrimInc(g_model1),getTrimInc(g_model2));
@ -898,82 +897,176 @@ void CompareDialog::printMixers()
void CompareDialog::printCurves() void CompareDialog::printCurves()
{ {
#if 0 int i,r,g,b,c,count1,count2,usedcurves=0;
int i,r,g,b,c; QString cm1y,cm1x, cm2y,cm2x;
char buffer [16]; char buffer [16];
QString color; QPen pen(Qt::black, 2, Qt::SolidLine);
QColor * qplot_color[8]; int numcurves=firmware->getCapability(NumCurves);
qplot_color[0]=new QColor(0,0,127); if (numcurves==0) {
qplot_color[1]=new QColor(0,127,0); numcurves=16;
qplot_color[2]=new QColor(127,0,0); }
qplot_color[3]=new QColor(127,127,0);
qplot_color[4]=new QColor(0,0,255);
qplot_color[5]=new QColor(0,255,0);
qplot_color[6]=new QColor(255,0,0);
qplot_color[7]=new QColor(255,255,0);
QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>"; QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
str.append(tr("Curves")); str.append(tr("Curves"));
str.append("</h2></td></tr><tr><td>"); str.append("</h2></td></tr><tr><td>");
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Point Curves")+"</b></td></tr><tr>"); str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">");
for(i=0; i<5; i++) QImage qi1(ISIZE+1,ISIZE+1,QImage::Format_RGB32);
str.append(doTC(tr("pt %1").arg(i+1), "", true)); QPainter painter1(&qi1);
str.append("<td></td>"); QImage qi2(ISIZE+1,ISIZE+1,QImage::Format_RGB32);
for(i=0; i<5; i++) QPainter painter2(&qi2);
str.append(doTC(tr("pt %1").arg(i+1), "", true)); painter1.setBrush(QBrush("#FFFFFF"));
str.append("</tr>"); painter2.setBrush(QBrush("#FFFFFF"));
painter1.setPen(QColor(0,0,0));
painter2.setPen(QColor(0,0,0));
painter1.drawRect(0,0,ISIZE,ISIZE);
painter2.drawRect(0,0,ISIZE,ISIZE);
for(i=0; i<numcurves; i++) {
count1=0;
for(int j=0; j<g_model1->curves[i].count; j++) {
if (g_model1->curves[i].points[j].y!=0)
count1++;
}
count2=0;
for(int j=0; j<g_model2->curves[i].count; j++) {
if (g_model2->curves[i].points[j].y!=0)
count2++;
}
if ((count1>0) || (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)|| (g_model1->curves[i].count !=5) ||
(count2>0) || (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)|| (g_model2->curves[i].count !=5)) {
pen.setColor(colors[usedcurves]);
painter1.setPen(pen);
painter2.setPen(pen);
for(i=0; i<MAX_CURVE5; i++) { colors[usedcurves].getRgb(&r,&g,&b);
qplot_color[i]->getRgb(&r,&g,&b); c=r;
c=r; c*=256;
c*=256; c+=g;
c+=g; c*=256;
c*=256; c+=b;
c+=b; sprintf(buffer,"%06x",c);
sprintf(buffer,"%06x",c); // curves are different in number of points or curve type so makes little sense to compare they are just different
str.append("<tr>"); if ((g_model1->curves[i].count!=g_model2->curves[i].count) || (g_model1->curves[i].type!=g_model2->curves[i].type)) {
for(int j=0; j<5; j++) { cm1y="[";
color=getColor1(g_model2->curves5[i][j],g_model2->curves5[i][j]); cm1x="[";
str.append(doTR(QString::number(g_model1->curves5[i][j]),color)); for(int j=0; j<g_model1->curves[i].count; j++) {
} cm1y.append(QString("%1").arg(g_model1->curves[i].points[j].y));
str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1)); cm1x.append(QString("%1").arg(g_model1->curves[i].points[j].x));
for(int j=0; j<5; j++) { if (j<(g_model1->curves[i].count-1)) {
color=getColor1(g_model2->curves5[i][j],g_model2->curves5[i][j]); cm1y.append(",");
str.append(doTR(QString::number(g_model2->curves5[i][j]),color)); cm1x.append(",");
} }
str.append("</tr>"); if (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
} painter1.drawLine(ISIZE/2+(ISIZE*g_model1->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model1->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
str.append("</table></td></tr><tr><td>"); else
painter1.drawLine(ISIZE*(j-1)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
}
cm1y.append("]");
cm1x.append("]");
cm2y="[";
cm2x="[";
for(int j=0; j<g_model2->curves[i].count; j++) {
cm2y.append(QString("%1").arg(g_model2->curves[i].points[j].y));
cm2x.append(QString("%1").arg(g_model2->curves[i].points[j].x));
if (j<(g_model2->curves[i].count-1)) {
cm2y.append(",");
cm2x.append(",");
}
if (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
painter2.drawLine(ISIZE/2+(ISIZE*g_model2->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model2->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
else
painter2.drawLine(ISIZE*(j-1)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
}
cm2y.append("]");
cm2x.append("]");
str.append("<tr><td nowrap width=\"45%\"><font color=green>");
str.append(cm1y);
if ((g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
str.append(QString("<br>")+cm1x+QString("</font></td>"));
}
str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
str.append("<td nowrap width=\"45%\"><font color=red>");
str.append(cm2y);
if ((g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
str.append(QString("<br>")+cm2x+QString("</font></td></tr>"));
}
} else {
// curves have the same number of points and the same type, we can compare them point by point
cm1y="[";
cm1x="[";
cm2y="[";
cm2x="[";
for(int j=0; j<g_model1->curves[i].count; j++) {
if (g_model1->curves[i].points[j].y!=g_model2->curves[i].points[j].y) {
cm1y.append(QString("<font color=green>%1</font>").arg(g_model1->curves[i].points[j].y));
cm2y.append(QString("<font color=red>%1</font>").arg(g_model2->curves[i].points[j].y));
} else {
cm1y.append(QString("<font color=grey>%1</font>").arg(g_model1->curves[i].points[j].y));
cm2y.append(QString("<font color=grey>%1</font>").arg(g_model2->curves[i].points[j].y));
}
if (g_model1->curves[i].points[j].x!=g_model2->curves[i].points[j].x) {
cm1x.append(QString("<font color=green>%1</font>").arg(g_model1->curves[i].points[j].x));
cm2x.append(QString("<font color=red>%1</font>").arg(g_model2->curves[i].points[j].x));
} else {
cm1x.append(QString("<font color=grey>%1</font>").arg(g_model1->curves[i].points[j].x));
cm2x.append(QString("<font color=grey>%1</font>").arg(g_model2->curves[i].points[j].x));
}
if (j<(g_model1->curves[i].count-1)) {
cm1y.append(",");
cm1x.append(",");
cm2y.append(",");
cm2x.append(",");
}
if (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
painter1.drawLine(ISIZE/2+(ISIZE*g_model1->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model1->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
else
painter1.drawLine(ISIZE*(j-1)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
if (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
painter2.drawLine(ISIZE/2+(ISIZE*g_model2->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model2->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
else
painter2.drawLine(ISIZE*(j-1)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
}
painter1.setPen(QColor(0,0,0));
painter2.setPen(QColor(0,0,0));
painter1.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
painter2.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
painter1.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
painter2.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
for(i=0; i<21; i++) {
painter1.drawLine(ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5,(ISIZE*i)/(20));
painter2.drawLine(ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5,(ISIZE*i)/(20));
painter1.drawLine((ISIZE*i)/(20),ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5);
painter2.drawLine((ISIZE*i)/(20),ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5);
}
str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Point Curves")+"</b></td></tr><tr>"); cm1y.append("]");
for(i=0; i<9; i++) cm1x.append("]");
str.append(doTC(tr("pt %1").arg(i+1), "", true)); cm2y.append("]");
str.append("<td></td>"); cm2x.append("]");
for(i=0; i<9; i++) str.append("<tr><td nowrap width=\"45%\">");
str.append(doTC(tr("pt %1").arg(i+1), "", true)); str.append(cm1y);
str.append("</tr>"); if ((g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
for(i=0; i<MAX_CURVE9; i++) { str.append(QString("<br>")+cm1x+QString("</td>"));
qplot_color[i]->getRgb(&r,&g,&b); }
c=r; str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
c*=256; str.append("<td nowrap width=\"45%\">");
c+=g; str.append(cm2y);
c*=256; if ((g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
c+=b; str.append(QString("<br>")+cm2x+QString("</td></tr>"));
sprintf(buffer,"%06x",c); }
str.append("<tr>"); }
for(int j=0; j<9; j++) { usedcurves++;
color=getColor1(g_model2->curves9[i][j],g_model2->curves9[i][j]);
str.append(doTR(QString::number(g_model1->curves5[i][j]),color));
} }
str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1+MAX_CURVE5));
for(int j=0; j<9; j++) {
color=getColor1(g_model2->curves9[i][j],g_model2->curves9[i][j]);
str.append(doTR(QString::number(g_model2->curves9[i][j]),color));
}
str.append("</tr>");
} }
str.append("</table></td></tr></table>"); if (usedcurves>0) {
te->append(str); str.append(QString("<tr><td width=45 align=center><img src=\"%1\" border=0></td><td>&nbsp;</td><td width=45 align=center><img src=\"%2\" border=0></td>").arg(curvefile1).arg(curvefile2));
#endif str.append("</table></td></tr></table>");
qi1.save(curvefile1, "png",100);
qi2.save(curvefile2, "png",100);
te->append(str);
}
} }
void CompareDialog::printSwitches() void CompareDialog::printSwitches()
@ -1026,7 +1119,7 @@ void CompareDialog::printFSwitches()
for(int i=0; i<GetCurrentFirmware()->getCapability(CustomFunctions); i++) for(int i=0; i<GetCurrentFirmware()->getCapability(CustomFunctions); i++)
{ {
if (g_model1->customFn[i].swtch.type || g_model2->customFn[i].swtch.type) { if (g_model1->customFn[i].swtch.type || g_model2->customFn[i].swtch.type) {
if ((g_model1->customFn[i].swtch != g_model2->customFn[i].swtch) || (g_model1->customFn[i].func!=g_model2->customFn[i].func) || (g_model1->customFn[i].adjustMode!=g_model2->customFn[i].adjustMode) || (g_model1->customFn[i].param!=g_model2->customFn[i].param)) { if ((g_model1->customFn[i].swtch != g_model2->customFn[i].swtch) || (g_model1->customFn[i].func!=g_model2->customFn[i].func) || (g_model1->customFn[i].adjustMode!=g_model2->customFn[i].adjustMode) || (g_model1->customFn[i].param!=g_model2->customFn[i].param) || (g_model1->customFn[i].enabled != g_model2->customFn[i].enabled) || (g_model1->customFn[i].repeatParam != g_model2->customFn[i].repeatParam)) {
color1="green"; color1="green";
color2="red"; color2="red";
} else { } else {

9
companion/src/comparedialog.h
View file

@ -15,9 +15,10 @@ class CompareDialog : public QDialog
Q_OBJECT Q_OBJECT
public: public:
CompareDialog(QWidget *parent); CompareDialog(QWidget *parent, Firmware * firmware);
~CompareDialog(); ~CompareDialog();
Firmware * firmware;
protected: protected:
GeneralSettings * settings; GeneralSettings * settings;
ModelData * g_model1; ModelData * g_model1;
@ -60,8 +61,8 @@ class CompareDialog : public QDialog
bool ChannelHasMix(MixData * mixArray, uint8_t destCh); bool ChannelHasMix(MixData * mixArray, uint8_t destCh);
QTextEdit * te; QTextEdit * te;
QString curvefile5; QString curvefile1;
QString curvefile9; QString curvefile2;
QDir *qd; QDir *qd;
private slots: private slots:

8
companion/src/helpers.cpp
View file

@ -797,12 +797,12 @@ QString getTimerStr(TimerData & timer)
return result; return result;
} }
QString getProtocol(ModelData * g_model) QString getProtocol(ModuleData & module)
{ {
QString str = getProtocolStr(g_model->moduleData[0].protocol); QString str = getProtocolStr(module.protocol);
if (g_model->moduleData[0].protocol == PPM) if (module.protocol == PPM)
str.append(QObject::tr(": %1 Channels, %2usec Delay").arg(g_model->moduleData[0].channelsCount).arg(g_model->moduleData[0].ppmDelay)); str.append(QObject::tr(": %1 Channels, %2usec Delay, Pulse polarity %3").arg(module.channelsCount).arg(module.ppmDelay).arg(module.polarityToString()));
return str; return str;
} }

2
companion/src/helpers.h
View file

@ -123,7 +123,7 @@ int findmult(float value, float base);
QString getTrimInc(ModelData * g_model); QString getTrimInc(ModelData * g_model);
QString getTimerStr(TimerData & timer); QString getTimerStr(TimerData & timer);
QString getProtocol(ModelData * g_model); QString getProtocol(ModuleData & module);
QString getCenterBeepStr(ModelData * g_model); QString getCenterBeepStr(ModelData * g_model);
/* FrSky helpers */ /* FrSky helpers */

2
companion/src/mainwindow.cpp
View file

@ -863,7 +863,7 @@ void MainWindow::burnFuses()
void MainWindow::compare() void MainWindow::compare()
{ {
CompareDialog *fd = new CompareDialog(this); CompareDialog *fd = new CompareDialog(this,GetCurrentFirmware());
fd->setAttribute(Qt::WA_DeleteOnClose, true); fd->setAttribute(Qt::WA_DeleteOnClose, true);
fd->show(); fd->show();
} }