Skip to content

Commit 1720e86

Browse files
committed
changed "other" to "GUI"
1 parent 8416f34 commit 1720e86

5 files changed

Lines changed: 16 additions & 16 deletions

File tree

config/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"state_history_len": 100,
2424
"analog_history_dur": 12,
2525
},
26-
"other": {
26+
"GUI": {
2727
"ui_font_size": 11,
2828
"log_font_size": 9,
2929
},

gui/GUI_main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ def launch_GUI():
197197
app.setStyle('Fusion')
198198
app.setWindowIcon(QtGui.QIcon("gui/icons/logo.svg"))
199199
font = QtGui.QFont()
200-
font.setPixelSize(get_setting("other",("ui_font_size")))
200+
font.setPixelSize(get_setting("GUI",("ui_font_size")))
201201
app.setFont(font)
202202
gui_main = GUI_main(app)
203203
sys.excepthook = gui_main.excepthook

gui/dialogs.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -425,17 +425,17 @@ def __init__(self, parent):
425425
plotting_layout.setRowStretch(i + 1, 1)
426426
plotting_box.setLayout(plotting_layout)
427427

428-
other_box = QtWidgets.QGroupBox("Other")
429-
other_layout = QtWidgets.QGridLayout()
430-
self.ui_font_size = Spin_setter(self, "UI font size*", ("other", "ui_font_size"), " pt")
431-
self.log_font_size = Spin_setter(self, "Log font size*", ("other", "log_font_size"), " pt")
428+
gui_box = QtWidgets.QGroupBox("GUI")
429+
gui_layout = QtWidgets.QGridLayout()
430+
self.ui_font_size = Spin_setter(self, "UI font size*", ("GUI", "ui_font_size"), " pt")
431+
self.log_font_size = Spin_setter(self, "Log font size*", ("GUI", "log_font_size"), " pt")
432432

433433
other_spins = [self.ui_font_size, self.log_font_size]
434434
for i, variable in enumerate(other_spins):
435-
variable.add_to_grid(other_layout, i)
436-
other_layout.setColumnStretch(2, 1)
437-
other_layout.setRowStretch(i + 1, 1)
438-
other_box.setLayout(other_layout)
435+
variable.add_to_grid(gui_layout, i)
436+
gui_layout.setColumnStretch(2, 1)
437+
gui_layout.setRowStretch(i + 1, 1)
438+
gui_box.setLayout(gui_layout)
439439

440440
self.fill_with_defaults_btn = QtWidgets.QPushButton("Use defaults")
441441
self.fill_with_defaults_btn.clicked.connect(self.fill_with_defaults)
@@ -452,7 +452,7 @@ def __init__(self, parent):
452452

453453
settings_grid_layout.addWidget(paths_box, 0, 0, 1, 3)
454454
settings_grid_layout.addWidget(plotting_box, 1, 0)
455-
settings_grid_layout.addWidget(other_box, 1, 1)
455+
settings_grid_layout.addWidget(gui_box, 1, 1)
456456
settings_grid_layout.addLayout(btns_layout, 2, 0, 1, 3)
457457
settings_grid_layout.setColumnStretch(2, 1)
458458

@@ -483,8 +483,8 @@ def fill_with_defaults(self):
483483
self.event_history_len.spn.setValue(default_user_settings["plotting"]["event_history_len"])
484484
self.state_history_len.spn.setValue(default_user_settings["plotting"]["state_history_len"])
485485
self.analog_history_dur.spn.setValue(default_user_settings["plotting"]["analog_history_dur"])
486-
self.ui_font_size.spn.setValue(default_user_settings["other"]["ui_font_size"])
487-
self.log_font_size.spn.setValue(default_user_settings["other"]["log_font_size"])
486+
self.ui_font_size.spn.setValue(default_user_settings["GUI"]["ui_font_size"])
487+
self.log_font_size.spn.setValue(default_user_settings["GUI"]["log_font_size"])
488488

489489
def saveChanges(self):
490490
user_setting_dict_new = {
@@ -498,7 +498,7 @@ def saveChanges(self):
498498
"state_history_len": self.state_history_len.spn.value(),
499499
"analog_history_dur": self.analog_history_dur.spn.value(),
500500
},
501-
"other": {
501+
"GUI": {
502502
"ui_font_size": self.ui_font_size.spn.value(),
503503
"log_font_size": self.log_font_size.spn.value(),
504504
},

gui/run_experiment_tab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ def __init__(self, name, setup_number, parent=None):
403403
self.variables_button.setEnabled(False)
404404
self.log_textbox = QtWidgets.QTextEdit()
405405
self.log_textbox.setMinimumHeight(180)
406-
self.log_textbox.setFont(QtGui.QFont('Courier New',get_setting("other","log_font_size")))
406+
self.log_textbox.setFont(QtGui.QFont('Courier New',get_setting("GUI","log_font_size")))
407407
self.log_textbox.setReadOnly(True)
408408

409409
self.Vlayout = QtWidgets.QVBoxLayout(self)

gui/run_task_tab.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ def __init__(self, parent=None):
145145
# Log text and task plots.
146146

147147
self.log_textbox = QtWidgets.QTextEdit()
148-
self.log_textbox.setFont(QtGui.QFont("Courier New", get_setting("other","log_font_size")))
148+
self.log_textbox.setFont(QtGui.QFont("Courier New", get_setting("GUI","log_font_size")))
149149
self.log_textbox.setReadOnly(True)
150150

151151
self.task_plot = Task_plot()

0 commit comments

Comments
 (0)