Focus control upstream

mxcubeweb/core/models/configmodels.py

@@ -75,6 +75,7 @@ class UISampleViewVideoControlsModel(UIPropertiesModel):
 
 class UIPropertiesListModel(BaseModel):
     sample_view: UIPropertiesModel
+    sample_view_beam_controls: UISampleViewVideoControlsModel
     beamline_setup: UIPropertiesModel
     camera_setup: UICameraConfigModel
     sample_view_video_controls: UISampleViewVideoControlsModel

mxcubeweb/routes/beamline.py

@@ -1,4 +1,4 @@
-# import json
+import json
 import sys
 import logging
 
@@ -251,4 +251,46 @@ def prepare_beamline_for_sample():
             return Response(status=200)
         return Response(status=200)
 
+    @bp.route("/beamfocus", methods=["PUT"])
+    @server.require_control
+    @server.restrict
+    def set_beam_focus():
+        """
+        Move the aperture motor.
+            :request Content-type: application/json, new position {'diameter': 50}.
+                Note: level specified as integer (not 'Diameter 50')
+            :statuscode: 200: no error
+            :statuscode: 409: error
+        """
+        params = request.data
+        params = json.loads(params)
+        size_x = params["mot01"]
+        size_y = params["mot02"]
+
+        beam_info = HWR.beamline.beam
+        beam_info.set_beam_size(size_x, size_y)
+        return Response(status=200)
+
+    @bp.route("/beamfocus", methods=["GET"])
+    # @server.restrict
+    def get_beam_focus():
+        """
+        Returns  beam focus motors (position and state)
+        """
+
+        beam_info = HWR.beamline.beam
+        beam_info_values = app.beamline.get_beam_info()
+        motors_moving_state = beam_info.get_motors_states()
+
+        data = {
+            "mot01": {"value": beam_info_values["size_x"], "state": motors_moving_state["mot01"]},
+            "mot02": {"value": beam_info_values["size_y"], "state": motors_moving_state["mot02"]},
+        }
+        print(data)
+        resp = jsonify(data)
+        resp.status_code = 200
+
+        return resp
+
+
     return bp

test/HardwareObjectsMockup.xml/mxcube-web/ui.yaml

@@ -74,6 +74,16 @@ sample_view:
       precision: 3
       suffix: mm
 
+sample_view_beam_controls:
+  id: sample_view_beam_controls
+  components:
+    - id: phase
+      show: true
+    - id: aperture
+      show: true
+    - id: beam_focus
+      show: false
+
 sample_view_video_controls:
   id: sample_view_video_controls
   components:

ui/package.json

@@ -59,6 +59,7 @@
     "react-router": "^6.2.1",
     "react-router-bootstrap": "^0.26.1",
     "react-router-dom": "^6.19.0",
+    "react-select": "5.8.0",
     "react-slick": "^0.29.0",
     "react-sticky": "^6.0.3",
     "redux": "4.1.2",