Skip to content

Dont assume that unit attribute exists #770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Dont assume that unit attribute exists #770

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9113e2b
Dont assume that unit attribute exists
jenshnielsen Sep 28, 2017
d0c044b
Dont assume that full_name or nd_array exist either
jenshnielsen Sep 28, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions qcodes/plots/pyqtgraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,8 +527,8 @@ def fixUnitScaling(self, startranges: Optional[Dict[str, Dict[str, Union[float,i
# make a dict mapping axis labels to axis positions
for axis in ('x', 'y', 'z'):
if self.traces[i]['config'].get(axis):
unit = self.traces[i]['config'][axis].unit
if unit not in standardunits:
unit = getattr(self.traces[i]['config'][axis], 'unit', None)
if unit is not None and unit not in standardunits:
if axis in ('x', 'y'):
ax = plot.getAxis(axismapping[axis])
else:
Expand All @@ -546,18 +546,18 @@ def fixUnitScaling(self, startranges: Optional[Dict[str, Dict[str, Union[float,i
ax.update()

# set limits either from dataset or
setarr = self.traces[i]['config'][axis].ndarray
setarr = getattr(self.traces[i]['config'][axis], 'ndarray', None)
arrmin = None
arrmax = None
if not np.all(np.isnan(setarr)):
if setarr and not np.all(np.isnan(setarr)):
arrmax = setarr.max()
arrmin = setarr.min()
elif startranges is not None:
try:
paramname = self.traces[i]['config'][axis].full_name
arrmax = startranges[paramname]['max']
arrmin = startranges[paramname]['min']
except (IndexError, KeyError):
except (IndexError, KeyError, AttributeError):
continue

if axis == 'x':
Expand Down