Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gr-wxgui / src / python / forms / converters.py

diff --git a/gr-wxgui/src/python/forms/converters.py b/gr-wxgui/src/python/forms/converters.py
index 9f757aa8410eb24b7d226e9c828da4caa8a2fd6c..db14d2752c19ba6f3fa891129e86dc71407607bf 100644 (file)
--- a/gr-wxgui/src/python/forms/converters.py
+++ b/gr-wxgui/src/python/forms/converters.py
@@ -72,12 +72,14 @@ class bool_converter(abstract_converter):
                self._true = true
                self._false = false
        def external_to_internal(self, v):
-               return bool(v)
+               if v == self._true: return True
+               if v == self._false: return False
+               raise Exception, 'Value "%s" is not a possible option.'%v
        def internal_to_external(self, v):
                if v: return self._true
                else: return self._false
        def help(self):
-               return "Value must be cast-able to type bool."
+               return "Value must be in (%s, %s)."%(self._true, self._false)
 
 class eval_converter(abstract_converter):
        """
@@ -134,8 +136,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):