Skip to content
This repository has been archived by the owner on Jul 3, 2023. It is now read-only.

Add Script Tuner #234

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Add Script Tuner #234

wants to merge 60 commits into from

Conversation

JosephusPaye
Copy link
Member

@JosephusPaye JosephusPaye commented Feb 18, 2019 •
edited
Loading

This adds a visual script tuner to NUsight.

Supersedes #208. Moved here to a new PR as I couldn't request reviews since the original was created by @TrentHouliston.

TrentHouliston and others added 30 commits October 3, 2018 20:38
@TrentHouliston
Added empty Script tuner module
f0d16ce
@TrentHouliston
Adding things
ef4c63d
@TrentHouliston
I don't know how grids work!
c178ae1
@JosephusPaye
Initial attempt at line editor
459b8d9
@JosephusPaye
Rename ScriptData => Frame
e1f8690
@JosephusPaye
Merge branch 'master' into houliston/script_tuner
67e9ec7
@JosephusPaye
Minor style and data changes
c298799
@JosephusPaye
Add a scrollable timeline ruler at the top
d290d7d
@JosephusPaye
WIP: Remove viewBox and draw using a basic scale with a cell size mul…
5dfd750 
…tiplier
@JosephusPaye
Add EditorViewModel with cell timeline width, height, scale, and cell…
445ae47 
… width

This allows for drawing the timeline and line editors at the same scale
@JosephusPaye
Make timeline and lines have the same length: the longest script
d6f55df
@JosephusPaye
Make points draggable
eff78ae
@JosephusPaye
Ensure servo.frames array is sorted for better drag performance
962d2c9
@JosephusPaye
Use crosshair cursor over the graph
85b267e
@JosephusPaye
Add play head
1316713
@JosephusPaye
Fix JSX comments
fd151a8
@JosephusPaye
[WIP] Add playback controls
3fa962b
@JosephusPaye
Style fix
7545931
@JosephusPaye
Refactor playback and pause/play functionality
79a27e9 
Now uses `mobxUtils.now()` to keep track of time during playback
@JosephusPaye
Merge branch 'master' into houliston/script_tuner
235859e
@JosephusPaye
[WIP] Add viewer
86d8d98
@JosephusPaye
Use binary-search-bounds library for finding frames to interpolate
62bbec3
@JosephusPaye
[WIP] Add robot visualiser
4b782b9
@JosephusPaye
[WIP] Make viewer render edited servo angles
6d57876
@JosephusPaye
Big refactor! Update darwin_model and model_visualiser to use createT…
d0b97c4 
…ransformer
@JosephusPaye
Rename servos to match C++ code on the robots
7f6611f
@JosephusPaye
Use ternary to simplify finding servo angle
9865db9
@JosephusPaye
Allow drag only from left mouse button
c2cee03
@JosephusPaye
Use binary search to find and insert new frame at position, instead o…
21a3381 
…f appending and sorting
@JosephusPaye
Make timeline ruler slightly taller, add zoom
5257279
JosephusPaye and others added 18 commits February 5, 2019 17:42
@JosephusPaye
Add editor blank state when no script is selected
56e9683
@JosephusPaye
Add loading icon to explorer, move sample script data to network
41546d5
@JosephusPaye
Merge branch 'master' into houliston/script_tuner
b56bc2d
@JosephusPaye
Remove functions in render, fix lint
1cbe481
@JosephusPaye
Merge branch 'master' into houliston/script_tuner
4802c0b
@JosephusPaye
Move sample script to simulator, request via network
26023d3
@JosephusPaye
Add more sample scripts, change all times in script tuner to be milli…
9b0bb80 
…seconds

Only switch to seconds when displaying or working with SVG
@JosephusPaye
Remove some sample scripts
c62978d
@JosephusPaye
Minor visual changes
4a25151
@JosephusPaye
Restart playback when pressing play at the end of the timeline
e44ecf9
@JosephusPaye
Lint
48b386b
@JosephusPaye
Reset editor state when switching scripts
2e67158
@JosephusPaye
Switch to callback refs for timeline and body scrolling
dd3e100
@JosephusPaye
Allow Spacebar to toggle playback
8b8fea5
@ysims
Changes
c6ad0cb
@JosephusPaye
Wrap selected script in a custom DataViewModel to track changes, prom…
789c29f 
…pt for save, or reset changes
@JosephusPaye
Add dropDirection prop to RobotSelector, Select, and Dropdown
98f70b1
@JosephusPaye
Add ability to select target robot and save edited script
b79765e
@BrendanAnnable BrendanAnnable temporarily deployed to nusight-pr-234 February 18, 2019 11:48 Inactive
@JosephusPaye JosephusPaye mentioned this pull request Feb 18, 2019
Closed
BrendanAnnable
BrendanAnnable reviewed Feb 18, 2019
View reviewed changes
Copy link
Member

@BrendanAnnable BrendanAnnable left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

screen shot 2019-02-18 at 11 04 03 pm

Love the effort here! But this is not reviewable! 😂

Can we split this PR up? I think all of these could be separated:

  • each react component and their stories
  • the simulator
  • new model json files
  • proto changes
  • integration into main.tsx

@JosephusPaye
Copy link
Member Author

Yeah, it's huge. Will see about splitting it up.

This was referenced Feb 20, 2019
Merged
Merged
Merged
@JosephusPaye JosephusPaye mentioned this pull request Jul 4, 2019
Open
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@BrendanAnnable BrendanAnnable BrendanAnnable left review comments

@TrentHouliston TrentHouliston Awaiting requested review from TrentHouliston

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@JosephusPaye @BrendanAnnable @TrentHouliston @ysims