Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[CP #1598 > support/v5.13] [Rec] Fixed "Recording" display bug and some other bugs #1599

Merged
merged 1 commit into from
May 17, 2024
Merged

[CP #1598 > support/v5.13] [Rec] Fixed "Recording" display bug and some other bugs #1599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions app/rec/rec_gui/src/widgets/recording_history_widget/job_history_model.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ void JobHistoryModel::setRecorderStatuses(const eCAL::rec_server::RecorderStatus
if (hdf5_recorder_item == nullptr) continue;

bool update_needed_hdf5_rec = false;
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateStillOnline (recorder_still_online);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updatePid (pid);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateInfoLastCommandResponse(client_job_status.second.info_last_command_response_);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateLength ({ client_job_status.second.job_status_.rec_hdf5_status_.total_length_, client_job_status.second.job_status_.rec_hdf5_status_.total_frame_count_ });
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateUnflushedFrameCount (client_job_status.second.job_status_.rec_hdf5_status_.unflushed_frame_count_);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateState (client_job_status.second.job_status_.state_);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateUploadStatus (client_job_status.second.job_status_.upload_status_);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateInfo (client_job_status.second.job_status_.rec_hdf5_status_.info_);
update_needed_hdf5_rec = update_needed_hdf5_rec || hdf5_recorder_item->updateIsDeleted (is_deleted);
update_needed_hdf5_rec = hdf5_recorder_item->updateStillOnline (recorder_still_online) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updatePid (pid) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateInfoLastCommandResponse(client_job_status.second.info_last_command_response_) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateLength ({ client_job_status.second.job_status_.rec_hdf5_status_.total_length_, client_job_status.second.job_status_.rec_hdf5_status_.total_frame_count_ }) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateUnflushedFrameCount (client_job_status.second.job_status_.rec_hdf5_status_.unflushed_frame_count_) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateState (client_job_status.second.job_status_.state_) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateUploadStatus (client_job_status.second.job_status_.upload_status_) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateInfo (client_job_status.second.job_status_.rec_hdf5_status_.info_) || update_needed_hdf5_rec;
update_needed_hdf5_rec = hdf5_recorder_item->updateIsDeleted (is_deleted) || update_needed_hdf5_rec;

if (update_needed_hdf5_rec)
{
Expand Down Expand Up @@ -216,13 +216,13 @@ void JobHistoryModel::setRecorderStatuses(const eCAL::rec_server::RecorderStatus
}

bool update_needed_addon = false;
update_needed_addon = update_needed_addon || addon_item->updateStillOnline (addon_still_online);
update_needed_addon = update_needed_addon || addon_item->updatePid (pid);
update_needed_addon = update_needed_addon || addon_item->updateLength ({std::chrono::steady_clock::duration(0), addon_id_status_pair.second.total_frame_count_ });
update_needed_addon = update_needed_addon || addon_item->updateUnflushedFrameCount(addon_id_status_pair.second.unflushed_frame_count_);
update_needed_addon = update_needed_addon || addon_item->updateState (addon_state);
update_needed_addon = update_needed_addon || addon_item->updateInfo (addon_id_status_pair.second.info_);
update_needed_addon = update_needed_addon || addon_item->updateIsDeleted (is_deleted);
update_needed_addon = addon_item->updateStillOnline (addon_still_online) || update_needed_addon;
update_needed_addon = addon_item->updatePid (pid) || update_needed_addon;
update_needed_addon = addon_item->updateLength ({std::chrono::steady_clock::duration(0), addon_id_status_pair.second.total_frame_count_ }) || update_needed_addon;
update_needed_addon = addon_item->updateUnflushedFrameCount(addon_id_status_pair.second.unflushed_frame_count_) || update_needed_addon;
update_needed_addon = addon_item->updateState (addon_state) || update_needed_addon;
update_needed_addon = addon_item->updateInfo (addon_id_status_pair.second.info_) || update_needed_addon;
update_needed_addon = addon_item->updateIsDeleted (is_deleted) || update_needed_addon;

if (update_needed_addon)
{
Expand Down
8 changes: 4 additions & 4 deletions app/rec/rec_gui/src/widgets/wait_for_shutdown_dialog/wait_for_shutdown_dialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,10 +373,10 @@ bool WaitForShutdownDialog::updateAllFields()
auto job_history = QEcalRec::instance()->jobHistory();

bool safe_to_exit = true;
safe_to_exit = safe_to_exit && updateWaitForFlushing();
safe_to_exit = safe_to_exit && updateBuiltInRecorderUploading(job_history);
safe_to_exit = safe_to_exit && updateBuiltInFtpServer();
safe_to_exit = safe_to_exit && updateNonUploadedMeasurements();
safe_to_exit = updateWaitForFlushing() && safe_to_exit;
safe_to_exit = updateBuiltInRecorderUploading(job_history) && safe_to_exit;
safe_to_exit = updateBuiltInFtpServer() && safe_to_exit;
safe_to_exit = updateNonUploadedMeasurements() && safe_to_exit;

updateItIsSafeToExit(safe_to_exit);

Expand Down
6 changes: 3 additions & 3 deletions app/rec/rec_server_cli/src/ecal_rec_server_cli.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1568,9 +1568,9 @@ bool IsRecorderBusy(bool print_status)
std::cout << "Waiting for the following events:" << std::endl;

bool still_busy = false;
still_busy = still_busy || IsAnyClientFlushing (print_status);
still_busy = still_busy || IsAnyClientUploading (print_status);
still_busy = still_busy || IsBuiltInFtpServerBusy(print_status);
still_busy = IsAnyClientFlushing (print_status) || still_busy;
still_busy = IsAnyClientUploading (print_status) || still_busy;
still_busy = IsBuiltInFtpServerBusy(print_status) || still_busy;

if (print_status && !still_busy)
{
Expand Down
Loading