Skip to content

Commit

Permalink
Tue May 26 21:15:58 MST 2015
Browse files Browse the repository at this point in the history
  • Loading branch information
Daniel Buscombe committed May 27, 2015
1 parent 52ed771 commit 9d85ed3
Show file tree
Hide file tree
Showing 24 changed files with 76 additions and 81 deletions.
3 changes: 1 addition & 2 deletions PyHum/test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,10 @@ def dotest():
notes = 4 # Notes per octave (for wavelet analysis)

# for mapping
#imagery = 1 # server='http://server.arcgisonline.com/ArcGIS', service='World_Imagery'
dogrid = 1 # yes
calc_bearing = 0 #no
filt_bearing = 1 #yes
res = 0.1 # grid resolution in metres
res = 0.2 # grid resolution in metres
cog = 1 # GPS course-over-ground used for heading

# for downward-looking echosounder echogram (e1-e2) analysis
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ which carries out the following operations:
draft = 0.3 # draft in metres
flip_lr = 1 # flip port and starboard
model = 998 # humminbird model
chunk_size = 0 # auto chunk size
chunk_size = 1000 # chunk size = 1000 pings
# correction specific settings
maxW = 1000 # rms output wattage
Expand All @@ -216,11 +216,10 @@ which carries out the following operations:
notes = 4 # Notes per octave (for wavelet analysis)
# for mapping
#imagery = 1 # server='http://server.arcgisonline.com/ArcGIS', service='World_Imagery'
dogrid = 1 # yes
calc_bearing = 0 #no
filt_bearing = 1 #yes
res = 0.1 # grid resolution in metres
res = 0.2 # grid resolution in metres
cog = 1 # GPS course-over-ground used for heading
# for downward-looking echosounder echogram (e1-e2) analysis
Expand Down
5 changes: 2 additions & 3 deletions docs/README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ which carries out the following operations::
draft = 0.3 # draft in metres
flip_lr = 1 # flip port and starboard
model = 998 # humminbird model
chunk_size = 0 # auto chunk size
chunk_size = 1000 # chunk size = 1000 pings

# correction specific settings
maxW = 1000 # rms output wattage
Expand All @@ -202,11 +202,10 @@ which carries out the following operations::
notes = 4 # Notes per octave (for wavelet analysis)

# for mapping
#imagery = 1 # server='http://server.arcgisonline.com/ArcGIS', service='World_Imagery'
dogrid = 1 # yes
calc_bearing = 0 #no
filt_bearing = 1 #yes
res = 0.1 # grid resolution in metres
res = 0.2 # grid resolution in metres
cog = 1 # GPS course-over-ground used for heading

# for downward-looking echosounder echogram (e1-e2) analysis
Expand Down
Binary file modified docs/_build/doctrees/README.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/environment.pickle
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/pyhum.read.doctree
View file
Binary file not shown.
Binary file modified docs/_build/doctrees/pyhum.texture.doctree
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion docs/_build/html/.buildinfo
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: faa017b65804b8b53d37a7eb4a5ce7e3
config: 97e17a24f1ca8fcbd7334c91fda71817
tags: 645f666f9bcd5a90fca523b33c5a78b7
15 changes: 7 additions & 8 deletions docs/_build/html/README.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Getting started &mdash; PyHum 1.2.9 documentation</title>
<title>Getting started &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.0 documentation" href="index.html" />
<link rel="next" title="Modules" href="modules.html" />
<link rel="prev" title="PyHum: Python program for reading and processing low-cost sidescan sonar data" href="index.html" />
</head>
Expand All @@ -40,7 +40,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="PyHum: Python program for reading and processing low-cost sidescan sonar data"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -191,7 +191,7 @@ <h2>Installation on Amazon Linux EC-2 instance<a class="headerlink" href="#insta
<span class="n">draft</span> <span class="o">=</span> <span class="mf">0.3</span> <span class="c"># draft in metres</span>
<span class="n">flip_lr</span> <span class="o">=</span> <span class="mi">1</span> <span class="c"># flip port and starboard</span>
<span class="n">model</span> <span class="o">=</span> <span class="mi">998</span> <span class="c"># humminbird model</span>
<span class="n">chunk_size</span> <span class="o">=</span> <span class="mi">0</span> <span class="c"># auto chunk size</span>
<span class="n">chunk_size</span> <span class="o">=</span> <span class="mi">1000</span> <span class="c"># chunk size = 1000 pings</span>

<span class="c"># correction specific settings</span>
<span class="n">maxW</span> <span class="o">=</span> <span class="mi">1000</span> <span class="c"># rms output wattage</span>
Expand All @@ -205,11 +205,10 @@ <h2>Installation on Amazon Linux EC-2 instance<a class="headerlink" href="#insta
<span class="n">notes</span> <span class="o">=</span> <span class="mi">4</span> <span class="c"># Notes per octave (for wavelet analysis)</span>

<span class="c"># for mapping</span>
<span class="c">#imagery = 1 # server=&#39;http://server.arcgisonline.com/ArcGIS&#39;, service=&#39;World_Imagery&#39;</span>
<span class="n">dogrid</span> <span class="o">=</span> <span class="mi">1</span> <span class="c"># yes</span>
<span class="n">calc_bearing</span> <span class="o">=</span> <span class="mi">0</span> <span class="c">#no</span>
<span class="n">filt_bearing</span> <span class="o">=</span> <span class="mi">1</span> <span class="c">#yes</span>
<span class="n">res</span> <span class="o">=</span> <span class="mf">0.1</span> <span class="c"># grid resolution in metres</span>
<span class="n">res</span> <span class="o">=</span> <span class="mf">0.2</span> <span class="c"># grid resolution in metres</span>
<span class="n">cog</span> <span class="o">=</span> <span class="mi">1</span> <span class="c"># GPS course-over-ground used for heading</span>

<span class="c"># for downward-looking echosounder echogram (e1-e2) analysis</span>
Expand Down Expand Up @@ -322,7 +321,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="index.html" title="PyHum: Python program for reading and processing low-cost sidescan sonar data"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
5 changes: 2 additions & 3 deletions docs/_build/html/_sources/README.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ which carries out the following operations::
draft = 0.3 # draft in metres
flip_lr = 1 # flip port and starboard
model = 998 # humminbird model
chunk_size = 0 # auto chunk size
chunk_size = 1000 # chunk size = 1000 pings

# correction specific settings
maxW = 1000 # rms output wattage
Expand All @@ -202,11 +202,10 @@ which carries out the following operations::
notes = 4 # Notes per octave (for wavelet analysis)

# for mapping
#imagery = 1 # server='http://server.arcgisonline.com/ArcGIS', service='World_Imagery'
dogrid = 1 # yes
calc_bearing = 0 #no
filt_bearing = 1 #yes
res = 0.1 # grid resolution in metres
res = 0.2 # grid resolution in metres
cog = 1 # GPS course-over-ground used for heading

# for downward-looking echosounder echogram (e1-e2) analysis
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/examples.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>&lt;no title&gt; &mdash; PyHum 1.2.9 documentation</title>
<title>&lt;no title&gt; &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.0 documentation" href="index.html" />
<link rel="prev" title="pyhum.e1e2 module" href="pyhum.e1e2.html" />
</head>
<body role="document">
Expand All @@ -36,7 +36,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.e1e2.html" title="pyhum.e1e2 module"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -99,7 +99,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.e1e2.html" title="pyhum.e1e2 module"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/genindex.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Index &mdash; PyHum 1.2.9 documentation</title>
<title>Index &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -24,7 +24,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.0 documentation" href="index.html" />
</head>
<body role="document">
<div class="related" role="navigation" aria-label="related navigation">
Expand All @@ -33,7 +33,7 @@ <h3>Navigation</h3>
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
accesskey="I">index</a></li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -95,7 +95,7 @@ <h3>Navigation</h3>
<li class="right" style="margin-right: 10px">
<a href="#" title="General Index"
>index</a></li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>PyHum: python module for Humminbird analysis &mdash; PyHum 1.2.9 documentation</title>
<title>PyHum: python module for Humminbird analysis &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="#" />
<link rel="top" title="PyHum 1.3.0 documentation" href="#" />
<link rel="next" title="Getting started" href="README.html" />
</head>
<body role="document">
Expand All @@ -36,7 +36,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
accesskey="N">next</a> |</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -159,7 +159,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
>next</a> |</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="#">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
10 changes: 5 additions & 5 deletions docs/_build/html/modules.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>Modules &mdash; PyHum 1.2.9 documentation</title>
<title>Modules &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.0 documentation" href="index.html" />
<link rel="next" title="PyHum package" href="pyhum.html" />
<link rel="prev" title="Getting started" href="README.html" />
</head>
Expand All @@ -40,7 +40,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>

Expand Down Expand Up @@ -134,7 +134,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="README.html" title="Getting started"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
</ul>
</div>
<div class="footer" role="contentinfo">
Expand Down
Binary file modified docs/_build/html/objects.inv
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions docs/_build/html/pyhum.correct.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />

<title>pyhum.correct module &mdash; PyHum 1.2.9 documentation</title>
<title>pyhum.correct module &mdash; PyHum 1.3.0 documentation</title>

<link rel="stylesheet" href="_static/classic.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />

<script type="text/javascript">
var DOCUMENTATION_OPTIONS = {
URL_ROOT: './',
VERSION: '1.2.9',
VERSION: '1.3.0',
COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html',
HAS_SOURCE: true
Expand All @@ -23,7 +23,7 @@
<script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="PyHum 1.2.9 documentation" href="index.html" />
<link rel="top" title="PyHum 1.3.0 documentation" href="index.html" />
<link rel="up" title="PyHum package" href="pyhum.html" />
<link rel="next" title="pyhum.texture module" href="pyhum.texture.html" />
<link rel="prev" title="pyhum.read module" href="pyhum.read.html" />
Expand All @@ -41,7 +41,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.read.html" title="pyhum.read module"
accesskey="P">previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" accesskey="U">PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down Expand Up @@ -182,7 +182,7 @@ <h3>Navigation</h3>
<li class="right" >
<a href="pyhum.read.html" title="pyhum.read module"
>previous</a> |</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.2.9 documentation</a> &raquo;</li>
<li class="nav-item nav-item-0"><a href="index.html">PyHum 1.3.0 documentation</a> &raquo;</li>
<li class="nav-item nav-item-1"><a href="pyhum.html" >PyHum package</a> &raquo;</li>
</ul>
</div>
Expand Down
Loading

0 comments on commit 9d85ed3

Please sign in to comment.