Moved function get_viewport_info to SampleView component

Author: marcus-oscarsson

mxcubeweb/app.py

@@ -25,7 +25,6 @@
 )
 
 from mxcubeweb.core.adapter.adapter_manager import HardwareObjectAdapterManager
-from mxcubeweb.core.components.beamline import Beamline
 from mxcubeweb.core.components.chat import Chat
 from mxcubeweb.core.components.component_base import import_component
 from mxcubeweb.core.components.harvester import Harvester
@@ -166,7 +165,6 @@ def init(
         )
         MXCUBEApplication.chat = Chat(MXCUBEApplication, {})
         MXCUBEApplication.sample_changer = SampleChanger(MXCUBEApplication, {})
-        MXCUBEApplication.beamline = Beamline(MXCUBEApplication, {})
         MXCUBEApplication.sample_view = SampleView(MXCUBEApplication, {})
         MXCUBEApplication.workflow = Workflow(MXCUBEApplication, {})
         MXCUBEApplication.harvester = Harvester(MXCUBEApplication, {})
@@ -203,7 +201,6 @@ def init_signal_handlers():
         MXCUBEApplication.queue.init_signals(HWR.beamline.queue_model)
         MXCUBEApplication.sample_view.init_signals()
         MXCUBEApplication.sample_changer.init_signals()
-        MXCUBEApplication.beamline.init_signals()
         MXCUBEApplication.harvester.init_signals()
 
     @staticmethod

mxcubeweb/core/components/beamline.py

@@ -146,7 +146,7 @@ def init_signals(self):
 
     def set_image_size(self, width, height):
         HWR.beamline.sample_view.camera.restart_streaming((width, height))
-        return self.app.beamline.get_viewport_info()
+        return self.get_viewport_info()
 
     def move_to_centred_position(self, point_id):
         point = HWR.beamline.sample_view.get_shape(point_id)
@@ -368,3 +368,48 @@ def set_centring_method(self, method):
             HWR.beamline.queue_manager.centring_method = CENTRING_METHOD.MANUAL
 
         logging.getLogger("user_level_log").info(msg)
+
+    def get_viewport_info(self):
+        """
+        Get information about current "view port" video dimension, beam position,
+        pixels per mm, returns a dictionary with the format:
+
+            data = {"pixelsPerMm": pixelsPerMm,
+                    "imageWidth": width,
+                    "imageHeight": height,
+                    "format": fmt,
+                    "sourceIsScalable": source_is_scalable,
+                    "scale": scale,
+                    "videoSizes": video_sizes,
+                    "position": position,
+                    "shape": shape,
+                    "size_x": sx, "size_y": sy}
+
+        :returns: Dictionary with view port data, with format described above
+        :rtype: dict
+        """
+        fmt, source_is_scalable = "MJPEG", False
+
+        if self.app.CONFIG.app.VIDEO_FORMAT == "MPEG1":
+            fmt, source_is_scalable = "MPEG1", True
+            video_sizes = HWR.beamline.sample_view.camera.get_available_stream_sizes()
+            (width, height, scale) = HWR.beamline.sample_view.camera.get_stream_size()
+        else:
+            scale = 1
+            width = HWR.beamline.sample_view.camera.get_width()
+            height = HWR.beamline.sample_view.camera.get_height()
+            video_sizes = [(width, height)]
+
+        pixels_per_mm = HWR.beamline.diffractometer.get_pixels_per_mm()
+
+        return {
+            "pixelsPerMm": pixels_per_mm,
+            "imageWidth": width,
+            "imageHeight": height,
+            "format": fmt,
+            "sourceIsScalable": source_is_scalable,
+            "scale": scale,
+            "videoSizes": video_sizes,
+            "videoHash": HWR.beamline.sample_view.camera.stream_hash,
+            "videoURL": self.app.CONFIG.app.VIDEO_STREAM_URL,
+        }

mxcubeweb/core/components/sampleview.py

@@ -64,7 +64,7 @@ def get_image_data():
             :statuscode: 200: no error
             :statuscode: 409: error
         """
-        data = app.beamline.get_viewport_info()
+        data = app.sample_view.get_viewport_info()
 
         resp = jsonify(data)
         resp.status_code = 200