ZMQPreviewPublisher: Stream CBOR data
This commit is contained in:
@@ -9,56 +9,23 @@ ZMQPreviewPublisher::ZMQPreviewPublisher(ZMQContext& context, const std::string&
|
||||
socket.Bind(addr);
|
||||
}
|
||||
|
||||
void ZMQPreviewPublisher::Start(const DiffractionExperiment &experiment, const JFCalibration &calibration) {
|
||||
void ZMQPreviewPublisher::StartDataCollection(const uint8_t *image_data, size_t image_size, int64_t preview_stride) {
|
||||
{
|
||||
std::unique_lock<std::mutex> ul(m);
|
||||
stride = experiment.GetPreviewStride();
|
||||
stride = preview_stride;
|
||||
current_part = -1;
|
||||
}
|
||||
auto mask = calibration.CalculateNexusMask(experiment);
|
||||
JFJochProtoBuf::PreviewFrame frame;
|
||||
frame.set_image_number(-1);
|
||||
frame.set_width(experiment.GetXPixelsNum());
|
||||
frame.set_height(experiment.GetYPixelsNum());
|
||||
frame.set_pixel_depth(4);
|
||||
frame.set_data(mask.data(), experiment.GetPixelsNum() * sizeof(uint32_t));
|
||||
socket.Send(grpcToJson(frame));
|
||||
socket.Send(image_data, image_size);
|
||||
}
|
||||
|
||||
void ZMQPreviewPublisher::Stop(const DiffractionExperiment& experiment) {}
|
||||
|
||||
void ZMQPreviewPublisher::Publish(const DiffractionExperiment& experiment, const void* image_data, const DataMessage &message) {
|
||||
void ZMQPreviewPublisher::SendImage(const uint8_t *image_data, size_t image_size, int64_t image_number) {
|
||||
{
|
||||
std::unique_lock<std::mutex> ul(m);
|
||||
int64_t part = message.number / stride;
|
||||
int64_t part = image_number / stride;
|
||||
if (current_part >= part)
|
||||
return;
|
||||
else
|
||||
current_part = part;
|
||||
}
|
||||
|
||||
JFJochProtoBuf::PreviewFrame frame;
|
||||
|
||||
frame.set_image_number(message.number);
|
||||
frame.set_total_images(experiment.GetImageNum());
|
||||
frame.set_wavelength_a(experiment.GetWavelength_A());
|
||||
frame.set_beam_x_pxl(experiment.GetBeamX_pxl());
|
||||
frame.set_beam_y_pxl(experiment.GetBeamY_pxl());
|
||||
frame.set_saturation_value(experiment.GetOverflow());
|
||||
frame.set_file_prefix(experiment.GetFilePrefix());
|
||||
frame.set_detector_distance_mm(experiment.GetDetectorDistance_mm());
|
||||
frame.set_width(experiment.GetXPixelsNum());
|
||||
frame.set_height(experiment.GetYPixelsNum());
|
||||
frame.set_pixel_depth(experiment.GetPixelDepth());
|
||||
|
||||
frame.set_data(image_data, experiment.GetPixelsNum() * experiment.GetPixelDepth());
|
||||
|
||||
for (const auto &s: message.spots) {
|
||||
auto fr = frame.add_spots();
|
||||
fr->set_x(s.x);
|
||||
fr->set_y(s.y);
|
||||
fr->set_indexed(s.indexed);
|
||||
}
|
||||
|
||||
socket.Send(grpcToJson(frame));
|
||||
socket.Send(image_data, image_size);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user