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
ea160feb
Commit
ea160feb
authored
5 years ago
by
Conor Finn
Browse files
Options
Downloads
Patches
Plain Diff
RE #26846 Fix startup script and add comments
parent
40d9ae43
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
scripts/Engineering_Diffraction_2.py
+13
-12
13 additions, 12 deletions
scripts/Engineering_Diffraction_2.py
with
13 additions
and
12 deletions
scripts/Engineering_Diffraction_2.py
+
13
−
12
View file @
ea160feb
# Mantid Repository : https://github.com/mantidproject/mantid
# Mantid Repository : https://github.com/mantidproject/mantid
#
#
# Copyright © 201
8
ISIS Rutherford Appleton Laboratory UKRI,
# Copyright © 201
9
ISIS Rutherford Appleton Laboratory UKRI,
# NScD Oak Ridge National Laboratory, European Spallation Source
# NScD Oak Ridge National Laboratory, European Spallation Source
# & Institut Laue - Langevin
# & Institut Laue - Langevin
# SPDX - License - Identifier: GPL - 3.0 +
# SPDX - License - Identifier: GPL - 3.0 +
...
@@ -10,16 +10,17 @@ from Engineering.gui.engineering_diffraction.engineering_diffraction import Engi
...
@@ -10,16 +10,17 @@ from Engineering.gui.engineering_diffraction.engineering_diffraction import Engi
from
qtpy
import
QtCore
from
qtpy
import
QtCore
# Check if the interface is loaded and if so show it while maintaining its state.
if
'
engineering_diffraction
'
in
globals
():
if
'
engineering_diffraction
'
in
globals
():
eng
_diff
=
globals
()[
'
engineering_diffraction
'
]
eng
ineering_diffraction
=
globals
()[
'
engineering_diffraction
'
]
if
not
eng_diff
.
isHidden
():
# Restore a minimised window.
eng_diff
.
setWindowState
(
if
not
engineering_diffraction
.
isHidden
():
eng_diff
.
windowState
(
engineering_diffraction
.
setWindowState
(
engineering_diffraction
.
windowState
()
&
~
QtCore
.
Qt
.
WindowMinimized
)
&
~
QtCore
.
Qt
.
WindowMinimized
|
QtCore
.
Qt
.
WindowActive
)
|
QtCore
.
Qt
.
WindowActive
)
eng
_diff
.
activateWindow
()
eng
ineering_diffraction
.
activateWindow
()
else
:
else
:
eng
_diff
=
EngineeringDiffractionGui
()
eng
ineering_diffraction
=
EngineeringDiffractionGui
()
eng
_diff
.
show
()
eng
ineering_diffraction
.
show
()
else
:
else
:
# Reload GUI if not currently loaded.
eng
_diff
=
EngineeringDiffractionGui
()
eng
ineering_diffraction
=
EngineeringDiffractionGui
()
eng
_diff
.
show
()
eng
ineering_diffraction
.
show
()
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