add jet gui

Signed-off-by: John Thornton <[email protected]>

Author: jethornton

mesact/src/libmesact/buildini.py

@@ -5,7 +5,6 @@
 
 from libmesact import mdi
 
-
 def build(parent):
 	buildErrors = []
 	iniFilePath = os.path.join(parent.configPath, parent.configNameUnderscored + '.ini')
@@ -15,7 +14,6 @@ def build(parent):
 	iniContents.append(datetime.now().strftime('%b %d %Y %H:%M:%S') + '\n')
 	iniContents.append('# Changes to most things are ok and will be read by the Configuration Tool\n')
 
-
 	# build the [MESA] section
 	iniContents.append('\n[MESA]\n')
 	iniContents.append(f'VERSION = {parent.version}\n')
@@ -59,6 +57,13 @@ def build(parent):
 	else:
 		iniContents.append(f'DISPLAY = {parent.guiCB.currentData()}\n')
 	iniContents.append(f'DISPLAY = {parent.guiCB.itemData(parent.guiCB.currentIndex())}\n')
+	if parent.keyboard_qss_cb.isChecked():
+		iniContents.append(f'INPUT = keyboard\n')
+	elif parent.touch_qss_cb.isChecked():
+		iniContents.append(f'INPUT = touch\n')
+	elif len(parent.custom_qss_le.text()) > 0:
+		iniContents.append(f'QSS = {parent.custom_qss_le.text()}\n')
+
 	if parent.editorCB.currentData():
 		iniContents.append(f'EDITOR = {parent.editorCB.currentData()}\n')
 	iniContents.append(f'PROGRAM_PREFIX = {os.path.expanduser("~/linuxcnc/nc_files")}\n')

mesact/src/libmesact/combos.py

@@ -74,6 +74,8 @@ def build(parent):
 	for item in gui:
 		parent.guiCB.addItem(item[0], item[1])
 	parent.guiCB.setEditable(True)
+	if parent.jet_gui:
+		parent.guiCB.addItem('JET GUI', 'jet')
 
 	linearUnits = [
 		['Select', False],

mesact/src/libmesact/connections.py

@@ -20,6 +20,7 @@
 from libmesact import mdi
 from libmesact import samples
 from libmesact import hal
+from libmesact import gui
 
 def connect(parent):
 	# Menu Items
@@ -69,6 +70,7 @@ def connect(parent):
 	parent.create_pin_pb.clicked.connect(partial(firmware.create_pin, parent))
 
 	# Settings Tab
+	parent.guiCB.currentIndexChanged.connect(partial(gui.gui_changed, parent))
 	parent.minLinJogVelDSB.valueChanged.connect(partial(utilities.unitsChanged, parent))
 	parent.defLinJogVelDSB.valueChanged.connect(partial(utilities.unitsChanged, parent))
 	parent.maxLinJogVelDSB.valueChanged.connect(partial(utilities.unitsChanged, parent))
@@ -79,6 +81,8 @@ def connect(parent):
 	parent.axisButtonGroup.buttonClicked.connect(partial(utilities.axisDisplayChanged, parent))
 	parent.linearUnitsCB.currentIndexChanged.connect(partial(utilities.unitsChanged, parent))
 	parent.trajMaxLinVelDSB.valueChanged.connect(partial(utilities.maxVelChanged, parent))
+	parent.keyboard_qss_cb.stateChanged.connect(partial(gui.qss_changed, parent))
+	parent.touch_qss_cb.stateChanged.connect(partial(gui.qss_changed, parent))
 
 	'''
 	#parent.frontToolLatheRB.buttonClicked.connect(partial(utilities.axisDisplayChanged, parent))

mesact/src/libmesact/gui.py

@@ -0,0 +1,22 @@
+
+from PyQt5.Qt import Qt
+
+def gui_changed(parent):
+	if parent.guiCB.currentData():
+		if parent.guiCB.currentData() == 'jet':
+			parent.jet_gui_gb.setEnabled(True)
+		else:
+			parent.jet_gui_gb.setEnabled(False)
+	else:
+		parent.jet_gui_gb.setEnabled(False)
+
+def qss_changed(parent, state):
+	if state == Qt.CheckState.Checked:
+		if parent.sender().objectName() == 'keyboard_qss_cb':
+			parent.touch_qss_cb.setChecked(False)
+		elif parent.sender().objectName() == 'touch_qss_cb':
+			parent.keyboard_qss_cb.setChecked(False)
+
+
+
+

mesact/src/libmesact/startup.py

@@ -24,6 +24,19 @@ def setup(parent):
 	parent.pythonLB.setText(python_version())
 	parent.pyqt5LB.setText(qVersion())
 
+	try: # need to set this before building combos
+		jet = subprocess.check_output(['apt-cache', 'policy', 'jet'], text=True)
+		if len(jet) > 0:
+			version = jet.split()[2]
+			parent.jet_gui_lb.setText(f'{version}')
+			parent.jet_gui = True
+		else:
+			parent.jet_gui_lb.setText('Not Installed')
+			parent.jet_gui = False
+	except:
+		#jet = None
+		pass
+
 	combos.build(parent)
 	# disable some boards until programmed
 	#parent.boardCB.model().item(1).setEnabled(False) # 5i24/6i24

mesact/src/libmesact/updateini.py

@@ -173,6 +173,14 @@ def update(self, parent, iniFile):
 		else:
 			display.append(['DISPLAY', 'DISPLAY', f'{parent.guiCB.currentData()}'])
 
+		if parent.keyboard_qss_cb.isChecked():
+			display.append(['DISPLAY', 'INPUT', 'keyboard\n'])
+		elif parent.touch_qss_cb.isChecked():
+			display.append(['DISPLAY', 'INPUT', 'touch\n'])
+		elif len(parent.custom_qss_le.text()) > 0:
+			display.append(['DISPLAY', 'QSS', f'{parent.custom_qss_le.text()}\n'])
+
+
 		if parent.editorCB.currentData(): # if an editor is not selected delete it
 			display.append(['DISPLAY', 'EDITOR', f'{parent.editorCB.currentData()}'])
 		else: