Skip to content

Commit

Permalink
change to new camera websockets for argus
Browse files Browse the repository at this point in the history
  • Loading branch information
walesch-yan committed Nov 25, 2024
1 parent 7c5cfb1 commit 42bff7a
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
17 changes: 9 additions & 8 deletions demo/mxcube-web/server.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@ server:
DEBUG: false

ALLOWED_CORS_ORIGINS:
- http://localhost:8081
- http://127.0.0.1:8081
- http://localhost:5173
- http://127.0.0.1:5173
- ws://localhost:8000
- ws://127.0.0.1:8000
- "ws://localhost:9090"
- "http://localhost:9090"
- "http://localhost:8081"
- "http://127.0.0.1:8081"
- "http://localhost:5173"
- "http://127.0.0.1:5173"
- "ws://localhost:8000"
- "ws://127.0.0.1:8000"
- "ws://localhost:7000"
- "ws://127.0.0.1:7000"
- "http://localhost:7000"

sso:
USE_SSO: false
Expand Down
4 changes: 2 additions & 2 deletions ui/src/components/BeamlineCamera/BeamlineCamera.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ function BeamlineCamera(props) {

useEffect(() => {
if (argusStreams) {
const argusCameras = Object.entries(argusStreams).map(([key, value]) => {
const argusCameras = Object.keys(argusStreams).map((key) => {
return {
description: null,
format: null,
height: 1280,
width: 960,
label: key,
url: value,
url: `ws://localhost:7000/ws/${key}`,
};
});
if (cameraSetup && cameraSetup.components.length > 0) {
Expand Down
1 change: 1 addition & 0 deletions ui/src/components/BeamlineCamera/CameraCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export default function CameraCard(props) {
preserveDrawingBuffer: false,
protocols: [],
autoplay: true,
displayGl: false,
});
}

Expand Down

0 comments on commit 42bff7a

Please sign in to comment.