Skip to content

Commit

Permalink
added blueprints
Browse files Browse the repository at this point in the history
  • Loading branch information
jcheong0428 committed Oct 15, 2017
1 parent 06e99e7 commit 56fd319
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 6 deletions.
Binary file added blueprints/final_cosan_helmet_light.stl
Binary file not shown.
10 changes: 7 additions & 3 deletions facesync/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import numpy as np
import matplotlib.pyplot as plt

def VideoViewer(path_to_video, data_df):
def VideoViewer(path_to_video, data_df, ylabel='',legend=False,xlim=None,ylim=None):
"""
This function plays a video and plots the data underneath the video and moves a cursor as the video plays.
Plays videos using Jupyter_Video_Widget by https://github.com/Who8MyLunch/Jupyter_Video_Widget
Expand Down Expand Up @@ -51,8 +51,11 @@ def VideoViewer(path_to_video, data_df):
t=wid.current_time
ax.axvline(fps*t,color='k',linestyle='--') # cursor is always first of ax
# plot each column
data_df.plot(ax=ax)
data_df.plot(ax=ax,legend=legend,xlim=xlim,ylim=ylim)
ax.set_ylabel(ylabel)
ax.set_xlabel('Frames')
if legend:
plt.legend(loc=1)
plt.tight_layout()

def plot_dat(ax,t,fps=fps):
Expand Down Expand Up @@ -94,7 +97,8 @@ def AudioAligner(original, sample, search_start=0.0,search_end=15.0, xmax = 60,m
orig = orig[:,0]
# grab one channel of sample audio
tomatch_r,tomatch = wav.read(sample)
tomatch = tomatch[:,0]
if np.ndim(tomatch) >1:
tomatch = tomatch[:,0]

fs = 44100

Expand Down
2 changes: 1 addition & 1 deletion facesync/version.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"""Specifies current version of facesync to be used by setup.py and __init__.py
"""

__version__ = '0.0.8'
__version__ = '0.0.9'
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# from nltools.version import __version__
from setuptools import setup, find_packages

__version__ = '0.0.8'
__version__ = '0.0.9'

# try:
# from setuptools.core import setup
Expand All @@ -17,7 +17,7 @@
author='Jin Hyun Cheong',
author_email='jcheong.gr@dartmouth.edu',
url='https://github.com/jcheong0428/facesync',
download_url = 'https://github.com/jcheong0428/facesync/tarball/0.8',
download_url = 'https://github.com/jcheong0428/facesync/tarball/0.9',
install_requires=['numpy', 'scipy'],
packages=find_packages(exclude=['facesync/tests']),
package_data={'facesync': ['resources/*']},
Expand Down

0 comments on commit 56fd319

Please sign in to comment.