Commit a8e1c858 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Fixed DeprecationWarning coming from holoviews. Updated version info.


Signed-off-by: Daniel Scheffler's avatarDaniel Scheffler <danschef@gfz-potsdam.de>
parent f1ec5818
Pipeline #11602 failed with stages
in 4 minutes and 26 seconds
......@@ -546,12 +546,14 @@ class COREG(object):
vmax = np.nanpercentile(arr_masked.compressed(), pmax)
arr2plot = rescale_intensity(arr_masked, in_range=(vmin, vmax), out_range='int8')
return hv.Image(arr2plot, bounds=(xmin, ymin, xmax, ymax))(
style={'cmap': 'gray',
'vmin': vmin, 'vmax': vmax,
'interpolation': 'none'},
plot={'fig_inches': figsize, 'show_grid': True})
# plot={'fig_size':100, 'show_grid':True})
return hv.Image(arr2plot, bounds=(xmin, ymin, xmax, ymax))\
.opts(style={'cmap': 'gray',
'vmin': vmin,
'vmax': vmax,
'interpolation': 'none'},
plot={'fig_inches': figsize,
# 'fig_size': 100,
'show_grid': True})
hvIm_matchWin = get_hv_image(self.matchWin)
hvIm_otherWin_orig = get_hv_image(self.otherWin)
......@@ -562,8 +564,8 @@ class COREG(object):
print('Matching window before and after correction (above and below): ')
# get layouts (docs on options: http://build.holoviews.org/Tutorials/Options.html)
layout_before = (hvIm_matchWin + hvIm_matchWin)(plot=dict(fig_inches=figsize))
layout_after = (hvIm_otherWin_orig + hvIm_otherWin_corr)(plot=dict(fig_inches=figsize))
layout_before = (hvIm_matchWin + hvIm_matchWin).opts(plot=dict(fig_inches=figsize))
layout_after = (hvIm_otherWin_orig + hvIm_otherWin_corr).opts(plot=dict(fig_inches=figsize))
# plot!
imgs = {1: layout_before, 2: layout_after}
......
......@@ -385,7 +385,7 @@ class Tie_Point_Grid(object):
global_shared_im2shift = self.shift
if not self.q:
print("Calculating tie point grid (%s points) 1 CPU core..." % len(GDF))
print("Calculating tie point grid (%s points) on 1 CPU core..." % len(GDF))
results = np.empty((len(geomPoints), 14), np.object)
bar = ProgressBar(prefix='\tprogress:')
for i, coreg_kwargs in enumerate(list_coreg_kwargs):
......
......@@ -22,5 +22,5 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
__version__ = '0.9.17'
__versionalias__ = '2020-05-19_01'
__version__ = '0.9.18'
__versionalias__ = '2020-08-18_01'
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment