Re: [tauruslib-devel] [PATCH] Fix bug-220: change read widget fails...

[Zbigniew R. <zre...@ce...>]

Hi Carlos,

Your patch was applied to develop branch.

Cheers,
Zibi
On 11/23/2015 03:37 PM, cpa...@ce... wrote:
> From: cpascual <cpa...@ce...>
>
> The "change read/write widget" feature of taurusform relies on the
> TaurusWidgetFactory to obtain class objects from the class name,
> but names of locally defined classes are not supported. Fix it
> by using the globals before the factory. Do the same for all other
> setXXXwidgetClass() methods.
> ---
>   lib/taurus/qt/qtgui/panel/taurusvalue.py | 7 ++++++-
>   1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/lib/taurus/qt/qtgui/panel/taurusvalue.py b/lib/taurus/qt/qtgui/panel/taurusvalue.py
> index 85b00d0..543ba0e 100644
> --- a/lib/taurus/qt/qtgui/panel/taurusvalue.py
> +++ b/lib/taurus/qt/qtgui/panel/taurusvalue.py
> @@ -607,6 +607,7 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget):
>       def labelWidgetClassFactory(self, classID):
>           if self._customWidget is not None: return None
>           if classID is None or classID == 'None': return None
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): return classID
>           elif str(classID) == 'Auto': return self.getDefaultLabelWidgetClass()
>           else: return TaurusWidgetFactory().getWidgetClass(classID)
> @@ -614,7 +615,7 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget):
>       def readWidgetClassFactory(self, classID):
>           if self._customWidget is not None: return None
>           if classID is None or classID == 'None': return None
> -
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): ret = classID
>           elif str(classID) == 'Auto': ret = self.getDefaultReadWidgetClass()
>           else: ret = TaurusWidgetFactory().getWidgetClass(classID)
> @@ -634,6 +635,7 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget):
>           if self._customWidget is not None: return None
>           if classID is None or classID == 'None': return None
>           if self._compact and not ignoreCompact: return None
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): return classID
>           elif str(classID) == 'Auto': return self.getDefaultWriteWidgetClass()
>           else: return TaurusWidgetFactory().getWidgetClass(classID)
> @@ -641,12 +643,14 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget):
>       def unitsWidgetClassFactory(self, classID):
>           if self._customWidget is not None: return None
>           if classID is None or classID == 'None': return None
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): return classID
>           elif str(classID) == 'Auto': return self.getDefaultUnitsWidgetClass()
>           else: return TaurusWidgetFactory().getWidgetClass(classID)
>           
>       def customWidgetClassFactory(self, classID):
>           if classID is None or classID == 'None': return None
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): return classID
>           elif str(classID) == 'Auto': return self.getDefaultCustomWidgetClass()
>           else: return TaurusWidgetFactory().getWidgetClass(classID)
> @@ -654,6 +658,7 @@ class TaurusValue(Qt.QWidget, TaurusBaseWidget):
>       def extraWidgetClassFactory(self, classID):
>           if self._customWidget is not None: return None
>           if classID is None or classID == 'None': return None
> +        classID = globals().get(classID, classID)
>           if isinstance(classID, type): return classID
>           elif str(classID) == 'Auto': return self.getDefaultExtraWidgetClass()
>           else: return TaurusWidgetFactory().getWidgetClass(classID)

-- 

ALBA Synchrotron <http://www.albasynchrotron.es>

	Zbigniew Reszela
Controls Section - Computing Division

ALBA SYNCHROTRON LIGHT SOURCE
Carrer de la Llum 2-26 | 08290 | Cerdanyola del Vallès| Barcelona | 
Spain <http://www.albasynchrotron.es/AboutUs/Access>
(+34) 93 592 4407
www.albasynchrotron.es <http://www.albasynchrotron.es>| 
zre...@ce... <mailto:zre...@ce...>

**Please, do not print this e-mail unless it is absolutely necessary.
**Si heu rebut aquest correu per error, us informo que pot contenir 
informació confidencial i privada i que està prohibit el seu ús. Us 
agrairíem que ho comuniqueu al remitent i l'elimineu. Gràcies.
Si ha recibido este correo por error, le informo de que puede contener 
información confidencial y privada y que está prohibido su uso. Le 
agradeceré que lo comunique a su remitente y lo elimine. Gracias.
If you have received this e-mail in error, please note that it may 
contain confidential and private information, therefore, the use of this 
information is strictly forbidden. Please inform the sender of the error 
and delete the information received. Thank you.