Skip to content

Commit

Permalink
Updated documentation and standalone packages to v3.6
Browse files Browse the repository at this point in the history
  • Loading branch information
mcuntz committed Jun 26, 2021
1 parent 23750a0 commit 19d84d1
Show file tree
Hide file tree
Showing 12 changed files with 44 additions and 23 deletions.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ Different netCDF test files were provided by `Juliane Mai`_.
.. _cx_Freeze: https://cx-freeze.readthedocs.io/en/latest/
.. _documentation: https://mcuntz.github.io/ncvue/
.. _Marcelo Duarte: https://github.com/marcelotduarte
.. _Windows executable: http://www.macu.de/extra/ncvue.msi
.. _Windows executable: http://www.macu.de/extra/ncvue-3.6-amd64.msi
.. _install: https://scitools.org.uk/cartopy/docs/latest/installing.html
.. _instructions: https://mcuntz.github.io/ncvue/html/install.html
.. _LICENSE: https://github.com/mcuntz/ncvue/blob/main/LICENSE
Expand Down
9 changes: 6 additions & 3 deletions docs/html/_modules/ncvue/ncvcontour.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>ncvue.ncvcontour &mdash; ncvue 3.3.1 documentation</title>
<title>ncvue.ncvcontour &mdash; ncvue 3.6 documentation</title>



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



Expand All @@ -29,6 +31,7 @@


<script type="text/javascript" id="documentation_options" data-url_root="../../" src="../../_static/documentation_options.js"></script>
<script data-url_root="../../" id="documentation_options" src="../../_static/documentation_options.js"></script>
<script src="../../_static/jquery.js"></script>
<script src="../../_static/underscore.js"></script>
<script src="../../_static/doctools.js"></script>
Expand Down Expand Up @@ -61,7 +64,7 @@


<div class="version">
3.3.1
3.6
</div>


Expand Down Expand Up @@ -249,7 +252,7 @@ <h1>Source code for ncvue.ncvcontour</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_checkbutton</span><span class="p">,</span> <span class="n">add_combobox</span><span class="p">,</span> <span class="n">add_entry</span><span class="p">,</span> <span class="n">add_imagemenu</span>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_spinbox</span><span class="p">,</span> <span class="n">add_tooltip</span>
<span class="kn">import</span> <span class="nn">matplotlib</span>
<span class="n">matplotlib</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;TkAgg&#39;</span><span class="p">)</span>
<span class="c1"># matplotlib.use(&#39;TkAgg&#39;)</span>
<span class="kn">from</span> <span class="nn">matplotlib</span> <span class="kn">import</span> <span class="n">pyplot</span> <span class="k">as</span> <span class="n">plt</span>
<span class="c1"># plt.style.use(&#39;seaborn-darkgrid&#39;)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">style</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;seaborn-dark&#39;</span><span class="p">)</span>
Expand Down
11 changes: 6 additions & 5 deletions docs/html/_modules/ncvue/ncvmap.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>ncvue.ncvmap &mdash; ncvue 3.4 documentation</title>
<title>ncvue.ncvmap &mdash; ncvue 3.6 documentation</title>



Expand Down Expand Up @@ -64,7 +64,7 @@


<div class="version">
3.4
3.6
</div>


Expand Down Expand Up @@ -226,6 +226,7 @@ <h1>Source code for ncvue.ncvmap</h1><div class="highlight"><pre>
<span class="sd">* Open new netcdf file, communicate via top widget, Jan 2021, Matthias Cuntz</span>
<span class="sd">* Write coordinates and value on bottom of plotting canvas,</span>
<span class="sd"> May 2021, Matthias Cuntz</span>
<span class="sd">* Larger pad for colorbar, Jun 2021, Matthias Cuntz</span>

<span class="sd">.. moduleauthor:: Matthias Cuntz</span>

Expand Down Expand Up @@ -253,7 +254,7 @@ <h1>Source code for ncvue.ncvmap</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_checkbutton</span><span class="p">,</span> <span class="n">add_combobox</span><span class="p">,</span> <span class="n">add_entry</span><span class="p">,</span> <span class="n">add_imagemenu</span>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_menu</span><span class="p">,</span> <span class="n">add_scale</span><span class="p">,</span> <span class="n">add_spinbox</span><span class="p">,</span> <span class="n">add_tooltip</span>
<span class="kn">import</span> <span class="nn">matplotlib</span> <span class="k">as</span> <span class="nn">mpl</span>
<span class="n">mpl</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;TkAgg&#39;</span><span class="p">)</span>
<span class="c1"># mpl.use(&#39;TkAgg&#39;)</span>
<span class="kn">from</span> <span class="nn">matplotlib</span> <span class="kn">import</span> <span class="n">pyplot</span> <span class="k">as</span> <span class="n">plt</span>
<span class="c1"># plt.style.use(&#39;seaborn-darkgrid&#39;)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">style</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;seaborn-dark&#39;</span><span class="p">)</span>
Expand Down Expand Up @@ -1446,7 +1447,7 @@ <h1>Source code for ncvue.ncvmap</h1><div class="highlight"><pre>
<span class="c1"># origin=&#39;upper&#39;, extent=self.img_extent,</span>
<span class="c1"># transform=self.itrans)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">cb</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">figure</span><span class="o">.</span><span class="n">colorbar</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">cc</span><span class="p">,</span> <span class="n">fraction</span><span class="o">=</span><span class="mf">0.05</span><span class="p">,</span>
<span class="n">shrink</span><span class="o">=</span><span class="mf">0.75</span><span class="p">,</span>
<span class="n">shrink</span><span class="o">=</span><span class="mf">0.75</span><span class="p">,</span> <span class="n">pad</span><span class="o">=</span><span class="mf">0.07</span><span class="p">,</span>
<span class="n">extend</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">iextend</span><span class="p">)</span>
<span class="k">except</span> <span class="ne">Exception</span><span class="p">:</span>
<span class="n">estr</span> <span class="o">=</span> <span class="s1">&#39;Map pcolormesh: lon (&#39;</span> <span class="o">+</span> <span class="n">vx</span> <span class="o">+</span> <span class="s1">&#39;), &#39;</span>
Expand All @@ -1464,7 +1465,7 @@ <h1>Source code for ncvue.ncvmap</h1><div class="highlight"><pre>
<span class="n">cmap</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">icmap</span><span class="p">,</span> <span class="n">extend</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">iextend</span><span class="p">,</span>
<span class="n">transform</span><span class="o">=</span><span class="bp">self</span><span class="o">.</span><span class="n">itrans</span><span class="p">)</span>
<span class="bp">self</span><span class="o">.</span><span class="n">cb</span> <span class="o">=</span> <span class="bp">self</span><span class="o">.</span><span class="n">figure</span><span class="o">.</span><span class="n">colorbar</span><span class="p">(</span><span class="bp">self</span><span class="o">.</span><span class="n">cc</span><span class="p">,</span> <span class="n">fraction</span><span class="o">=</span><span class="mf">0.05</span><span class="p">,</span>
<span class="n">shrink</span><span class="o">=</span><span class="mf">0.75</span><span class="p">)</span>
<span class="n">shrink</span><span class="o">=</span><span class="mf">0.75</span><span class="p">,</span> <span class="n">pad</span><span class="o">=</span><span class="mf">0.07</span><span class="p">)</span>
<span class="c1"># self.cc, = self.axes.plot(yy, vv[0,:])</span>
<span class="k">except</span> <span class="ne">Exception</span><span class="p">:</span>
<span class="n">estr</span> <span class="o">=</span> <span class="s1">&#39;Map contourf: lon (&#39;</span> <span class="o">+</span> <span class="n">vx</span> <span class="o">+</span> <span class="s1">&#39;), lat (&#39;</span> <span class="o">+</span> <span class="n">vy</span> <span class="o">+</span> <span class="s1">&#39;),&#39;</span>
Expand Down
6 changes: 3 additions & 3 deletions docs/html/_modules/ncvue/ncvscatter.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<meta name="viewport" content="width=device-width, initial-scale=1.0" />

<title>ncvue.ncvscatter &mdash; ncvue 3.5.1 documentation</title>
<title>ncvue.ncvscatter &mdash; ncvue 3.6 documentation</title>



Expand Down Expand Up @@ -64,7 +64,7 @@


<div class="version">
3.5.1
3.6
</div>


Expand Down Expand Up @@ -253,7 +253,7 @@ <h1>Source code for ncvue.ncvscatter</h1><div class="highlight"><pre>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_checkbutton</span><span class="p">,</span> <span class="n">add_combobox</span><span class="p">,</span> <span class="n">add_entry</span>
<span class="kn">from</span> <span class="nn">.ncvwidgets</span> <span class="kn">import</span> <span class="n">add_spinbox</span><span class="p">,</span> <span class="n">add_tooltip</span>
<span class="kn">import</span> <span class="nn">matplotlib</span>
<span class="n">matplotlib</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;TkAgg&#39;</span><span class="p">)</span>
<span class="c1"># matplotlib.use(&#39;TkAgg&#39;)</span>
<span class="kn">from</span> <span class="nn">matplotlib</span> <span class="kn">import</span> <span class="n">pyplot</span> <span class="k">as</span> <span class="n">plt</span>
<span class="c1"># plt.style.use(&#39;seaborn-darkgrid&#39;)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">style</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;seaborn-dark&#39;</span><span class="p">)</span>
Expand Down
26 changes: 20 additions & 6 deletions docs/html/_modules/ncvue/ncvue.html
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,7 @@ <h1>Source code for ncvue.ncvue</h1><div class="highlight"><pre>
<span class="sd">* Set titlebar and taskbar icon only if &quot;standalone&quot; not in ipython or jupyter,</span>
<span class="sd"> May 2021, Matthias Cuntz</span>
<span class="sd">* Different themes for different OS, May 2021, Matthias Cuntz</span>
<span class="sd">* Font size 13 on Windows for plots, Jun 2021, Matthias Cuntz</span>

<span class="sd">.. moduleauthor:: Matthias Cuntz</span>

Expand All @@ -250,6 +251,9 @@ <h1>Source code for ncvue.ncvue</h1><div class="highlight"><pre>
<span class="kn">import</span> <span class="nn">netCDF4</span> <span class="k">as</span> <span class="nn">nc</span>
<span class="kn">from</span> <span class="nn">.ncvmethods</span> <span class="kn">import</span> <span class="n">analyse_netcdf</span>
<span class="kn">from</span> <span class="nn">.ncvmain</span> <span class="kn">import</span> <span class="n">ncvMain</span>
<span class="kn">import</span> <span class="nn">matplotlib</span> <span class="k">as</span> <span class="nn">mpl</span>
<span class="n">mpl</span><span class="o">.</span><span class="n">use</span><span class="p">(</span><span class="s1">&#39;TkAgg&#39;</span><span class="p">)</span>
<span class="kn">from</span> <span class="nn">matplotlib</span> <span class="kn">import</span> <span class="n">pyplot</span> <span class="k">as</span> <span class="n">plt</span>


<span class="n">__all__</span> <span class="o">=</span> <span class="p">[</span><span class="s1">&#39;ncvue&#39;</span><span class="p">]</span>
Expand Down Expand Up @@ -291,17 +295,27 @@ <h1>Source code for ncvue.ncvue</h1><div class="highlight"><pre>
<span class="k">if</span> <span class="n">ios</span> <span class="o">==</span> <span class="s1">&#39;Darwin&#39;</span><span class="p">:</span>
<span class="n">theme</span> <span class="o">=</span> <span class="s1">&#39;aqua&#39;</span>
<span class="k">elif</span> <span class="n">ios</span> <span class="o">==</span> <span class="s1">&#39;Windows&#39;</span><span class="p">:</span>
<span class="c1"># # style packages</span>
<span class="c1"># # top.tk.call(&#39;lappend&#39;, &#39;auto_path&#39;,</span>
<span class="c1"># # bundle_dir + &#39;/themes/awthemes-10.3.0&#39;)</span>
<span class="c1"># # theme = &#39;awlight&#39; # &#39;awlight&#39;, &#39;awdark&#39;</span>
<span class="c1"># # top.tk.call(&#39;package&#39;, &#39;require&#39;, theme)</span>
<span class="n">top</span><span class="o">.</span><span class="n">option_add</span><span class="p">(</span><span class="s2">&quot;*Font&quot;</span><span class="p">,</span> <span class="s2">&quot;Helvetica 10&quot;</span><span class="p">)</span>
<span class="n">plt</span><span class="o">.</span><span class="n">rc</span><span class="p">(</span><span class="s1">&#39;font&#39;</span><span class="p">,</span> <span class="n">size</span><span class="o">=</span><span class="mi">13</span><span class="p">)</span>
<span class="c1"># standard themes</span>
<span class="c1"># (&#39;winnative&#39;, &#39;clam&#39;, &#39;alt&#39;, &#39;default&#39;, &#39;classic&#39;, &#39;vista&#39;, &#39;xpnative&#39;)</span>
<span class="c1"># theme = &#39;vista&#39;</span>

<span class="c1"># style packages</span>
<span class="c1"># Download from https://sourceforge.net/projects/tcl-awthemes/</span>
<span class="c1"># top.tk.call(&#39;lappend&#39;, &#39;auto_path&#39;,</span>
<span class="c1"># bundle_dir + &#39;/themes/awthemes-10.3.2&#39;)</span>
<span class="c1"># theme = &#39;awdark&#39; # &#39;awlight&#39;, &#39;awdark&#39;</span>
<span class="c1"># top.tk.call(&#39;package&#39;, &#39;require&#39;, theme)</span>

<span class="c1"># single file styles</span>
<span class="c1"># &#39;azure&#39;, &#39;azure-dark&#39;, &#39;Breeze&#39;</span>
<span class="c1"># top.tk.call(&#39;source&#39;, bundle_dir + &#39;/themes/breeze/breeze.tcl&#39;)</span>
<span class="c1"># theme = &#39;Breeze&#39;</span>
<span class="n">top</span><span class="o">.</span><span class="n">tk</span><span class="o">.</span><span class="n">call</span><span class="p">(</span><span class="s1">&#39;source&#39;</span><span class="p">,</span> <span class="n">bundle_dir</span> <span class="o">+</span> <span class="s1">&#39;/themes/azure/azure.tcl&#39;</span><span class="p">)</span>
<span class="n">theme</span> <span class="o">=</span> <span class="s1">&#39;azure&#39;</span>
<span class="c1"># top.tk.call(&#39;source&#39;, bundle_dir + &#39;/themes/azure/azure-dark.tcl&#39;)</span>
<span class="n">theme</span> <span class="o">=</span> <span class="s1">&#39;azure&#39;</span> <span class="c1"># &#39;azure&#39;, &#39;azure-dark&#39;, &#39;Breeze&#39;</span>
<span class="c1"># theme = &#39;azure-dark&#39;</span>
<span class="k">elif</span> <span class="n">ios</span> <span class="o">==</span> <span class="s1">&#39;Linux&#39;</span><span class="p">:</span>
<span class="n">theme</span> <span class="o">=</span> <span class="s1">&#39;clam&#39;</span> <span class="c1"># &#39;clam&#39;, &#39;alt&#39;, &#39;default&#39;, &#39;classic&#39;</span>
<span class="n">style</span> <span class="o">=</span> <span class="n">ttk</span><span class="o">.</span><span class="n">Style</span><span class="p">()</span>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/_sources/readme.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Different netCDF test files were provided by `Juliane Mai`_.
.. _cx_Freeze: https://cx-freeze.readthedocs.io/en/latest/
.. _documentation: https://mcuntz.github.io/ncvue/
.. _Marcelo Duarte: https://github.com/marcelotduarte
.. _Windows executable: http://www.macu.de/extra/ncvue.msi
.. _Windows executable: http://www.macu.de/extra/ncvue-3.6-amd64.msi
.. _install: https://scitools.org.uk/cartopy/docs/latest/installing.html
.. _instructions: https://mcuntz.github.io/ncvue/html/install.html
.. _LICENSE: https://github.com/mcuntz/ncvue/blob/main/LICENSE
Expand Down
1 change: 1 addition & 0 deletions docs/html/ncvmap.html
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,7 @@
<li><p>Open new netcdf file, communicate via top widget, Jan 2021, Matthias Cuntz</p></li>
<li><p>Write coordinates and value on bottom of plotting canvas,
May 2021, Matthias Cuntz</p></li>
<li><p>Larger pad for colorbar, Jun 2021, Matthias Cuntz</p></li>
</ul>
<p>The following classes are provided:</p>
<table class="longtable docutils align-default">
Expand Down
1 change: 1 addition & 0 deletions docs/html/ncvue.html
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,7 @@
<li><p>Set titlebar and taskbar icon only if “standalone” not in ipython or jupyter,
May 2021, Matthias Cuntz</p></li>
<li><p>Different themes for different OS, May 2021, Matthias Cuntz</p></li>
<li><p>Font size 13 on Windows for plots, Jun 2021, Matthias Cuntz</p></li>
</ul>
<p>The following functions are provided:</p>
<table class="longtable docutils align-default">
Expand Down
2 changes: 1 addition & 1 deletion docs/html/readme.html
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ <h2>Quick usage guide<a class="headerlink" href="#quick-usage-guide" title="Perm
run <code class="docutils literal notranslate"><span class="pre">ncvue</span></code> including Python:</p>
<ul class="simple">
<li><p><a class="reference external" href="http://www.macu.de/extra/ncvue-3.6.dmg">macOS app</a> (macOS &gt; 10.13, High Sierra)</p></li>
<li><p><a class="reference external" href="http://www.macu.de/extra/ncvue.msi">Windows executable</a> (Windows 10)</p></li>
<li><p><a class="reference external" href="http://www.macu.de/extra/ncvue-3.6-amd64.msi">Windows executable</a> (Windows 10)</p></li>
</ul>
<p>A dialog box might pop up on macOS saying that the <code class="docutils literal notranslate"><span class="pre">ncvue.app</span></code> is from an
unidentified developer. This is because <code class="docutils literal notranslate"><span class="pre">ncvue</span></code> is an open-source software.
Expand Down
2 changes: 1 addition & 1 deletion docs/html/searchindex.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/src/readme.rst
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Different netCDF test files were provided by `Juliane Mai`_.
.. _cx_Freeze: https://cx-freeze.readthedocs.io/en/latest/
.. _documentation: https://mcuntz.github.io/ncvue/
.. _Marcelo Duarte: https://github.com/marcelotduarte
.. _Windows executable: http://www.macu.de/extra/ncvue.msi
.. _Windows executable: http://www.macu.de/extra/ncvue-3.6-amd64.msi
.. _install: https://scitools.org.uk/cartopy/docs/latest/installing.html
.. _instructions: https://mcuntz.github.io/ncvue/html/install.html
.. _LICENSE: https://github.com/mcuntz/ncvue/blob/main/LICENSE
Expand Down
3 changes: 2 additions & 1 deletion ncvue/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
* v3.5, Uses different themes on different OS, Jun 2021, Matthias Cuntz
* v3.5.1, Explicitly set labelling of second y-axis to the right,
Jun 2021, Matthias Cuntz
* v3.6, separate units with spacee and use cx_Freeze, Jun 2021, Matthias Cuntz
* v3.6, standalone with cx_Freeze, separate units with space,
Jun 2021, Matthias Cuntz
.. moduleauthor:: Matthias Cuntz
"""
Expand Down

0 comments on commit 19d84d1

Please sign in to comment.