diff --git a/plugins/channelrx/demodadsb/adsbdemodgui.cpp b/plugins/channelrx/demodadsb/adsbdemodgui.cpp index b176a973b..11751582a 100644 --- a/plugins/channelrx/demodadsb/adsbdemodgui.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodgui.cpp @@ -215,7 +215,7 @@ void Aircraft::addCoordinate(const ADSBAircraftPosition& position, AircraftModel { QVariantList& prevList = m_coordinates.back(); prevList.push_back(QVariant::fromValue(coord)); - m_coordinateDateTimes.push_back(position.m_dateTime); + m_coordinateDateTimes.push_back(position.m_dateTime.toUTC()); if (showFullPath) { model->aircraftCoordsUpdated(this); } @@ -267,11 +267,13 @@ void Aircraft::addCoordinate(const ADSBAircraftPosition& position, AircraftModel } } } - m_coordinateDateTimes.push_back(position.m_dateTime); + m_coordinateDateTimes.push_back(position.m_dateTime.toUTC()); m_lastColor = color; - // Prune recent list so only last 25 seconds of coordinates - QDateTime cutoff = QDateTime::currentDateTime().addSecs(-25); + // Prune recent list so only last 25 seconds of coordinates. In UTC, as the times are + // kept: comparing local QDateTimes works out both offsets again every time, under a + // lock Qt shares between all threads + QDateTime cutoff = QDateTime::currentDateTimeUtc().addSecs(-25); int keepCount = 0; for (int i = m_coordinateDateTimes.size() - 1; i >= 0; i--) { @@ -2974,7 +2976,7 @@ void ADSBDemodGUI::tick() (100.0f + powDbPeak) / 100.0f, nbMagsqSamples); - if (m_tickCount % 4 == 0) { + if ((m_tickCount % 4 == 0) && !ui->channelPower->visibleRegion().isEmpty()) { ui->channelPower->setText(tr("%1 dB").arg(powDbAvg, 0, 'f', 1)); } @@ -3088,15 +3090,22 @@ void ADSBDemodGUI::averageSeries(QLineSeries *series, const QDateTime& startTime int startIdx = 0; int endIdx = -1; + // The points are epoch milliseconds, so compare them as such. Making a QDateTime of + // each meant a local time zone lookup per point, under a lock Qt shares between all + // threads, walking back over 10 minutes of points in every series every minute - the + // same code in the ACARS demodulator was a ~450 ms GUI stall + const qint64 startMs = startTime.toMSecsSinceEpoch(); + const qint64 endMs = endTime.toMSecsSinceEpoch(); + for (int i = series->count() - 1; i >= 0; i--) { - QDateTime dt = QDateTime::fromMSecsSinceEpoch(series->at(i).x()); + const qint64 ms = (qint64) series->at(i).x(); - if ((endIdx == -1) && (dt <= endTime)) + if ((endIdx == -1) && (ms <= endMs)) { endIdx = i; } - else if (dt < startTime) + else if (ms < startMs) { startIdx = i + 1; break; diff --git a/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp b/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp index 5e526739d..75458c340 100644 --- a/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodtrackerdecode.cpp @@ -339,6 +339,14 @@ QList *ADSBDemodTracker::copyAnimations(QList *animations, const QDateTime& aircraftStateDateTime) @@ -404,6 +412,11 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, aircraft->m_mapTrailResetPending = false; } + // Converted once for all the pipes + const QDateTime positionDateTime = aircraft->m_positionDateTime.toUTC(); + const QString positionDateTimeString = positionDateTime.toString(Qt::ISODateWithMs); + const QString altitudeDateTimeString = mapDateTime(aircraft->m_altitudeDateTime); + for (const auto& pipe : (reportPipes.size() > 0 ? reportPipes : mapPipes)) { MessageQueue *messageQueue = qobject_cast(pipe->m_element); @@ -412,10 +425,10 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, swgMapItem->setLatitude(aircraft->m_latitude); swgMapItem->setLongitude(aircraft->m_longitude); swgMapItem->setAltitude(altitudeM); - swgMapItem->setPositionDateTime(new QString(aircraft->m_positionDateTime.toString(Qt::ISODateWithMs))); - swgMapItem->setAltitudeDateTime(new QString(aircraft->m_altitudeDateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(positionDateTimeString)); + swgMapItem->setAltitudeDateTime(new QString(altitudeDateTimeString)); swgMapItem->setFixedPosition(false); - swgMapItem->setAvailableUntil(new QString(aircraft->m_positionDateTime.addSecs(61).toString(Qt::ISODateWithMs))); // Changed from 60 to 61 due to https://github.com/CesiumGS/cesium/issues/12426 + swgMapItem->setAvailableUntil(new QString(positionDateTime.addSecs(61).toString(Qt::ISODateWithMs))); // Changed from 60 to 61 due to https://github.com/CesiumGS/cesium/issues/12426 QString image; if (m_settings.m_useLiveryIcons) { image = aircraft->getLiveryImage(); @@ -446,7 +459,7 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, QDateTime labelDateTime; swgMapItem->setLabel(new QString(aircraft->getLabel(&m_settings, labelDateTime))); if (labelDateTime.isValid()) { - swgMapItem->setLabelDateTime(new QString(labelDateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setLabelDateTime(new QString(mapDateTime(labelDateTime))); } if (aircraft->m_trackValid) @@ -459,7 +472,7 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, } else { swgMapItem->setRoll(aircraft->m_rollEst); } - swgMapItem->setOrientationDateTime(new QString(aircraft->m_positionDateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setOrientationDateTime(new QString(positionDateTimeString)); } else { @@ -491,7 +504,7 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, // Present only for unthrottled log replay. The Map uses this both as the // CZML sample time and as the instruction not to coalesce this state with // the next frame before it reaches the 3D display. - aircraftState->setDateTime(new QString(aircraftStateDateTime.toString(Qt::ISODateWithMs))); + aircraftState->setDateTime(new QString(mapDateTime(aircraftStateDateTime))); } aircraftState->setIcao(new QString(QString::number(aircraft->m_icao, 16))); if (!aircraft->m_callsign.isEmpty()) { @@ -508,7 +521,7 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, if (aircraft->m_indicatedAirspeedValid) { aircraftState->setAirspeed(aircraft->m_indicatedAirspeed); - aircraftState->setAirspeedDateTime(new QString(aircraft->m_indicatedAirspeedDateTime.toString(Qt::ISODateWithMs))); + aircraftState->setAirspeedDateTime(new QString(mapDateTime(aircraft->m_indicatedAirspeedDateTime))); } else { @@ -532,7 +545,7 @@ void ADSBDemodTracker::sendToMap(ADSBAircraft *aircraft, if (aircraft->m_pressureAltitudeValid) { aircraftState->setAltitude(aircraft->m_pressureAltitude); - aircraftState->setAltitudeDateTime(new QString(aircraft->m_altitudeDateTime.toString(Qt::ISODateWithMs))); + aircraftState->setAltitudeDateTime(new QString(altitudeDateTimeString)); } else { @@ -4353,12 +4366,12 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::gearAnimation(QDateTime startDat // Gear up (0.0) / down (1.0) SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_GEAR)); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(up); animation->setLoop(0); animation->setDuration(5); animation->setMultiplier(0.2f); - animation->setSound(new QString("A320_gear.wav")); + animation->setSound(new QString("gear.wav")); return animation; } @@ -4367,7 +4380,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::gearAngle(QDateTime startDateTim // Gear deflection - on ground it should be flat (0.0) in the air at an angle (1.0) SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_GEAR_ANGLE)); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(flat); animation->setLoop(0); animation->setDuration(1); @@ -4381,7 +4394,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::flapsAnimation(QDateTime startDa bool retract = flaps < currentFlaps; SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_FLAPS)); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(retract); animation->setLoop(0); animation->setDuration(5*std::abs(flaps-currentFlaps)); @@ -4391,7 +4404,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::flapsAnimation(QDateTime startDa } else { animation->setStartOffset(currentFlaps); } - animation->setSound(new QString("A320_flaps.wav")); + animation->setSound(new QString("flaps.wav")); return animation; } @@ -4400,7 +4413,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::slatsAnimation(QDateTime startDa // Extend / retract slats SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_SLATS)); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(retract); animation->setLoop(0); animation->setDuration(5); @@ -4413,7 +4426,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::rotorAnimation(QDateTime startDa // Turn rotors in helicopter.glb model SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_ROTOR)); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(false); animation->setLoop(true); animation->setMultiplier(1); @@ -4428,7 +4441,7 @@ SWGSDRangel::SWGMapAnimation *ADSBDemodTracker::engineAnimation(QDateTime startD // to look like a turning propellor - 720 is two revolutions a second SWGSDRangel::SWGMapAnimation *animation = new SWGSDRangel::SWGMapAnimation(); animation->setName(new QString(ANIMATION_ENGINE.arg(engine))); - animation->setStartDateTime(new QString(startDateTime.toString(Qt::ISODateWithMs))); + animation->setStartDateTime(new QString(mapDateTime(startDateTime))); animation->setReverse(false); animation->setLoop(true); animation->setMultiplier(720); diff --git a/plugins/channelrx/demoddroneid/droneiddemod.cpp b/plugins/channelrx/demoddroneid/droneiddemod.cpp index 2c6cd5c55..5be8bb467 100644 --- a/plugins/channelrx/demoddroneid/droneiddemod.cpp +++ b/plugins/channelrx/demoddroneid/droneiddemod.cpp @@ -344,7 +344,7 @@ void DroneIDDemod::sendMapItem(const QString& name, double latitude, double long swgMapItem->setLongitude(longitude); swgMapItem->setAltitude(altitude); swgMapItem->setAltitudeReference(altitudeReference); - swgMapItem->setPositionDateTime(new QString(dateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(dateTime.toUTC().toString(Qt::ISODateWithMs))); swgMapItem->setFixedPosition(false); swgMapItem->setImage(new QString(image)); swgMapItem->setImageRotation(imageRotation); @@ -357,7 +357,7 @@ void DroneIDDemod::sendMapItem(const QString& name, double latitude, double long swgMapItem->setHeading(imageRotation); swgMapItem->setPitch(0.0f); swgMapItem->setRoll(0.0f); - swgMapItem->setOrientationDateTime(new QString(dateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setOrientationDateTime(new QString(dateTime.toUTC().toString(Qt::ISODateWithMs))); swgMapItem->setLabelAltitudeOffset(1.0f); if (!animation.isEmpty()) @@ -365,7 +365,7 @@ void DroneIDDemod::sendMapItem(const QString& name, double latitude, double long // Each map item owns and deletes its animations, so create for each pipe SWGSDRangel::SWGMapAnimation *swgAnimation = new SWGSDRangel::SWGMapAnimation(); swgAnimation->setName(new QString(animation)); - swgAnimation->setStartDateTime(new QString(dateTime.toString(Qt::ISODateWithMs))); + swgAnimation->setStartDateTime(new QString(dateTime.toUTC().toString(Qt::ISODateWithMs))); swgAnimation->setReverse(0); swgAnimation->setLoop(1); swgAnimation->setMultiplier(1.0f); diff --git a/plugins/channelrx/demodft8/ft8demodworker.cpp b/plugins/channelrx/demodft8/ft8demodworker.cpp index d21fb8c28..91d042820 100644 --- a/plugins/channelrx/demodft8/ft8demodworker.cpp +++ b/plugins/channelrx/demodft8/ft8demodworker.cpp @@ -380,7 +380,7 @@ void FT8DemodWorker::processBuffer(int16_t *buffer, QDateTime periodTS) swgMapItem->setLongitude(longitude); swgMapItem->setAltitude(0); swgMapItem->setAltitudeReference(1); // CLAMP_TO_GROUND - swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTime().toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTimeUtc().toString(Qt::ISODateWithMs))); swgMapItem->setImageRotation(0); swgMapItem->setText(new QString(text)); swgMapItem->setImage(new QString("antenna.png")); diff --git a/plugins/channelrx/demodils/ilsdemodgui.cpp b/plugins/channelrx/demodils/ilsdemodgui.cpp index d5638dfaf..ec9bcff22 100644 --- a/plugins/channelrx/demodils/ilsdemodgui.cpp +++ b/plugins/channelrx/demodils/ilsdemodgui.cpp @@ -457,7 +457,7 @@ void ILSDemodGUI::on_addMarker_clicked() swgMapItem->setAltitude(stationAltitude); swgMapItem->setAltitudeReference(1); // CLAMP_TO_GROUND swgMapItem->setFixedPosition(true); - swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTime().toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTimeUtc().toString(Qt::ISODateWithMs))); swgMapItem->setImage(new QString(QString("qrc:///aprs/aprs/aprs-symbols-24-0-06.png"))); QString text; diff --git a/plugins/channelrx/demodpager/pagerdemodgui.cpp b/plugins/channelrx/demodpager/pagerdemodgui.cpp index b8c36255c..a3f89609f 100644 --- a/plugins/channelrx/demodpager/pagerdemodgui.cpp +++ b/plugins/channelrx/demodpager/pagerdemodgui.cpp @@ -1132,7 +1132,7 @@ void PagerDemodGUI::sendToMap(const QString& address, const QString& message, fl swgMapItem->setAltitude(0); swgMapItem->setAltitudeReference(1); // CLAMP_TO_GROUND swgMapItem->setFixedPosition(false); - swgMapItem->setPositionDateTime(new QString(dateTime.toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(dateTime.toUTC().toString(Qt::ISODateWithMs))); swgMapItem->setImageRotation(0); swgMapItem->setText(new QString(message)); diff --git a/plugins/feature/ais/aisgui.cpp b/plugins/feature/ais/aisgui.cpp index 2da15f4d6..dc9aea3a0 100644 --- a/plugins/feature/ais/aisgui.cpp +++ b/plugins/feature/ais/aisgui.cpp @@ -1016,9 +1016,9 @@ void AISGUI::sendToMap(const QString &name, const QString &label, if (positionDateTime.isValid()) { - swgMapItem->setPositionDateTime(new QString(positionDateTime.toString(Qt::ISODateWithMs))); - swgMapItem->setOrientationDateTime(new QString(positionDateTime.toString(Qt::ISODateWithMs))); - swgMapItem->setAvailableUntil(new QString(positionDateTime.addSecs(10*60).toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(positionDateTime.toUTC().toString(Qt::ISODateWithMs))); + swgMapItem->setOrientationDateTime(new QString(positionDateTime.toUTC().toString(Qt::ISODateWithMs))); + swgMapItem->setAvailableUntil(new QString(positionDateTime.toUTC().addSecs(10*60).toString(Qt::ISODateWithMs))); } swgMapItem->setImageRotation(heading); diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp index 7b5501700..e4a3ec308 100644 --- a/plugins/feature/aprs/aprsgui.cpp +++ b/plugins/feature/aprs/aprsgui.cpp @@ -369,12 +369,12 @@ bool APRSGUI::handleMessage(const Message& message) swgMapItem->setAltitudeReference(1); // CLAMP_TO_GROUND swgMapItem->setFixedPosition(false); if (aprs->m_hasTimestamp) { - swgMapItem->setPositionDateTime(new QString(aprs->m_timestamp.toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(aprs->m_timestamp.toUTC().toString(Qt::ISODateWithMs))); } else { - swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTime().toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(QDateTime::currentDateTimeUtc().toString(Qt::ISODateWithMs))); } // Need to set availableUntil for 3D track to be displayed - swgMapItem->setAvailableUntil(new QString(QDateTime::currentDateTime().addDays(1).toString(Qt::ISODateWithMs))); + swgMapItem->setAvailableUntil(new QString(QDateTime::currentDateTimeUtc().addDays(1).toString(Qt::ISODateWithMs))); if (aprs->m_objectKilled) { swgMapItem->setImage(new QString("")); diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp index 04a447b08..2fe0f8594 100644 --- a/plugins/feature/radiosonde/radiosondegui.cpp +++ b/plugins/feature/radiosonde/radiosondegui.cpp @@ -524,9 +524,9 @@ void RadiosondeGUI::sendToMap(const QString &name, const QString &label, if (positionDateTime.isValid()) { - swgMapItem->setPositionDateTime(new QString(positionDateTime.toString(Qt::ISODateWithMs))); - swgMapItem->setOrientationDateTime(new QString(positionDateTime.toString(Qt::ISODateWithMs))); - swgMapItem->setAvailableUntil(new QString(positionDateTime.addSecs(1*60*60).toString(Qt::ISODateWithMs))); + swgMapItem->setPositionDateTime(new QString(positionDateTime.toUTC().toString(Qt::ISODateWithMs))); + swgMapItem->setOrientationDateTime(new QString(positionDateTime.toUTC().toString(Qt::ISODateWithMs))); + swgMapItem->setAvailableUntil(new QString(positionDateTime.toUTC().addSecs(1*60*60).toString(Qt::ISODateWithMs))); } swgMapItem->setImageRotation(heading);