From: daid303 Date: Thu, 7 Feb 2013 09:04:16 +0000 (+0100) Subject: Renamed glTextCtrl to glNumberCtrl to better reflect the function of the class. X-Git-Tag: 13.03~53 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=1caeb25370864301a4399e8c74c54c6e0d85c636;p=cura.git Renamed glTextCtrl to glNumberCtrl to better reflect the function of the class. --- diff --git a/Cura/gui/preview3d.py b/Cura/gui/preview3d.py index 348c273d..d40d5405 100644 --- a/Cura/gui/preview3d.py +++ b/Cura/gui/preview3d.py @@ -128,17 +128,17 @@ class previewPanel(wx.Panel): self.scaleForm = openglGui.glFrame(self.glCanvas, (1, 3)) openglGui.glGuiLayoutGrid(self.scaleForm) openglGui.glLabel(self.scaleForm, 'Scale X', (0,0)) - self.scaleXctrl = openglGui.glTextCtrl(self.scaleForm, '1.0', (1,0), lambda value: self.OnScaleEntry(value, 0)) + self.scaleXctrl = openglGui.glNumberCtrl(self.scaleForm, '1.0', (1,0), lambda value: self.OnScaleEntry(value, 0)) openglGui.glLabel(self.scaleForm, 'Scale Y', (0,1)) - self.scaleYctrl = openglGui.glTextCtrl(self.scaleForm, '1.0', (1,1), lambda value: self.OnScaleEntry(value, 1)) + self.scaleYctrl = openglGui.glNumberCtrl(self.scaleForm, '1.0', (1,1), lambda value: self.OnScaleEntry(value, 1)) openglGui.glLabel(self.scaleForm, 'Scale Z', (0,2)) - self.scaleZctrl = openglGui.glTextCtrl(self.scaleForm, '1.0', (1,2), lambda value: self.OnScaleEntry(value, 2)) + self.scaleZctrl = openglGui.glNumberCtrl(self.scaleForm, '1.0', (1,2), lambda value: self.OnScaleEntry(value, 2)) openglGui.glLabel(self.scaleForm, 'Size X (mm)', (0,4)) - self.scaleXmmctrl = openglGui.glTextCtrl(self.scaleForm, '0.0', (1,4), lambda value: self.OnScaleEntryMM(value, 0)) + self.scaleXmmctrl = openglGui.glNumberCtrl(self.scaleForm, '0.0', (1,4), lambda value: self.OnScaleEntryMM(value, 0)) openglGui.glLabel(self.scaleForm, 'Size Y (mm)', (0,5)) - self.scaleYmmctrl = openglGui.glTextCtrl(self.scaleForm, '0.0', (1,5), lambda value: self.OnScaleEntryMM(value, 1)) + self.scaleYmmctrl = openglGui.glNumberCtrl(self.scaleForm, '0.0', (1,5), lambda value: self.OnScaleEntryMM(value, 1)) openglGui.glLabel(self.scaleForm, 'Size Z (mm)', (0,6)) - self.scaleZmmctrl = openglGui.glTextCtrl(self.scaleForm, '0.0', (1,6), lambda value: self.OnScaleEntryMM(value, 2)) + self.scaleZmmctrl = openglGui.glNumberCtrl(self.scaleForm, '0.0', (1,6), lambda value: self.OnScaleEntryMM(value, 2)) openglGui.glLabel(self.scaleForm, 'Uniform scale', (0,8)) self.scaleUniform = openglGui.glCheckbox(self.scaleForm, True, (1,8), None) self.scaleForm.setHidden(True) diff --git a/Cura/gui/util/openglGui.py b/Cura/gui/util/openglGui.py index 3506e27d..a198d851 100644 --- a/Cura/gui/util/openglGui.py +++ b/Cura/gui/util/openglGui.py @@ -441,14 +441,14 @@ class glLabel(glGuiControl): def OnMouseDown(self, x, y): return False -class glTextCtrl(glGuiControl): +class glNumberCtrl(glGuiControl): def __init__(self, parent, value, pos, callback): self._callback = callback self._value = str(value) self._selectPos = 0 self._maxLen = 6 self._inCallback = False - super(glTextCtrl, self).__init__(parent, pos) + super(glNumberCtrl, self).__init__(parent, pos) def setValue(self, value): if self._inCallback: