Skip to content

v0.7 #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cmalmstr wants to merge 73 commits into
base: v0.7
Choose a base branch
from
Open

v0.7 #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
55599cd
Format change -> HTML
cmalmstr Nov 9, 2015
9d952dd
Added state to files loaded from selector
cmalmstr Nov 9, 2015
c8618b9
Mov Clip Selection Panel
mysunnytime Nov 26, 2015
54d2cbf
New file for angle data
cmalmstr Nov 26, 2015
bb24c95
Rename of angle data file
cmalmstr Nov 26, 2015
dbe70e5
Format Correction
mysunnytime Nov 26, 2015
81999a5
Defined the interface between Selection and Calculation
mysunnytime Nov 26, 2015
3c79437
angeData: New interface, comments
cmalmstr Nov 26, 2015
8f3ee7b
Completion of angleData (?)
cmalmstr Nov 26, 2015
d9ceba3
From guy to calculation
mysunnytime Nov 28, 2015
91e12cf
Merge remote-tracking branch 'origin/v0.7' into v0.7
mysunnytime Nov 28, 2015
75bfa37
Complete: from guy to calculation
mysunnytime Nov 28, 2015
def4c77
Addition of overlay div for vis
cmalmstr Nov 28, 2015
84b5b5c
merge calculation into mocom
mysunnytime Nov 28, 2015
a445cfc
Correction of index in vector calculations
cmalmstr Nov 28, 2015
de87d8d
Merge calculation - syntax
mysunnytime Nov 28, 2015
a9572fb
Added motion tracks, connect the joints in mocom and debugging
cmalmstr Nov 29, 2015
eb0e47f
Debug the jointArrayList problem
mysunnytime Nov 29, 2015
7d0242e
Final (?) debugging of angle calculations + change of input format
cmalmstr Nov 29, 2015
20d271b
Loader and Closer
mysunnytime Nov 29, 2015
f97d1db
HTML structure for visualizations
cmalmstr Nov 29, 2015
37f30e1
Merge remote-tracking branch 'origin/v0.7' into v0.7
cmalmstr Nov 29, 2015
11f3e3f
Script for streamgraphs for overview is added into index and addition…
cmalmstr Dec 1, 2015
ca09352
initialize createVis() in mocom
mysunnytime Dec 1, 2015
f7ad92f
fixed the close button
mysunnytime Dec 1, 2015
2b3a4c3
the transit between calculation and vis
mysunnytime Dec 1, 2015
2530526
Included streamgraph code in mocom.js and started work on small multi…
cmalmstr Dec 1, 2015
dfeb2b5
Included code for small multiples in mocom.js instead of index
cmalmstr Dec 2, 2015
3f5bb6c
Worked on the code to draw lines in the small multiples. Small restru…
cmalmstr Dec 2, 2015
66a99a3
Moved all styling of the visualization to separate css
cmalmstr Dec 2, 2015
843d626
Added graph scaling and drawing for speed and acceleration multiples …
cmalmstr Dec 3, 2015
f0f66ce
Skeleton Vis
mysunnytime Dec 3, 2015
19cc4a6
fixed conflict + clear when close the window
mysunnytime Dec 3, 2015
0145534
Missed changes
mysunnytime Dec 3, 2015
1b67b5e
Connected vis to real data FOUND BUG
cmalmstr Dec 3, 2015
1f1a778
Worked out loading bug and finalized connection to real data
cmalmstr Dec 3, 2015
5c6c05b
Cleaning up and fixing minor issues with frames
cmalmstr Dec 3, 2015
f735e4c
Skeleton things and brush test
mysunnytime Dec 3, 2015
87230ff
Merge remote-tracking branch 'origin/v0.7' into v0.7
mysunnytime Dec 3, 2015
911e6ef
Code Tided up for createVis
mysunnytime Dec 3, 2015
22221ab
Added takeAPos and takeBPos arrays to store positions of joint projec…
cmalmstr Dec 4, 2015
71b3cdd
Made angle calculations more effecient
cmalmstr Dec 4, 2015
7f49a60
Added comments for angle and position array formats
cmalmstr Dec 4, 2015
9632a40
Fixed issue with wrist data and added joint index for other arm and legs
cmalmstr Dec 4, 2015
79b8249
Create Brush for overview
mysunnytime Dec 4, 2015
abbe48d
Layout change and brush connecting attempt
mysunnytime Dec 4, 2015
f405096
Debugged multiples to respond to brushing
cmalmstr Dec 4, 2015
8a37090
when brush is empty, show all the data
mysunnytime Dec 4, 2015
0f5b322
when brush is really empty, show all the data
mysunnytime Dec 4, 2015
0f97c7d
Added axis and styling to small multiples
cmalmstr Dec 5, 2015
c255133
Added mouse over in multiples
cmalmstr Dec 5, 2015
3c7270c
Connected instant views with mouse over
cmalmstr Dec 5, 2015
53ab07b
Skeleton mapped to our coordinate
mysunnytime Dec 5, 2015
db585a9
Not finished tweaking projections
cmalmstr Dec 5, 2015
b2aa710
Debugging angle calculations
cmalmstr Dec 6, 2015
40ee404
Basic layout change
mysunnytime Dec 6, 2015
a0afbc5
Basic style change
mysunnytime Dec 6, 2015
5698ed0
Angle calculations debugging
cmalmstr Dec 6, 2015
ebe87d8
Debugging calculations
cmalmstr Dec 6, 2015
7c8d9ec
create diff view skeleton
mysunnytime Dec 7, 2015
1a383e8
change colors of skeleton
mysunnytime Dec 7, 2015
b088d78
Add skeleton to overview
mysunnytime Dec 7, 2015
9e8ec14
adjust skeleton size
mysunnytime Dec 7, 2015
5554184
Calculations are OK! Skeletons made bigger
cmalmstr Dec 7, 2015
ebfd49b
Merge remote-tracking branch 'origin/v0.7' into v0.7
cmalmstr Dec 7, 2015
12da9ae
Synced the scaling of the skeletons
cmalmstr Dec 7, 2015
e7e194e
GUI changes
mysunnytime Dec 8, 2015
1fc11aa
GUI changes
mysunnytime Dec 8, 2015
fb3fac6
Remove auto enter to mocom
mysunnytime Dec 9, 2015
73dca4d
Adjust layout
mysunnytime Dec 10, 2015
da1e53d
Prepare for webpage
cmalmstr Feb 24, 2016
1d8d239
Anonymization and name change
cmalmstr Feb 24, 2016
741e9e5
tiny tweaks
mysunnytime Jun 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,11 @@ div.over2 {
padding-bottom: 20px;
float: left;
height: 520px;
position: relative;
}



#sidebar {
width: 250px;
border: 1px solid;
Expand Down
Loading