[Argus -To be replaced] - Removed StreamSwitch

Author: marcus-oscarsson

mxcubeweb/core/adapter/argus_adapter.py

@@ -1,13 +1,16 @@
 from typing import ClassVar
 
-from Argus import Argus
+try:
+    from Argus import Argus
+except ImportError:
+    Argus = None
 
 from mxcubeweb.core.adapter.adapter_base import AdapterBase
 
 
 class ArgusAdapter(AdapterBase):
     ATTRIBUTES: ClassVar = ["processes_info", "last_response", "camera_streams"]
-    SUPPORTED_TYPES: ClassVar[list[object]] = [Argus]
+    SUPPORTED_TYPES: ClassVar[list[object]] = []
 
     def __init__(self, ho, *args):
         super().__init__(ho, *args)

ui/src/components/Argus/ArgusButton.jsx

@@ -16,7 +16,7 @@ export default function ArgusButton(props) {
   if (!argus) {
     return null;
   }
-  const processes_info = argus.attributes.processes_info;
+  const { processes_info } = argus.attributes;
   const recording =
     processes_info?.running?.Recorder?.settings?.recording || false;
   const running = processes_info?.closable_running || false;

ui/src/components/Argus/StreamSwitch.jsx

@@ -11,25 +11,25 @@ export function StreamSwitch(props) {
   );
   const [streammode, setStreammode] = useState('monitors');
 
-  return (
-    cameras ? (
-      <div style={{ textAlign: 'center' }}>
-        {streammode === 'monitors' && (
-          <StreamMonitors handleSourceSwitch={handleSourceSwitch} />
-        )}
-        {streammode === 'dropdown' && (
-          <StreamDropdown handleSourceSwitch={handleSourceSwitch} />
-        )}
-        <button
-          type="button"
-          onClick={() => {
-            setStreammode(streammode === 'monitors' ? 'dropdown' : 'monitors');
-          }}
-          style={{ display: 'block', margin: '10px auto' }}
-        >
-          Switch Stream Mode
-        </button>
-      </div>
-    ) : (<div></div>)
+  return cameras ? (
+    <div style={{ textAlign: 'center' }}>
+      {streammode === 'monitors' && (
+        <StreamMonitors handleSourceSwitch={handleSourceSwitch} />
+      )}
+      {streammode === 'dropdown' && (
+        <StreamDropdown handleSourceSwitch={handleSourceSwitch} />
+      )}
+      <button
+        type="button"
+        onClick={() => {
+          setStreammode(streammode === 'monitors' ? 'dropdown' : 'monitors');
+        }}
+        style={{ display: 'block', margin: '10px auto' }}
+      >
+        Switch Stream Mode
+      </button>
+    </div>
+  ) : (
+    <div />
   );
 }

ui/src/components/SampleView/SampleImage.jsx

@@ -861,24 +861,24 @@ class SampleImage extends React.Component {
     this.canvas.requestRenderAll();
   }
 
-  changeSource = (source) => {
-    const canvas = document.querySelector('#sample-img');
-    if (source && canvas) {
-      if (this.player) {
-        this.player.stop();
-        this.player = new JSMpeg.Player(source, {
-          canvas,
-          decodeFirstFrame: false,
-          preserveDrawingBuffer: false,
-          protocols: [],
-          autoplay: true,
-          displayGl: false,
-        });
-        this.player.play();
-      }
-      canvas.src = source;
-    }
-  };
+  // changeSource = (source) => {
+  //   const canvas = document.querySelector('#sample-img');
+  //   if (source && canvas) {
+  //     if (this.player) {
+  //       this.player.stop();
+  //       this.player = new JSMpeg.Player(source, {
+  //         canvas,
+  //         decodeFirstFrame: false,
+  //         preserveDrawingBuffer: false,
+  //         protocols: [],
+  //         autoplay: true,
+  //         displayGl: false,
+  //       });
+  //       this.player.play();
+  //     }
+  //     canvas.src = source;
+  //   }
+  // };
 
   render() {
     this.configureGrid();
@@ -916,7 +916,7 @@ class SampleImage extends React.Component {
           </div>
         </div>
 
-        <StreamSwitch handleSourceSwitch={this.changeSource} />
+        {/* <StreamSwitch handleSourceSwitch={this.changeSource} /> -- > */}
       </div>
     );
   }