warehack.ing/WireViz
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply suggestions from code review by @kvid

Browse Source 
Co-authored-by: kvid <kvid@users.noreply.github.com>
This commit is contained in:
Daniel Rojas 2020-12-06 12:37:02 +01:00 committed by GitHub
parent 1d29c6cce8
commit d9b67e4567
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/wireviz/DataClasses.py
View File

@ -200,9 +200,11 @@ class Cable:
try: try:
g, u = self.gauge.split(' ') g, u = self.gauge.split(' ')
except Exception: except Exception:
raise Exception(f'{self.gauge} - Gauge must be a number, or number and unit separated by a space') raise Exception(f'Cable {self.name} gauge={self.gauge} - Gauge must be a number, or number and unit separated by a space')
self.gauge = g self.gauge = g
if self.gauge_unit is not None:
print(f'Warning: Cable {self.name} gauge_unit={self.gauge_unit} is ignored because its gauge contains {u}')
if u.upper() == 'AWG': if u.upper() == 'AWG':
self.gauge_unit = u.upper() self.gauge_unit = u.upper()
else: else:
@ -216,17 +218,18 @@ class Cable:
if isinstance(self.length, str): # length and unit specified if isinstance(self.length, str): # length and unit specified
try: try:
l, u = self.length.split(' ') L, u = self.length.split(' ')
l = float(l) L = float(L)
except Exception: except Exception:
raise Exception(f'{self.length} - Length must be a number, or number and unit separated by a space') raise Exception(f'Cable {self.name} length={self.length} - Length must be a number, or number and unit separated by a space')
self.length = l self.length = L
if self.length_unit is not None:
print(f'Warning: Cable {self.name} length_unit={self.length_unit} is ignored because its length contains {u}')
self.length_unit = u self.length_unit = u
elif self.length is not None: # length specified, assume m elif not any(isinstance(self.length, t) for t in [int, float]):
if self.gauge_unit is None: raise Exception(f'Cable {self.name} length has a non-numeric value')
elif self.gauge_unit is None:
self.length_unit = 'm' self.length_unit = 'm'
else:
pass # length not specified
self.connections = [] self.connections = []