Re: [tauruslib-devel] [PATCH 3/3] Fix bug#235 TaurusLineEdit does not work with non numeric models

[Carlos P. <cpa...@ce...>]

Applied to taurus4-preview

On Wed 2 December 2015 14:49:14 cfalcon wrote:
> TaurusLineEdit fails with models of non numeric attributes.
> It is because the validator is not present and the method getValue
> returns None.
> 
> Fix it, moving the checking of the validator status only for
> numeric attributes.
> ---
>  lib/taurus/qt/qtgui/input/tauruslineedit.py | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/lib/taurus/qt/qtgui/input/tauruslineedit.py
> b/lib/taurus/qt/qtgui/input/tauruslineedit.py index 66d15d9..6595d11
> 100755
> --- a/lib/taurus/qt/qtgui/input/tauruslineedit.py
> +++ b/lib/taurus/qt/qtgui/input/tauruslineedit.py
> @@ -188,12 +188,13 @@ class TaurusValueLineEdit(Qt.QLineEdit,
> TaurusBaseWritableWidget): if model_obj is None:
>              return None
>          val = self.validator()
> -        if val is None or val.validate(str(text), 0)[0] !=
> val.Acceptable: -            return None
>          try:
>              model_type = model_obj.type
>              model_format = model_obj.data_format
>              if model_type in [DataType.Integer, DataType.Float]:
> +                if val is None or \
> +                                val.validate(str(text), 0)[0] !=
> val.Acceptable: +                    return None
>                  q = Quantity(text)
>                  # allow implicit units (assume wvalue.units
> implicitly) if q.dimensionless:

-- 
+----------------------------------------------------+
 Carlos Pascual Izarra
 Scientific Software Coordinator
 Computing Division
 ALBA Synchrotron  [http://www.albasynchrotron.es]
 Carrer de la Llum 2-26
 E-08290 Cerdanyola del Valles (Barcelona), Spain
 E-mail: cpa...@ce...
 Phone: +34 93 592 4428
+----------------------------------------------------+