Skip to content

Commit

Permalink
Make unit labels consistent across main window and Preferences.
Browse files Browse the repository at this point in the history
  • Loading branch information
@lowrie
lowrie committed Mar 16, 2016
1 parent 34ebfe8 commit 96e8189
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 23 deletions.
29 changes: 13 additions & 16 deletions qt_config.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -180,15 +174,16 @@ 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)
tt = 'The initial board width when pyRouterJig starts.'
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)
Expand Down Expand Up @@ -225,15 +220,16 @@ 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)
tt = 'The initial bit width when pyRouterJig starts.'
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)
Expand Down Expand Up @@ -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)

Expand All @@ -311,15 +307,16 @@ 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)
tt = 'The minimum allowable finger width. Currently, only enforced for Equal Spacing.'
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)
Expand Down
11 changes: 6 additions & 5 deletions qt_driver.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -382,29 +383,29 @@ 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))
self.le_board_width.editingFinished.connect(self._on_board_width)
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)
Expand All @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions utils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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]
Expand Down

0 comments on commit 96e8189

Please sign in to comment.