Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
mantid
Manage
Activity
Members
Labels
Plan
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
mantidproject
mantid
Commits
c59038fd
Commit
c59038fd
authored
5 years ago
by
Matthew Andrew
Browse files
Options
Downloads
Patches
Plain Diff
Changed GUi variable names to snakecase Re #25546
parent
f68e47dd
No related branches found
No related tags found
No related merge requests found
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
+156
-156
156 additions, 156 deletions
...mon/home_instrument_widget/home_instrument_widget_view.py
scripts/test/Muon/home_instrument_widget_test.py
+45
-45
45 additions, 45 deletions
scripts/test/Muon/home_instrument_widget_test.py
with
201 additions
and
201 deletions
scripts/Muon/GUI/Common/home_instrument_widget/home_instrument_widget_view.py
+
156
−
156
View file @
c59038fd
This diff is collapsed.
Click to expand it.
scripts/test/Muon/home_instrument_widget_test.py
+
45
−
45
View file @
c59038fd
...
...
@@ -68,18 +68,18 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
def
test_that_changeing_time_zero_updates_model
(
self
):
time_zero
=
1.23456
self
.
view
.
timezero_checkbox
.
setChecked
(
False
)
self
.
view
.
time
_
zero_checkbox
.
setChecked
(
False
)
self
.
view
.
set_time_zero
(
time_zero
)
self
.
view
.
timezero_edit
.
editingFinished
.
emit
()
self
.
view
.
time
_
zero_edit
.
editingFinished
.
emit
()
self
.
assertEqual
(
self
.
model
.
get_user_time_zero
(),
round
(
time_zero
,
3
))
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
2
)
def
test_that_changeing_time_zero_does_nothing_if_checkbox_is_checked
(
self
):
time_zero
=
1.23456
self
.
view
.
timezero_checkbox
.
setChecked
(
True
)
self
.
view
.
time
_
zero_checkbox
.
setChecked
(
True
)
self
.
view
.
set_time_zero
(
time_zero
)
self
.
view
.
timezero_edit
.
editingFinished
.
emit
()
self
.
view
.
time
_
zero_edit
.
editingFinished
.
emit
()
self
.
assertEqual
(
self
.
model
.
get_user_time_zero
(),
0.0
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
0
)
...
...
@@ -88,28 +88,28 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
user_time_zero
=
1.234
self
.
model
.
set_user_time_zero
(
user_time_zero
)
self
.
view
.
timezero_checkbox
.
setChecked
(
True
)
self
.
view
.
time
_
zero_checkbox
.
setChecked
(
True
)
self
.
assertEqual
(
self
.
view
.
get_time_zero
(),
0.0
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
1
)
self
.
view
.
timezero_checkbox
.
setChecked
(
False
)
self
.
view
.
time
_
zero_checkbox
.
setChecked
(
False
)
self
.
assertEqual
(
self
.
view
.
get_time_zero
(),
user_time_zero
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
2
)
def
test_that_changeing_first_good_data_updates_model
(
self
):
time_zero
=
1.23456
self
.
view
.
firstgooddata_checkbox
.
setChecked
(
False
)
self
.
view
.
first
_
good
_
data_checkbox
.
setChecked
(
False
)
self
.
view
.
set_first_good_data
(
time_zero
)
self
.
view
.
firstgooddata_edit
.
editingFinished
.
emit
()
self
.
view
.
first
_
good
_
data_edit
.
editingFinished
.
emit
()
self
.
assertEqual
(
self
.
model
.
get_user_first_good_data
(),
round
(
time_zero
,
3
))
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
2
)
def
test_that_changeing_first_good_data_does_nothing_if_checkbox_is_checked
(
self
):
time_zero
=
1.23456
self
.
view
.
firstgooddata_checkbox
.
setChecked
(
True
)
self
.
view
.
first
_
good
_
data_checkbox
.
setChecked
(
True
)
self
.
view
.
set_first_good_data
(
time_zero
)
self
.
view
.
firstgooddata_edit
.
editingFinished
.
emit
()
self
.
view
.
first
_
good
_
data_edit
.
editingFinished
.
emit
()
self
.
assertEqual
(
self
.
model
.
get_user_time_zero
(),
0.0
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
0
)
...
...
@@ -118,11 +118,11 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
user_time_zero
=
1.234
self
.
model
.
set_user_first_good_data
(
user_time_zero
)
self
.
view
.
firstgooddata_checkbox
.
setChecked
(
True
)
self
.
view
.
first
_
good
_
data_checkbox
.
setChecked
(
True
)
self
.
assertEqual
(
self
.
view
.
get_first_good_data
(),
0.0
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
1
)
self
.
view
.
firstgooddata_checkbox
.
setChecked
(
False
)
self
.
view
.
first
_
good
_
data_checkbox
.
setChecked
(
False
)
self
.
assertEqual
(
self
.
view
.
get_first_good_data
(),
user_time_zero
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
2
)
...
...
@@ -174,18 +174,18 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
3
)
def
test_that_on_dead_time_unselected_deadtime_model_set_to_none
(
self
):
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
1
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
1
)
self
.
context
.
gui_context
[
'
DeadTimeSource
'
]
=
'
FromFile
'
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
0
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
0
)
self
.
assertEqual
(
self
.
view
.
deadtime_label_3
.
text
(),
self
.
presenter
.
dead_time_from_data_text
([
0.0
]))
self
.
assertEqual
(
self
.
view
.
dead
_
time_label_3
.
text
(),
self
.
presenter
.
dead_time_from_data_text
([
0.0
]))
self
.
assertEqual
(
self
.
model
.
_data
.
current_data
[
"
DeadTimeTable
"
],
None
)
self
.
gui_variable_observer
.
update
.
assert_called_once_with
(
self
.
gui_context
.
gui_variables_notifier
,
None
)
def
test_that_on_deadtime_data_selected_updates_with_no_loaded_data
(
self
):
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
1
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
1
)
self
.
assertEqual
(
self
.
view
.
deadtime_label_3
.
text
(),
"
No loaded dead time
"
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_label_3
.
text
(),
"
No loaded dead time
"
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
0
)
def
test_that_on_deadtime_data_selected_updates_with_loaded_data
(
self
):
...
...
@@ -193,9 +193,9 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
dead_time_data
.
toDict
.
return_value
=
{
'
dead-time
'
:
[
0.001
,
0.002
,
0.003
]}
self
.
presenter
.
_model
.
get_dead_time_table_from_data
=
mock
.
MagicMock
(
return_value
=
dead_time_data
)
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
1
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
1
)
self
.
assertEqual
(
self
.
view
.
deadtime_label_3
.
text
(),
'
From 0.001 to 0.003 (ave. 0.002)
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_label_3
.
text
(),
'
From 0.001 to 0.003 (ave. 0.002)
'
)
self
.
gui_variable_observer
.
update
.
assert_called_once_with
(
self
.
gui_context
.
gui_variables_notifier
,
None
)
@mock.patch
(
...
...
@@ -203,34 +203,34 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
def
test_that_selecting_from_table_workspace_deadtime_option_enables_table_workspace_combo_box
(
self
,
get_table_names_mock
):
get_table_names_mock
.
return_value
=
[
'
table_1
'
,
'
table_2
'
,
'
table_3
'
]
self
.
assertTrue
(
self
.
view
.
deadtime_file_selector
.
isHidden
())
self
.
assertTrue
(
self
.
view
.
dead
_
time_file_selector
.
isHidden
())
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
2
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
2
)
self
.
assertEqual
(
self
.
view
.
deadtime_label_3
.
text
(),
"
From 0.000 to 0.000 (ave. 0.000)
"
)
self
.
assertFalse
(
self
.
view
.
deadtime_file_selector
.
isHidden
())
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
count
(),
4
)
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
itemText
(
0
),
'
None
'
)
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
itemText
(
1
),
'
table_1
'
)
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
itemText
(
2
),
'
table_2
'
)
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
itemText
(
3
),
'
table_3
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_label_3
.
text
(),
"
From 0.000 to 0.000 (ave. 0.000)
"
)
self
.
assertFalse
(
self
.
view
.
dead
_
time_file_selector
.
isHidden
())
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
count
(),
4
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
itemText
(
0
),
'
None
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
itemText
(
1
),
'
table_1
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
itemText
(
2
),
'
table_2
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
itemText
(
3
),
'
table_3
'
)
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
0
)
def
test_that_returning_to_None_options_hides_table_workspace_selector
(
self
):
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
2
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
2
)
self
.
context
.
gui_context
[
'
DeadTimeSource
'
]
=
'
FromADS
'
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
0
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
0
)
self
.
assertEqual
(
self
.
view
.
deadtime_label_3
.
text
(),
"
From 0.000 to 0.000 (ave. 0.000)
"
)
self
.
assertTrue
(
self
.
view
.
deadtime_file_selector
.
isHidden
())
self
.
assertEqual
(
self
.
view
.
dead
_
time_label_3
.
text
(),
"
From 0.000 to 0.000 (ave. 0.000)
"
)
self
.
assertTrue
(
self
.
view
.
dead
_
time_file_selector
.
isHidden
())
self
.
gui_variable_observer
.
update
.
assert_called_once_with
(
self
.
gui_context
.
gui_variables_notifier
,
None
)
def
test_browse_button_displayed_when_from_other_file_selected
(
self
):
self
.
assertTrue
(
self
.
view
.
deadtime_browse_button
.
isHidden
())
self
.
assertTrue
(
self
.
view
.
dead
_
time_browse_button
.
isHidden
())
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
3
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
3
)
self
.
assertFalse
(
self
.
view
.
deadtime_browse_button
.
isHidden
())
self
.
assertFalse
(
self
.
view
.
dead
_
time_browse_button
.
isHidden
())
self
.
assertEqual
(
self
.
gui_variable_observer
.
update
.
call_count
,
0
)
@mock.patch
(
...
...
@@ -238,9 +238,9 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
def
test_browse_clicked_displays_warning_popup_if_file_does_not_contain_table
(
self
,
load_deadtime_mock
):
self
.
view
.
show_file_browser_and_return_selection
=
mock
.
MagicMock
()
load_deadtime_mock
.
return_value
=
''
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
3
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
3
)
self
.
view
.
deadtime_browse_button
.
clicked
.
emit
(
True
)
self
.
view
.
dead
_
time_browse_button
.
clicked
.
emit
(
True
)
self
.
view
.
show_file_browser_and_return_selection
.
assert_called_once_with
(
'
Files (*.nxs)
'
,
[
''
],
multiple_files
=
False
)
...
...
@@ -252,9 +252,9 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
'
Muon.GUI.Common.home_instrument_widget.home_instrument_widget_presenter.load_utils.load_dead_time_from_filename
'
)
def
test_browse_clicked_does_nothing_if_no_file_selected
(
self
,
load_deadtime_mock
):
self
.
view
.
show_file_browser_and_return_selection
=
mock
.
MagicMock
(
return_value
=
[
''
])
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
3
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
3
)
self
.
view
.
deadtime_browse_button
.
clicked
.
emit
(
True
)
self
.
view
.
dead
_
time_browse_button
.
clicked
.
emit
(
True
)
load_deadtime_mock
.
assert_not_called
()
self
.
view
.
warning_popup
.
assert_not_called
()
...
...
@@ -265,11 +265,11 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
def
test_browse_clicked_fails_if_table_not_loaded_into_ADS
(
self
,
load_deadtime_mock
):
self
.
view
.
show_file_browser_and_return_selection
=
mock
.
MagicMock
(
return_value
=
[
'
filename
'
])
load_deadtime_mock
.
return_value
=
'
dead_time_table_name
'
self
.
view
.
deadtime_selector
.
setCurrentIndex
(
3
)
self
.
view
.
dead
_
time_selector
.
setCurrentIndex
(
3
)
self
.
view
.
deadtime_browse_button
.
clicked
.
emit
(
True
)
self
.
view
.
dead
_
time_browse_button
.
clicked
.
emit
(
True
)
self
.
assertEqual
(
self
.
view
.
deadtime_selector
.
currentIndex
(),
2
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_selector
.
currentIndex
(),
2
)
self
.
view
.
warning_popup
.
assert_called_once_with
(
"
Dead time table cannot be loaded
"
)
self
.
gui_variable_observer
.
update
.
assert_not_called
()
...
...
@@ -278,11 +278,11 @@ class HomeTabInstrumentPresenterTest(unittest.TestCase):
self
.
view
.
show_file_browser_and_return_selection
=
mock
.
MagicMock
(
return_value
=
[
filename
])
self
.
model
.
check_dead_time_file_selection
=
mock
.
MagicMock
(
return_value
=
True
)
self
.
view
.
deadtime_browse_button
.
clicked
.
emit
(
True
)
self
.
view
.
dead
_
time_browse_button
.
clicked
.
emit
(
True
)
self
.
assertEqual
(
self
.
view
.
deadtime_selector
.
currentIndex
(),
2
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_selector
.
currentIndex
(),
2
)
self
.
view
.
warning_popup
.
assert_not_called
()
self
.
assertEqual
(
self
.
view
.
deadtime_file_selector
.
currentText
(),
'
MUSR00015196_deadTimes
'
)
self
.
assertEqual
(
self
.
view
.
dead
_
time_file_selector
.
currentText
(),
'
MUSR00015196_deadTimes
'
)
self
.
gui_variable_observer
.
update
.
assert_called_once_with
(
self
.
gui_context
.
gui_variables_notifier
,
None
)
def
test_validate_variable_rebin_string_allows_single_number
(
self
):
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment