Merge pull request #25 from vladimir-poleh/dynamic_mdi_commands_list

Allow to use more than 10 MDI Commands.

Author: jethornton

mesact/src/libmesact/buildini.py

@@ -3,6 +3,9 @@
 
 from PyQt5.QtWidgets import QSpinBox
 
+from libmesact import mdi
+
+
 def build(parent):
 	buildErrors = []
 	iniFilePath = os.path.join(parent.configPath, parent.configNameUnderscored + '.ini')
@@ -155,9 +158,10 @@ def build(parent):
 	# build the [HALUI] section
 	if parent.haluiCB.isChecked():
 		iniContents.append('\n[HALUI]\n')
-		for i in range(10):
-			if getattr(parent, f"mdiCmdLE_{i}").text():
-				iniContents.append(f'MDI_COMMAND = {getattr(parent, f"mdiCmdLE_{i}").text()}\n')
+		for i in range(mdi.get_mdi_commands_count(parent)):
+			cmd = mdi.get_mdi_command(parent, i)
+			if cmd:
+				iniContents.append(f'MDI_COMMAND = {cmd}\n')
 
 	# build the axes and joints
 	axes = [] # use only one axis letter with multiple joint axis

mesact/src/libmesact/check.py

@@ -1,3 +1,5 @@
+from libmesact import mdi
+
 
 def checkit(parent):
 	parent.mainTW.setCurrentIndex(11)
@@ -230,13 +232,13 @@ def checkit(parent):
 	# end of SS Cards Tab
 
 	# check the Options Tab for errors
-	mdi = []
-	for i in range(9):
-		cmd = getattr(parent, f'mdiCmdLE_{i}').text()
+	mdi_commands = []
+	for i in range(mdi.get_mdi_commands_count(parent)):
+		cmd = mdi.get_mdi_command(parent, i)
 		if len(cmd) > 0:
-			mdi.append(i)
-	if len(mdi) > 0:
-		if len(mdi) != max(mdi) + 1:
+			mdi_commands.append(i)
+	if len(mdi_commands) > 0:
+		if len(mdi_commands) != max(mdi_commands) + 1:
 			tabError = True
 			configErrors.append(f'\tMDI commands must start at 0 and not skip any')
 		if not parent.haluiCB.isChecked():

mesact/src/libmesact/mdi.py

@@ -0,0 +1,58 @@
+from PyQt5.QtWidgets import QGridLayout, QLabel, QLineEdit
+
+
+def get_mdi_commands_count(parent):
+    # Workaround for QGridLayout.rowCount() that returns 1 for empty grid
+    grid_layout: QGridLayout = parent.mdiCommandsListGL
+    rows = 0
+    grid_layout.rowCount()
+    for i in range(grid_layout.count()):
+        row, _, span, _ = grid_layout.getItemPosition(i)
+        rows = max(1, row + span)
+    return rows
+
+
+def add_mdi_command_row(parent):
+    grid_layout: QGridLayout = parent.mdiCommandsListGL
+    row = get_mdi_commands_count(parent)
+    __add_mdi_command_row(grid_layout, row)
+
+
+def set_mdi_command(parent, command_number, value):
+    row_count = get_mdi_commands_count(parent)
+    i = row_count
+    while i <= command_number:
+        add_mdi_command_row(parent)
+        i += 1
+    text_box: QLineEdit = parent.findChild(QLineEdit, __get_mdi_command_control_name(command_number))
+    text_box.setText(value)
+
+
+def get_mdi_command(parent, command_number):
+    rows_count = get_mdi_commands_count(parent)
+    if rows_count == 0 or command_number >= rows_count:
+        return ""
+    text_box: QLineEdit = parent.findChild(QLineEdit, __get_mdi_command_control_name(command_number))
+    return text_box.text().strip()
+
+
+def cleanup_mdi_commands(parent):
+    grid_layout: QGridLayout = parent.mdiCommandsListGL
+    for i in reversed(range(grid_layout.count())):
+        widget = grid_layout.itemAt(i).widget()
+        grid_layout.removeWidget(widget)
+        widget.setParent(None)
+    for i in range(10):
+        __add_mdi_command_row(grid_layout, i)
+
+
+def __get_mdi_command_control_name(command_number):
+    return f'mdiCmdLE_{command_number}'
+
+
+def __add_mdi_command_row(grid_layout, row):
+    label = QLabel(f'MDI Command {row}')
+    grid_layout.addWidget(label, row, 0)
+    text_box = QLineEdit()
+    text_box.setObjectName(__get_mdi_command_control_name(row))
+    grid_layout.addWidget(text_box, row, 1)

mesact/src/libmesact/openini.py

@@ -6,6 +6,8 @@
 
 from libmesact import utilities
 from libmesact import dialogs
+from libmesact import mdi
+
 
 class loadini:
 	def __init__(self):
@@ -185,13 +187,14 @@ def loadini(self, parent, iniFile):
 			start = self.sections['[HALUI]'][0]
 			end = self.sections['[HALUI]'][1]
 			mdicmd = []
+			mdi.cleanup_mdi_commands(parent)
 			for item in self.content[start:end]:
 				if item != '\n' and item.startswith('MDI_COMMAND'):
 					item = item.split('=')
 					item = item[1].strip()
 					mdicmd.append(item)
 			for i, item in enumerate(mdicmd):
-				getattr(parent, f'mdiCmdLE_{i}').setText(item)
+				mdi.set_mdi_command(parent, i, item)
 
 		for section in self.sections.items():
 			if section[0].startswith('[JOINT'):

mesact/src/libmesact/updateini.py

@@ -3,6 +3,9 @@
 
 from PyQt5.QtWidgets import QSpinBox
 
+from libmesact import mdi
+
+
 class updateini:
 	generated_hal_items = [
 		'main.hal',
@@ -316,35 +319,20 @@ def update(self, parent, iniFile):
 		if '[HALUI]' in self.sections:
 			index = self.sections['[HALUI]']
 			if len(index) == 2:
-				ini_mdi = []
-				for i in range(index[0], index[1]):
+				start = index[0]
+				end = index[1]
+				# remove all existing MDI commands
+				for i in reversed(range(start, end)):
 					if self.content[i].startswith('MDI_COMMAND'):
-						ini_mdi.append(self.content[i].split('=')[1].strip())
+						del self.content[i]
 				tool_mdi = []
-				for i in range(10):
-					mdi_text = f'{getattr(parent, f"mdiCmdLE_{i}").text()}'
+				for i in range(mdi.get_mdi_commands_count(parent)):
+					mdi_text = mdi.get_mdi_command(parent, i)
 					if mdi_text:
-						tool_mdi.append(f'{getattr(parent, f"mdiCmdLE_{i}").text()}')
-
-				if len(ini_mdi) == len(tool_mdi):
-					for i, j in enumerate(range(index[0] + 1, index[1])):
-						if self.content[j].startswith('MDI_COMMAND'):
-							self.content[j] = f'MDI_COMMAND = {getattr(parent, f"mdiCmdLE_{i}").text()}\n'
-				elif len(ini_mdi) > len(tool_mdi):
-					remove = len(ini_mdi) - len(tool_mdi)
-					for i in reversed(range(index[0] + 1, index[1])):
-						if self.content[i].startswith('MDI_COMMAND') and remove > 0:
-							del self.content[i]
-							remove -= 1
-					self.get_sections() # update section start/end
-				elif len(ini_mdi) < len(tool_mdi):
-					add = len(tool_mdi) - len(ini_mdi)
-					for i, j in enumerate(range(index[0] + 1, index[1] + add)):
-						if self.content[j].startswith('MDI_COMMAND'): # replace it
-							self.content[j] = f'MDI_COMMAND = {getattr(parent, f"mdiCmdLE_{i}").text()}\n'
-						elif self.content[j].strip() == '': # insert it
-							self.content.insert(j, f'MDI_COMMAND = {getattr(parent, f"mdiCmdLE_{i}").text()}\n')
-					self.get_sections() # update section start/end
+						tool_mdi.append(mdi_text)
+				for i in reversed(range(len(tool_mdi))):
+					self.content.insert(start + 1, f'MDI_COMMAND = {tool_mdi[i]}\n')
+				self.get_sections() # update section start/end
 
 		############ Massive rework needed here
 		# if the section exists and is in the tool update it

mesact/src/mesact

@@ -46,6 +46,7 @@ from libmesact import settings
 from libmesact import spindle
 from libmesact import shutdown
 from libmesact import updates
+from libmesact import mdi
 
 # testing imports
 from libmesact import testing
@@ -226,6 +227,10 @@ class MainWindow(QMainWindow):
 		#self.checkMesaflashCB.clicked.connect(partial(settings.update_value, self))
 		#self.newUserCB.clicked.connect(partial(settings.update_value, self))
 
+		# Options Tab - MDI
+		mdi.cleanup_mdi_commands(self)
+		self.addMdiCommandPB.clicked.connect(partial(mdi.add_mdi_command_row, self))
+
 	def changed(self):
 		#if isinstance(self.sender(), QComboBox):
 		#	if self.sender().currentData():