Commit Graph

61 Commits

Author SHA1 Message Date
5e7f874bfd feat(web-ui): Constrain camera feed section and Basler streams to viewport height
Addressed user feedback to prevent the camera feed section and its internal
streams from overflowing the viewport.

- **Explicitly constrained camera-view height:** Ensured `.camera-view` utilizes
  `height: 100%` and `overflow-y: auto` to fit within its parent (`.main-container`)
  and allow internal scrolling if content is too tall.
- **Refined individual stream container sizing:** Removed fixed `height: 100%`
  from `.camera-container-individual` and re-enabled `max-width: 100%`. This,
  combined with `aspect-ratio` and `max-height: 100%`, allows individual camera
  streams to scale correctly within their allocated grid cells without causing
  overflow.
- **Ensured grid row containment:** Applied `height: 100%` and `overflow: hidden`
  to `.camera-color-row` and `.camera-mono-row` to tightly constrain content
  within grid rows.
2025-12-03 12:29:23 +07:00
43019286cf fix(web-ui): Refine LMC spacing and ensure consistent control widths
Addressed user feedback regarding precise layout adjustments for the Lamp
Matrix Control (LMC) interface.

- **Removed all explicit padding:** Removed `padding` from `.main-container`
  and `padding-right` from `.lamp-view` to make content flush with browser edges
  as per new instructions.
- **Unified Control Widths:** Explicitly set `width: 470px` for `.region-control`,
  `.control-panel`, and `.center-lamp-control` to ensure they precisely match
  the calculated 470px width of the `.matrix-grid`. This creates visual
  consistency and horizontal alignment across all LMC components.
- **Centered LMC Components:** Ensured all LMC components are horizontally
  centered within the `.lamp-view` by setting `align-items: center` on
  `.lamp-view .main-content`.
2025-12-03 11:45:03 +07:00
b4793ca585 fix(web-ui): Correct Lamp Matrix visual and layout responsiveness
Resolved issues with the Lamp Matrix control being cropped and distorting,
and not maintaining a fixed 5x5 layout.

- **Fixed 5x5 Matrix:** Reverted `.matrix-grid` to `grid-template-columns: repeat(5, 70px)`
  to enforce a consistent 5x5 lamp layout.
- **Prevented Warping:** Removed `width: 100%` from `.matrix-grid` to allow its
  width to be intrinsically determined by its content, preventing distortion.
- **Ensured Adequate Space:** Set `.lamp-view` to `flex: 0 0 auto` with a
  `min-width: 480px` to guarantee sufficient space for the fixed matrix and
  controls without cropping.
- **Responsive Control Panels:** Applied `max-width: 470px` to `.control-panel`
  and `.center-lamp-control` to align their size with the matrix grid while
  maintaining responsiveness in smaller viewports.
- **Full Screen Utilization:** Ensured the overall application expands to fill
  the browser window by removing `max-width` from `.main-container`.
2025-12-03 10:55:11 +07:00
84e1e895ae feat(web-ui): Implement responsive camera stream layout and styling
This commit introduces a refined layout and styling for the camera streams
in the unified web UI. Key changes include:

- **Responsive Grid Layout:** Implemented a CSS Grid-based layout for camera feeds,
  ensuring the color camera occupies 1/3 height and mono cameras 2/3 height.
- **Improved Stream Fit:** Adjusted CSS to ensure individual camera streams
  (visual containers) perfectly fit within their designated borders without
  cropping, distortion, or excessive transparent space, addressing user feedback
  regarding "zoomed out" or ill-fitting streams.
- **Aesthetic Enhancements:** Removed black backgrounds from stream containers
  and applied corner radii for a modern look.
- **Padding Adjustments:** Optimized padding to prevent UI elements from appearing
  cramped while maintaining visual separation.
- **New Tests:** Added robust visual tests () to programmatically
  verify layout correctness and ensure tight fitting of camera feeds within
  their containers.
- **Dependency Updates:** Updated  to reflect any new or
  changed Python dependencies.
- **Test Runner & Gitignore:** Included  script and updated
   to properly ignore virtual environment artifacts.
2025-12-03 10:45:01 +07:00
c9c8cb7df7 revert: Revert controllerSoftware to commit 6a21816e42 2025-12-02 21:54:09 +07:00
413590d1a2 Changed color camera back to color, set all cameras to 20ms shutter speed 2025-12-01 15:42:16 +07:00
35ddf9f844 3 cameras confirmed available 2025-12-01 15:25:57 +07:00
d12931641b Changed to adaptive camera count 2025-12-01 11:55:51 +07:00
4a46b12c05 Stable Dual Camera setup 2025-12-01 11:51:45 +07:00
d11288165b AVC encoding implemented, now optimizing 2025-12-01 10:11:10 +07:00
19fcdd6c9f Proper res, low framerate due to JPEG encoding 2025-12-01 09:59:22 +07:00
7af789a1d6 First camera feed success 2025-12-01 09:42:34 +07:00
da4f7073dc test python script 2025-12-01 09:08:39 +07:00
17d691173b Temporary Commit 2025-11-28 16:18:30 +07:00
Tempest
7d5b283dd3 Update .gitignore to exclude .DS_Store files 2025-11-28 11:01:55 +07:00
40b9b2c8d2 feat: Add pupil detection and camera stream to UI
- Add a new section to the web UI to display pupil detection data and a live camera stream with YOLO segmentation.
- Add a /video_feed endpoint to stream the annotated camera feed.
- Update the VisionSystem to support onnxruntime-gpu with a fallback to CPU.
- Add logging to indicate which backend is being used.
- Refactor the test suite to accommodate the new features and fix existing tests.
2025-11-28 08:29:17 +07:00
8aebeea6ee Resolve merge conflict in app.py and integrate vision system 2025-11-27 22:23:57 +07:00
60fa88926f Add new files and update existing ones 2025-11-27 22:22:56 +07:00
77a4eca751 Merge branch 'dev' of https://git.spirals.cc/shudder5305/pupilometer into dev 2025-10-06 13:17:16 +07:00
Tempest
6a21816e42 Ready for delivery 2025-10-04 19:11:03 +07:00
Tempest
197c3c20e2 Readded numerical input. 2025-09-22 14:37:30 +07:00
Tempest
91d4f59a9f Updated for single BLE Characteristic communication, replacing for 1 Char 1 Lamp 2025-09-19 20:35:25 +07:00
Tempest
b4cfbbe60b Removing older version and temporary tests from repo 2025-09-19 20:30:34 +07:00
Tempest
bda937a889 Remove misc file and modified firmware flow to commit data to BLE buffer 2025-09-18 21:44:13 +07:00
4601abd8d8 Merge branch 'dev' of https://git.spirals.cc/shudder5305/pupilometer into dev 2025-09-17 18:25:56 +07:00
Tempest
6bf9ede793 Changing firmware for modifying the whole lamp at the same time. 2025-09-17 12:47:12 +07:00
de9c73aba2 Stashed commit 2025-08-08 20:35:38 +07:00
Tempest
f3c2529394 Handled Ctrl C gracefully... I hope. 2025-08-08 15:52:38 +07:00
Tempest
ef12927410 Fixed phone interface vertical overflow 2025-08-08 15:22:32 +07:00
Tempest
89677ac283 Corrected the web page behavior on widescreen to get matrix and control panel side by side. 2025-08-08 15:16:47 +07:00
Tempest
1819bbfa2e Modified app.py to migrate to server-side rendering 2025-08-08 00:02:33 +07:00
Tempest
ebb25aee9c Updated to a workable interface right now. 2025-08-07 18:17:29 +07:00
Tempest
c27e3d661d Modified for correct value sending 2025-08-06 17:07:55 +07:00
ce0639863c Added to prepare for web interface of application. 2025-08-06 15:22:46 +07:00
bddc6c99fc Modified to add flask into app requirements 2025-08-06 15:21:38 +07:00
d79fc79519 Preparing Web Interface for Lamp Matrix Controller 2025-08-05 15:44:05 +07:00
2aaffd8ba1 Re-sorted service list to ensure correct processing order 2025-08-04 17:48:14 +07:00
54a02ad149 Corrected the characteristic order to properly address lamps 2025-08-04 17:42:26 +07:00
208643a286 Modified to accomodate bleak on Jetson AGX 2025-08-04 17:31:20 +07:00
f258fced41 Added requirements.txt for portability 2025-08-04 17:27:14 +07:00
Tempest
b7cd8d18e8 Final Commit for TUI 2025-07-25 18:15:11 +07:00
Tempest
528ca5da5b Splitted Center into its own value... ugly solution 2025-07-25 17:54:38 +07:00
Tempest
cf9a3d7c93 Implemented a basic Text-based User Interface 2025-07-25 16:57:16 +07:00
Tempest
4e4adeb581 Added test script for controlling Billboard over BLE 2025-07-15 20:06:42 +07:00
Tempest
7fa219a7f3 Remove Leftover MacOS file... again 2024-11-15 21:25:53 +07:00
Tempest
20d65d5b56 Removed MacOS leftover file 2024-11-15 21:24:01 +07:00
Tempest
ed9270663d Preparing for the RDM module 2024-11-15 20:08:40 +07:00
Tempest
245eb45ff1 Finalized BLE communication 2024-11-15 11:46:47 +07:00
2a30a98144 testing multiple characteristics 2024-11-13 16:49:57 +07:00
f5c2200e79 Remove string print from BLE intepreter 2024-11-05 09:31:34 +07:00