Merge pull request #3540 from andronick83/patch-1

Fix #3538 - "halparam" tag not working in PyVCP

Author: andypugh

lib/python/pyvcp_widgets.py

@@ -198,12 +198,11 @@ def __init__(self,root,pycomp,halpin=None,halparam=None,param_pin=0,size=200,cpr
             halpin = "dial."+str(pyvcp_dial.n)+".out"
         self.halpin=halpin            
 
+        self.param_pin = param_pin
         if halparam == None:
-            self.param_pin = param_pin
-            if self.param_pin == 1:
-                halparam = "dial." + str(pyvcp_dial.n) + ".param_pin"
-                self.halparam=halparam        
-                pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
+            halparam = "dial." + str(pyvcp_dial.n) + ".param_pin"
+        self.halparam=halparam        
+        pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
 
         pyvcp_dial.n += 1
         self.pycomp=pycomp
@@ -979,12 +978,12 @@ def __init__(self,master,pycomp,halpin=None, halparam=None,param_pin=0,
 
         self.halpin=halpin
 
-        if halparam == None:
-            self.param_pin = param_pin
-            if self.param_pin == 1:
+        self.param_pin = param_pin
+        if self.param_pin == 1:
+            if halparam == None:
                 halparam = "spinbox." + str(pyvcp_spinbox.n) + ".param_pin"
-                self.halparam=halparam
-                pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
+            self.halparam=halparam
+            pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
 
         pyvcp_spinbox.n += 1
 
@@ -1560,12 +1559,12 @@ def __init__(self,master,pycomp,
             halpin = "scale."+str(pyvcp_scale.n)
         self.halpin=halpin
 
-        if halparam == None:
-            self.param_pin = param_pin
-            if self.param_pin == 1:
+        self.param_pin = param_pin
+        if self.param_pin == 1:
+            if halparam == None:
                 halparam = "scale."+str(pyvcp_scale.n)+".param_pin"
-                self.halparam=halparam        
-                pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
+            self.halparam=halparam        
+            pycomp.newpin(halparam, HAL_FLOAT, HAL_IN)
 
         pyvcp_scale.n += 1