Skip to content
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.

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

Feature/flask server render #20

Open
wants to merge 46 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a261955
Added directory for ipython notebooks.
psigen Nov 27, 2016
2303643
Added initial, non-working version of Data Interpolation.
psigen Nov 27, 2016
4cf5452
Renamed "temp" to "temperature".
psigen Nov 27, 2016
8181975
Added gitignore for IPython checkpoints.
psigen Nov 27, 2016
2eaa59a
Cleaned up and nominally working data interpolation script.
psigen Nov 27, 2016
09aaca5
Added a data export script that writes CSV for a given logfile.
psigen Nov 27, 2016
0dabae6
Added data export function cleanup.
psigen Nov 27, 2016
e8820ca
Added switch for partial sensor export.
psigen Nov 27, 2016
7187f2c
Added combined and independent data export scripts.
psigen Nov 27, 2016
0a83a1c
Fixed typo in spelling.
psigen Nov 27, 2016
200a39a
Minor bugfixes to loading.
psigen Nov 27, 2016
2b798a5
[WIP] Added updates to render actual map overlay.
psigen Nov 27, 2016
a9995ae
Created very barebones rendering system for logs.
psigen Nov 28, 2016
567a692
Update README.md
psigen Nov 29, 2016
a7800d0
Added missing float cast (for integer values).
psigen Dec 2, 2016
15d830c
Only plot vehicle position for sensor readings.
psigen Dec 2, 2016
b6d2d16
Modified data interpolation notebook to ignore data from times where …
jjblum May 3, 2017
12a502c
Added .csv file output of the sensor DataFrame.
jjblum Oct 3, 2017
b4d8246
Started a prototype for extracting data collected while a sampler jar…
jjblum Oct 3, 2017
d52736f
Added merging of files.
jjblum Oct 4, 2017
cef962e
Minor changes.
jjblum Oct 13, 2017
492d656
Need to debug why certain files cause infinite memory usage issues.
jjblum Nov 27, 2017
de4e214
saving netherlands scripts
shawnhanna Dec 7, 2017
f7f63a8
updated histogram plotting example
shawnhanna Dec 7, 2017
8b07567
more updates to histogram and jupyter notebook. added dependencies to…
shawnhanna Apr 6, 2018
5893b0a
added support for intcatch unstable logs (I am calling them v4_3_0)
shawnhanna Jun 9, 2018
b6ca302
updatd interp notebook to handle ERM data
shawnhanna Jun 9, 2018
d84f005
started working on the file processing server pipeline for ERM
shawnhanna Jun 13, 2018
e8ba77d
some changes to the flask image server
shawnhanna Jun 19, 2018
c54f85b
starting work on processor
shawnhanna Jun 28, 2018
e47f474
added pose fixer
shawnhanna Jun 28, 2018
3934e15
added histogram for insitu data
shawnhanna Jul 10, 2018
e27ecca
added more functionality to data processor and image server. seems to…
shawnhanna Jul 10, 2018
75dff2d
a few more updates to the server
shawnhanna Jul 10, 2018
7be8098
finished up the initial server pipeline
shawnhanna Jul 11, 2018
62fa18d
fixed range issue with processing script so it now processes all poss…
shawnhanna Jul 12, 2018
d572b4d
updates for AWS usage of server
shawnhanna Jul 16, 2018
98045d9
final changes for v0.1
shawnhanna Jul 16, 2018
83931b0
added links to other data types in each render page
shawnhanna Jul 25, 2018
1dcd4d6
changes to color min and max for ph
shawnhanna Aug 2, 2018
6728dfa
added histograms and csv files
shawnhanna Aug 2, 2018
472d1f1
Merge pull request #18 from platypusllc/feature/insitu-log-parsing
shawnhanna Sep 7, 2018
3cae5d1
Merge branch 'master' into feature/flask_server_render
shawnhanna Sep 7, 2018
cefeb27
some formatting and updates for erm
shawnhanna Sep 11, 2018
cad42f8
Merge branch 'feature/insitu-log-parsing' into feature/flask_server_r…
shawnhanna Sep 11, 2018
48e5d4f
updates to ERM scripts
shawnhanna Oct 10, 2018
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
Prev Previous commit
Next Next commit
final changes for v0.1
shawnhanna committed Jul 16, 2018
commit 98045d993b7e3286b40154307d5ee3f47c9c490c
2 changes: 2 additions & 0 deletions image_server/image_server.py
Original file line number Diff line number Diff line change
@@ -85,6 +85,8 @@ def render_index():
log_folder = "./stats/"
log_files = []
for file in os.listdir(log_folder):
if (str(file) == ".gitignore"):
continue
if (os.path.isfile(log_folder+file)):
print "adding file: " + file
log_files.append(os.path.splitext(file)[0])
6 changes: 6 additions & 0 deletions image_server/run_periodic.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/bin/bash
while [ 1 ]
do
python data_processor.py ~/mount_nas/ -1 5000 1000000 5 12
sleep 60
done
2 changes: 1 addition & 1 deletion image_server/templates/index.html
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@
</head>
<body>

<h1>{{ log_folder }}!</h1>
<h1>ERM Robotic Boat Sensor Data</h1>

<ul>
{% for file in log_files %}