Issue #78: Layer [Panel] Redesign [Update] 2.56:

- transformation controls widget refactor

Issue #73: Delta [Panel] Redesign:
- fixed "Layer changed" subroutine;
- fixed setting proper stem values in UI;

Author: kateliev

Lib/typerig/proxy/fl/gui/widgets.py

@@ -138,15 +138,15 @@ def __init__(self, label_text, tooltip=None, obj_name=None):
 		if tooltip is not None: self.setToolTip(tooltip)
 		if obj_name is not None: self.setObjectName(obj_name)
 
-class CustomSpinBox(QtGui.QSpinBox):
+class CustomSpinBox(QtGui.QDoubleSpinBox):
 	def __init__(self, init_values=(0., 100., 0., 1.), tooltip=None, suffix=None, obj_name=None):
 		super(CustomSpinBox, self).__init__()
 
 		if any([isinstance(n, float) for n in init_values]):
-			self.input = QtGui.QDoubleSpinBox()
+			self.setDecimals(2)
 			init_values = [float(n) for n in init_values]
 		else:
-			self.input = QtGui.QSpinBox()
+			self.setDecimals(0)
 
 		# - Init
 		spb_min, spb_max, spb_value, spb_step = init_values
@@ -173,7 +173,7 @@ def __init__(self, label_text, init_values=(0., 100., 0., 1.), tooltip=None, suf
 			input_obj_name, lbl_obj_name = obj_name
 
 		# - Widgets
-		self.label =CustomLabel(label_text, tooltip, lbl_obj_name)
+		self.label = CustomLabel(label_text, tooltip, lbl_obj_name)
 		self.input = CustomSpinBox(init_values, tooltip, suffix, input_obj_name)
 
 		# - Layout
@@ -871,35 +871,34 @@ def __init__(self):
 		self.lay_controls = TRFlowLayout(spacing=10) 
 
 		tooltip_button = "Scale X"
-		self.spb_scale_x = CustomSpinLabel('scale_x', (-999., 999, 0, 1), tooltip_button, ' %', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_scale_x = CustomSpinLabel('scale_x', (-999., 999., 100., 1.), tooltip_button, ' %', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_scale_x)
 
 		tooltip_button = "Scale Y"
-		self.spb_scale_y = CustomSpinLabel('scale_y', (-999., 999, 0, 1), tooltip_button, ' %', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_scale_y = CustomSpinLabel('scale_y', (-999., 999., 100., 1.), tooltip_button, ' %', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_scale_y)
 
 		tooltip_button = "Translate X"
-		self.spb_translate_x = CustomSpinLabel('translate_x', (-999., 999, 0, 1), tooltip_button, ' u', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_translate_x = CustomSpinLabel('translate_x', (-999., 999, 0., 1.), tooltip_button, ' u', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_translate_x)
 
 		tooltip_button = "Translate Y"
-		self.spb_translate_y = CustomSpinLabel('translate_y', (-999., 999, 0, 1), tooltip_button, ' u', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_translate_y = CustomSpinLabel('translate_y', (-999., 999., 0., 1.), tooltip_button, ' u', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_translate_y)
 
 		tooltip_button = "Skew/Slant"
-		self.spb_shear = CustomSpinLabel('skew', (-90., 90, 0, 1), tooltip_button, ' °', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_shear = CustomSpinLabel('skew', (-90., 90., 0., 1.), tooltip_button, ' °', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_shear)
 
 		tooltip_button = "Rotate"
-		self.spb_rotate = CustomSpinLabel('rotate', (-360., 360, 0, 1), tooltip_button, ' °', ('spn_panel_inf', 'lbl_panel'))
+		self.spb_rotate = CustomSpinLabel('rotate', (-360., 360., 0., 1.), tooltip_button, ' °', ('spn_panel_inf', 'lbl_panel'))
 		self.lay_controls.addWidget(self.spb_rotate)
 
 		self.lay_box.addLayout(self.lay_controls)
 
 		box_transform.setLayout(self.lay_box)
 		self.lay_main.addWidget(box_transform)
 
-		self.reset()
 		self.setLayout(self.lay_main)
 
 	def reset(self):

Scripts/TypeRig GUI/Panel/Delta.py

@@ -36,7 +36,7 @@
 global pMode
 pLayers = None
 pMode = 0
-app_name, app_version = 'TypeRig | Delta', '5.3'
+app_name, app_version = 'TypeRig | Delta', '5.4'
 
 TRToolFont = getTRIconFontPath()
 font_loaded = QtGui.QFontDatabase.addApplicationFont(TRToolFont)
@@ -198,27 +198,27 @@ def __init__(self):
 		# -- Delta controls
 		lay_controls = TRFlowLayout(spacing=10)
 
-		self.cpn_value_width = TRCustomSpinController('width', (-999., 999., 100, 1.), ' %', 'Width')
+		self.cpn_value_width = TRCustomSpinController('width', (-999, 999, 100, 1), ' %', 'Width')
 		lay_controls.addWidget(self.cpn_value_width)
 		self.cpn_value_width.spin_box.valueChanged.connect(lambda: self.execute_scale())
 
-		self.cpn_value_height = TRCustomSpinController('height', (-999., 999., 100, 1.), ' %', 'Height')
+		self.cpn_value_height = TRCustomSpinController('height', (-999, 999, 100, 1), ' %', 'Height')
 		lay_controls.addWidget(self.cpn_value_height)
 		self.cpn_value_height.spin_box.valueChanged.connect(lambda: self.execute_scale())
 
-		self.cpn_value_stem_x = TRCustomSpinController('stem_vertical_alt', (-300., 300., 1, 1.), ' u', 'Vertical stem width')
+		self.cpn_value_stem_x = TRCustomSpinController('stem_vertical_alt', (-300, 300, 1, 1), ' u', 'Vertical stem width')
 		lay_controls.addWidget(self.cpn_value_stem_x)
 		self.cpn_value_stem_x.spin_box.valueChanged.connect(lambda: self.execute_scale())
 
-		self.cpn_value_stem_y = TRCustomSpinController('stem_horizontal_alt', (-300., 300., 1, 1.), ' u', 'Horizontal stem width')
+		self.cpn_value_stem_y = TRCustomSpinController('stem_horizontal_alt', (-300, 300, 1, 1), ' u', 'Horizontal stem width')
 		lay_controls.addWidget(self.cpn_value_stem_y)
 		self.cpn_value_stem_y.spin_box.valueChanged.connect(lambda: self.execute_scale())
 
-		self.cpn_value_lerp_t = TRCustomSpinController('interpolate', (-300., 300., 0, 1.), ' %', 'Time along axis')
+		self.cpn_value_lerp_t = TRCustomSpinController('interpolate', (-300, 300, 0, 1), ' %', 'Time along axis')
 		lay_controls.addWidget(self.cpn_value_lerp_t)
 		self.cpn_value_lerp_t.spin_box.valueChanged.connect(lambda: self.execute_scale(True))
 
-		self.cpn_value_ital = TRCustomSpinController('slope_italic', (-20., 20., self.active_font.italic_angle, 1.), ' °', 'Italic angle')
+		self.cpn_value_ital = TRCustomSpinController('slope_italic', (-20, 20, self.active_font.italic_angle, 1), ' °', 'Italic angle')
 		lay_controls.addWidget(self.cpn_value_ital)
 		self.cpn_value_ital.spin_box.valueChanged.connect(lambda: self.execute_scale())
 
@@ -306,7 +306,7 @@ def __prepare_delta(self):
 				self.__refresh_ui()
 				return False
 
-		elif self.active_glyph.layer().name != self.active_layer:
+		if self.active_glyph.layer().name != self.active_layer:
 			self.__refresh_ui()
 			self.active_layer = self.active_glyph.layer().name
 			warnings.warn('Layer changed! Forcing refresh...', LayerWarning)
@@ -339,10 +339,11 @@ def __refresh_ui(self):
 		self.cpn_value_width.setValue(100)
 		self.cpn_value_height.setValue(100)
 		self.value_array = DeltaScale(self.axis_stems, self.axis_stems)
+		all_layers = sum(self.masters_data.values(),[])
 
 		if len(self.axis_data):
-			self.cpn_value_stem_x.setValue(float(self.__where(self.axis_data, self.active_glyph.layer().name, 1)))
-			self.cpn_value_stem_y.setValue(float(self.__where(self.axis_data, self.active_glyph.layer().name, 2)))
+			self.cpn_value_stem_x.setValue(float(self.__where(all_layers, self.active_glyph.layer().name, 1)))
+			self.cpn_value_stem_y.setValue(float(self.__where(all_layers, self.active_glyph.layer().name, 2)))
 
 		self.cpn_value_ital.setValue(self.active_font.italic_angle)
 
@@ -361,6 +362,10 @@ def __set_axis(self, verbose=False):
 		self.masters_data = self.tree_layer.getTree()
 		self.axis_data = self.masters_data[tree_axis_group_name]
 		self.axis_stems = []
+
+		if not len(self.axis_data):
+			warnings.warn('Axis not set! Please add two or more layers!', TRDeltaAxisWarning)
+			return
 
 		for layer_data in self.axis_data:
 			try:
@@ -371,6 +376,7 @@ def __set_axis(self, verbose=False):
 				warnings.warn('Missing or invalid stem data!', TRDeltaStemWarning)
 				return
 
+		self.__refresh_ui()
 		if verbose: output(0, '%s %s' %(app_name, app_version), 'Font: %s; Axis set.' %(self.active_font.name))
 
 	def __reset_axis(self, verbose=False):