qtplasmac: remove unused modules, variables

snowgoer540 · snowgoer540 · commit 6068ac003356 · 2022-08-23T19:52:46.000-04:00
diff --git a/lib/python/plasmac/ellipse.py b/lib/python/plasmac/ellipse.py
@@ -21,7 +21,6 @@
 
 import os
 import sys
-import math
 import numpy
 import gettext
 
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_block.py b/lib/python/qtvcp/lib/qtplasmac/conv_block.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from qtvcp.core import Status
 from importlib import reload
 from plasmac import block as BLOCK
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py b/lib/python/qtvcp/lib/qtplasmac/conv_bolt.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import bolt_circle as BOLT
 
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_circle.py b/lib/python/qtvcp/lib/qtplasmac/conv_circle.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import circle as CIRCLE
 
@@ -156,7 +155,6 @@ def widgets(P, W, Conv):
         W.entries.addWidget(W.overcut, 7, 1)
         W.entries.addWidget(W.ocLabel, 8, 0)
         W.entries.addWidget(W.ocEntry, 8, 1)
-        from PyQt5.QtWidgets import QSizePolicy
         for r in [9,10,11]:
             W['s{}'.format(r)] = QLabel('')
             W['s{}'.format(r)].setFixedHeight(24)
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py b/lib/python/qtvcp/lib/qtplasmac/conv_ellipse.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import ellipse as ELLIPSE
 
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py b/lib/python/qtvcp/lib/qtplasmac/conv_gusset.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import gusset as GUSSET
 
@@ -67,7 +66,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def rad_button_pressed(P, W, Conv, widget):
     if widget.text() == _translate('Conversational', 'RADIUS'):
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_line.py b/lib/python/qtvcp/lib/qtplasmac/conv_line.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import line as LINE
 
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py b/lib/python/qtvcp/lib/qtplasmac/conv_polygon.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import polygon as POLYGON
 
@@ -68,7 +67,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def mode_changed(P, W, Conv):
     if W.mCombo.currentIndex() == 2:
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py b/lib/python/qtvcp/lib/qtplasmac/conv_rectangle.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import rectangle as RECTANGLE
 
@@ -41,10 +40,6 @@ def preview(P, W, Conv):
             styles[n] = 'chamfer'
         elif W['r{}Button'.format(n)].text().startswith(_translate('Conversational', 'iRADIUS')):
             styles[n] = 'intRadius'
-    style1 = W.r1Button.text()
-    style2 = W.r1Button.text()
-    style3 = W.r1Button.text()
-    style4 = W.r1Button.text()
     error = RECTANGLE.preview(Conv, P.fTmp, P.fNgc, P.fNgcBkp, \
             int(W.conv_material.currentText().split(':')[0]), \
             W.conv_material.currentText().split(':')[1].strip(), \
@@ -81,7 +76,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def rad_button_pressed(P, W, Conv, button, value):
     if button.text().split()[0] == _translate('Conversational', 'RADIUS'):
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_sector.py b/lib/python/qtvcp/lib/qtplasmac/conv_sector.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import sector as SECTOR
 
@@ -66,7 +65,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def widgets(P, W, Conv):
     if P.developmentPin.get():
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_slot.py b/lib/python/qtvcp/lib/qtplasmac/conv_slot.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import slot as SLOT
 
@@ -67,7 +66,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def widgets(P, W, Conv):
     if P.developmentPin.get():
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_star.py b/lib/python/qtvcp/lib/qtplasmac/conv_star.py
@@ -21,7 +21,6 @@
 
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
 from importlib import reload
 from plasmac import star as STAR
 
@@ -67,7 +66,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def widgets(P, W, Conv):
     if P.developmentPin.get():
diff --git a/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py b/lib/python/qtvcp/lib/qtplasmac/conv_triangle.py
@@ -20,8 +20,7 @@
 '''
 
 from PyQt5.QtCore import Qt, QCoreApplication
-from PyQt5.QtWidgets import QLabel, QMessageBox
-from PyQt5.QtGui import QPixmap
+from PyQt5.QtWidgets import QMessageBox
 from importlib import reload
 from plasmac import triangle as TRIANGLE
 
@@ -73,7 +72,7 @@ def auto_preview(P, W, Conv, button=False):
         preview(P, W, Conv)
 
 def entry_changed(P, W, Conv, widget):
-    error = Conv.conv_entry_changed(P, W, widget)
+    Conv.conv_entry_changed(P, W, widget)
 
 def widgets(P, W, Conv):
     if P.developmentPin.get():
diff --git a/lib/python/qtvcp/lib/qtplasmac/conversational.py b/lib/python/qtvcp/lib/qtplasmac/conversational.py
@@ -24,7 +24,7 @@
 from importlib import reload
 from PyQt5.QtCore import Qt, QCoreApplication
 from PyQt5.QtWidgets import QFileDialog, QMessageBox, QPushButton, QLabel, QLineEdit
-from PyQt5.QtWidgets import QRadioButton, QButtonGroup, QComboBox, QCheckBox, QGroupBox
+from PyQt5.QtWidgets import QComboBox
 from qtvcp.core import Status, Action
 from qtvcp.lib.qtplasmac import conv_settings as CONVSET
 from qtvcp.lib.qtplasmac import conv_line as CONVLINE
@@ -388,7 +388,7 @@ def conv_entry_changed(P, W, widget, circleType=False):
         if value in ['', '.', '-', '-.']:
             return True
         try:
-            a = float(value)
+            float(value)
             reply = False
         except:
             head = _translate('HandlerClass', 'Numeric Entry Error')
diff --git a/lib/python/qtvcp/lib/qtplasmac/set_offsets.py b/lib/python/qtvcp/lib/qtplasmac/set_offsets.py
@@ -21,7 +21,7 @@
 
 import os
 from shutil import copy as COPY
-from PyQt5.QtCore import QCoreApplication, Qt
+from PyQt5.QtCore import QCoreApplication
 from PyQt5.QtWidgets import QDialog, QMessageBox, QPushButton, QGridLayout, QLabel
 from PyQt5.QtGui import QIcon
 
diff --git a/lib/python/qtvcp/lib/qtplasmac/tooltips.py b/lib/python/qtvcp/lib/qtplasmac/tooltips.py
@@ -2,7 +2,7 @@
 tooltips.py
 
 Copyright (C) 2021  Phillip A Carter
-Copyright (C) 2021  Gregory D Carl
+Copyright (C) 2021, 2022  Gregory D Carl
 
 This program is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
@@ -19,7 +19,7 @@
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 '''
 
-from PyQt5.QtCore import Qt, QCoreApplication
+from PyQt5.QtCore import QCoreApplication
 
 _translate = QCoreApplication.translate
 
diff --git a/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py b/share/qtvcp/screens/qtplasmac/qtplasmac_handler.py
@@ -1,4 +1,4 @@
-VERSION = '1.230.232'
+VERSION = '1.230.233'
 
 '''
 qtplasmac_handler.py
@@ -21,21 +21,19 @@
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 '''
 
-import os, sys
+import os
 from shutil import copy as COPY
 from shutil import move as MOVE
-from shutil import rmtree as RMTREE
 from subprocess import Popen, PIPE
 from subprocess import run as RUN
 from subprocess import call as CALL
-from subprocess import check_output as CHKOP
 from importlib import reload
 import time
 import tarfile
 import math
 import glob
 import linuxcnc
-import hal, hal_glib
+import hal
 from OpenGL.GL import glTranslatef
 from PyQt5 import QtCore, QtWidgets, QtGui
 from PyQt5.QtCore import *
@@ -2626,11 +2624,11 @@ def conv_call(self, operation):
 
     def set_axes_and_joints(self):
         kinematics = self.iniFile.find('KINS', 'KINEMATICS').lower().replace('=','').replace('trivkins','').replace(' ','') or None
-        kinstype = None
+        #kinstype = None
         self.coordinates = 'xyz'
         if kinematics:
             if 'kinstype' in kinematics:
-                kinstype = kinematics.lower().replace(' ','').split('kinstype')[1]
+                #kinstype = kinematics.lower().replace(' ','').split('kinstype')[1]
                 if 'coordinates' in kinematics:
                     kinematics = kinematics.lower().replace(' ','').split('kinstype')[0]
             if 'coordinates' in kinematics:
@@ -3385,7 +3383,7 @@ def user_button_setup(self):
                     continue
                 else:
                     try:
-                        pinstate = hal.get_value(halpin)
+                        hal.get_value(halpin)
                         self.idleOnList.append('button_{}'.format(str(bNum)))
                     except:
                         msg1 = _translate('HandlerClass', 'HAL pin')
@@ -3423,7 +3421,7 @@ def user_button_setup(self):
                         continue
                     else:
                         try:
-                            pinstate = hal.get_value(halpin)
+                            hal.get_value(halpin)
                             self.idleOnList.append('button_{}'.format(str(bNum)))
                         except:
                             msg1 = _translate('HandlerClass', 'HAL pin')
@@ -3616,7 +3614,7 @@ def user_button_command(self, bNum, command):
             ACTION.CALL_MDI(command)
         elif command and command[0] == '%':
             command = command.lstrip('%').lstrip() + '&'
-            msg = Popen(command, stdout=PIPE, stderr=PIPE, shell=True)
+            Popen(command, stdout=PIPE, stderr=PIPE, shell=True)
         else:
             head = _translate('HandlerClass', 'Code Error')
             msg0 = _translate('HandlerClass', 'Invalid code for user button')
@@ -4458,15 +4456,11 @@ def load_material_file(self):
             required = ['PIERCE_HEIGHT', 'PIERCE_DELAY', 'CUT_HEIGHT', 'CUT_SPEED']
             received = []
             for line in f_in:
-
-
-
                 try:
                     if line.startswith('#'):
                         continue
                     elif line.startswith('[MATERIAL_NUMBER_') and line.strip().endswith(']'):
                         if int(line.rsplit('_', 1)[1].strip().strip(']')) < 1000000:
-                            newMaterial = True
                             if not firstpass:
                                 self.write_materials(t_number,t_name,k_width,p_height,p_delay,pj_height,pj_delay,c_height,c_speed,c_amps,c_volts,pause,g_press,c_mode,t_item)
                                 for item in required:
diff --git a/share/qtvcp/screens/qtplasmac/versions.html b/share/qtvcp/screens/qtplasmac/versions.html
@@ -30,6 +30,13 @@ <h2>QtPlasmaC Version History</h2>
 </table>
 <br>
 <!--- ****** ADD NEXT VERSION BELOW THIS LINE ****** --->
+<br><b><u>v1.230.233 2022 Aug 23</u></b>
+<ul style="margin:0;">
+  <li>add missing globals to gcode filter</li>
+  <li>remove unused modules, variables</li>
+</ul>
+<i>Changes submitted by snowgoer540 (Greg Carl)</i><br>
+
 <br><b><u>v1.230.232 2022 Aug 21</u></b>
 <ul style="margin:0;">
   <li>fix a few more translation issues</li>
diff --git a/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py b/src/emc/usr_intf/qtplasmac/qtplasmac_gcode.py
@@ -26,8 +26,7 @@
 import shutil
 import time
 from subprocess import run as RUN
-from PyQt5 import QtCore, QtGui
-from PyQt5.QtCore import Qt, QRect
+from PyQt5.QtCore import Qt
 from PyQt5.QtGui import QIcon
 from PyQt5.QtWidgets import QApplication, QDialog, QScrollArea, QWidget, QVBoxLayout, QLabel, QPushButton, QStyle, QFrame
 
@@ -473,7 +472,7 @@ def do_material_change():
         c = line.split(';', 1)[0]
     else:
         c = line
-    a, b = c.split('p', 1)
+    b = c.split('p', 1)[1]
     m = ''
     # get the material number
     for mNum in b.strip():
