223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

restored correct bound calculation 

test different bounds options
This commit is contained in:
Martin Diehl 2020-08-04 20:34:40 +02:00
parent e07c00a592
commit 7d49606597
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/damask/_colormap.py
View File

@ -186,7 +186,7 @@ class Colormap(mpl.colors.ListedColormap):
np.logical_or (np.isnan(field), field == gap)) # mask gap and NaN (if gap present) np.logical_or (np.isnan(field), field == gap)) # mask gap and NaN (if gap present)
if bounds is None: if bounds is None:
hi,lo = field[mask].min(),field[mask].max() hi,lo = field[mask].max(),field[mask].min()
else: else:
hi,lo = bounds[::-1] hi,lo = bounds[::-1]

BIN
python/tests/reference/Colormap/shade.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 143 B

BIN
python/tests/reference/Colormap/shade_None.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 146 B

BIN
python/tests/reference/Colormap/shade_[2, 10].png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 136 B

9
python/tests/test_Colormap.py
View File

@ -131,13 +131,14 @@ class TestColormap:
c += c c += c
assert (np.allclose(c.colors[:len(c.colors)//2],c.colors[len(c.colors)//2:])) assert (np.allclose(c.colors[:len(c.colors)//2],c.colors[len(c.colors)//2:]))
def test_shade(self,reference_dir,update): @pytest.mark.parametrize('bounds',[None,[2,10]])
def test_shade(self,reference_dir,update,bounds):
data = np.add(*np.indices((10, 11))) data = np.add(*np.indices((10, 11)))
img_current = Colormap.from_predefined('orientation').shade(data) img_current = Colormap.from_predefined('orientation').shade(data,bounds=bounds)
if update: if update:
img_current.save(reference_dir/'shade.png') img_current.save(reference_dir/f'shade_{bounds}.png')
else: else:
img_reference = Image.open(reference_dir/'shade.png') img_reference = Image.open(reference_dir/f'shade_{bounds}.png')
diff = ImageChops.difference(img_reference.convert('RGB'),img_current.convert('RGB')) diff = ImageChops.difference(img_reference.convert('RGB'),img_current.convert('RGB'))
assert not diff.getbbox() assert not diff.getbbox()