Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add a dialog where config settings can be changed #1580

Merged
merged 1 commit into from
Sep 25, 2023
Merged

Add a dialog where config settings can be changed #1580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions hexrd/ui/config_dialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
from hexrd.ui.hexrd_config import HexrdConfig
from hexrd.ui.ui_loader import UiLoader


class ConfigDialog:
def __init__(self, parent=None):
self.ui = UiLoader().load_file('config_dialog.ui', parent)

self.update_gui()
self.setup_connections()

def setup_connections(self):
self.ui.accepted.connect(self.on_accepted)

def exec_(self):
self.update_gui()
self.ui.exec_()

def update_gui(self):
self.max_cpus_ui = self.max_cpus_config

def update_config(self):
self.max_cpus_config = self.max_cpus_ui

def on_accepted(self):
self.update_config()

@property
def max_cpus_ui(self):
if not self.ui.limit_cpus.isChecked():
return None

return self.ui.max_cpus.value()

@max_cpus_ui.setter
def max_cpus_ui(self, v):
self.ui.limit_cpus.setChecked(v is not None)
if v is None:
return

self.ui.max_cpus.setValue(v)

@property
def max_cpus_config(self):
return HexrdConfig().max_cpus

@max_cpus_config.setter
def max_cpus_config(self, v):
HexrdConfig().max_cpus = v
6 changes: 6 additions & 0 deletions hexrd/ui/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
from hexrd.ui.calibration_slider_widget import CalibrationSliderWidget
from hexrd.ui.create_hedm_instrument import create_hedm_instrument
from hexrd.ui.color_map_editor import ColorMapEditor
from hexrd.ui.config_dialog import ConfigDialog
from hexrd.ui.progress_dialog import ProgressDialog
from hexrd.ui.cal_tree_view import CalTreeView
from hexrd.ui.hand_drawn_mask_dialog import HandDrawnMaskDialog
Expand Down Expand Up @@ -219,6 +220,8 @@ def setup_connections(self):
self.on_action_transform_detectors_triggered)
self.ui.action_image_calculator.triggered.connect(
self.open_image_calculator)
self.ui.action_edit_config.triggered.connect(
self.on_action_edit_config_triggered)
self.ui.action_open_mask_manager.triggered.connect(
self.on_action_open_mask_manager_triggered)
self.ui.action_show_live_updates.toggled.connect(
Expand Down Expand Up @@ -1238,6 +1241,9 @@ def on_accepted():

dialog.accepted.connect(on_accepted)

def on_action_edit_config_triggered(self):
ConfigDialog(self.ui).exec_()

def update_enable_states(self):
has_images = HexrdConfig().has_images
num_images = HexrdConfig().imageseries_length
Expand Down
117 changes: 117 additions & 0 deletions hexrd/ui/resources/ui/config_dialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>config_dialog</class>
<widget class="QDialog" name="config_dialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>374</width>
<height>94</height>
</rect>
</property>
<property name="windowTitle">
<string>HEXRDGUI Configuration</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="1">
<widget class="QSpinBox" name="max_cpus">
<property name="enabled">
<bool>false</bool>
</property>
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>10000</number>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QCheckBox" name="limit_cpus">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Limit the number of CPUs used for multiprocessing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="text">
<string>Limit CPUs?</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="button_box">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<tabstops>
<tabstop>limit_cpus</tabstop>
<tabstop>max_cpus</tabstop>
</tabstops>
<resources/>
<connections>
<connection>
<sender>limit_cpus</sender>
<signal>toggled(bool)</signal>
<receiver>max_cpus</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>97</x>
<y>25</y>
</hint>
<hint type="destinationlabel">
<x>276</x>
<y>25</y>
</hint>
</hints>
</connection>
<connection>
<sender>button_box</sender>
<signal>accepted()</signal>
<receiver>config_dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>186</x>
<y>68</y>
</hint>
<hint type="destinationlabel">
<x>186</x>
<y>46</y>
</hint>
</hints>
</connection>
<connection>
<sender>button_box</sender>
<signal>rejected()</signal>
<receiver>config_dialog</receiver>
<slot>reject()</slot>
<hints>
<hint type="sourcelabel">
<x>186</x>
<y>68</y>
</hint>
<hint type="destinationlabel">
<x>186</x>
<y>46</y>
</hint>
</hints>
</connection>
</connections>
</ui>
12 changes: 9 additions & 3 deletions hexrd/ui/resources/ui/main_window.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<x>0</x>
<y>0</y>
<width>1600</width>
<height>22</height>
<height>26</height>
</rect>
</property>
<widget class="QMenu" name="menu_file">
Expand Down Expand Up @@ -206,6 +206,7 @@
<addaction name="action_transform_detectors"/>
<addaction name="action_edit_refinements"/>
<addaction name="action_image_calculator"/>
<addaction name="action_edit_config"/>
</widget>
<widget class="QMenu" name="menu_run">
<property name="title">
Expand Down Expand Up @@ -316,7 +317,7 @@
<x>0</x>
<y>0</y>
<width>550</width>
<height>775</height>
<height>753</height>
</rect>
</property>
<attribute name="label">
Expand All @@ -329,7 +330,7 @@
<x>0</x>
<y>0</y>
<width>550</width>
<height>775</height>
<height>753</height>
</rect>
</property>
<attribute name="label">
Expand Down Expand Up @@ -839,6 +840,11 @@
<string>Threshold</string>
</property>
</action>
<action name="action_edit_config">
<property name="text">
<string>Configuration</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>
Expand Down
Loading