ZMQPreviewPublisher: Add spots to preview message + allow for frame number management within the ZMQPreviewPublisher

This commit is contained in:
2023-05-18 22:36:43 +02:00
parent ff92984fcc
commit eaccdf67b7
8 changed files with 163 additions and 62 deletions
+11 -9
View File
@@ -349,10 +349,12 @@ void JFJochReceiver::FrameTransformationThread() {
bool send_image = false; // We send image if at least one module was collected in full
if (GPUImageAnalysis::GPUPresent() && (spotfinder_stride > 0) && (image_number % spotfinder_stride == 0)) {
calculate_spots = true;
if (rad_int_mapping)
send_bkg_estimate = true;
if (GPUImageAnalysis::GPUPresent()) {
if (((spotfinder_stride > 0) && (image_number % spotfinder_stride == 0)) || send_preview) {
calculate_spots = true;
if (rad_int_mapping)
send_bkg_estimate = true;
}
}
if (experiment.GetSummation() >= threaded_summation_threshold) {
@@ -421,11 +423,6 @@ void JFJochReceiver::FrameTransformationThread() {
if (send_bkg_estimate)
spot_finder->RunRadialIntegration();
if (send_preview)
preview_publisher->Publish(experiment,
transformation.GetPreview16BitImage(),
image_number);
if (calculate_spots) {
spot_finder->GetSpotFinderResults(experiment, GetDataProcessingSettings(), spots);
for (const auto &spot: spots)
@@ -472,6 +469,11 @@ void JFJochReceiver::FrameTransformationThread() {
spot_finder->GetRadialIntegrationCount());
}
if (send_preview)
preview_publisher->Publish(experiment,
transformation.GetPreview16BitImage(),
message);
if (push_images_to_writer) {
message.receiver_available_send_buffers = GetAvailableSendBuffers();