qtvcp project: fix various issues

missing modules, copy/paste, undefined variables, whitespace, etc.

Author: snowgoer540

lib/python/qtvcp/lib/audio_player.py

@@ -100,7 +100,7 @@ def set_sounds(self):
                 self.logout = '/usr/share/sounds/LinuxMint/stereo/desktop-logout.ogg'
                 self.bell = '/usr/share/sounds/freedesktop/stereo/bell.oga'
                 if not os.path.exists(self.error):
-                    log.error('Audio player - Mint sound File not found {}'.format(self.error))
+                    LOG.error('Audio player - Mint sound File not found {}'.format(self.error))
                 return
         except:
             pass
@@ -127,7 +127,7 @@ def _register_messages(self):
 
     # jump to a builtin alert sound
     # This uses the system to play the sound because gst is not available
-    # this can still fail if gstreamer/tools are not available 
+    # this can still fail if gstreamer/tools are not available
     def os_jump(self, w, f):
         if 'beep' in f.lower():
             self[f.lower()]()
@@ -254,7 +254,7 @@ def os_speak(self, f):
                 # fallback call the system espeak - no queue used
                 os.system('''espeak -s 160 -v m3 -p 1 "%s" &''' % cmd)
 
-    # when sentences ends, start the next one, until there are none. 
+    # when sentences ends, start the next one, until there are none.
     def speak_finished(self, *args):
         if args[0] == espeak.event_MSG_TERMINATED:
             if not esQueue.empty():

lib/python/qtvcp/qt_action.py

@@ -641,7 +641,7 @@ def CALL_DIALOG(self, command):
         try:
             a = command['NAME']
         except:
-            LOG.warning("Call Dialog command Dict not recogzied: {}".format(option))
+            LOG.warning("Call Dialog command Dict not recogzied: {}".format(command))
         STATUS.emit('dialog-request', command)
 
     def HIDE_POINTER(self, state):
@@ -746,7 +746,7 @@ def ADD_WIDGET_TO_TAB(self, widgetTo, widget,name):
                 widgetTo.setMaximumWidth(widget.maximumWidth())
                 widgetTo.addWidget(tw)
             else:
-                LOG.warning('Widget {} is not a Tab or stacked Widget - skipping'.format(loc))
+                LOG.warning('Widget {} is not a Tab or stacked Widget - skipping'.format(widgetTo))
                 return False
         except Exception as e:
             LOG.warning("problem inserting child into location: {},{}".format(widget,e))
@@ -797,7 +797,7 @@ def SET_SHADOW(self, widget,state,color):
 
     # In free (joint) mode we use the plain joint number.
     # In axis mode we convert the joint number to the equivalent
-    # axis number 
+    # axis number
     def get_jog_info(self, num):
         if STATUS.stat.motion_mode == linuxcnc.TRAJ_MODE_FREE:
             return True, self.jnum_check(num)
@@ -1042,7 +1042,7 @@ def finish(self):
 
     # request an error dialog box
     def error(self, exitcode, stderr):
-        message = '''The filter program '{}' that was filtering '{}' 
+        message = '''The filter program '{}' that was filtering '{}'
                         exited with an error'''.format(self.program_filter, self.filtered_program)
         if stderr != '':
             more = "The error messages it produced are shown below:"

lib/python/qtvcp/widgets/camview_widget.py

@@ -171,7 +171,7 @@ def convertToGray(self, img):
         return  CV.cvtColor(img, CV.COLOR_BGR2GRAY)
 
     def blur(self, img, B=7):
-        return CV.GaussingBlur(img, (b,b), CV.BORDER_DEFAULT)
+        return CV.GaussingBlur(img, (B,B), CV.BORDER_DEFAULT)
 
     def canny(self, img, x=125, y=175):
         return CV.Canny(img , x, y)
@@ -212,12 +212,12 @@ def zoom(self, frame, scale):
         return frame[ch-coh:ch+coh, cw-cow:cw+cow]
 
     # draw a circle around small holes
-    # 
+    #
     def findCircles(self,frame):
         # Our operations on the frame come here
         gray = CV.cvtColor(frame, CV.COLOR_BGR2GRAY)
         # Display the resulting frame
- 
+
         circles = CV.HoughCircles(gray,CV.cv.CV_HOUGH_GRADIENT,1,20,param1=50,param2=30,minRadius=10,maxRadius=15)
         # print circles
         if circles is not None:
@@ -235,27 +235,27 @@ def blobInit(self):
         # Setup BlobDetector
         detector = CV.SimpleBlobDetector()
         params = CV.SimpleBlobDetector_Params()
-	 
+
         # Filter by Area.
         params.filterByArea = True
         params.minArea = 20000
         params.maxArea = 40000
-	 
+
         # Filter by Circularity
         params.filterByCircularity = True
         params.minCircularity = 0.5
- 
+
         # Filter by Convexity
         params.filterByConvexity = False
         #params.minConvexity = 0.87
-	 
+
         # Filter by Inertia
         params.filterByInertia = True
         params.minInertiaRatio = 0.8
 
         # Distance Between Blobs
         params.minDistBetweenBlobs = 200
-	 
+
         # Create a detector with the parameters
         self.detector = CV.SimpleBlobDetector(params)
 
@@ -266,9 +266,9 @@ def findBlob(self, image):
 
         keypoints = self.detector.detect(image)
         for k in keypoints:
-        	CV.circle(overlay, (int(k.pt[0]), int(k.pt[1])), int(k.size/2), (0, 0, 255), -1)
-        	CV.line(overlay, (int(k.pt[0])-20, int(k.pt[1])), (int(k.pt[0])+20, int(k.pt[1])), (0,0,0), 3)
-        	CV.line(overlay, (int(k.pt[0]), int(k.pt[1])-20), (int(k.pt[0]), int(k.pt[1])+20), (0,0,0), 3)
+            CV.circle(overlay, (int(k.pt[0]), int(k.pt[1])), int(k.size/2), (0, 0, 255), -1)
+            CV.line(overlay, (int(k.pt[0])-20, int(k.pt[1])), (int(k.pt[0])+20, int(k.pt[1])), (0,0,0), 3)
+            CV.line(overlay, (int(k.pt[0]), int(k.pt[1])-20), (int(k.pt[0]), int(k.pt[1])+20), (0,0,0), 3)
 
         opacity = 0.5
         CV.addWeighted(overlay, opacity, image, 1 - opacity, 0, image)
@@ -444,7 +444,7 @@ def list_ports(self):
         dev_port = 0
         working_ports = []
         available_ports = []
-        while len(non_working_ports) < 6: # if there are more than 5 non working ports stop the testing. 
+        while len(non_working_ports) < 6: # if there are more than 5 non working ports stop the testing.
             camera = CV.VideoCapture(dev_port)
             if not camera.isOpened():
                 non_working_ports.append(dev_port)

lib/python/qtvcp/widgets/file_manager.py

@@ -260,8 +260,8 @@ def onJumpClicked(self):
             if temp is not None:
                 self.updateDirectoryView(temp)
             else:
-                STATUS.emit('error', linuxcnc.OPERATOR_ERROR, 'file jumopath: {} not valid'.format(data))
-                log.debug('file jumopath: {} not valid'.format(data))
+                STATUS.emit('error', OPERATOR_ERROR, 'file jumopath: {} not valid'.format(data))
+                LOG.debug('file jumopath: {} not valid'.format(data))
 
     # jump directly to a saved path from the menu
     def jumpTriggered(self, data):
@@ -301,7 +301,7 @@ def _getPathActivated(self):
             self.listClicked(row)
 
         fname = self.currentPath
-        if fname is None: 
+        if fname is None:
             return
         if fname:
             self.load(fname)
@@ -447,7 +447,7 @@ def load(self, fname=None):
     # This can be class patched to do something else
     def recordBookKeeping(self):
         fname = self.currentPath
-        if fname is None: 
+        if fname is None:
             return
         if self.PREFS_:
             self.PREFS_.putpref('last_loaded_directory', self.model.rootPath(), str, 'BOOK_KEEPING')

lib/python/qtvcp/widgets/mdi_history.py

@@ -39,8 +39,8 @@
 class MDIHistory(QWidget, _HalWidgetBase):
     def __init__(self, parent=None):
         super(MDIHistory, self).__init__(parent)
-        self.setMinimumSize(QSize(200, 150))    
-        self.setWindowTitle("PyQt5 editor test example") 
+        self.setMinimumSize(QSize(200, 150))
+        self.setWindowTitle("PyQt5 editor test example")
 
         lay = QVBoxLayout()
         lay.setContentsMargins(0,0,0,0)
@@ -100,7 +100,7 @@ def reload(self, w=None ):
                 self.list.scrollToBottom()
                 self.MDILine.setText('')
         except:
-            LOG.debug('File path is not valid: {}'.format(fp))
+            LOG.debug('File path is not valid: {}'.format(self.fp))
 
     def selectionChanged(self,old, new):
         cmd = self.getSelected()

lib/python/qtvcp/widgets/nurbs_editor.py

@@ -48,6 +48,7 @@
         QStyleFactory, QWidget, QColorDialog)
 from PyQt5 import QtGui, QtCore
 
+import gcode
 from qt5_graphics import Lcnc_3dGraphics
 from qtvcp.core import Info, Path, Action
 
@@ -101,7 +102,7 @@ def __init__(self, parent=None, path=None):
         self.update()
 
     def setGraphicsDisplay(self):
-        # class patch to catch gcode errors - in theory 
+        # class patch to catch gcode errors - in theory
         self.graphics.report_gcode_error = self.report_gcode_error
         # reset trverse color so other displays don;t change
         self.defaultColor = self.graphics.colors['traverse']
@@ -304,5 +305,4 @@ def report_gcode_error(self, result, seq, filename):
     window = NurbsEditor(path = inifilename)
     window.load_dialog()
     sys.exit(app.exec_())
-  
 

lib/python/qtvcp/widgets/overlay_widget.py

@@ -147,7 +147,7 @@ def __init__(self, parent=None):
     # STATUS messages
     # adjust image path name at runtime
     def _hal_init(self):
-        STATUS.connect('focus-overlay-changed', lambda w, data, text, color: 
+        STATUS.connect('focus-overlay-changed', lambda w, data, text, color:
                         self._status_response(data, text, color))
         STATUS.connect('graphics-loading-progress',lambda w,f: self.updateProgress(f))
         if self.PREFS_:
@@ -327,7 +327,7 @@ def setShowText(self, value):
         self.mb.setVisible(value)
     def getShowText(self):
         return self._show_text
-    def resetShowText(self):
+    def resetShowText(self, value):
         self._show_text = True
         self.mb.setVisible(value)
 

lib/python/qtvcp/widgets/stylesheeteditor.py

@@ -49,6 +49,8 @@
 
 from qtvcp.core import Info, Path
 from qtvcp.qt_makegui import VCPWindow
+from qtvcp import logger
+LOG = logger.getLogger(__name__)
 INFO = Info()
 PATH = Path()
 WIDGETS = VCPWindow()
@@ -115,7 +117,7 @@ def setPath(self):
         except Exception as e:
             print(e)
 
-        # check for qss in the users's config folder 
+        # check for qss in the users's config folder
         localqss = PATH.CONFIGPATH
         try:
             fileNames= [f for f in os.listdir(localqss) if f.endswith('.qss')]