qtdragon/hd -allow camview size aspect adjustments from the preference file

Some cameras show a slightly distorted image. Now a user can adjust the X or Y size
from the preference file.

Author: c-morley

share/qtvcp/screens/qtdragon/qtdragon_handler.py

@@ -56,7 +56,7 @@
 WARNING = 1
 CRITICAL = 2
 
-VERSION ='1.1'
+VERSION ='1.2'
 
 class HandlerClass:
     def __init__(self, halcomp, widgets, paths):
@@ -370,6 +370,8 @@ def init_preferences(self):
         self.w.chk_use_camera.setChecked(self.w.PREFS_.getpref('Use camera', False, bool, 'CUSTOM_FORM_ENTRIES'))
         self.w.chk_alpha_mode.setChecked(self.w.PREFS_.getpref('Use alpha display mode', False, bool, 'CUSTOM_FORM_ENTRIES'))
         self.w.chk_inhibit_selection.setChecked(self.w.PREFS_.getpref('Inhibit display mouse selection', True, bool, 'CUSTOM_FORM_ENTRIES'))
+        self.cam_xscale_changed(self.w.PREFS_.getpref('Camview xscale', 100, int, 'CUSTOM_FORM_ENTRIES'))
+        self.cam_yscale_changed(self.w.PREFS_.getpref('Camview yscale', 100, int, 'CUSTOM_FORM_ENTRIES'))
 
     def closing_cleanup__(self):
         if not self.w.PREFS_: return
@@ -402,6 +404,8 @@ def closing_cleanup__(self):
         self.w.PREFS_.putpref('Use camera', self.w.chk_use_camera.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
         self.w.PREFS_.putpref('Use alpha display mode', self.w.chk_alpha_mode.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
         self.w.PREFS_.putpref('Inhibit display mouse selection', self.w.chk_inhibit_selection.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
+        self.w.PREFS_.putpref('Camview xscale', self.cam_xscale_percent(), int, 'CUSTOM_FORM_ENTRIES')
+        self.w.PREFS_.putpref('Camview yscale', self.cam_yscale_percent(), int, 'CUSTOM_FORM_ENTRIES')
 
     def init_widgets(self):
         self.adjust_stacked_widgets(TAB_MAIN)
@@ -935,6 +939,17 @@ def cam_dia_changed(self, value):
     def cam_rot_changed(self, value):
         self.w.camview.rotation = float(value) / 10
 
+    # scaling of the camera image for size aspect corrections
+    # set from preference file
+    def cam_xscale_changed(self, value):
+        self.w.camview.scaleX  = float(value/100)
+    def cam_xscale_percent(self):
+        return self.w.camview.scaleX * 100
+    def cam_yscale_changed(self, value):
+        self.w.camview.scaleY  = float(value/100)
+    def cam_yscale_percent(self):
+        return self.w.camview.scaleY * 100
+
     # settings tab
     def chk_override_limits_checked(self, state):
         # only toggle override if it's not in synch with the button

share/qtvcp/screens/qtdragon_hd/qtdragon_hd_handler.py

@@ -61,7 +61,7 @@
 WARNING = 1
 CRITICAL = 2
 
-VERSION ='1.2'
+VERSION ='1.3'
 
 class HandlerClass:
     def __init__(self, halcomp, widgets, paths):
@@ -314,6 +314,8 @@ def init_preferences(self):
         self.w.chk_use_camera.setChecked(self.w.PREFS_.getpref('Use camera', False, bool, 'CUSTOM_FORM_ENTRIES'))
         self.w.chk_alpha_mode.setChecked(self.w.PREFS_.getpref('Use alpha display mode', False, bool, 'CUSTOM_FORM_ENTRIES'))
         self.w.chk_inhibit_selection.setChecked(self.w.PREFS_.getpref('Inhibit display mouse selection', True, bool, 'CUSTOM_FORM_ENTRIES'))
+        self.cam_xscale_changed(self.w.PREFS_.getpref('Camview xscale', 100, int, 'CUSTOM_FORM_ENTRIES'))
+        self.cam_yscale_changed(self.w.PREFS_.getpref('Camview yscale', 100, int, 'CUSTOM_FORM_ENTRIES'))
 
     def closing_cleanup__(self):
         if not self.w.PREFS_: return
@@ -347,6 +349,8 @@ def closing_cleanup__(self):
         self.w.PREFS_.putpref('Use camera', self.w.chk_use_camera.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
         self.w.PREFS_.putpref('Use alpha display mode', self.w.chk_alpha_mode.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
         self.w.PREFS_.putpref('Inhibit display mouse selection', self.w.chk_inhibit_selection.isChecked(), bool, 'CUSTOM_FORM_ENTRIES')
+        self.w.PREFS_.putpref('Camview xscale', self.cam_xscale_percent(), int, 'CUSTOM_FORM_ENTRIES')
+        self.w.PREFS_.putpref('Camview yscale', self.cam_yscale_percent(), int, 'CUSTOM_FORM_ENTRIES')
 
     def init_widgets(self):
         self.w.stackedWidget_mainTab.setCurrentIndex(0)
@@ -992,6 +996,17 @@ def cam_dia_changed(self, value):
     def cam_rot_changed(self, value):
         self.w.camview.rotation = float(value) / 10
 
+    # scaling of the camera image for size aspect corrections
+    # set from preference file
+    def cam_xscale_changed(self, value):
+        self.w.camview.scaleX  = float(value/100)
+    def cam_xscale_percent(self):
+        return self.w.camview.scaleX * 100
+    def cam_yscale_changed(self, value):
+        self.w.camview.scaleY  = float(value/100)
+    def cam_yscale_percent(self):
+        return self.w.camview.scaleY * 100
+
     # settings tab
 
     def chk_override_limits_checked(self, state):