Commit Graph

393 Commits

Author SHA1 Message Date
Azlothe
ad5ee9b1a7 replace range and measure with ModalityMeasure type 2024-05-09 23:00:35 -07:00
Azlothe
d777898851 clean 2024-05-09 22:56:09 -07:00
Azlothe
f4e3ca02eb utilize visual range and bounds 2024-05-09 22:53:16 -07:00
Azlothe
cb9c7896e1 extract total visual complexity calculation 2024-05-09 22:43:52 -07:00
18e2c06e15 Merge branch 'demo4' into lpd 2024-05-09 22:29:51 -07:00
4c011fcbda Merge branch 'demo4' into lpd 2024-05-09 22:28:12 -07:00
bedlam343
b68da29f2f widgetId for warning elements 2024-05-09 21:05:38 -07:00
28eb898cb1 fix drones not moving and add stress level LPD priority 2024-05-09 20:37:46 -07:00
bedlam343
beed141841 Merge branch 'demo4' into ui 2024-05-09 20:02:12 -07:00
Elena Schramme
98aca5e8ed fixed stress level but message list still broken 2024-05-09 16:23:08 -07:00
Polfish
7e7ecf08a3
import Screen from support types not widget 2024-05-09 15:51:48 -07:00
Polfish
fe9785bd8c
initial fix for stress level lpds to store element in list 2024-05-09 15:47:41 -07:00
Elena Schramme
04f07af9bf fix message list 2024-05-09 15:41:05 -07:00
Elena Schramme
b2bef109f7 move all messages to pearce-screen 2024-05-09 15:34:25 -07:00
Polfish
c86bdf19b7
fix initialLPD, but drones still broken 2024-05-09 15:31:03 -07:00
Polfish
4a6a5c9a24
Merge branch 'demo4' into lpd 2024-05-09 15:29:25 -07:00
Elena Schramme
47164d0faa stress level LPD update 2024-05-09 14:49:50 -07:00
bedlam343
565a05a070 fix overlap not triggering when appraoching from left or right of element 2024-05-09 12:46:54 -07:00
7b52db00c9 switch widgets to use icon element 2024-05-09 20:59:02 +02:00
a0c19b8247 move icons to assets/icons 2024-05-09 20:59:00 +02:00
09390a011a add map warning widget 2024-05-09 20:58:26 +02:00
eeafca0714 initial minimap design and flight path improvements 2024-05-09 20:58:23 +02:00
fbb1435517 cleaned up 2024-05-09 09:42:03 -07:00
bedlam343
325af6ae3b initial commit 2024-05-09 01:04:58 -07:00
Azlothe
efd22551d2 restrainer: element count within widgets 2024-05-09 00:14:58 -07:00
6253a27a54 Merge branch 'demo4' into lpd change to pearce screen 2024-05-08 23:15:19 -07:00
bedlam343
2c44c01ffe make pearce screen great again 2024-05-08 22:43:25 -07:00
95bc2ff393 Merge branch 'demo4' into lpd 2024-05-08 21:52:42 -07:00
6b532a1b0c fix initialLPD 2024-05-08 21:45:05 -07:00
5332550359 escalate and deesclate 2024-05-08 20:54:34 -07:00
b3db335163 only add to elemsInGaze if on correct screen 2024-05-08 19:17:08 -07:00
f360754c61 mouse updates from root-monitor were added to prototype 2024-05-08 18:39:13 -07:00
bedlam343
fd3b4cc2de cleanup and fix ship not found error 2024-05-08 16:48:19 -07:00
848a68a9ab everything works even better now. except that one thing, which i removed the console.log for because it was annoying me 2024-05-08 16:31:30 -07:00
7a2eff908d everything works now. other than the one thing 2024-05-08 16:21:04 -07:00
e1bee94adc merge complete, added types and turned Element into BaseElement in monitor 2024-05-08 13:48:23 -07:00
5aa3c0a6b6 Merge branch 'demo4-monitor' into demo4 2024-05-08 13:44:32 -07:00
90c89832f2 i honestly don't know what i did, it's been a few days lol 2024-05-08 13:36:40 -07:00
Azlothe
b74eece3a0 remove x and y from elements for element and lpd's 2024-05-07 21:48:50 -07:00
Azlothe
7380bbb1a4 fix screen type error 2024-05-07 21:35:40 -07:00
Elena Schramme
8a845b0167 add screen attributes for sections to go in 2024-05-07 21:31:48 -07:00
bedlam343
61c04ea152 Merge branch 'beta4-multiple-screens' into demo4 2024-05-07 21:02:30 -07:00
bedlam343
13ca5313f0 refine home screen 2024-05-07 20:59:32 -07:00
bedlam343
b881ef1d62 give Prototype its own page 2024-05-07 20:11:51 -07:00
Polfish
2216965e4e
Merge branch 'demo4' into lpd 2024-05-07 15:49:57 -07:00
bedlam343
0659486922 fix 2024-05-05 15:00:25 -07:00
bedlam343
e6ab7a3fc9 FIX: app crashing on only stress Level message from world sim 2024-05-05 14:59:45 -07:00
ec5387d3ea demo3.5 presentation 2024-05-03 09:59:13 -07:00
245972c4a3 add widget for acaFuelLow and animate missile warning icon 2024-05-03 08:06:28 -07:00
Elena Schramme
9d83adbf0a start on displaying ACAFuelLow Message 2024-05-02 23:55:15 -07:00
bedlam343
9ea8956284 approve deny element with buttons 2024-05-02 23:07:09 -07:00
bedlam343
bdc7a43816 mock left screen 2024-05-02 22:55:50 -07:00
bedlam343
23ddc018b1 Merge branch 'beta4-more-widgets-elements' into beta4-multiple-screens 2024-05-02 22:38:05 -07:00
bedlam343
f80b5e22f2 Merge branch 'demo4' into beta4-more-widgets-elements 2024-05-02 22:33:41 -07:00
Elena Schramme
859e58d5a7 Implement ACAFuelLow Message 2024-05-02 22:11:25 -07:00
aff2cd6ea0 fixing widget update 2024-05-02 22:03:14 -07:00
e973ca5b0e integrating missileToOwnship stress level LPDs 2024-05-02 20:59:30 -07:00
bedlam343
3afeb73124 screen property for widgets. select for each screen. Move prototype back to Prototype.tsx 2024-05-02 18:05:05 -07:00
Elena Schramme
9e59405462 Implement MissileToOwnship message
Co-authored-by: Paul Chon <Polfish@users.noreply.github.com>
2024-05-02 16:19:53 -07:00
3a1431c2b6 monitor gaze and keys 2024-05-02 12:57:15 -07:00
bafe806cb1 monitor 2024-05-02 12:13:26 -07:00
a06c81bb43 keys and mouse saved to state with timestamp 2024-05-02 10:25:09 -07:00
0b641d3111 fixing merge on drone and ownship selector but useMoveShips not working 2024-05-02 00:40:04 -07:00
bedlam343
34bdbd0a90 fully integrate all functionality 2024-05-02 00:02:03 -07:00
aea8fbf274 Merge branch 'demo4' into lpd 2024-05-01 23:43:37 -07:00
bedlam343
774d6bf918 Merge branch 'demo4' into beta4-multiple-screens 2024-05-01 23:36:58 -07:00
bedlam343
5c64c3c460 integrate minimap and gaze back into app 2024-05-01 23:33:34 -07:00
bc396dd1ff fix placing widget on screen to absolute 2024-05-01 22:40:12 -07:00
071540eb5d show missileToOwnshipLow on minimap 2024-05-01 22:24:57 -07:00
9100629df0 integrate initial lpd into prototype 2024-05-01 17:14:19 -07:00
bedlam343
72009264f9 simple/complex element types. change widget type to 'sectionType.' 2024-05-01 16:19:16 -07:00
9ee4a750e4 copy initial state into initial LPD 2024-05-01 15:32:10 -07:00
cf1608f0ea delete duplicate lpd files 2024-05-01 14:12:02 -07:00
d5f6e58ed1 restructure lpd files 2024-05-01 12:42:54 -07:00
165bc74a22 fixing lpd and files to match with main 2024-05-01 12:00:58 -07:00
8ab1e91a21 Merge branch 'main' into lpd 2024-05-01 11:57:19 -07:00
d33798db93 applied previous changes to mouse press 2024-05-01 11:36:21 -07:00
81f1a4db00 stores keypress and elements in gaze! 2024-05-01 11:32:40 -07:00
1304ca86c2 keypresses and elements in gaze get stored, but pressing multiple keys is tricky 2024-05-01 09:56:29 -07:00
fc69ab4d4d tried to add the keypresses to state, but state doesnt update 2024-05-01 08:21:19 -07:00
bedlam343
f385c14597 navigation between 3 pages 2024-04-30 23:12:16 -07:00
bedlam343
2c27a7748b react-router-dom setup 2024-04-30 22:57:44 -07:00
bedlam343
5418312d06 add helpful comment 2024-04-30 17:18:11 -07:00
bedlam343
f4b1753cdd small change 2024-04-30 17:17:22 -07:00
bedlam343
40126e2a13 implement key-pair widgets 2024-04-30 17:12:08 -07:00
10bbddb3b9 lpd helper function for each element type and lpd reorganization 2024-04-30 16:46:30 -07:00
b41ccec984 added circle around cursor that changes with radius size 2024-04-30 11:48:40 -07:00
bedlam343
1b035cda28 change name to Prototype 2024-04-27 13:15:30 -07:00
bedlam343
09122a55ce change 2024-04-27 13:13:51 -07:00
bedlam343
e4619b916e start demo screen 2024-04-26 00:37:22 -07:00
bedlam343
26f55139c5 show priorities of messages 2024-04-25 23:59:06 -07:00
bedlam343
50a7d54200 danger icon for missleDetected 2024-04-25 17:31:14 -07:00
bedlam343
e7fcdb044b increase size of tinder widget 2024-04-25 17:24:43 -07:00
Elena Schramme
6fa9c992b4 add createWidget to the lpd files 2024-04-25 17:18:37 -07:00
bedlam343
82ba97ae9b sorted message list based on priority 2024-04-25 17:13:24 -07:00
Polfish
e5431307fc
adding lpds and lpd helper functions
initial, low, medium, and high lpds and helper functions to generate widgets, elements, and sections
2024-04-25 16:39:25 -07:00
bedlam343
86f7592a80 wrap elements inside tinder widget in a div 2024-04-25 16:30:20 -07:00
bedlam343
625d4e234c generate message list from messages from world sim 2024-04-25 16:22:35 -07:00
bedlam343
0f60630153 TinderWiget and VehicleWidget components 2024-04-25 16:05:16 -07:00
bedlam343
3c0059fc32 static 'tinder' for widget in selector. update tinder widget with elements on new messages 2024-04-25 15:39:02 -07:00
bedlam343
603af02bd7 Merge branch 'beta3-task2-pixel-map-optimization' into beta3-task3-ui 2024-04-25 15:35:09 -07:00
bedlam343
d78efda6ce eslint-disable-next-line 2024-04-25 14:46:47 -07:00
Elena Schramme
81b5320606 create lpd.ts 2024-04-25 14:45:38 -07:00
bedlam343
a49446402d update drone/ship positions through redux 2024-04-25 14:33:40 -07:00
bedlam343
0b3c29ff2d initial ships an d Widget and Element components 2024-04-25 13:25:43 -07:00
559e0da4b4 assimilator now returns action type. it now returns updateWidget if a widget already exists 2024-04-25 13:03:09 -07:00
30448758c8 can't be placed outside of section now 2024-04-25 12:42:09 -07:00
192426afa4 use canOverlap in widget 2024-04-25 12:35:46 -07:00
c4c320e5e1 use canOverlap in widget 2024-04-25 12:15:33 -07:00
bedlam343
e7d90009e4 add icons folder 2024-04-25 11:48:33 -07:00
bedlam343
8d60f9be97 modify Element type inheritance 2024-04-25 11:42:40 -07:00
bedlam343
f007b66a2d initial commit 2024-04-25 11:34:46 -07:00
bedlam343
d978cf990a Merge branch 'beta3-type-modification' into beta3-task3-ui 2024-04-25 11:26:13 -07:00
bedlam343
1867013adf Merge branch 'beta3-task2-pixel-map-optimization' into beta3-task3-ui 2024-04-25 11:13:33 -07:00
bedlam343
5d044e0190 Merge branch 'beta3-task2-pixel-map-optimization' of https://git.tjdev.de/thi-sjsu-project/react-redux-app into beta3-task2-pixel-map-optimization 2024-04-25 11:03:00 -07:00
bedlam343
7b3922b6be initial sections 2024-04-25 11:02:55 -07:00
bedlam343
9368ab6984 Merge branch 'task4-worldsim' into beta3-task3-ui 2024-04-25 10:57:02 -07:00
bff8afe051 gaze now in state with time stamp 2024-04-25 10:53:44 -07:00
a069737efc removed pixel map 2024-04-25 09:18:47 -07:00
39b8c59bcb css type for prototype 3 and example red bg 2024-04-24 21:41:46 -07:00
ecc56a6ac8 css type and example in prototype 2 2024-04-24 21:20:54 -07:00
3388610543 Merge branch 'task3-ui' into lpd 2024-04-24 21:09:33 -07:00
b86641c538 optimized placement, removed need for pixel map 2024-04-24 20:01:08 -07:00
d686e422a8 add more drones and drone and ownship movement
moved old minimap to another file
2024-04-24 17:09:33 -07:00
bedlam343
784c87a518 Widget & Element components 2024-04-24 15:36:07 -07:00
bedlam343
cf69e2b19f Merge branch 'beta3-type-modification' into task3-ui 2024-04-24 14:22:25 -07:00
bedlam343
dedff62349 merge task4-ui 2024-04-24 14:16:50 -07:00
bedlam343
2491f66c91 start using world sim messages and stress level 2024-04-23 17:49:28 -07:00
bedlam343
0facf370bd Merge branch 'task4-worldsim' into task3-ui 2024-04-23 17:30:47 -07:00
aa05e2780d added mouse button hook 2024-04-23 15:58:40 -07:00
fa86e098b2 Merge remote-tracking branch 'origin/task4-worldsim' into beta3task5gaze 2024-04-23 15:44:33 -07:00
37d4cb576d idk what this is honestly 2024-04-23 15:43:26 -07:00
bedlam343
397815c3c3 refactor useWorldSim 2024-04-22 22:57:43 -07:00
bedlam343
cc3f0a01eb Merge branch 'task4-worldsim' into task3-ui 2024-04-22 22:51:32 -07:00
bedlam343
57a600315a useWorldSim 2024-04-22 22:45:30 -07:00
bedlam343
dda83b5fac change typeProperties to typeData 2024-04-19 23:48:35 -07:00
bedlam343
4efb267009 example additional properties 2024-04-19 23:48:05 -07:00
bedlam343
ad8a081bbc update type definitions 2024-04-19 23:45:37 -07:00
bedlam343
56b9984179 add missing widget properties 2024-04-19 23:17:48 -07:00
bedlam343
e7c81e3d60 initial commit 2024-04-19 23:12:38 -07:00
a085e6fb0c widgets into elements 2024-04-19 15:09:43 -07:00
9e4f11b3b6 key down done 2024-04-19 14:44:09 -07:00
60bb9c564d gaze tracking done 2024-04-19 14:32:10 -07:00
bedlam343
e2886915b8 add typing to useMousePosition 2024-04-18 21:47:29 -07:00
bedlam343
898693dcc6 move useMousePointer inside hooks folder 2024-04-18 21:42:02 -07:00
e012bb6cc8 ring and print position 2024-04-18 20:21:10 -07:00
bedlam343
fd5392de61 new gazeSlice. rename cmSlice to minimapSlice 2024-04-18 17:41:07 -07:00
Elena Schramme
8fbf3b4fff added widgets for low stress level 2024-04-18 14:34:24 -07:00
Elena Schramme
0f3fdba228 extended lpd, added widget location 2024-04-18 14:12:18 -07:00
8cb1d172fe move lpd into prototype folder 2024-04-17 14:10:46 -07:00
4905ba076e create test widget 2024-04-17 13:57:37 -07:00
726576673f Merge branch 'main' into lpd 2024-04-17 13:51:33 -07:00
af4f85b34c initial lpd 2024-04-17 13:49:14 -07:00
bedlam343
852e06fcc2 Prototype3.tsx file 2024-04-16 18:30:17 -07:00
c11af8ece4 added message section type quick reference in comments 2024-04-12 07:45:06 -07:00
f6d451905d made ui look cleaner 2024-04-12 07:36:00 -07:00
04b4092b8c correct postioning 2024-04-12 07:17:49 -07:00
bedlam343
ebf96d119d increase msg interval time to 10 seconds 2024-04-12 00:17:01 -07:00
bedlam343
e141a320c4 start demo btn 2024-04-12 00:12:24 -07:00
bedlam343
176fe3de7c change box sizes. add more messages and more drones 2024-04-11 23:49:39 -07:00
bedlam343
0e984da97c initial demo2 commit 2024-04-11 23:21:21 -07:00
212b4fa394 two boxes next to eachother 2024-04-11 22:27:05 -07:00
cef9788e93 fixed ratio bug 2024-04-11 21:54:27 -07:00
dc79bab238 add messages and sections 2024-04-11 21:45:17 -07:00
891c47558a Merge branch 'main' of https://git.tjdev.de/thi-sjsu-project/react-redux-app 2024-04-11 21:29:49 -07:00
42365bb3c7 tinder in selector 2024-04-11 21:29:44 -07:00
bedlam343
b7450fa91f msgs every 5 seconds 2024-04-11 21:26:58 -07:00
bedlam343
6d4f7fa95c generate message every 5 seconds 2024-04-11 21:25:07 -07:00
2a8e00ec38 go through message, just need to make it so the last useEffect gets called every 5-10 seconds 2024-04-11 21:02:48 -07:00
7b473f1228 updated selector 2024-04-11 20:49:38 -07:00
Elena Schramme
13bdce9613 adjust widget existing check for assimilator 2024-04-11 19:29:49 -07:00
Elena Schramme
76e10a06de updated widget locations in MS 2024-04-11 18:53:45 -07:00
bedlam343
94b40347a2 code clean up and bug fixes. Display added widget on the screen 2024-04-11 17:04:43 -07:00
475e54ad4e adds widget to pixelMap in addWidget 2024-04-11 13:11:29 -07:00
1b6db7c391 comments 2024-04-11 12:50:56 -07:00
cfb88a8f11 assimilator finds a place for it to go now! 2024-04-11 12:41:42 -07:00
6348d95efb some assimilator stuff, not yet working 2024-04-11 11:53:03 -07:00
676322240c some assimilator stuff, not working yet 2024-04-11 11:47:26 -07:00
b029d0c263 Merge branch 'main' of https://git.tjdev.de/thi-sjsu-project/react-redux-app 2024-04-11 11:46:28 -07:00
20d8aa9763 some assimilator stuff, not yet working 2024-04-11 11:36:06 -07:00
Elena Schramme
87f9d61001 add widget existing check for assimilator 2024-04-11 11:31:56 -07:00
692db3c401 Merge branch 'main' of https://git.tjdev.de/thi-sjsu-project/react-redux-app 2024-04-11 10:57:18 -07:00
9f1df0953d fixed sample widget 2024-04-11 10:56:37 -07:00
Elena Schramme
8b0d197ecf MS updated to return widgets 2024-04-11 09:49:39 -07:00
97e24a30ec location 2024-04-11 09:36:35 -07:00
ff6a407a64 add section 2024-04-11 09:33:05 -07:00
b9614540b4 Merge branch 'main' of https://git.tjdev.de/thi-sjsu-project/react-redux-app 2024-04-11 00:05:33 -07:00
bedlam343
acc1a9f4c2 reduce drones and ownship movement speed/rate 2024-04-10 23:12:14 -07:00
Polfish
d52d733da2 random drone movement 2024-04-10 22:21:03 -07:00
bedlam343
24a33b3669 disable serializableCheck for performance optimization 2024-04-10 21:43:17 -07:00
3de537ffd2 add section 2024-04-10 19:41:54 -07:00
a1501d11c9 sections 2024-04-10 18:28:09 -07:00
7b77bacdfc pixelMap 2024-04-10 15:49:28 -07:00
bedlam343
c4dea9ba87 delete initialGrid function 2024-04-10 15:46:19 -07:00
bedlam343
5c416cf58f restore initializeGrid 2024-04-10 15:44:48 -07:00
bedlam343
202e3d9700 support-types 2024-04-10 15:36:33 -07:00
bedlam343
81b32773c3 ownship movement 2024-04-10 14:16:06 -07:00
bedlam343
9d454767c9 add ownship and drone icons 2024-04-10 13:26:31 -07:00
bedlam343
5232bc4df8 1920 cols 2024-04-09 23:37:42 -07:00
bedlam343
a5b71dbe5e make grid bounded 2024-04-09 23:30:33 -07:00