qtvcp -fix embedded panel instance reference

Widget reference to INSTANCE was always the main screen.
Now INSTANCE refers to the panel's instance.
The main screen instance reference is available as MAIN_INSTANCE

Author: c-morley

lib/python/qtvcp/qt_makepins.py

@@ -112,7 +112,8 @@ def __init__(self, halcomp, path, window, debug):
                             idname = widget.objectName()
                             LOG.verbose('{}: HAL-ified widget: {}'.format(name.upper(), idname))
                             if not isinstance(widget, ScreenOptions):
-                                widget.hal_init()
+                                # give panel name to halified widgets
+                                widget.hal_init(INSTANCE_NAME= pName)
 
                     # restore HAL component name
                     halcomp.comp.setprefix(oldname)

lib/python/qtvcp/widgets/simple_widgets.py

@@ -411,7 +411,8 @@ def _hal_init(self):
             self.hal_pin_led.value_changed.connect(lambda data: self.indicator_update(data))
         elif self._ind_status:
             self._init_state_change()
-        self._globalParameter = {'__builtins__' : None, 'INSTANCE':self.QTVCP_INSTANCE_,
+        self._globalParameter = {'__builtins__' : None, 'MAIN_INSTANCE':self.QTVCP_INSTANCE_,
+                                    'INSTANCE':self.THIS_INSTANCE_,
                                  'PROGRAM_LOADER':AUX_PRGM, 'ACTION':ACTION, 'HAL':hal, 'print':print}
         self._localsParameter = {'dir': dir, 'True':True, 'False':False}
 

lib/python/qtvcp/widgets/widget_baseclass.py

@@ -49,9 +49,13 @@ def __init__(self,comp=None,path=None,window=None):
         #print self.__class__._instanceNum >=1
         #print 'comp',comp,self.__class__._instanceNum
 
-
-    def hal_init(self, HAL_NAME=None):
+        # INSTANCE_NAME is the embedded panel name
+    def hal_init(self, HAL_NAME=None,INSTANCE_NAME = None):
         self.__class__.QTVCP_INSTANCE_.registerHalWidget(self)
+        if INSTANCE_NAME is not None:
+            self.__class__.THIS_INSTANCE_ = self.__class__.QTVCP_INSTANCE_[INSTANCE_NAME]
+        else:
+            self.__class__.THIS_INSTANCE_ = self.__class__.QTVCP_INSTANCE_
         if HAL_NAME is not None:
             self.HAL_NAME_ = str(HAL_NAME)
         else: