From 96e8189c61e18243c39a0f9a9ef8ca2ab42dbd19 Mon Sep 17 00:00:00 2001 From: "Robert B. Lowrie" Date: Tue, 15 Mar 2016 18:39:54 -0600 Subject: [PATCH] Make unit labels consistent across main window and Preferences. --- qt_config.py | 29 +++++++++++++---------------- qt_driver.py | 11 ++++++----- utils.py | 7 +++++-- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/qt_config.py b/qt_config.py index 844102a..f86e309 100644 --- a/qt_config.py +++ b/qt_config.py @@ -122,12 +122,6 @@ def __init__(self, config, units, parent=None): self.initialize() self.change_state = 0 - def unit_string(self): - if self.new_config['metric']: - return 'mm' - else: - return 'in.' - def create_units(self): '''Creates the layout for units preferences''' w = QtGui.QWidget() @@ -180,7 +174,8 @@ def create_boards(self): w = QtGui.QWidget() vbox = QtGui.QVBoxLayout() - self.le_board_width_label = QtGui.QLabel('Initial Board Width ({}):'.format(self.unit_string())) + us = self.units.units_string(noTick=True) + self.le_board_width_label = QtGui.QLabel('Initial Board Width ({}):'.format(us)) self.le_board_width = QtGui.QLineEdit(w) self.le_board_width.setFixedWidth(self.line_edit_width) self.le_board_width.editingFinished.connect(self._on_board_width) @@ -188,7 +183,7 @@ def create_boards(self): grid = form_line(self.le_board_width_label, self.le_board_width, tt) vbox.addLayout(grid) - self.le_db_thick_label = QtGui.QLabel('Initial Double Board Thickness ({}):'.format(self.unit_string())) + self.le_db_thick_label = QtGui.QLabel('Initial Double Board Thickness ({}):'.format(us)) self.le_db_thick = QtGui.QLineEdit(w) self.le_db_thick.setFixedWidth(self.line_edit_width) self.le_db_thick.editingFinished.connect(self._on_db_thick) @@ -225,7 +220,8 @@ def create_bit(self): w = QtGui.QWidget() vbox = QtGui.QVBoxLayout() - self.le_bit_width_label = QtGui.QLabel('Initial Bit Width ({}):'.format(self.unit_string())) + us = self.units.units_string(noTick=True) + self.le_bit_width_label = QtGui.QLabel('Initial Bit Width ({}):'.format(us)) self.le_bit_width = QtGui.QLineEdit(w) self.le_bit_width.setFixedWidth(self.line_edit_width) self.le_bit_width.editingFinished.connect(self._on_bit_width) @@ -233,7 +229,7 @@ def create_bit(self): grid = form_line(self.le_bit_width_label, self.le_bit_width, tt) vbox.addLayout(grid) - self.le_bit_depth_label = QtGui.QLabel('Initial Bit Depth ({}):'.format(self.unit_string())) + self.le_bit_depth_label = QtGui.QLabel('Initial Bit Depth ({}):'.format(us)) self.le_bit_depth = QtGui.QLineEdit(w) self.le_bit_depth.setFixedWidth(self.line_edit_width) self.le_bit_depth.editingFinished.connect(self._on_bit_depth) @@ -287,19 +283,19 @@ def create_output(self): grid = form_line(self.le_printsf_label, self.le_printsf, tt) vbox.addLayout(grid) - self.le_min_image_label = QtGui.QLabel('Min Image Width:') + self.le_min_image_label = QtGui.QLabel('Min Image Width (pixels):') self.le_min_image = QtGui.QLineEdit(w) self.le_min_image.setFixedWidth(self.line_edit_width) self.le_min_image.editingFinished.connect(self._on_min_image) - tt = 'On save image, minimum width of image in pixels.' + tt = 'On save image, minimum width of image.' grid = form_line(self.le_min_image_label, self.le_min_image, tt) vbox.addLayout(grid) - self.le_max_image_label = QtGui.QLabel('Max Image Width:') + self.le_max_image_label = QtGui.QLabel('Max Image Width (pixels):') self.le_max_image = QtGui.QLineEdit(w) self.le_max_image.setFixedWidth(self.line_edit_width) self.le_max_image.editingFinished.connect(self._on_max_image) - tt = 'On save image, maximum width of image in pixels.' + tt = 'On save image, maximum width of image.' grid = form_line(self.le_max_image_label, self.le_max_image, tt) vbox.addLayout(grid) @@ -311,7 +307,8 @@ def create_misc(self): w = QtGui.QWidget() vbox = QtGui.QVBoxLayout() - self.le_min_finger_width_label = QtGui.QLabel('Min Finger Width ({}):'.format(self.unit_string())) + us = self.units.units_string(noTick=True) + self.le_min_finger_width_label = QtGui.QLabel('Min Finger Width ({}):'.format(us)) self.le_min_finger_width = QtGui.QLineEdit(w) self.le_min_finger_width.setFixedWidth(self.line_edit_width) self.le_min_finger_width.editingFinished.connect(self._on_min_finger_width) @@ -319,7 +316,7 @@ def create_misc(self): grid = form_line(self.le_min_finger_width_label, self.le_min_finger_width, tt) vbox.addLayout(grid) - self.le_caul_trim_label = QtGui.QLabel('Caul Trim ({}):'.format(self.unit_string())) + self.le_caul_trim_label = QtGui.QLabel('Caul Trim ({}):'.format(us)) self.le_caul_trim = QtGui.QLineEdit(w) self.le_caul_trim.setFixedWidth(self.line_edit_width) self.le_caul_trim.editingFinished.connect(self._on_caul_trim) diff --git a/qt_driver.py b/qt_driver.py index 0f4b5fa..ef0f53d 100644 --- a/qt_driver.py +++ b/qt_driver.py @@ -373,6 +373,7 @@ def create_widgets(self): self.main_frame = QtGui.QWidget() lineEditWidth = 80 + us = self.units.units_string(noTick=True) # Create the figure canvas, using mpl interface self.fig = qt_fig.Qt_Fig(self.template, self.boards, self.config) @@ -382,7 +383,7 @@ def create_widgets(self): self.fig.canvas.setFocus() # Board width line edit - self.le_board_width_label = QtGui.QLabel('Board Width') + self.le_board_width_label = QtGui.QLabel('Board Width ({})'.format(us)) self.le_board_width = QtGui.QLineEdit(self.main_frame) self.le_board_width.setFixedWidth(lineEditWidth) self.le_board_width.setText(self.units.increments_to_string(self.boards[0].width)) @@ -390,21 +391,21 @@ def create_widgets(self): self.le_board_width.setSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) # Bit width line edit - self.le_bit_width_label = QtGui.QLabel('Bit Width') + self.le_bit_width_label = QtGui.QLabel('Bit Width ({})'.format(us)) self.le_bit_width = QtGui.QLineEdit(self.main_frame) self.le_bit_width.setFixedWidth(lineEditWidth) self.le_bit_width.setText(self.units.increments_to_string(self.bit.width)) self.le_bit_width.editingFinished.connect(self._on_bit_width) # Bit depth line edit - self.le_bit_depth_label = QtGui.QLabel('Bit Depth') + self.le_bit_depth_label = QtGui.QLabel('Bit Depth ({})'.format(us)) self.le_bit_depth = QtGui.QLineEdit(self.main_frame) self.le_bit_depth.setFixedWidth(lineEditWidth) self.le_bit_depth.setText(self.units.increments_to_string(self.bit.depth)) self.le_bit_depth.editingFinished.connect(self._on_bit_depth) # Bit angle line edit - self.le_bit_angle_label = QtGui.QLabel('Bit Angle') + self.le_bit_angle_label = QtGui.QLabel('Bit Angle (deg.)') self.le_bit_angle = QtGui.QLineEdit(self.main_frame) self.le_bit_angle.setFixedWidth(lineEditWidth) self.le_bit_angle.setText('%g' % self.bit.angle) @@ -414,7 +415,7 @@ def create_widgets(self): self.le_boardm_label = [] self.le_boardm = [] for i in lrange(2): - self.le_boardm_label.append(QtGui.QLabel('Thickness')) + self.le_boardm_label.append(QtGui.QLabel('Thickness ({})'.format(us))) self.le_boardm.append(QtGui.QLineEdit(self.main_frame)) self.le_boardm[i].setFixedWidth(lineEditWidth) s = self.units.increments_to_string(self.boards[i+2].dheight) diff --git a/utils.py b/utils.py index 1fcce72..c4c70b5 100644 --- a/utils.py +++ b/utils.py @@ -175,7 +175,7 @@ def increments_to_string(self, increments, with_units=False): if with_units: r += self.units_string() return r - def units_string(self, verbose=False): + def units_string(self, verbose=False, noTick=False): '''Returns a string that represents the units''' if self.metric: if verbose: @@ -186,7 +186,10 @@ def units_string(self, verbose=False): if verbose: return ' inches' else: - return '"' + if noTick: + return 'in.' + else: + return '"' def length_to_increments(self, v): ''' Converts v to increments, where v is [inches|mm]