From 7d4915f78da95b5da4a3525c392667cfd4ed04be Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Sep 2009 13:05:38 -0700
Subject: Round the slider's value, but not the internal representation. Now,
 the slider can operate on any step size without killing the precision for
 other forms.

---
 gr-wxgui/src/python/forms/converters.py | 3 +--
 gr-wxgui/src/python/forms/forms.py      | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'gr-wxgui/src')

diff --git a/gr-wxgui/src/python/forms/converters.py b/gr-wxgui/src/python/forms/converters.py
index 9f757aa84..3cc13466a 100644
--- a/gr-wxgui/src/python/forms/converters.py
+++ b/gr-wxgui/src/python/forms/converters.py
@@ -134,8 +134,7 @@ class slider_converter(abstract_converter):
 		self._scaler = float(maximum - minimum)/num_steps
 		self._cast = cast
 	def external_to_internal(self, v):
-		#slider's internal representation is an integer
-		return int(round((v - self._offset)/self._scaler))
+		return (v - self._offset)/self._scaler
 	def internal_to_external(self, v):
 		return self._cast(v*self._scaler + self._offset)
 	def help(self):
diff --git a/gr-wxgui/src/python/forms/forms.py b/gr-wxgui/src/python/forms/forms.py
index c69315b03..c0f181b4d 100644
--- a/gr-wxgui/src/python/forms/forms.py
+++ b/gr-wxgui/src/python/forms/forms.py
@@ -37,6 +37,9 @@ The forms follow a layered model:
 Known problems:
   * An empty label in the radio box still consumes space.
   * The static text cannot resize the parent at runtime.
+  * Text box should indicate its that its edited but not committed.
+    * Colorize?
+    * Tab out to commit?
 """
 
 EXT_KEY = 'external'
@@ -176,7 +179,7 @@ class _slider_base(_form_base):
 		self._add_widget(self._slider, label, flag=wx.EXPAND)
 
 	def _handle(self, event): self[INT_KEY] = self._slider.GetValue()
-	def _update(self, value): self._slider.SetValue(value)
+	def _update(self, value): self._slider.SetValue(int(round(value)))
 
 ########################################################################
 # Static Text Form
-- 
cgit 


From 3b5fc17434361cb7698e9dd9b0f16e4fbdea7f78 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 9 Sep 2009 13:57:38 -0700
Subject: set text box bg color on change

---
 gr-wxgui/src/python/forms/forms.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'gr-wxgui/src')

diff --git a/gr-wxgui/src/python/forms/forms.py b/gr-wxgui/src/python/forms/forms.py
index c0f181b4d..8dc58367d 100644
--- a/gr-wxgui/src/python/forms/forms.py
+++ b/gr-wxgui/src/python/forms/forms.py
@@ -37,9 +37,6 @@ The forms follow a layered model:
 Known problems:
   * An empty label in the radio box still consumes space.
   * The static text cannot resize the parent at runtime.
-  * Text box should indicate its that its edited but not committed.
-    * Colorize?
-    * Tab out to commit?
 """
 
 EXT_KEY = 'external'
@@ -227,11 +224,18 @@ class text_box(_form_base):
 	def __init__(self, label='', width=-1, converter=converters.eval_converter(), **kwargs):
 		_form_base.__init__(self, converter=converter, **kwargs)
 		self._text_box = wx.TextCtrl(self._parent, size=wx.Size(width, -1), style=wx.TE_PROCESS_ENTER)
+		self._default_bg_colour = self._text_box.GetBackgroundColour()
 		self._text_box.Bind(wx.EVT_TEXT_ENTER, self._handle)
+		self._text_box.Bind(wx.EVT_TEXT, self._update_color)
 		self._add_widget(self._text_box, label)
 
+	def _update_color(self, *args):
+		if self._text_box.GetValue() == self[INT_KEY]:
+			self._text_box.SetBackgroundColour(self._default_bg_colour)
+		else: self._text_box.SetBackgroundColour('#EEDDDD')
+
 	def _handle(self, event): self[INT_KEY] = self._text_box.GetValue()
-	def _update(self, value): self._text_box.SetValue(value)
+	def _update(self, value): self._text_box.SetValue(value); self._update_color()
 
 ########################################################################
 # Slider Form
-- 
cgit