qtvcp -use PATH to get image directory not INFO

Author: c-morley

lib/python/qtvcp/lib/gcode_utility/facing.py

@@ -11,13 +11,14 @@
 from PyQt5.QtWidgets import QFileDialog, QMessageBox
 
 from linuxcnc import OPERATOR_ERROR, NML_ERROR
-from qtvcp.core import Info, Status, Action
+from qtvcp.core import Info, Status, Action, Path
 
 INFO = Info()
 STATUS = Status()
 ACTION = Action()
+PATH = Path()
 HERE = os.path.dirname(os.path.abspath(__file__))
-IMAGES = os.path.join(INFO.IMAGE_PATH, 'gcode_utility')
+IMAGES = os.path.join(PATH.IMAGEDIR, 'gcode_utility')
 
 class Facing(QtWidgets.QWidget):
     def __init__(self, parent=None):

lib/python/qtvcp/lib/gcode_utility/hole_circle.py

@@ -13,14 +13,15 @@
 from PyQt5.QtGui import QPainter, QBrush, QPen, QColor
 
 from linuxcnc import OPERATOR_ERROR, NML_ERROR
-from qtvcp.core import Info, Status, Action
+from qtvcp.core import Info, Status, Action, Path
 
 INFO = Info()
 STATUS = Status()
 ACTION = Action()
+PATH = Path()
 
 HERE = os.path.dirname(os.path.abspath(__file__))
-IMAGES = os.path.join(INFO.IMAGE_PATH, 'gcode_utility')
+IMAGES = os.path.join(PATH.IMAGEDIR, 'gcode_utility')
 
 class Preview(QtWidgets.QWidget):
     def __init__(self):

lib/python/qtvcp/widgets/basic_probe.py

@@ -630,7 +630,7 @@ def next(self,t,direction=None):
                 file.open(QtCore.QFile.ReadOnly)
                 html = file.readAll()
                 html = str(html, encoding='utf8')
-                html = html.replace("../images/widgets/","{}/widgets/".format(INFO.IMAGE_PATH))
+                html = html.replace("../images/widgets/","{}/widgets/".format(PATH.IMAGEDIR))
                 t.setHtml(html)
                 if t.verticalScrollBar().isVisible():
                     t.verticalScrollBar().setPageStep(100)

lib/python/qtvcp/widgets/image_switcher.py

@@ -22,7 +22,7 @@
 from PyQt5.QtGui import QPixmap
 
 from qtvcp.widgets.widget_baseclass import _HalWidgetBase
-from qtvcp.core import Status, Info, Tool
+from qtvcp.core import Status, Info, Tool, Path
 from qtvcp import logger
 
 # Instantiate the libraries with global reference
@@ -31,15 +31,15 @@
 STATUS = Status()
 INFO = Info()
 TOOL = Tool()
+PATH = Path()
 LOG = logger.getLogger(__name__)
 
 # Force the log level for this module
 # LOG.setLevel(logger.INFO) # One of DEBUG, INFO, WARNING, ERROR, CRITICAL
 
-if INFO.IMAGE_PATH is not None:
-    DEFAULTIMAGE = (os.path.join(INFO.IMAGE_PATH,'applet-critical.png')) or ''
+if PATH.IMAGEDIR is not None:
+    DEFAULTIMAGE = (os.path.join(PATH.IMAGEDIR,'applet-critical.png')) or ''
 else:
-    INFO.IMAGE_PATH = ''
     DEFAULTIMAGE = ''
 
 class ImageSwitcher(QLabel, _HalWidgetBase):
@@ -97,7 +97,7 @@ def show_image_by_number(self, number):
         # if path doesn't exist try referencing
         # from the built in image folder
         if not os.path.exists(path):
-            path = os.path.join(INFO.IMAGE_PATH, path)
+            path = os.path.join(PATH.IMAGEDIR, path)
             if not os.path.exists(path):
                 LOG.debug('No Path: {}'.format(path))
         pixmap = QPixmap(path)
@@ -148,9 +148,9 @@ class StatusImageSwitcher(ImageSwitcher):
 
     def __init__(self, parent=None):
         super(StatusImageSwitcher, self).__init__(parent)
-        self._imagePath = [os.path.join(INFO.IMAGE_PATH,'applet-critical.png'),
-                    os.path.join(INFO.IMAGE_PATH,'spindle_ccw.gif'),
-                    os.path.join(INFO.IMAGE_PATH,'spindle_cw.gif')]
+        self._imagePath = [os.path.join(PATH.IMAGEDIR,'applet-critical.png'),
+                    os.path.join(PATH.IMAGEDIR,'spindle_ccw.gif'),
+                    os.path.join(PATH.IMAGEDIR,'spindle_cw.gif')]
         self.spindle = True
         self.all_homed = False
         self.axis_homed = False

lib/python/qtvcp/widgets/versa_probe.py

@@ -698,7 +698,7 @@ def next(self,t,direction=None):
                 file.open(QtCore.QFile.ReadOnly)
                 html = file.readAll()
                 html = str(html, encoding='utf8')
-                html = html.replace("../images/probe_icons/","{}/probe_icons/".format(INFO.IMAGE_PATH))
+                html = html.replace("../images/probe_icons/","{}/probe_icons/".format(PATH.IMAGEDIR))
                 t.setHtml(html)
                 if t.verticalScrollBar().isVisible():
                     t.verticalScrollBar().setPageStep(20)