chore(cpn): upgrade to Ubuntu 22.04 and Qt 6.9.0 (#5986)
Co-authored-by: elecpower <elecpower@users.noreply.github.com> Co-authored-by: raphaelcoeffic <1050031+raphaelcoeffic@users.noreply.github.com>
This commit is contained in:
co-authored by
elecpower
raphaelcoeffic
parent
7264b28e62
commit
9e86a3ea84
@@ -80,8 +80,7 @@ LogsDialog::LogsDialog(QWidget *parent) :
|
||||
timeTicker->setDateTimeFormat("hh:mm:ss.zzz");
|
||||
axisRect->axis(QCPAxis::atBottom)->setTicker(timeTicker);
|
||||
QDateTime now = QDateTime::currentDateTime();
|
||||
axisRect->axis(QCPAxis::atBottom)->setRange(now.addSecs(-60 * 60 * 2).toTime_t(), now.toTime_t());
|
||||
|
||||
axisRect->axis(QCPAxis::atBottom)->setRange(now.addSecs(-60 * 60 * 2).toMSecsSinceEpoch(), now.toMSecsSinceEpoch());
|
||||
axisRect->axis(QCPAxis::atLeft)->setTickLabels(false);
|
||||
axisRect->addAxis(QCPAxis::atLeft);
|
||||
axisRect->addAxis(QCPAxis::atRight);
|
||||
@@ -884,13 +883,12 @@ void LogsDialog::plotLogs()
|
||||
if (plotCoords.max_y < y) plotCoords.max_y = y;
|
||||
|
||||
if (time_str.contains('.')) {
|
||||
time = QDateTime::fromString(time_str, "yyyy-MM-dd HH:mm:ss.zzz")
|
||||
.toTime_t();
|
||||
time = QDateTime::fromString(time_str, "yyyy-MM-dd HH:mm:ss.zzz").toMSecsSinceEpoch();
|
||||
time += time_str.mid(time_str.indexOf('.')).toDouble();
|
||||
} else {
|
||||
time = QDateTime::fromString(time_str, "yyyy-MM-dd HH:mm:ss")
|
||||
.toTime_t();
|
||||
time = QDateTime::fromString(time_str, "yyyy-MM-dd HH:mm:ss").toMSecsSinceEpoch();
|
||||
}
|
||||
|
||||
plotCoords.x.push_back(time);
|
||||
|
||||
if(plots.min_x == INVALID_MIN)
|
||||
|
||||
Reference in New Issue
Block a user