Moved themes and images from source code directory

mcuntz · Jan 17, 2024 · d381fd5 · d381fd5
1 parent f801491
commit d381fd5
Show file tree

Hide file tree

Showing 230 changed files with 52 additions and 1,821 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,10 @@
 Changelog
 ---------
 
+v4.4 (??? 2024)
+    * Bugfix formatted string used wrong data type in `analyse_netcdf`.
+    * Move themes and images directories from src/ncvue to src directory.
+
 v4.3 (Jan 2024)
     * Added conda and continuous integration badges.
     * Allow multiple netcdf files.

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,8 +1,7 @@
 prune **
-graft bin
 include src/ncvue/*.py
-graft src/ncvue/images
-graft src/ncvue/themes/azure-2.0
+graft src/images
+graft src/themes/azure-2.0
 graft tests
 
 include AUTHORS.rst CHANGELOG.rst CONTRIBUTING.rst README.rst LICENSE pyproject.toml setup.cfg

diff --git a/src/ncvue/images/Accent.png b/src/ncvue/images/Accent.png
diff --git a/src/ncvue/images/Blues.png b/src/ncvue/images/Blues.png
diff --git a/src/ncvue/images/BrBG.png b/src/ncvue/images/BrBG.png
diff --git a/src/ncvue/images/BuGn.png b/src/ncvue/images/BuGn.png
diff --git a/src/ncvue/images/BuPu.png b/src/ncvue/images/BuPu.png
diff --git a/src/ncvue/images/CMRmap.png b/src/ncvue/images/CMRmap.png
diff --git a/src/ncvue/images/Dark2.png b/src/ncvue/images/Dark2.png
diff --git a/src/ncvue/images/GnBu.png b/src/ncvue/images/GnBu.png
diff --git a/src/ncvue/images/Grays.png b/src/ncvue/images/Grays.png
diff --git a/src/ncvue/images/Greens.png b/src/ncvue/images/Greens.png
diff --git a/src/ncvue/images/Greys.png b/src/ncvue/images/Greys.png
diff --git a/src/ncvue/images/OrRd.png b/src/ncvue/images/OrRd.png
diff --git a/src/ncvue/images/Oranges.png b/src/ncvue/images/Oranges.png
diff --git a/src/ncvue/images/PRGn.png b/src/ncvue/images/PRGn.png
diff --git a/src/ncvue/images/Paired.png b/src/ncvue/images/Paired.png
diff --git a/src/ncvue/images/Pastel1.png b/src/ncvue/images/Pastel1.png
diff --git a/src/ncvue/images/Pastel2.png b/src/ncvue/images/Pastel2.png
diff --git a/src/ncvue/images/PiYG.png b/src/ncvue/images/PiYG.png
diff --git a/src/ncvue/images/PuBu.png b/src/ncvue/images/PuBu.png
diff --git a/src/ncvue/images/PuBuGn.png b/src/ncvue/images/PuBuGn.png
diff --git a/src/ncvue/images/PuOr.png b/src/ncvue/images/PuOr.png
diff --git a/src/ncvue/images/PuRd.png b/src/ncvue/images/PuRd.png
diff --git a/src/ncvue/images/Purples.png b/src/ncvue/images/Purples.png
diff --git a/src/ncvue/images/RdBu.png b/src/ncvue/images/RdBu.png
diff --git a/src/ncvue/images/RdGy.png b/src/ncvue/images/RdGy.png
diff --git a/src/ncvue/images/RdPu.png b/src/ncvue/images/RdPu.png
diff --git a/src/ncvue/images/RdYlBu.png b/src/ncvue/images/RdYlBu.png
diff --git a/src/ncvue/images/RdYlGn.png b/src/ncvue/images/RdYlGn.png
diff --git a/src/ncvue/images/Reds.png b/src/ncvue/images/Reds.png
diff --git a/src/ncvue/images/Set1.png b/src/ncvue/images/Set1.png
diff --git a/src/ncvue/images/Set2.png b/src/ncvue/images/Set2.png
diff --git a/src/ncvue/images/Set3.png b/src/ncvue/images/Set3.png
diff --git a/src/ncvue/images/Spectral.png b/src/ncvue/images/Spectral.png
diff --git a/src/ncvue/images/Wistia.png b/src/ncvue/images/Wistia.png
diff --git a/src/ncvue/images/YlGn.png b/src/ncvue/images/YlGn.png
diff --git a/src/ncvue/images/YlGnBu.png b/src/ncvue/images/YlGnBu.png
diff --git a/src/ncvue/images/YlOrBr.png b/src/ncvue/images/YlOrBr.png
diff --git a/src/ncvue/images/YlOrRd.png b/src/ncvue/images/YlOrRd.png
diff --git a/src/ncvue/images/afmhot.png b/src/ncvue/images/afmhot.png
diff --git a/src/ncvue/images/autumn.png b/src/ncvue/images/autumn.png
diff --git a/src/ncvue/images/binary.png b/src/ncvue/images/binary.png
diff --git a/src/ncvue/images/bone.png b/src/ncvue/images/bone.png
diff --git a/src/ncvue/images/brg.png b/src/ncvue/images/brg.png
diff --git a/src/ncvue/images/bwr.png b/src/ncvue/images/bwr.png
diff --git a/src/ncvue/images/cividis.png b/src/ncvue/images/cividis.png
diff --git a/src/ncvue/images/cool.png b/src/ncvue/images/cool.png
diff --git a/src/ncvue/images/coolwarm.png b/src/ncvue/images/coolwarm.png
diff --git a/src/ncvue/images/copper.png b/src/ncvue/images/copper.png
diff --git a/src/ncvue/images/cubehelix.png b/src/ncvue/images/cubehelix.png
diff --git a/src/ncvue/images/flag.png b/src/ncvue/images/flag.png
diff --git a/src/ncvue/images/gist_earth.png b/src/ncvue/images/gist_earth.png
diff --git a/src/ncvue/images/gist_gray.png b/src/ncvue/images/gist_gray.png
diff --git a/src/ncvue/images/gist_grey.png b/src/ncvue/images/gist_grey.png
diff --git a/src/ncvue/images/gist_heat.png b/src/ncvue/images/gist_heat.png
diff --git a/src/ncvue/images/gist_ncar.png b/src/ncvue/images/gist_ncar.png
diff --git a/src/ncvue/images/gist_rainbow.png b/src/ncvue/images/gist_rainbow.png
diff --git a/src/ncvue/images/gist_stern.png b/src/ncvue/images/gist_stern.png
diff --git a/src/ncvue/images/gist_yarg.png b/src/ncvue/images/gist_yarg.png
diff --git a/src/ncvue/images/gist_yerg.png b/src/ncvue/images/gist_yerg.png
diff --git a/src/ncvue/images/gnuplot.png b/src/ncvue/images/gnuplot.png
diff --git a/src/ncvue/images/gnuplot2.png b/src/ncvue/images/gnuplot2.png
diff --git a/src/ncvue/images/gray.png b/src/ncvue/images/gray.png
diff --git a/src/ncvue/images/grey.png b/src/ncvue/images/grey.png
diff --git a/src/ncvue/images/hot.png b/src/ncvue/images/hot.png
diff --git a/src/ncvue/images/hsv.png b/src/ncvue/images/hsv.png
diff --git a/src/ncvue/images/inferno.png b/src/ncvue/images/inferno.png
diff --git a/src/ncvue/images/jet.png b/src/ncvue/images/jet.png
diff --git a/src/ncvue/images/magma.png b/src/ncvue/images/magma.png
diff --git a/src/ncvue/images/ncvue_icon.ico b/src/ncvue/images/ncvue_icon.ico
diff --git a/src/ncvue/images/ncvue_icon.png b/src/ncvue/images/ncvue_icon.png
diff --git a/src/ncvue/images/nipy_spectral.png b/src/ncvue/images/nipy_spectral.png
diff --git a/src/ncvue/images/ocean.png b/src/ncvue/images/ocean.png
diff --git a/src/ncvue/images/pink.png b/src/ncvue/images/pink.png
diff --git a/src/ncvue/images/plasma.png b/src/ncvue/images/plasma.png
diff --git a/src/ncvue/images/plot_png_colormaps.py b/src/ncvue/images/plot_png_colormaps.py
diff --git a/src/ncvue/images/prism.png b/src/ncvue/images/prism.png
diff --git a/src/ncvue/images/rainbow.png b/src/ncvue/images/rainbow.png
diff --git a/src/ncvue/images/seismic.png b/src/ncvue/images/seismic.png
diff --git a/src/ncvue/images/spring.png b/src/ncvue/images/spring.png
diff --git a/src/ncvue/images/summer.png b/src/ncvue/images/summer.png
diff --git a/src/ncvue/images/tab10.png b/src/ncvue/images/tab10.png
diff --git a/src/ncvue/images/tab20.png b/src/ncvue/images/tab20.png
diff --git a/src/ncvue/images/tab20b.png b/src/ncvue/images/tab20b.png
diff --git a/src/ncvue/images/tab20c.png b/src/ncvue/images/tab20c.png
diff --git a/src/ncvue/images/terrain.png b/src/ncvue/images/terrain.png
diff --git a/src/ncvue/images/turbo.png b/src/ncvue/images/turbo.png
diff --git a/src/ncvue/images/twilight.png b/src/ncvue/images/twilight.png
diff --git a/src/ncvue/images/twilight_shifted.png b/src/ncvue/images/twilight_shifted.png
diff --git a/src/ncvue/images/viridis.png b/src/ncvue/images/viridis.png
diff --git a/src/ncvue/images/winter.png b/src/ncvue/images/winter.png
diff --git a/src/ncvue/ncvcontour.py b/src/ncvue/ncvcontour.py
@@ -27,6 +27,8 @@
     * Address fi.variables[name] directly by fi[name], Jan 2024, Matthias Cuntz
     * Allow groups in netcdf files, Jan 2024, Matthias Cuntz
     * Allow multiple netcdf files, Jan 2024, Matthias Cuntz
+    * Move images/ directory from src/ncvue/ to src/ directory,
+      Jan 2024, Matthias Cuntz
 
 """
 import os
@@ -138,12 +140,12 @@ def __init__(self, master, **kwargs):
         self.cmaps  = [ i for i in allcmaps if not i.endswith('_r') ]
         self.cmaps.sort()
         # self.imaps  = [ tk.PhotoImage(file=os.path.dirname(__file__) +
-        #                               '/images/' + i + '.png')
+        #                               '/../images/' + i + '.png')
         #                 for i in self.cmaps ]
         bundle_dir = getattr(sys, '_MEIPASS',
                              os.path.abspath(os.path.dirname(__file__)))
         self.imaps  = [ tk.PhotoImage(file=bundle_dir +
-                                      '/images/' + i + '.png')
+                                      '/../images/' + i + '.png')
                         for i in self.cmaps ]
 
         # 1. row
@@ -385,7 +387,7 @@ def newnetcdf(self):
             for ii, nn in enumerate(ncfile):
                 self.top.fi.append(nc.Dataset(nn, 'r'))
                 if len(ncfile) > 1:
-                    self.top.groups.append(f'file{ii:04d}')
+                    self.top.groups.append(f'file{ii:03d}')
             # Check groups
             ianalyse = True
             if len(ncfile) == 1:

diff --git a/src/ncvue/ncvmap.py b/src/ncvue/ncvmap.py
@@ -31,6 +31,8 @@
     * Address fi.variables[name] directly by fi[name], Jan 2024, Matthias Cuntz
     * Allow groups in netcdf files, Jan 2024, Matthias Cuntz
     * Allow multiple netcdf files, Jan 2024, Matthias Cuntz
+    * Move images/ directory from src/ncvue/ to src/ directory,
+      Jan 2024, Matthias Cuntz
 
 """
 import os
@@ -157,12 +159,12 @@ def __init__(self, master, **kwargs):
         self.cmaps  = [ i for i in allcmaps if not i.endswith('_r') ]
         self.cmaps.sort()
         # self.imaps  = [ tk.PhotoImage(file=os.path.dirname(__file__) +
-        #                               '/images/' + i + '.png')
+        #                               '/../images/' + i + '.png')
         #                 for i in self.cmaps ]
         bundle_dir = getattr(sys, '_MEIPASS',
                              os.path.abspath(os.path.dirname(__file__)))
         self.imaps  = [ tk.PhotoImage(file=bundle_dir +
-                                      '/images/' + i + '.png')
+                                      '/../images/' + i + '.png')
                         for i in self.cmaps ]
 
         # only projections with keyword: central_longitude
@@ -566,7 +568,7 @@ def newnetcdf(self):
             for ii, nn in enumerate(ncfile):
                 self.top.fi.append(nc.Dataset(nn, 'r'))
                 if len(ncfile) > 1:
-                    self.top.groups.append(f'file{ii:04d}')
+                    self.top.groups.append(f'file{ii:03d}')
             # Check groups
             ianalyse = True
             if len(ncfile) == 1:

diff --git a/src/ncvue/ncvmethods.py b/src/ncvue/ncvmethods.py
@@ -162,14 +162,12 @@ def analyse_netcdf(self):
                     tunit = ivar.units
                 except AttributeError:
                     tunit = ''
-                # assure 01, etc. if values < 10
+                # assure 01, etc. if values < 1000, 10, 10 in year, month, day
                 if tunit.find('since') > 0:
                     tt = tunit.split()
                     dd = tt[2].split('-')
-                    dd[0] = ('000' + dd[0])[-4:]
-                    dd[1] = ('0' + dd[1])[-2:]
-                    dd[2] = ('0' + dd[1])[-2:]
-                    tt[2] = '-'.join(dd)
+                    tt[2] = (f'{int(dd[0]):04d}-{int(dd[1]):02d}-'
+                             f'{int(dd[2]):02d}')
                     tunit = ' '.join(tt)
                 try:
                     ivar = selvar(self, self.tvar[ig])
@@ -188,11 +186,13 @@ def analyse_netcdf(self):
                         dtime.append(dt.datetime.strptime(sstt, itunit))
                     ntime = cf.date2num(dtime,
                                         'days since 0001-01-01 00:00:00')
-                    self.dtime[ig] = cf.num2date(ntime,
-                                                'days since 0001-01-01 00:00:00')
+                    self.dtime[ig] = cf.num2date(
+                        ntime,
+                        'days since 0001-01-01 00:00:00')
                 else:
                     try:
-                        self.dtime[ig] = cf.num2date(time, tunit, calendar=tcal)
+                        self.dtime[ig] = cf.num2date(time, tunit,
+                                                     calendar=tcal)
                     except ValueError:
                         self.dtime[ig] = None
                 if self.dtime[ig] is not None:
@@ -226,18 +226,17 @@ def analyse_netcdf(self):
                             only_use_cftime_datetimes=False,
                             only_use_python_datetimes=True)
                         self.time[ig] = np.array([ dd.isoformat()
-                                                  for dd in ttime ],
-                                                dtype='datetime64[ms]')
+                                                   for dd in ttime ],
+                                                 dtype='datetime64[ms]')
                     except:
                         self.time[ig] = None
                 if self.time[ig] is None:
                     try:
-                        # self.time = cf.num2date(time, tunit,
                         ttime = cf.num2date(time, tunit,
                                             calendar=tcal)
                         self.time[ig] = np.array([ dd.isoformat()
-                                                  for dd in ttime ],
-                                                dtype='datetime64[ms]')
+                                                   for dd in ttime ],
+                                                 dtype='datetime64[ms]')
                     except:
                         self.time[ig] = None
                 if self.time[ig] is None:
@@ -248,8 +247,6 @@ def analyse_netcdf(self):
                     # e.g. if units = "months since ..."
                     self.time[ig] = time
                     self.dtime[ig] = time
-                # print('time:  ', self.time[ig])
-                # print('dtime: ', self.dtime[ig])
                 break
         #
         # construct list of variable names with dimensions
@@ -367,7 +364,7 @@ def analyse_netcdf(self):
                     saxis = ''
                 if saxis.lower() == 'x':
                     self.lonvar[ig] = gname + vv
-        # fifth sweep: same as first but units can be "degrees"
+        # fifth sweep: same as first but units can be simply "degrees"
         if not self.latvar[ig]:
             for vv in fi.variables:
                 try:
@@ -400,7 +397,7 @@ def analyse_netcdf(self):
                         sunit = ''
                     if sunit.lower() == 'degrees':
                         self.lonvar[ig] = gname + vv
-        # sixth sweep: same as second but units can be "degrees"
+        # sixth sweep: same as second but units can be simply "degrees"
         if not self.latvar[ig]:
             for vv in fi.variables:
                 sname = fi[vv].name
@@ -421,7 +418,7 @@ def analyse_netcdf(self):
                         sunit = ''
                     if sunit.lower() == 'degrees':
                         self.lonvar[ig] = gname + vv
-        # seventh sweep: same as third but units can be "degrees"
+        # seventh sweep: same as third but units can be simply "degrees"
         if not self.latvar[ig]:
             for vv in fi.variables:
                 sname = fi[vv].name
@@ -452,8 +449,8 @@ def analyse_netcdf(self):
             ivar = selvar(self, self.latvar[ig])
             latshape = ivar.shape
             if (len(latshape) < 1) or (len(latshape) > 2):
-                estr  = 'Something went wrong determining lat/lon:'
-                estr += ' latitude variable is not 1D or 2D.'
+                estr  = ('Something went wrong determining lat/lon:'
+                         ' latitude variable is not 1D or 2D.')
                 print(estr)
                 estr = 'latitude variable with dimensions:'
                 ldim = ivar.dimensions
@@ -469,8 +466,8 @@ def analyse_netcdf(self):
             elif len(lonshape) == 2:
                 self.londim[ig] = ivar.dimensions[1]
             else:
-                estr  = 'Something went wrong determining lat/lon:'
-                estr += ' longitude variable is not 1D or 2D.'
+                estr  = ('Something went wrong determining lat/lon:'
+                         ' longitude variable is not 1D or 2D.')
                 print(estr)
                 estr = 'longitude variable with dimensions:'
                 ldim = ivar.dimensions
@@ -683,7 +680,7 @@ def set_dim_lon(self):
             self.londlblval[i].set(ll.dimensions[i])
             if ll.shape[i] > 1:
                 tstr  = "Specific dimension value: 0-{:d}\n".format(
-                    ll.shape[i]-1)
+                    ll.shape[i] - 1)
                 tstr += "or arithmetic operation on axis:\n"
                 tstr += "  " + ", ".join(DIMMETHODS)
             else:

diff --git a/src/ncvue/ncvscatter.py b/src/ncvue/ncvscatter.py
@@ -502,7 +502,7 @@ def newnetcdf(self):
             for ii, nn in enumerate(ncfile):
                 self.top.fi.append(nc.Dataset(nn, 'r'))
                 if len(ncfile) > 1:
-                    self.top.groups.append(f'file{ii:04d}')
+                    self.top.groups.append(f'file{ii:03d}')
             # Check groups
             ianalyse = True
             if len(ncfile) == 1:

diff --git a/src/ncvue/ncvue.py b/src/ncvue/ncvue.py
@@ -29,6 +29,8 @@
     * Font size 13 on Windows for plots, Jun 2021, Matthias Cuntz
     * Allow groups in netcdf files, Jan 2024, Matthias Cuntz
     * Allow multiple netcdf files, Jan 2024, Matthias Cuntz
+    * Move themes/ and images/ directories from src/ncvue/ to src/ directory,
+      Jan 2024, Matthias Cuntz
 
 """
 import os
@@ -92,34 +94,37 @@ def ncvue(ncfile=[], miss=np.nan):
         top.option_add("*Font", "Helvetica 10")
         plt.rc('font', size=13)
         # standard Windows themes
-        # ('winnative', 'clam', 'alt', 'default', 'classic', 'vista', 'xpnative')
+        # ('winnative', 'clam', 'alt', 'default', 'classic', 'vista',
+        #  'xpnative')
         # theme = 'vista'
         # style = ttk.Style()
         # style.theme_use(theme)
 
         # style packages
         # Download from https://sourceforge.net/projects/tcl-awthemes/
         # top.tk.call('lappend', 'auto_path',
-        #             bundle_dir + '/themes/awthemes-10.3.2')
+        #             bundle_dir + '/../themes/awthemes-10.3.2')
         # theme = 'awdark'  # 'awlight', 'awdark'
         # top.tk.call('package', 'require', theme)
         # style = ttk.Style()
         # style.theme_use(theme)
 
         # single file styles
         # 'azure' and 'azure-dark' v1.x, 'Breeze'
-        # top.tk.call('source', bundle_dir + '/themes/breeze/breeze.tcl')
+        # top.tk.call('source', bundle_dir + '/../themes/breeze/breeze.tcl')
         # theme = 'Breeze'
-        # top.tk.call('source', bundle_dir + '/themes/azure-1.3/azure.tcl')
+        # top.tk.call('source', bundle_dir + '/../themes/azure-1.3/azure.tcl')
         # theme = 'azure'
-        # top.tk.call('source', bundle_dir + '/themes/azure-1.3/azure-dark.tcl')
+        # top.tk.call('source', bundle_dir +
+        #             '/../themes/azure-1.3/azure-dark.tcl')
         # theme = 'azure-dark'
         # style = ttk.Style()
         # style.theme_use(theme)
 
         # 'azure' v2.x, 'sun-valley', 'forest' of rdbende
-        top.tk.call('source', bundle_dir + '/themes/azure-2.0/azure.tcl')
-        # top.tk.call('source', bundle_dir + '/themes/sun-valley-1.0/sun-valley.tcl')
+        top.tk.call('source', bundle_dir + '/../themes/azure-2.0/azure.tcl')
+        # top.tk.call('source', bundle_dir +
+        #             '/../themes/sun-valley-1.0/sun-valley.tcl')
         theme = 'light'  # light, dark
         top.tk.call("set_theme", theme)
     elif ios == 'Linux':
@@ -129,7 +134,7 @@ def ncvue(ncfile=[], miss=np.nan):
         # style.theme_use(theme)
 
         # 'azure' v2.x, 'sun-valley', 'forest' of rdbende
-        top.tk.call('source', bundle_dir + '/themes/azure-2.0/azure.tcl')
+        top.tk.call('source', bundle_dir + '/../themes/azure-2.0/azure.tcl')
         theme = 'light'  # light, dark
         top.tk.call("set_theme", theme)
 
@@ -140,7 +145,7 @@ def ncvue(ncfile=[], miss=np.nan):
     except NameError:
         whichpy = ''
     if not whichpy:
-        icon = tk.PhotoImage(file=bundle_dir + '/images/ncvue_icon.png')
+        icon = tk.PhotoImage(file=bundle_dir + '/../images/ncvue_icon.png')
         top.iconphoto(True, icon)  # True: apply to all future toplevels
     else:
         icon = None
@@ -177,7 +182,7 @@ def ncvue(ncfile=[], miss=np.nan):
         for ii, nn in enumerate(ncfile):
             top.fi.append(nc.Dataset(nn, 'r'))
             if len(ncfile) > 1:
-                top.groups.append(f'file{ii:04d}')
+                top.groups.append(f'file{ii:03d}')
         # Check groups
         if len(ncfile) == 1:
             top.groups = list(top.fi[0].groups.keys())