Browse Source

QTime::msec only returns the msec component. Replaced with msecsTo to get the actual elapsed time in msec.

QGC4.4
Hugo Trippaers 4 years ago committed by Don Gagne
parent
commit
9b88c47c0f
  1. 5
      src/Camera/QGCCameraControl.cc

5
src/Camera/QGCCameraControl.cc

@ -779,7 +779,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status) @@ -779,7 +779,7 @@ QGCCameraControl::_setVideoStatus(VideoStatus status)
void
QGCCameraControl::_recTimerHandler()
{
_recordTime = static_cast<uint32_t>(_recTime.msec());
_recordTime = static_cast<uint32_t>(_recTime.msecsTo(QTime::currentTime()));
emit recordTimeChanged();
}
@ -1537,8 +1537,9 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap @@ -1537,8 +1537,9 @@ QGCCameraControl::handleCaptureStatus(const mavlink_camera_capture_status_t& cap
}
//-- Do we have recording time?
if(cap.recording_time_ms) {
// Resync our _recTime timer to the time info received from the camera component
_recordTime = cap.recording_time_ms;
_recTime = _recTime.addMSecs(_recTime.msec() - static_cast<int>(cap.recording_time_ms));
_recTime = _recTime.addMSecs(_recTime.msecsTo(QTime::currentTime()) - static_cast<int>(cap.recording_time_ms));
emit recordTimeChanged();
}
//-- Video/Image Capture Status

Loading…
Cancel
Save