Commit 8284ccf2 authored by Daniel Scheffler's avatar Daniel Scheffler
Browse files

Updated version info.

parent d31fdf91
Pipeline #1282 failed with stages
in 12 minutes and 12 seconds
...@@ -1124,22 +1124,16 @@ class COREG(object): ...@@ -1124,22 +1124,16 @@ class COREG(object):
# check if shapes of two images are equal (due to bug (?), in some cases otherWin_deshift_geoArr does not have # check if shapes of two images are equal (due to bug (?), in some cases otherWin_deshift_geoArr does not have
# the exact same dimensions as self.matchWin -> maybe bounds are handled differently by gdal.Warp) # the exact same dimensions as self.matchWin -> maybe bounds are handled differently by gdal.Warp)
#print('hier')
if not self.matchWin.shape == otherWin_deshift_geoArr.shape: # FIXME this seems to be already fixed if not self.matchWin.shape == otherWin_deshift_geoArr.shape: # FIXME this seems to be already fixed
#print('drin')
#print(self.matchWin.shape, otherWin_deshift_geoArr.shape)
warnings.warn('SSIM input array shapes are not equal! This issue seemed to be already fixed.. ') warnings.warn('SSIM input array shapes are not equal! This issue seemed to be already fixed.. ')
matchFull = self.ref if self.matchWin.imID == 'ref' else self.shift matchFull = self.ref if self.matchWin.imID == 'ref' else self.shift
matchWinData, _, _ = matchFull.get_mapPos(self.matchBox.mapPoly.bounds, self.matchWin.prj, matchWinData, _, _ = matchFull.get_mapPos(self.matchBox.mapPoly.bounds, self.matchWin.prj,
rspAlg='cubic', band2get=matchFull.band4match) rspAlg='cubic', band2get=matchFull.band4match)
#print(self.matchWin.shape, otherWin_deshift_geoArr.shape)
self.matchWin.clip_to_poly(self.matchBox.mapPoly) self.matchWin.clip_to_poly(self.matchBox.mapPoly)
#print(self.matchWin.shape, otherWin_deshift_geoArr.shape)
# at the image edges it is possible that the size of the matchBox must be reduced in order to make array # at the image edges it is possible that the size of the matchBox must be reduced in order to make array
# shapes match # shapes match
if not matchWinData.shape == otherWin_deshift_geoArr.shape: # FIXME this seems to be already fixed if not matchWinData.shape == otherWin_deshift_geoArr.shape: # FIXME this seems to be already fixed
#print('drin2')
self.matchBox.buffer_imXY(float(-np.ceil(abs(self.x_shift_px))), float(-np.ceil(abs(self.y_shift_px)))) self.matchBox.buffer_imXY(float(-np.ceil(abs(self.x_shift_px))), float(-np.ceil(abs(self.y_shift_px))))
otherWin_deshift_geoArr = self._get_deshifted_otherWin() otherWin_deshift_geoArr = self._get_deshifted_otherWin()
matchWinData, _, _ = matchFull.get_mapPos(self.matchBox.mapPoly.bounds, self.matchWin.prj, matchWinData, _, _ = matchFull.get_mapPos(self.matchBox.mapPoly.bounds, self.matchWin.prj,
......
...@@ -11,8 +11,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid ...@@ -11,8 +11,8 @@ from arosics.Tie_Point_Grid import Tie_Point_Grid
__author__ = """Daniel Scheffler""" __author__ = """Daniel Scheffler"""
__email__ = 'daniel.scheffler@gfz-potsdam.de' __email__ = 'daniel.scheffler@gfz-potsdam.de'
__version__ = '0.5.0' __version__ = '0.5.1'
__versionalias__ = '2017-09-19_01' __versionalias__ = '2017-10-05_01'
__all__ = ['COREG', __all__ = ['COREG',
'COREG_LOCAL', 'COREG_LOCAL',
'DESHIFTER', 'DESHIFTER',
......
...@@ -27,7 +27,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn ...@@ -27,7 +27,7 @@ test_requirements = requirements + ['coverage', 'nose', 'nose-htmloutput', 'redn
setup( setup(
name='arosics', name='arosics',
version='0.5.0', version='0.5.1',
description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data", description="An Automated and Robust Open-Source Image Co-Registration Software for Multi-Sensor Satellite Data",
long_description=readme + '\n\n' + history, long_description=readme + '\n\n' + history,
author="Daniel Scheffler", author="Daniel Scheffler",
......
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