Skip to content

Commit c2a8fb4

Browse files
EzetowersEzetowers
committed
Added preevaluation on mutate and crossover methods
* Also a Give Permissions button was added in the BoardConfigurationWindow
1 parent 870f23b commit c2a8fb4

File tree

6 files changed

+248
-69
lines changed

6 files changed

+248
-69
lines changed

‎MLC/GUI/Autogenerated/autogenerated.py‎

Lines changed: 78 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,11 @@ def setupUi(self, BoardConfigurationWindow):
10851085
self.horizontalLayout_10.setSpacing(6)
10861086
self.horizontalLayout_10.setObjectName("horizontalLayout_10")
10871087
self.frame_11 = QtWidgets.QFrame(self.groupBox_11)
1088+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.MinimumExpanding)
1089+
sizePolicy.setHorizontalStretch(0)
1090+
sizePolicy.setVerticalStretch(0)
1091+
sizePolicy.setHeightForWidth(self.frame_11.sizePolicy().hasHeightForWidth())
1092+
self.frame_11.setSizePolicy(sizePolicy)
10881093
self.frame_11.setFrameShape(QtWidgets.QFrame.StyledPanel)
10891094
self.frame_11.setFrameShadow(QtWidgets.QFrame.Raised)
10901095
self.frame_11.setObjectName("frame_11")
@@ -1093,13 +1098,23 @@ def setupUi(self, BoardConfigurationWindow):
10931098
self.verticalLayout_8.setSpacing(6)
10941099
self.verticalLayout_8.setObjectName("verticalLayout_8")
10951100
self.serial_radio = QtWidgets.QRadioButton(self.frame_11)
1101+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
1102+
sizePolicy.setHorizontalStretch(0)
1103+
sizePolicy.setVerticalStretch(0)
1104+
sizePolicy.setHeightForWidth(self.serial_radio.sizePolicy().hasHeightForWidth())
1105+
self.serial_radio.setSizePolicy(sizePolicy)
10961106
self.serial_radio.setChecked(True)
10971107
self.serial_radio.setObjectName("serial_radio")
10981108
self.connection_type_group = QtWidgets.QButtonGroup(BoardConfigurationWindow)
10991109
self.connection_type_group.setObjectName("connection_type_group")
11001110
self.connection_type_group.addButton(self.serial_radio)
11011111
self.verticalLayout_8.addWidget(self.serial_radio)
11021112
self.ethernet_radio = QtWidgets.QRadioButton(self.frame_11)
1113+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Maximum)
1114+
sizePolicy.setHorizontalStretch(0)
1115+
sizePolicy.setVerticalStretch(0)
1116+
sizePolicy.setHeightForWidth(self.ethernet_radio.sizePolicy().hasHeightForWidth())
1117+
self.ethernet_radio.setSizePolicy(sizePolicy)
11031118
self.ethernet_radio.setObjectName("ethernet_radio")
11041119
self.connection_type_group.addButton(self.ethernet_radio)
11051120
self.verticalLayout_8.addWidget(self.ethernet_radio)
@@ -1108,19 +1123,10 @@ def setupUi(self, BoardConfigurationWindow):
11081123
self.connection_properties_frame.setFrameShape(QtWidgets.QFrame.StyledPanel)
11091124
self.connection_properties_frame.setFrameShadow(QtWidgets.QFrame.Raised)
11101125
self.connection_properties_frame.setObjectName("connection_properties_frame")
1111-
self.formLayout_2 = QtWidgets.QFormLayout(self.connection_properties_frame)
1112-
self.formLayout_2.setContentsMargins(11, 11, 11, 11)
1113-
self.formLayout_2.setSpacing(6)
1114-
self.formLayout_2.setObjectName("formLayout_2")
1115-
self.serial_interface_label = QtWidgets.QLabel(self.connection_properties_frame)
1116-
self.serial_interface_label.setObjectName("serial_interface_label")
1117-
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.LabelRole, self.serial_interface_label)
1118-
self.serial_interface_input = QtWidgets.QLineEdit(self.connection_properties_frame)
1119-
self.serial_interface_input.setObjectName("serial_interface_input")
1120-
self.formLayout_2.setWidget(0, QtWidgets.QFormLayout.FieldRole, self.serial_interface_input)
1121-
self.baud_rate_label = QtWidgets.QLabel(self.connection_properties_frame)
1122-
self.baud_rate_label.setObjectName("baud_rate_label")
1123-
self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.LabelRole, self.baud_rate_label)
1126+
self.gridLayout = QtWidgets.QGridLayout(self.connection_properties_frame)
1127+
self.gridLayout.setContentsMargins(11, 11, 11, 11)
1128+
self.gridLayout.setSpacing(6)
1129+
self.gridLayout.setObjectName("gridLayout")
11241130
self.baud_rate_selector = QtWidgets.QComboBox(self.connection_properties_frame)
11251131
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
11261132
sizePolicy.setHorizontalStretch(0)
@@ -1158,10 +1164,15 @@ def setupUi(self, BoardConfigurationWindow):
11581164
self.baud_rate_selector.addItem("")
11591165
self.baud_rate_selector.addItem("")
11601166
self.baud_rate_selector.addItem("")
1161-
self.formLayout_2.setWidget(2, QtWidgets.QFormLayout.FieldRole, self.baud_rate_selector)
1162-
self.parity_bits_label = QtWidgets.QLabel(self.connection_properties_frame)
1163-
self.parity_bits_label.setObjectName("parity_bits_label")
1164-
self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.LabelRole, self.parity_bits_label)
1167+
self.gridLayout.addWidget(self.baud_rate_selector, 2, 1, 1, 2)
1168+
self.serial_interface_label = QtWidgets.QLabel(self.connection_properties_frame)
1169+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
1170+
sizePolicy.setHorizontalStretch(0)
1171+
sizePolicy.setVerticalStretch(0)
1172+
sizePolicy.setHeightForWidth(self.serial_interface_label.sizePolicy().hasHeightForWidth())
1173+
self.serial_interface_label.setSizePolicy(sizePolicy)
1174+
self.serial_interface_label.setObjectName("serial_interface_label")
1175+
self.gridLayout.addWidget(self.serial_interface_label, 0, 0, 1, 1)
11651176
self.parity_bits_selector = QtWidgets.QComboBox(self.connection_properties_frame)
11661177
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
11671178
sizePolicy.setHorizontalStretch(0)
@@ -1174,10 +1185,31 @@ def setupUi(self, BoardConfigurationWindow):
11741185
self.parity_bits_selector.addItem("")
11751186
self.parity_bits_selector.addItem("")
11761187
self.parity_bits_selector.addItem("")
1177-
self.formLayout_2.setWidget(3, QtWidgets.QFormLayout.FieldRole, self.parity_bits_selector)
1188+
self.gridLayout.addWidget(self.parity_bits_selector, 3, 1, 1, 2)
1189+
self.permissions_button = QtWidgets.QPushButton(self.connection_properties_frame)
1190+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Fixed)
1191+
sizePolicy.setHorizontalStretch(0)
1192+
sizePolicy.setVerticalStretch(0)
1193+
sizePolicy.setHeightForWidth(self.permissions_button.sizePolicy().hasHeightForWidth())
1194+
self.permissions_button.setSizePolicy(sizePolicy)
1195+
self.permissions_button.setObjectName("permissions_button")
1196+
self.gridLayout.addWidget(self.permissions_button, 0, 2, 1, 1)
11781197
self.stop_bits_label = QtWidgets.QLabel(self.connection_properties_frame)
1198+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
1199+
sizePolicy.setHorizontalStretch(0)
1200+
sizePolicy.setVerticalStretch(0)
1201+
sizePolicy.setHeightForWidth(self.stop_bits_label.sizePolicy().hasHeightForWidth())
1202+
self.stop_bits_label.setSizePolicy(sizePolicy)
11791203
self.stop_bits_label.setObjectName("stop_bits_label")
1180-
self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.LabelRole, self.stop_bits_label)
1204+
self.gridLayout.addWidget(self.stop_bits_label, 4, 0, 1, 1)
1205+
self.byte_size_label = QtWidgets.QLabel(self.connection_properties_frame)
1206+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
1207+
sizePolicy.setHorizontalStretch(0)
1208+
sizePolicy.setVerticalStretch(0)
1209+
sizePolicy.setHeightForWidth(self.byte_size_label.sizePolicy().hasHeightForWidth())
1210+
self.byte_size_label.setSizePolicy(sizePolicy)
1211+
self.byte_size_label.setObjectName("byte_size_label")
1212+
self.gridLayout.addWidget(self.byte_size_label, 5, 0, 1, 1)
11811213
self.stop_bits_selector = QtWidgets.QComboBox(self.connection_properties_frame)
11821214
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
11831215
sizePolicy.setHorizontalStretch(0)
@@ -1188,10 +1220,26 @@ def setupUi(self, BoardConfigurationWindow):
11881220
self.stop_bits_selector.addItem("")
11891221
self.stop_bits_selector.addItem("")
11901222
self.stop_bits_selector.addItem("")
1191-
self.formLayout_2.setWidget(4, QtWidgets.QFormLayout.FieldRole, self.stop_bits_selector)
1192-
self.byte_size_label = QtWidgets.QLabel(self.connection_properties_frame)
1193-
self.byte_size_label.setObjectName("byte_size_label")
1194-
self.formLayout_2.setWidget(5, QtWidgets.QFormLayout.LabelRole, self.byte_size_label)
1223+
self.gridLayout.addWidget(self.stop_bits_selector, 4, 1, 1, 2)
1224+
self.baud_rate_label = QtWidgets.QLabel(self.connection_properties_frame)
1225+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
1226+
sizePolicy.setHorizontalStretch(0)
1227+
sizePolicy.setVerticalStretch(0)
1228+
sizePolicy.setHeightForWidth(self.baud_rate_label.sizePolicy().hasHeightForWidth())
1229+
self.baud_rate_label.setSizePolicy(sizePolicy)
1230+
self.baud_rate_label.setObjectName("baud_rate_label")
1231+
self.gridLayout.addWidget(self.baud_rate_label, 2, 0, 1, 1)
1232+
self.parity_bits_label = QtWidgets.QLabel(self.connection_properties_frame)
1233+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Maximum, QtWidgets.QSizePolicy.Preferred)
1234+
sizePolicy.setHorizontalStretch(0)
1235+
sizePolicy.setVerticalStretch(0)
1236+
sizePolicy.setHeightForWidth(self.parity_bits_label.sizePolicy().hasHeightForWidth())
1237+
self.parity_bits_label.setSizePolicy(sizePolicy)
1238+
self.parity_bits_label.setObjectName("parity_bits_label")
1239+
self.gridLayout.addWidget(self.parity_bits_label, 3, 0, 1, 1)
1240+
self.interface_combo = QtWidgets.QComboBox(self.connection_properties_frame)
1241+
self.interface_combo.setObjectName("interface_combo")
1242+
self.gridLayout.addWidget(self.interface_combo, 0, 1, 1, 1)
11951243
self.byte_size_selector = QtWidgets.QComboBox(self.connection_properties_frame)
11961244
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Fixed)
11971245
sizePolicy.setHorizontalStretch(0)
@@ -1203,7 +1251,7 @@ def setupUi(self, BoardConfigurationWindow):
12031251
self.byte_size_selector.addItem("")
12041252
self.byte_size_selector.addItem("")
12051253
self.byte_size_selector.addItem("")
1206-
self.formLayout_2.setWidget(5, QtWidgets.QFormLayout.FieldRole, self.byte_size_selector)
1254+
self.gridLayout.addWidget(self.byte_size_selector, 5, 1, 1, 2)
12071255
self.horizontalLayout_10.addWidget(self.connection_properties_frame)
12081256
self.verticalLayout_3.addLayout(self.horizontalLayout_10)
12091257
self.test_interface_layout = QtWidgets.QHBoxLayout()
@@ -1522,6 +1570,7 @@ def setupUi(self, BoardConfigurationWindow):
15221570
self.removeDigitalPin.clicked.connect(BoardConfigurationWindow.on_digital_pin_remove)
15231571
self.removeAnalogPin.clicked.connect(BoardConfigurationWindow.on_analog_pin_remove)
15241572
self.analog_resolution_spin.valueChanged['int'].connect(BoardConfigurationWindow.on_analog_resolution_change)
1573+
self.permissions_button.clicked.connect(BoardConfigurationWindow.on_permission_button_clicked)
15251574
# QtCore.QMetaObject.connectSlotsByName(BoardConfigurationWindow)
15261575

15271576
def retranslateUi(self, BoardConfigurationWindow):
@@ -1536,9 +1585,6 @@ def retranslateUi(self, BoardConfigurationWindow):
15361585
self.groupBox_11.setTitle(_translate("BoardConfigurationWindow", "Connection Type"))
15371586
self.serial_radio.setText(_translate("BoardConfigurationWindow", "Serial"))
15381587
self.ethernet_radio.setText(_translate("BoardConfigurationWindow", "Ethernet"))
1539-
self.serial_interface_label.setText(_translate("BoardConfigurationWindow", "Interface"))
1540-
self.serial_interface_input.setText(_translate("BoardConfigurationWindow", "/dev/ttyACM0"))
1541-
self.baud_rate_label.setText(_translate("BoardConfigurationWindow", "Baud Rate"))
15421588
self.baud_rate_selector.setItemText(0, _translate("BoardConfigurationWindow", "50"))
15431589
self.baud_rate_selector.setItemText(1, _translate("BoardConfigurationWindow", "75"))
15441590
self.baud_rate_selector.setItemText(2, _translate("BoardConfigurationWindow", "110"))
@@ -1569,17 +1615,20 @@ def retranslateUi(self, BoardConfigurationWindow):
15691615
self.baud_rate_selector.setItemText(27, _translate("BoardConfigurationWindow", "3000000"))
15701616
self.baud_rate_selector.setItemText(28, _translate("BoardConfigurationWindow", "3500000"))
15711617
self.baud_rate_selector.setItemText(29, _translate("BoardConfigurationWindow", "4000000"))
1572-
self.parity_bits_label.setText(_translate("BoardConfigurationWindow", "Parity Bits"))
1618+
self.serial_interface_label.setText(_translate("BoardConfigurationWindow", "Interface"))
15731619
self.parity_bits_selector.setItemText(0, _translate("BoardConfigurationWindow", "Parity one"))
15741620
self.parity_bits_selector.setItemText(1, _translate("BoardConfigurationWindow", "Parity even"))
15751621
self.parity_bits_selector.setItemText(2, _translate("BoardConfigurationWindow", "Parity odd"))
15761622
self.parity_bits_selector.setItemText(3, _translate("BoardConfigurationWindow", "Parity mark"))
15771623
self.parity_bits_selector.setItemText(4, _translate("BoardConfigurationWindow", "Parity space"))
1624+
self.permissions_button.setText(_translate("BoardConfigurationWindow", "Give Permissions"))
15781625
self.stop_bits_label.setText(_translate("BoardConfigurationWindow", "Stop Bits"))
1626+
self.byte_size_label.setText(_translate("BoardConfigurationWindow", "Byte size"))
15791627
self.stop_bits_selector.setItemText(0, _translate("BoardConfigurationWindow", "Stopbits one"))
15801628
self.stop_bits_selector.setItemText(1, _translate("BoardConfigurationWindow", "Stopbits one point five"))
15811629
self.stop_bits_selector.setItemText(2, _translate("BoardConfigurationWindow", "Stopbits two"))
1582-
self.byte_size_label.setText(_translate("BoardConfigurationWindow", "Byte size"))
1630+
self.baud_rate_label.setText(_translate("BoardConfigurationWindow", "Baud Rate"))
1631+
self.parity_bits_label.setText(_translate("BoardConfigurationWindow", "Parity Bits"))
15831632
self.byte_size_selector.setItemText(0, _translate("BoardConfigurationWindow", "Eight bits"))
15841633
self.byte_size_selector.setItemText(1, _translate("BoardConfigurationWindow", "Five bits"))
15851634
self.byte_size_selector.setItemText(2, _translate("BoardConfigurationWindow", "Six bits"))

0 commit comments

Comments
 (0)