comparison: src/ChartiSpindel.cpp
src/ChartiSpindel.cpp
- changeset 501
- a01ae5ff0e96
- parent 498
- c6f957fa7442
equal
deleted
inserted
replaced
| 500:cf75e6fadcb1 | 501:a01ae5ff0e96 |
|---|---|
| 208 if (series == temperature) | 208 if (series == temperature) |
| 209 t_tooltip->setText(QString(tr("%1\nTemperature %2°C")).arg(timeis.toString("dd-MM-yyyy hh:mm")).arg(point.y(), 2, 'f', 1)); | 209 t_tooltip->setText(QString(tr("%1\nTemperature %2°C")).arg(timeis.toString("dd-MM-yyyy hh:mm")).arg(point.y(), 2, 'f', 1)); |
| 210 else if (series == density) | 210 else if (series == density) |
| 211 t_tooltip->setText(QString(tr("%1\nDensity %2 SG")).arg(timeis.toString("dd-MM-yyyy hh:mm")).arg(point.y(), 5, 'f', 4)); | 211 t_tooltip->setText(QString(tr("%1\nDensity %2 SG")).arg(timeis.toString("dd-MM-yyyy hh:mm")).arg(point.y(), 5, 'f', 4)); |
| 212 else if (series == battery) { | 212 else if (series == battery) { |
| 213 double batt = point.y() - 3.064; /* 0% */ | 213 const float battery_max = 4.13; |
| 214 const float battery_min = 3.43; | |
| 215 double batt = ((point.y() - battery_min) / (battery_max - battery_min)) * 100; | |
| 214 if (batt < 0) | 216 if (batt < 0) |
| 215 batt = 0; | 217 batt = 0; |
| 216 batt = round(batt / 1.17875 * 1000.0) / 10; /* 100% range */ | |
| 217 if (batt > 100) | 218 if (batt > 100) |
| 218 batt = 100; | 219 batt = 100; |
| 219 t_tooltip->setText(QString(tr("%1\nBattery %2 volt\nCapacity %3%")).arg(timeis.toString("dd-MM-yyyy hh:mm")) | 220 t_tooltip->setText(QString(tr("%1\nBattery %2 volt\nCapacity %3%")).arg(timeis.toString("dd-MM-yyyy hh:mm")) |
| 220 .arg(point.y(), 3, 'f', 2).arg(batt, 2, 'f', 1, '0')); | 221 .arg(point.y(), 3, 'f', 2).arg(batt, 2, 'f', 1, '0')); |
| 221 } | 222 } |
