From a5fdc996b6f210911ae5e643255ff2dc1a004507 Mon Sep 17 00:00:00 2001 From: GotPPay Date: Fri, 10 Nov 2017 16:02:56 +0100 Subject: [PATCH] code refactoring --- .../module_type_constants/dual_tilt_128_cell_constants.py | 2 +- .../module_type_constants/dual_tilt_96_cell_constants.py | 2 +- .../module_type_constants/dual_tilt_pseries_constants.py | 2 +- .../module_type_constants/single_tilt_128_cell_constants.py | 2 +- .../module_type_constants/single_tilt_96_cell_constants.py | 2 +- .../module_type_constants/single_tilt_pseries_constants.py | 2 +- helix/validators/csv_input_validator.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/helix/constants/module_type_constants/dual_tilt_128_cell_constants.py b/helix/constants/module_type_constants/dual_tilt_128_cell_constants.py index ac2b672..616f75a 100644 --- a/helix/constants/module_type_constants/dual_tilt_128_cell_constants.py +++ b/helix/constants/module_type_constants/dual_tilt_128_cell_constants.py @@ -5,7 +5,7 @@ from helix.constants.panel_type import PanelType class DualTilt128CellConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (88.24, 82.0) # inches spacing_size_inches = 5.12 # This is inches presenter_spacing = (1.5, 1.5) diff --git a/helix/constants/module_type_constants/dual_tilt_96_cell_constants.py b/helix/constants/module_type_constants/dual_tilt_96_cell_constants.py index 49b333c..a1273db 100644 --- a/helix/constants/module_type_constants/dual_tilt_96_cell_constants.py +++ b/helix/constants/module_type_constants/dual_tilt_96_cell_constants.py @@ -5,7 +5,7 @@ from helix.constants.panel_type import PanelType class DualTilt96CellConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (88.24, 62.0) # inches spacing_size_inches = 5.12 # This is inches presenter_spacing = (1.5, 1) diff --git a/helix/constants/module_type_constants/dual_tilt_pseries_constants.py b/helix/constants/module_type_constants/dual_tilt_pseries_constants.py index 838b501..647001f 100644 --- a/helix/constants/module_type_constants/dual_tilt_pseries_constants.py +++ b/helix/constants/module_type_constants/dual_tilt_pseries_constants.py @@ -5,7 +5,7 @@ from helix.constants.panel_type import PanelType class DualTiltPSeriesConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (88.24, 82.0) # inches spacing_size_inches = 8.8503937 # This is inches presenter_spacing = (1.5, 1.5) diff --git a/helix/constants/module_type_constants/single_tilt_128_cell_constants.py b/helix/constants/module_type_constants/single_tilt_128_cell_constants.py index 8411abb..2815154 100644 --- a/helix/constants/module_type_constants/single_tilt_128_cell_constants.py +++ b/helix/constants/module_type_constants/single_tilt_128_cell_constants.py @@ -8,7 +8,7 @@ from helix.constants.system_type_constants.single_tilt_constants import SingleTi class SingleTilt128CellConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (82.0, 60.0) # inches presenter_spacing = (1.5, 1) panel_area = 23.29 diff --git a/helix/constants/module_type_constants/single_tilt_96_cell_constants.py b/helix/constants/module_type_constants/single_tilt_96_cell_constants.py index 70a0f35..de639fd 100644 --- a/helix/constants/module_type_constants/single_tilt_96_cell_constants.py +++ b/helix/constants/module_type_constants/single_tilt_96_cell_constants.py @@ -7,7 +7,7 @@ from helix.constants.system_type_constants.single_tilt_constants import SingleTi class SingleTilt96CellConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (62.0, 60.0) # inches presenter_spacing = (1, 1) panel_area = 17.58 diff --git a/helix/constants/module_type_constants/single_tilt_pseries_constants.py b/helix/constants/module_type_constants/single_tilt_pseries_constants.py index c2649e9..0e50141 100644 --- a/helix/constants/module_type_constants/single_tilt_pseries_constants.py +++ b/helix/constants/module_type_constants/single_tilt_pseries_constants.py @@ -7,7 +7,7 @@ from helix.constants.system_type_constants.single_tilt_constants import SingleTi class SingleTiltPSeriesConstants(object): - scaling_factor = 1.1 #require 10% additional space for panel spacing + tolerance = 0.1 #require 10% additional space for panel spacing panel_spacing = (82.0, 61.8755) # inches presenter_spacing = (1.5, 1) panel_area = 22.22 diff --git a/helix/validators/csv_input_validator.py b/helix/validators/csv_input_validator.py index 0c1ce07..d53217e 100644 --- a/helix/validators/csv_input_validator.py +++ b/helix/validators/csv_input_validator.py @@ -79,7 +79,7 @@ class CsvInputValidator(object): 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 + scaling_factor = self.user_values.module_system_constants().tolerance + 1 min_spacing = (min_spacing[0]*scaling_factor, min_spacing[1]*scaling_factor) for row_index, row in enumerate(rows):