Skip to content

Commit 46143fa

Browse files
Marco-GGMarco-GG
committed
Added new configuration inputs for the arduino protocol
* Added controls to select the report mode, read delay and read count * Removed the Mock connection benchmark and replaced it with a real connection
1 parent ff15e95 commit 46143fa

File tree

8 files changed

+721
-435
lines changed

8 files changed

+721
-435
lines changed

‎MLC/GUI/Autogenerated/autogenerated.py‎

Lines changed: 123 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Ui_BoardConfigurationWindow(object):
1212
def setupUi(self, BoardConfigurationWindow):
1313
BoardConfigurationWindow.setObjectName("BoardConfigurationWindow")
1414
BoardConfigurationWindow.setWindowModality(QtCore.Qt.ApplicationModal)
15-
BoardConfigurationWindow.resize(840, 674)
15+
BoardConfigurationWindow.resize(1024, 675)
1616
self.centralWidget = QtWidgets.QWidget(BoardConfigurationWindow)
1717
self.centralWidget.setObjectName("centralWidget")
1818
self.verticalLayout = QtWidgets.QVBoxLayout(self.centralWidget)
@@ -95,17 +95,17 @@ def setupUi(self, BoardConfigurationWindow):
9595
self.verticalLayout_8.setContentsMargins(11, 11, 11, 11)
9696
self.verticalLayout_8.setSpacing(6)
9797
self.verticalLayout_8.setObjectName("verticalLayout_8")
98-
self.radioButton = QtWidgets.QRadioButton(self.frame_11)
99-
self.radioButton.setChecked(True)
100-
self.radioButton.setObjectName("radioButton")
98+
self.serial_radio = QtWidgets.QRadioButton(self.frame_11)
99+
self.serial_radio.setChecked(True)
100+
self.serial_radio.setObjectName("serial_radio")
101101
self.connection_type_group = QtWidgets.QButtonGroup(BoardConfigurationWindow)
102102
self.connection_type_group.setObjectName("connection_type_group")
103-
self.connection_type_group.addButton(self.radioButton)
104-
self.verticalLayout_8.addWidget(self.radioButton)
105-
self.radioButton_2 = QtWidgets.QRadioButton(self.frame_11)
106-
self.radioButton_2.setObjectName("radioButton_2")
107-
self.connection_type_group.addButton(self.radioButton_2)
108-
self.verticalLayout_8.addWidget(self.radioButton_2)
103+
self.connection_type_group.addButton(self.serial_radio)
104+
self.verticalLayout_8.addWidget(self.serial_radio)
105+
self.ethernet_radio = QtWidgets.QRadioButton(self.frame_11)
106+
self.ethernet_radio.setObjectName("ethernet_radio")
107+
self.connection_type_group.addButton(self.ethernet_radio)
108+
self.verticalLayout_8.addWidget(self.ethernet_radio)
109109
self.horizontalLayout_10.addWidget(self.frame_11)
110110
self.connection_properties_frame = QtWidgets.QFrame(self.groupBox_11)
111111
self.connection_properties_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
@@ -232,15 +232,18 @@ def setupUi(self, BoardConfigurationWindow):
232232
self.verticalLayout_2.addWidget(self.boardTypeSelectorFrame)
233233
self.horizontalLayout_2.addWidget(self.frame_2, 0, QtCore.Qt.AlignTop)
234234
self.verticalLayout.addWidget(self.groupBox, 0, QtCore.Qt.AlignTop)
235-
self.frame = QtWidgets.QFrame(self.centralWidget)
236-
self.frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
237-
self.frame.setFrameShadow(QtWidgets.QFrame.Raised)
238-
self.frame.setObjectName("frame")
239-
self.horizontalLayout = QtWidgets.QHBoxLayout(self.frame)
240-
self.horizontalLayout.setContentsMargins(11, 11, 11, 11)
235+
self.groupBox1 = QtWidgets.QGroupBox(self.centralWidget)
236+
self.groupBox1.setAlignment(QtCore.Qt.AlignCenter)
237+
self.groupBox1.setObjectName("groupBox1")
238+
self.verticalLayout_10 = QtWidgets.QVBoxLayout(self.groupBox1)
239+
self.verticalLayout_10.setContentsMargins(11, 0, 11, 0)
240+
self.verticalLayout_10.setSpacing(1)
241+
self.verticalLayout_10.setObjectName("verticalLayout_10")
242+
self.horizontalLayout = QtWidgets.QHBoxLayout()
243+
self.horizontalLayout.setContentsMargins(11, 0, 0, 0)
241244
self.horizontalLayout.setSpacing(6)
242245
self.horizontalLayout.setObjectName("horizontalLayout")
243-
self.groupBox_2 = QtWidgets.QGroupBox(self.frame)
246+
self.groupBox_2 = QtWidgets.QGroupBox(self.groupBox1)
244247
self.groupBox_2.setObjectName("groupBox_2")
245248
self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.groupBox_2)
246249
self.verticalLayout_4.setContentsMargins(11, 11, 11, 11)
@@ -306,7 +309,7 @@ def setupUi(self, BoardConfigurationWindow):
306309
self.digitalPinsList.horizontalHeader().setStretchLastSection(True)
307310
self.verticalLayout_4.addWidget(self.digitalPinsList)
308311
self.horizontalLayout.addWidget(self.groupBox_2)
309-
self.groupBox_3 = QtWidgets.QGroupBox(self.frame)
312+
self.groupBox_3 = QtWidgets.QGroupBox(self.groupBox1)
310313
self.groupBox_3.setFlat(False)
311314
self.groupBox_3.setCheckable(False)
312315
self.groupBox_3.setObjectName("groupBox_3")
@@ -376,7 +379,96 @@ def setupUi(self, BoardConfigurationWindow):
376379
self.analogPinList.horizontalHeader().setStretchLastSection(True)
377380
self.verticalLayout_5.addWidget(self.analogPinList)
378381
self.horizontalLayout.addWidget(self.groupBox_3)
379-
self.verticalLayout.addWidget(self.frame)
382+
self.verticalLayout_10.addLayout(self.horizontalLayout)
383+
self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
384+
self.horizontalLayout_11.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint)
385+
self.horizontalLayout_11.setContentsMargins(11, 0, 11, 0)
386+
self.horizontalLayout_11.setSpacing(3)
387+
self.horizontalLayout_11.setObjectName("horizontalLayout_11")
388+
self.mode_frame = QtWidgets.QFrame(self.groupBox1)
389+
self.mode_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
390+
self.mode_frame.setFrameShadow(QtWidgets.QFrame.Raised)
391+
self.mode_frame.setObjectName("mode_frame")
392+
self.horizontalLayout_12 = QtWidgets.QHBoxLayout(self.mode_frame)
393+
self.horizontalLayout_12.setContentsMargins(11, 11, 11, 11)
394+
self.horizontalLayout_12.setSpacing(6)
395+
self.horizontalLayout_12.setObjectName("horizontalLayout_12")
396+
self.report_mode_label = QtWidgets.QLabel(self.mode_frame)
397+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
398+
sizePolicy.setHorizontalStretch(0)
399+
sizePolicy.setVerticalStretch(0)
400+
sizePolicy.setHeightForWidth(self.report_mode_label.sizePolicy().hasHeightForWidth())
401+
self.report_mode_label.setSizePolicy(sizePolicy)
402+
self.report_mode_label.setObjectName("report_mode_label")
403+
self.horizontalLayout_12.addWidget(self.report_mode_label)
404+
self.report_mode_combo = QtWidgets.QComboBox(self.mode_frame)
405+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
406+
sizePolicy.setHorizontalStretch(0)
407+
sizePolicy.setVerticalStretch(0)
408+
sizePolicy.setHeightForWidth(self.report_mode_combo.sizePolicy().hasHeightForWidth())
409+
self.report_mode_combo.setSizePolicy(sizePolicy)
410+
self.report_mode_combo.setObjectName("report_mode_combo")
411+
self.report_mode_combo.addItem("")
412+
self.report_mode_combo.addItem("")
413+
self.horizontalLayout_12.addWidget(self.report_mode_combo)
414+
self.horizontalLayout_11.addWidget(self.mode_frame)
415+
self.delay_frame = QtWidgets.QFrame(self.groupBox1)
416+
self.delay_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
417+
self.delay_frame.setFrameShadow(QtWidgets.QFrame.Raised)
418+
self.delay_frame.setObjectName("delay_frame")
419+
self.horizontalLayout_13 = QtWidgets.QHBoxLayout(self.delay_frame)
420+
self.horizontalLayout_13.setContentsMargins(11, 11, 11, 11)
421+
self.horizontalLayout_13.setSpacing(6)
422+
self.horizontalLayout_13.setObjectName("horizontalLayout_13")
423+
self.read_delay_label = QtWidgets.QLabel(self.delay_frame)
424+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
425+
sizePolicy.setHorizontalStretch(0)
426+
sizePolicy.setVerticalStretch(0)
427+
sizePolicy.setHeightForWidth(self.read_delay_label.sizePolicy().hasHeightForWidth())
428+
self.read_delay_label.setSizePolicy(sizePolicy)
429+
self.read_delay_label.setObjectName("read_delay_label")
430+
self.horizontalLayout_13.addWidget(self.read_delay_label)
431+
self.read_delay_spin = QtWidgets.QSpinBox(self.delay_frame)
432+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
433+
sizePolicy.setHorizontalStretch(0)
434+
sizePolicy.setVerticalStretch(0)
435+
sizePolicy.setHeightForWidth(self.read_delay_spin.sizePolicy().hasHeightForWidth())
436+
self.read_delay_spin.setSizePolicy(sizePolicy)
437+
self.read_delay_spin.setMinimum(0)
438+
self.read_delay_spin.setMaximum(255)
439+
self.read_delay_spin.setProperty("value", 0)
440+
self.read_delay_spin.setObjectName("read_delay_spin")
441+
self.horizontalLayout_13.addWidget(self.read_delay_spin)
442+
self.horizontalLayout_11.addWidget(self.delay_frame)
443+
self.count_frame = QtWidgets.QFrame(self.groupBox1)
444+
self.count_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
445+
self.count_frame.setFrameShadow(QtWidgets.QFrame.Raised)
446+
self.count_frame.setObjectName("count_frame")
447+
self.horizontalLayout_14 = QtWidgets.QHBoxLayout(self.count_frame)
448+
self.horizontalLayout_14.setContentsMargins(11, 11, 11, 11)
449+
self.horizontalLayout_14.setSpacing(6)
450+
self.horizontalLayout_14.setObjectName("horizontalLayout_14")
451+
self.read_count_label = QtWidgets.QLabel(self.count_frame)
452+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Preferred)
453+
sizePolicy.setHorizontalStretch(0)
454+
sizePolicy.setVerticalStretch(0)
455+
sizePolicy.setHeightForWidth(self.read_count_label.sizePolicy().hasHeightForWidth())
456+
self.read_count_label.setSizePolicy(sizePolicy)
457+
self.read_count_label.setObjectName("read_count_label")
458+
self.horizontalLayout_14.addWidget(self.read_count_label)
459+
self.read_count_spin = QtWidgets.QSpinBox(self.count_frame)
460+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Fixed, QtWidgets.QSizePolicy.Fixed)
461+
sizePolicy.setHorizontalStretch(0)
462+
sizePolicy.setVerticalStretch(0)
463+
sizePolicy.setHeightForWidth(self.read_count_spin.sizePolicy().hasHeightForWidth())
464+
self.read_count_spin.setSizePolicy(sizePolicy)
465+
self.read_count_spin.setMinimum(2)
466+
self.read_count_spin.setMaximum(255)
467+
self.read_count_spin.setObjectName("read_count_spin")
468+
self.horizontalLayout_14.addWidget(self.read_count_spin)
469+
self.horizontalLayout_11.addWidget(self.count_frame)
470+
self.verticalLayout_10.addLayout(self.horizontalLayout_11)
471+
self.verticalLayout.addWidget(self.groupBox1)
380472
self.frame_7 = QtWidgets.QFrame(self.centralWidget)
381473
self.frame_7.setFrameShape(QtWidgets.QFrame.NoFrame)
382474
self.frame_7.setFrameShadow(QtWidgets.QFrame.Raised)
@@ -392,20 +484,19 @@ def setupUi(self, BoardConfigurationWindow):
392484
self.closeButton.setObjectName("closeButton")
393485
self.horizontalLayout_5.addWidget(self.closeButton)
394486
self.verticalLayout.addWidget(self.frame_7)
395-
self.verticalLayout.setStretch(1, 1)
396487
BoardConfigurationWindow.setCentralWidget(self.centralWidget)
397488

398489
self.retranslateUi(BoardConfigurationWindow)
399490
self.baud_rate_selector.setCurrentIndex(16)
400-
self.addAnalogPin.clicked.connect(BoardConfigurationWindow.insertAnalogPin)
401491
self.testInterface.clicked.connect(BoardConfigurationWindow.checkConnection)
402492
self.showPinout.clicked.connect(BoardConfigurationWindow.showPinout)
403-
self.addDigitalPin.clicked.connect(BoardConfigurationWindow.insertDigitalPin)
404493
self.closeButton.clicked.connect(BoardConfigurationWindow.close)
405-
self.removeDigitalPin.clicked.connect(BoardConfigurationWindow.removeDigitalPin)
406-
self.removeAnalogPin.clicked.connect(BoardConfigurationWindow.removeAnalogPin)
407494
self.benchTests.clicked.connect(BoardConfigurationWindow.on_bench_test_click)
408495
self.connection_type_group.buttonClicked['int'].connect(BoardConfigurationWindow.on_connection_type_toggle)
496+
self.addAnalogPin.clicked.connect(BoardConfigurationWindow.insertAnalogPin)
497+
self.addDigitalPin.clicked.connect(BoardConfigurationWindow.insertDigitalPin)
498+
self.removeDigitalPin.clicked.connect(BoardConfigurationWindow.removeDigitalPin)
499+
self.removeAnalogPin.clicked.connect(BoardConfigurationWindow.removeDigitalPin)
409500
# QtCore.QMetaObject.connectSlotsByName(BoardConfigurationWindow)
410501

411502
def retranslateUi(self, BoardConfigurationWindow):
@@ -418,8 +509,8 @@ def retranslateUi(self, BoardConfigurationWindow):
418509
self.arduinoBoard.setItemText(2, _translate("BoardConfigurationWindow", "Arduino Mega"))
419510
self.showPinout.setText(_translate("BoardConfigurationWindow", "Show board Pinout"))
420511
self.groupBox_11.setTitle(_translate("BoardConfigurationWindow", "Connection Type"))
421-
self.radioButton.setText(_translate("BoardConfigurationWindow", "Serial"))
422-
self.radioButton_2.setText(_translate("BoardConfigurationWindow", "Ethernet"))
512+
self.serial_radio.setText(_translate("BoardConfigurationWindow", "Serial"))
513+
self.ethernet_radio.setText(_translate("BoardConfigurationWindow", "Ethernet"))
423514
self.serial_interface_label.setText(_translate("BoardConfigurationWindow", "Interface"))
424515
self.serial_interface_input.setText(_translate("BoardConfigurationWindow", "/dev/ttyACM0"))
425516
self.baud_rate_label.setText(_translate("BoardConfigurationWindow", "Baud Rate"))
@@ -469,6 +560,7 @@ def retranslateUi(self, BoardConfigurationWindow):
469560
self.byte_size_selector.setItemText(2, _translate("BoardConfigurationWindow", "Six bits"))
470561
self.byte_size_selector.setItemText(3, _translate("BoardConfigurationWindow", "Seven bits"))
471562
self.testInterface.setText(_translate("BoardConfigurationWindow", "Test Interface"))
563+
self.groupBox1.setTitle(_translate("BoardConfigurationWindow", "Board Setup"))
472564
self.groupBox_2.setTitle(_translate("BoardConfigurationWindow", "Digital Pins"))
473565
self.digitalPins.setItemText(0, _translate("BoardConfigurationWindow", "Pin 1"))
474566
self.digitalPins.setItemText(1, _translate("BoardConfigurationWindow", "Pin 2"))
@@ -494,6 +586,11 @@ def retranslateUi(self, BoardConfigurationWindow):
494586
item.setText(_translate("BoardConfigurationWindow", "Pin"))
495587
item = self.analogPinList.horizontalHeaderItem(1)
496588
item.setText(_translate("BoardConfigurationWindow", "Type"))
589+
self.report_mode_label.setText(_translate("BoardConfigurationWindow", "Report mode:"))
590+
self.report_mode_combo.setItemText(0, _translate("BoardConfigurationWindow", "Average"))
591+
self.report_mode_combo.setItemText(1, _translate("BoardConfigurationWindow", "Bulk"))
592+
self.read_delay_label.setText(_translate("BoardConfigurationWindow", "Read delay"))
593+
self.read_count_label.setText(_translate("BoardConfigurationWindow", "Read count"))
497594
self.benchTests.setText(_translate("BoardConfigurationWindow", "Bechmarking tests"))
498595
self.closeButton.setText(_translate("BoardConfigurationWindow", "Close"))
499596

0 commit comments

Comments
 (0)