|
30 | 30 | from qtvcp.widgets.entry_widget import TouchInputWidget
|
31 | 31 | from qtvcp.widgets.calculator import Calculator
|
32 | 32 | from qtvcp.lib.notify import Notify
|
33 |
| -from qtvcp.core import Status, Action, Info |
| 33 | +from qtvcp.core import Status, Action, Info, Tool |
34 | 34 | from qtvcp import logger
|
35 | 35 |
|
36 | 36 | # Instantiate the libraries with global reference
|
37 | 37 | # STATUS gives us status messages from linuxcnc
|
38 | 38 | # ACTION gives commands to linuxcnc
|
39 |
| -# INFO holds INI dile details |
| 39 | +# INFO holds INI file details |
| 40 | +# TOOL gives tool file access |
| 41 | +# NOTICE is for the desktop notify system |
40 | 42 | # LOG is for running code logging
|
41 | 43 | STATUS = Status()
|
42 | 44 | ACTION = Action()
|
43 | 45 | INFO = Info()
|
| 46 | +TOOL = Tool() |
44 | 47 | NOTICE = Notify()
|
45 | 48 | LOG = logger.getLogger(__name__)
|
46 | 49 |
|
@@ -269,8 +272,10 @@ def showtooldialog(self, message, more_info=None, details=None, display_type=1,
|
269 | 272 | def tool_change(self, change):
|
270 | 273 | if change:
|
271 | 274 | MORE = 'Please Insert Tool %d' % self.tool_number.get()
|
| 275 | + tool_table_line = TOOL.GET_TOOL_INFO(self.tool_number.get()) |
| 276 | + comment = str(tool_table_line[TOOL.COMMENTS]) |
272 | 277 | MESS = 'Manual Tool Change Request'
|
273 |
| - DETAILS = ' Tool Info:' |
| 278 | + DETAILS = ' Tool Info: %s'% comment |
274 | 279 |
|
275 | 280 | STATUS.emit('focus-overlay-changed', True, MESS, self._color)
|
276 | 281 | if self.speak:
|
|
0 commit comments