derek-thomas HF staff commited on
Commit
c67ece1
1 Parent(s): c27bcbd

Updates after refactoring

Browse files
Files changed (2) hide show
  1. disc_golf_simulator.py +16 -11
  2. utilities/visualize.py +1 -1
disc_golf_simulator.py CHANGED
@@ -1,15 +1,10 @@
1
- from logging import getLogger
2
- from pathlib import Path
3
- proj_dir = Path(__file__).parents[1]
4
- import sys
5
- sys.path.append(str(proj_dir))
6
-
7
  import numpy as np
8
  import streamlit as st
 
 
9
 
10
  from shotshaper.projectile import DiscGolfDisc
11
- from visualize import get_plot, get_stl, get_subplots, visualize_disc
12
-
13
 
14
  # Define the default values
15
  default_U = 24.2
@@ -37,11 +32,13 @@ def main():
37
  help='Fastest Throw on record is ~40m/s by Simon Lizotte')
38
  omega = st.sidebar.slider("Omega", min_value=0.0, max_value=200.0, value=default_omega, step=0.1)
39
  z0 = st.sidebar.slider("Release Height (m)", min_value=0.0, max_value=2.0, value=default_z0, step=0.1)
40
- pitch = st.sidebar.slider("Pitch Angle (deg) | Release angle", min_value=0.0, max_value=90.0, value=default_pitch,
 
41
  step=0.1)
42
  nose = st.sidebar.slider("Nose Angle (deg) | Up/Down", min_value=0.0, max_value=90.0, value=default_nose,
43
  step=0.1)
44
- roll = st.sidebar.slider("Roll Angle (deg) | Tilt Left/Right", min_value=-90.0, max_value=90.0, value=default_roll,
 
45
  step=0.1)
46
 
47
  pos = np.array((0, 0, default_z0))
@@ -86,6 +83,14 @@ def main():
86
  fig = get_subplots(arc, alphas, lifts, drags, moms, rolls, shot.velocity)
87
  st.plotly_chart(fig, True)
88
 
 
 
 
 
 
 
 
 
89
  with tab2:
90
  st.markdown("""
91
  # Motivation
@@ -109,7 +114,7 @@ def main():
109
  if __name__ == "__main__":
110
  # Setting up Logger and proj_dir
111
  logger = getLogger(__name__)
112
- proj_dir = Path(__file__).parents[1]
113
 
114
  st.title("Disc Golf Simulator")
115
 
 
 
 
 
 
 
 
1
  import numpy as np
2
  import streamlit as st
3
+ from logging import getLogger
4
+ from pathlib import Path
5
 
6
  from shotshaper.projectile import DiscGolfDisc
7
+ from utilities.visualize import get_plot, get_stl, get_subplots, visualize_disc
 
8
 
9
  # Define the default values
10
  default_U = 24.2
 
32
  help='Fastest Throw on record is ~40m/s by Simon Lizotte')
33
  omega = st.sidebar.slider("Omega", min_value=0.0, max_value=200.0, value=default_omega, step=0.1)
34
  z0 = st.sidebar.slider("Release Height (m)", min_value=0.0, max_value=2.0, value=default_z0, step=0.1)
35
+ pitch = st.sidebar.slider("Pitch Angle (deg) | Release angle", min_value=0.0, max_value=90.0,
36
+ value=default_pitch,
37
  step=0.1)
38
  nose = st.sidebar.slider("Nose Angle (deg) | Up/Down", min_value=0.0, max_value=90.0, value=default_nose,
39
  step=0.1)
40
+ roll = st.sidebar.slider("Roll Angle (deg) | Tilt Left/Right", min_value=-90.0, max_value=90.0,
41
+ value=default_roll,
42
  step=0.1)
43
 
44
  pos = np.array((0, 0, default_z0))
 
83
  fig = get_subplots(arc, alphas, lifts, drags, moms, rolls, shot.velocity)
84
  st.plotly_chart(fig, True)
85
 
86
+ vb_link = 'https://visitor-badge.glitch.me/badge?page_id=derek-thomas.disc-golf-simulator&left_color=gray&right_color=blue'
87
+ visitor_badge = f"![Total Visitors]({vb_link})"
88
+ st.markdown(f"""
89
+ Thanks for visiting :)
90
+
91
+
92
+ """)
93
+
94
  with tab2:
95
  st.markdown("""
96
  # Motivation
 
114
  if __name__ == "__main__":
115
  # Setting up Logger and proj_dir
116
  logger = getLogger(__name__)
117
+ proj_dir = Path(__file__).parent
118
 
119
  st.title("Disc Golf Simulator")
120
 
utilities/visualize.py CHANGED
@@ -5,7 +5,7 @@ import plotly.graph_objects as go
5
  from plotly.colors import sequential
6
  from stl.mesh import Mesh
7
 
8
- from extrema import find_extrema
9
 
10
 
11
  def get_stl(stl_file):
 
5
  from plotly.colors import sequential
6
  from stl.mesh import Mesh
7
 
8
+ from .extrema import find_extrema
9
 
10
 
11
  def get_stl(stl_file):