Skip to content

Commit f002c94

Browse files
EzetowersEzetowers
committed
Replicated gen_count_combo in Experiment tab
1 parent f46dbca commit f002c94

File tree

3 files changed

+105
-2
lines changed

3 files changed

+105
-2
lines changed

‎MLC/GUI/Autogenerated/autogenerated.py‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -701,6 +701,20 @@ def setupUi(self, ExperimentWindow):
701701
self.frame_3.setObjectName("frame_3")
702702
self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.frame_3)
703703
self.verticalLayout_3.setObjectName("verticalLayout_3")
704+
self.exp_gen_count_group = QtWidgets.QGroupBox(self.frame_3)
705+
self.exp_gen_count_group.setObjectName("exp_gen_count_group")
706+
self.gridLayout = QtWidgets.QGridLayout(self.exp_gen_count_group)
707+
self.gridLayout.setObjectName("gridLayout")
708+
self.exp_prov_gen_button = QtWidgets.QPushButton(self.exp_gen_count_group)
709+
self.exp_prov_gen_button.setObjectName("exp_prov_gen_button")
710+
self.gridLayout.addWidget(self.exp_prov_gen_button, 1, 0, 1, 1)
711+
self.exp_next_gen_button = QtWidgets.QPushButton(self.exp_gen_count_group)
712+
self.exp_next_gen_button.setObjectName("exp_next_gen_button")
713+
self.gridLayout.addWidget(self.exp_next_gen_button, 1, 1, 1, 1)
714+
self.exp_gen_count_combo = QtWidgets.QComboBox(self.exp_gen_count_group)
715+
self.exp_gen_count_combo.setObjectName("exp_gen_count_combo")
716+
self.gridLayout.addWidget(self.exp_gen_count_combo, 0, 0, 1, 2)
717+
self.verticalLayout_3.addWidget(self.exp_gen_count_group)
704718
self.groupBox_2 = QtWidgets.QGroupBox(self.frame_3)
705719
self.groupBox_2.setFlat(False)
706720
self.groupBox_2.setCheckable(False)
@@ -1049,8 +1063,10 @@ def setupUi(self, ExperimentWindow):
10491063
self.gen_start_over_button.clicked.connect(ExperimentWindow.on_gen_start_over_button_clicked)
10501064
self.test_preev_indiv_button.clicked.connect(ExperimentWindow.on_test_preev_indiv_button_clicked)
10511065
self.disable_board_check.toggled['bool'].connect(ExperimentWindow.on_disable_arduino_toggle)
1066+
self.exp_gen_count_combo.activated['QString'].connect(ExperimentWindow.on_gen_count_combo_changed)
1067+
self.exp_prov_gen_button.clicked.connect(ExperimentWindow.on_prev_gen_button_clicked)
1068+
self.exp_next_gen_button.clicked.connect(ExperimentWindow.on_next_gen_button_clicked)
10521069
# QtCore.QMetaObject.connectSlotsByName(ExperimentWindow)
1053-
ExperimentWindow.setTabOrder(self.tabWidget, self.textEdit)
10541070
ExperimentWindow.setTabOrder(self.textEdit, self.max_cost_combo)
10551071
ExperimentWindow.setTabOrder(self.max_cost_combo, self.min_cost_combo)
10561072
ExperimentWindow.setTabOrder(self.min_cost_combo, self.valid_points_combo)
@@ -1103,6 +1119,9 @@ def retranslateUi(self, ExperimentWindow):
11031119
self.label_13.setText(_translate("ExperimentWindow", "NaN/Inf Value:"))
11041120
self.label_12.setText(_translate("ExperimentWindow", "Overflow Value:"))
11051121
self.label_14.setText(_translate("ExperimentWindow", "Marker Size:"))
1122+
self.exp_gen_count_group.setTitle(_translate("ExperimentWindow", "Generation 0/0"))
1123+
self.exp_prov_gen_button.setText(_translate("ExperimentWindow", "<<"))
1124+
self.exp_next_gen_button.setText(_translate("ExperimentWindow", ">>"))
11061125
self.groupBox_2.setTitle(_translate("ExperimentWindow", "Scripts"))
11071126
self.ev_edit_button.setText(_translate("ExperimentWindow", "Edit"))
11081127
self.preev_edit_button.setText(_translate("ExperimentWindow", "Edit"))

‎MLC/GUI/Autogenerated/mlc_qtcreator/experiment.ui‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,32 @@
175175
<enum>QFrame::Raised</enum>
176176
</property>
177177
<layout class="QVBoxLayout" name="verticalLayout_3">
178+
<item>
179+
<widget class="QGroupBox" name="exp_gen_count_group">
180+
<property name="title">
181+
<string>Generation 0/0</string>
182+
</property>
183+
<layout class="QGridLayout" name="gridLayout">
184+
<item row="1" column="0">
185+
<widget class="QPushButton" name="exp_prov_gen_button">
186+
<property name="text">
187+
<string>&lt;&lt;</string>
188+
</property>
189+
</widget>
190+
</item>
191+
<item row="1" column="1">
192+
<widget class="QPushButton" name="exp_next_gen_button">
193+
<property name="text">
194+
<string>&gt;&gt;</string>
195+
</property>
196+
</widget>
197+
</item>
198+
<item row="0" column="0" colspan="2">
199+
<widget class="QComboBox" name="exp_gen_count_combo"/>
200+
</item>
201+
</layout>
202+
</widget>
203+
</item>
178204
<item>
179205
<widget class="QGroupBox" name="groupBox_2">
180206
<property name="title">
@@ -398,6 +424,9 @@
398424
<property name="text">
399425
<string>Disable board</string>
400426
</property>
427+
<property name="checked">
428+
<bool>true</bool>
429+
</property>
401430
</widget>
402431
</item>
403432
<item>
@@ -835,7 +864,6 @@
835864
</widget>
836865
</widget>
837866
<tabstops>
838-
<tabstop>tabWidget</tabstop>
839867
<tabstop>textEdit</tabstop>
840868
<tabstop>max_cost_combo</tabstop>
841869
<tabstop>min_cost_combo</tabstop>
@@ -1407,6 +1435,54 @@
14071435
</hint>
14081436
</hints>
14091437
</connection>
1438+
<connection>
1439+
<sender>exp_gen_count_combo</sender>
1440+
<signal>activated(QString)</signal>
1441+
<receiver>ExperimentWindow</receiver>
1442+
<slot>on_gen_count_combo_changed(QString)</slot>
1443+
<hints>
1444+
<hint type="sourcelabel">
1445+
<x>811</x>
1446+
<y>93</y>
1447+
</hint>
1448+
<hint type="destinationlabel">
1449+
<x>482</x>
1450+
<y>343</y>
1451+
</hint>
1452+
</hints>
1453+
</connection>
1454+
<connection>
1455+
<sender>exp_prov_gen_button</sender>
1456+
<signal>clicked()</signal>
1457+
<receiver>ExperimentWindow</receiver>
1458+
<slot>on_prev_gen_button_clicked()</slot>
1459+
<hints>
1460+
<hint type="sourcelabel">
1461+
<x>754</x>
1462+
<y>121</y>
1463+
</hint>
1464+
<hint type="destinationlabel">
1465+
<x>482</x>
1466+
<y>343</y>
1467+
</hint>
1468+
</hints>
1469+
</connection>
1470+
<connection>
1471+
<sender>exp_next_gen_button</sender>
1472+
<signal>clicked()</signal>
1473+
<receiver>ExperimentWindow</receiver>
1474+
<slot>on_next_gen_button_clicked()</slot>
1475+
<hints>
1476+
<hint type="sourcelabel">
1477+
<x>868</x>
1478+
<y>121</y>
1479+
</hint>
1480+
<hint type="destinationlabel">
1481+
<x>482</x>
1482+
<y>343</y>
1483+
</hint>
1484+
</hints>
1485+
</connection>
14101486
</connections>
14111487
<slots>
14121488
<slot>on_closed_dialog()</slot>

‎MLC/GUI/Experiment/ExperimentWindow.py‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -673,11 +673,13 @@ def _update_individuals_per_generation_list(self):
673673
# Disable Experiment tab buttons
674674
self._autogenerated_object.left_menu_frame.setDisabled(True)
675675
self._autogenerated_object.right_menu_frame.setDisabled(True)
676+
self._autogenerated_object.exp_gen_count_group.setDisabled(True)
676677
self._autogenerated_object.tabWidget.setTabEnabled(3, True)
677678
return
678679
else:
679680
self._autogenerated_object.left_menu_frame.setDisabled(False)
680681
self._autogenerated_object.right_menu_frame.setDisabled(False)
682+
self._autogenerated_object.exp_gen_count_group.setDisabled(False)
681683
self._autogenerated_object.tabWidget.setTabEnabled(3, False)
682684

683685
# Complete the list
@@ -726,10 +728,12 @@ def _update_experiment_info(self):
726728
from_gen_combo = self._autogenerated_object.from_gen_combo
727729
to_gen_combo = self._autogenerated_object.to_gen_combo
728730
gen_count_combo = self._autogenerated_object.gen_count_combo
731+
exp_gen_count_combo = self._autogenerated_object.exp_gen_count_combo
729732

730733
from_gen_combo.clear()
731734
to_gen_combo.clear()
732735
gen_count_combo.clear()
736+
exp_gen_count_combo.clear()
733737

734738
number_of_gens = experiment_info["generations"]
735739
if number_of_gens == 0:
@@ -753,6 +757,7 @@ def _update_experiment_info(self):
753757

754758
# Fill the db_view
755759
gen_count_group = self._autogenerated_object.gen_count_group
760+
exp_gen_count_group = self._autogenerated_object.exp_gen_count_group
756761
if number_of_gens != 0:
757762
if self._current_gen == 0:
758763
self._current_gen = 1
@@ -775,10 +780,13 @@ def _update_experiment_info(self):
775780

776781
# Refresh the gen_count_label
777782
gen_count_group.setTitle("Generation: {0}/{1}".format(self._current_gen, number_of_gens))
783+
exp_gen_count_group.setTitle("Generation: {0}/{1}".format(self._current_gen, number_of_gens))
778784

779785
# Refresh the gen_count_combo
780786
gen_count_combo.addItems(str(x) for x in xrange(1, number_of_gens + 1))
781787
gen_count_combo.setCurrentIndex(self._current_gen - 1)
788+
exp_gen_count_combo.addItems(str(x) for x in xrange(1, number_of_gens + 1))
789+
exp_gen_count_combo.setCurrentIndex(self._current_gen - 1)
782790
else:
783791
self._current_gen = 0
784792
gen_count_group.setTitle("Generation: 0/0")

0 commit comments

Comments
 (0)