senaduka/old-krovovi-kalkulator
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

code refactor

Browse Source
This commit is contained in:
GotPPay
2017-11-10 15:49:50 +01:00
parent 51d49f4bcc
commit 1eb55606f3
7 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
helix/validators/csv_input_validator.py
View File

@@ -14,33 +14,7 @@ class CsvInputValidator(object):
if len(headers) < 5:
return FileValidationError(FileValidationMessage.InvalidHeaders, 0)
if len(rows) == 0:
return FileValidationError(FileValidationMessage.InvalidRowCount, 0)
#check for spacing
try:
min_spacing = self.user_values.module_system_constants().panel_spacing
tolerance = self.user_values.module_system_constants().tolerance + 1
min_spacing = (min_spacing[0]*tolerance, min_spacing[1]*tolerance)
for row_index, row in enumerate(rows):
for row_index2, row2 in enumerate(rows):
if row_index2 <= row_index:
continue
x1_pos = float(row[11])
y1_pos = float(row[12])
x2_pos = float(row2[11])
y2_pos = float(row2[12])
x_diff = abs(x1_pos-x2_pos)
y_diff = abs(y1_pos-y2_pos)
if (x_diff < min_spacing[0]) and (y_diff < min_spacing[1]):
return FileValidationError(FileValidationMessage.PanelsTooClose,None)
except:
pass
return FileValidationError(FileValidationMessage.InvalidRowCount, 0)
for row_index, row in enumerate(rows):
chain = [
@@ -54,6 +28,7 @@ class CsvInputValidator(object):
file_validation_chain = [
CsvInputValidator.validate_file_for_panel_types,
CsvInputValidator.validate_for_spacing,
]
result = self.run_validation_chain(headers, rows, file_validation_chain)
if result:
@@ -101,6 +76,32 @@ class CsvInputValidator(object):
return FileValidationMessage.panel_type_too_few_corners(self.user_values.system_type())
return None
def validate_for_spacing(self, headers, rows):
try:
min_spacing = self.user_values.module_system_constants().panel_spacing
scaling_factor = self.user_values.module_system_constants().scaling_factor
min_spacing = (min_spacing[0]*scaling_factor, min_spacing[1]*scaling_factor)
for row_index, row in enumerate(rows):
for row_index2, row2 in enumerate(rows):
if row_index2 <= row_index:
continue
x1_pos = float(row[11])
y1_pos = float(row[12])
x2_pos = float(row2[11])
y2_pos = float(row2[12])
x_diff = abs(x1_pos-x2_pos)
y_diff = abs(y1_pos-y2_pos)
if (x_diff < min_spacing[0]) and (y_diff < min_spacing[1]):
return FileValidationMessage.PanelsTooClose
except:
return FileValidationMessage.Generic
# Helpers
def run_validation_chain(self, headers, data, chain):