Merge branch 'master' into master

Author: alexlib

.gitignore

@@ -24,3 +24,4 @@ openpiv/docs/_build/
 openpiv/examples/.vscode/settings.json
 openpiv/docs/_build/doctrees/environment.pickle
 openpiv/docs/src/test1.vec
+openpiv/test/OpenPIV_results_16_/field_A0000.png

mask.bmp

@@ -0,0 +1,71 @@
+# x	y	u	v	mask
+  0.4041	  3.3983	  0.1059	 -2.7964	  0.0000
+  0.9014	  3.3983	  0.1055	 -2.8239	  0.0000
+  1.3987	  3.3983	  0.0993	 -2.8579	  0.0000
+  1.8960	  3.3983	  0.0847	 -2.9079	  0.0000
+  2.3933	  3.3983	  0.0636	 -2.9569	  0.0000
+  2.8906	  3.3983	  0.0027	 -2.9658	  0.0000
+  3.3879	  3.3983	 -0.0587	 -2.9562	  0.0000
+  3.8852	  3.3983	 -0.1373	 -2.9133	  0.0000
+  4.3825	  3.3983	 -0.1947	 -2.8557	  0.0000
+  4.8798	  3.3983	 -0.3670	 -2.6830	  0.0000
+  0.4041	  2.9010	  0.0665	 -2.8040	  0.0000
+  0.9014	  2.9010	  0.0722	 -2.8245	  0.0000
+  1.3987	  2.9010	  0.4053	 -2.7250	  0.0000
+  1.8960	  2.9010	  0.0578	 -2.8927	  0.0000
+  2.3933	  2.9010	  0.0323	 -2.9326	  0.0000
+  2.8906	  2.9010	 -0.0168	 -2.9186	  0.0000
+  3.3879	  2.9010	 -0.0805	 -2.8935	  0.0000
+  3.8852	  2.9010	 -0.1594	 -2.8354	  0.0000
+  4.3825	  2.9010	 -0.2061	 -2.7844	  0.0000
+  4.8798	  2.9010	 -0.3066	 -2.6590	  0.0000
+  0.4041	  2.4036	 -0.0594	 -2.7840	  0.0000
+  0.9014	  2.4036	  0.0691	 -2.8055	  0.0000
+  1.3987	  2.4036	  0.0673	 -2.8306	  0.0000
+  1.8960	  2.4036	  0.0471	 -2.8555	  0.0000
+  2.3933	  2.4036	 -0.0328	 -3.1216	  0.0000
+  2.8906	  2.4036	 -0.0386	 -2.8746	  0.0000
+  3.3879	  2.4036	 -0.1014	 -2.8450	  0.0000
+  3.8852	  2.4036	 -0.1698	 -2.7944	  0.0000
+  4.3825	  2.4036	 -0.2126	 -2.7545	  0.0000
+  4.8798	  2.4036	 -0.2916	 -2.6564	  0.0000
+  0.4041	  1.9063	  0.0525	 -2.7684	  0.0000
+  0.9014	  1.9063	  0.0386	 -2.7413	  0.0000
+  1.3987	  1.9063	 -0.2324	 -2.9411	  0.0000
+  1.8960	  1.9063	  0.0251	 -2.8002	  0.0000
+  2.3933	  1.9063	  0.1382	 -2.9616	  0.0000
+  2.8906	  1.9063	 -0.0768	 -2.7952	  0.0000
+  3.3879	  1.9063	 -0.1411	 -2.7683	  0.0000
+  3.8852	  1.9063	 -0.1849	 -2.7214	  0.0000
+  4.3825	  1.9063	 -0.2214	 -2.6969	  0.0000
+  4.8798	  1.9063	 -0.2577	 -2.6471	  0.0000
+  0.4041	  1.4090	  0.0971	 -2.7341	  0.0000
+  0.9014	  1.4090	  0.0887	 -2.7155	  0.0000
+  1.3987	  1.4090	  0.0636	 -2.7338	  0.0000
+  1.8960	  1.4090	  0.0181	 -2.7250	  0.0000
+  2.3933	  1.4090	 -0.0418	 -2.7314	  0.0000
+  2.8906	  1.4090	 -0.0996	 -2.7079	  0.0000
+  3.3879	  1.4090	 -0.1617	 -2.7015	  0.0000
+  3.8852	  1.4090	 -0.3670	 -2.6830	  0.0000
+  4.3825	  1.4090	 -0.2229	 -2.6631	  0.0000
+  4.8798	  1.4090	 -0.2474	 -2.6431	  0.0000
+  0.4041	  0.9117	  0.1195	 -2.7126	  0.0000
+  0.9014	  0.9117	  0.1056	 -2.6844	  0.0000
+  1.3987	  0.9117	  0.0769	 -2.6932	  0.0000
+  1.8960	  0.9117	  0.1454	 -2.5757	  0.0000
+  2.3933	  0.9117	 -0.1543	 -2.7084	  0.0000
+  2.8906	  0.9117	 -0.0990	 -2.6575	  0.0000
+  3.3879	  0.9117	 -0.3521	 -2.5478	  0.0000
+  3.8852	  0.9117	 -0.1831	 -2.6454	  0.0000
+  4.3825	  0.9117	 -0.2044	 -2.6432	  0.0000
+  4.8798	  0.9117	 -0.0650	 -2.6367	  0.0000
+  0.4041	  0.4144	  0.1767	 -2.6746	  0.0000
+  0.9014	  0.4144	  0.5106	 -2.6316	  0.0000
+  1.3987	  0.4144	  0.1007	 -2.6398	  0.0000
+  1.8960	  0.4144	  0.0127	 -2.2562	  0.0000
+  2.3933	  0.4144	 -0.0425	 -2.6163	  0.0000
+  2.8906	  0.4144	 -0.1095	 -2.6114	  0.0000
+  3.3879	  0.4144	 -0.0219	 -2.5749	  0.0000
+  3.8852	  0.4144	 -0.1777	 -2.6289	  0.0000
+  4.3825	  0.4144	 -0.1981	 -2.6318	  0.0000
+  4.8798	  0.4144	 -0.2080	 -2.6325	  0.0000

openpiv-python-masking.ipynb

@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import sys
+import os
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -55,15 +56,15 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'OpenPIV'
-copyright = u'2014, OpenPIV group'
+project = 'OpenPIV'
+copyright = '2014, OpenPIV team'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.24.0'
+version = '0.24.4a'
 # The full version, including alpha/beta/rc tags.
 # release = '0.0.1a'
 
@@ -136,7 +137,7 @@
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
@@ -229,8 +230,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'openpiv', u'OpenPIV Documentation',
-     [u'OpenPIV group'], 1)
+    ('index', 'openpiv', 'OpenPIV Documentation',
+     ['OpenPIV group'], 1)
 ]
 
 # If true, show URL addresses after external links.

openpiv/data/test1/test_data.vec

@@ -29,6 +29,7 @@ Contents:
    src/installation_instruction
    src/tutorial1
    src/windef
+   src/masking
    src/developers
    src/api_reference
    src/faq

openpiv/data/test3/pair_4_frame_0.jpg

@@ -1,7 +1,7 @@
-cython>=0.20
 numpy>=1.9
 openpiv
 sphinx
 recommonmark
 ipykernel
 nbsphinx
+sphinx_rtd_theme