Skip to content

Commit 90a4873

Browse files
authored
Merge pull request #245 from ToFuProject/Issue237_PLotArray
[#237] Fixed
2 parents e4225c6 + ecf7449 commit 90a4873

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

datastock/_class1.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -470,7 +470,6 @@ def extract(
470470
return_keys: returns the value of keys
471471
472472
"""
473-
474473
return _class1_compute._extract_instance(
475474
self,
476475
keys=keys,

datastock/_class1_compute.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -735,7 +735,6 @@ def _extract_instance(
735735
# -----------------
736736
# select
737737
# -----------------
738-
739738
ldata, lref = _extract_select(
740739
coll=coll,
741740
keys=keys,
@@ -755,7 +754,6 @@ def _extract_instance(
755754
else:
756755
coll2 = coll.__class__()
757756

758-
759757
# ------------------------
760758
# Populate
761759
# ------------------------

datastock/_plot_as_array.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,18 @@ def plot_as_array(
9191

9292
# check key, inplace flag and extract sub-collection
9393
lk = [kk for kk in [keyX, keyY, keyZ, keyU] if kk is not None]
94-
coll2, key = coll.extract(
94+
coll2, keys = coll.extract(
9595
[key] + lk,
9696
inc_monot=False,
9797
inc_vectors=False,
9898
inc_allrefs=False,
9999
return_keys=True,
100100
inplace=inplace,
101101
)
102-
key = [kk for kk in key if kk not in lk][0]
102+
if key is None:
103+
key = [kk for kk in key if kk not in lk]
104+
lndim = [coll2.ddata[kk]['data'].ndim for kk in key]
105+
key = key[np.argmax(lndim)]
103106
ndim = coll2.ddata[key]['data'].ndim
104107

105108
# --------------
@@ -603,7 +606,6 @@ def _check(
603606
else:
604607
dvminmax2[k1]['min'] = dvminmax[kk]['min']
605608

606-
607609
if dvminmax is None or dvminmax.get(kk, {}).get('max') is None:
608610
dvminmax2[k1]['max'] = nanmax + margin
609611
else:

0 commit comments

Comments
 (0)