Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xsocs
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
22
Issues
22
List
Boards
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kmap
xsocs
Commits
886f788c
Commit
886f788c
authored
Dec 06, 2018
by
Thomas Vincent
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more tooltips for QSpace conversion widget
parent
4411a20c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
11 deletions
+58
-11
xsocs/gui/process/QSpaceWidget.py
xsocs/gui/process/QSpaceWidget.py
+28
-3
xsocs/gui/widgets/AcqParamsWidget.py
xsocs/gui/widgets/AcqParamsWidget.py
+30
-8
No files found.
xsocs/gui/process/QSpaceWidget.py
View file @
886f788c
...
...
@@ -102,6 +102,9 @@ class ConversionParamsWidget(Qt.QWidget):
# Maxipix correction
self
.
__maxipixCorrection
=
self
.
__createCheckBox
(
'1. Maxipix correction'
)
self
.
__maxipixCorrection
.
setToolTip
(
'Enable/Disable Maxipix detector module edges correction '
'on input images'
)
imgGboxLayout
.
addRow
(
self
.
__maxipixCorrection
)
...
...
@@ -124,6 +127,15 @@ class ConversionParamsWidget(Qt.QWidget):
maskLayout
=
Qt
.
QHBoxLayout
()
maskLayout
.
addWidget
(
self
.
__maskFileLineEdit
,
1
)
maskLayout
.
addWidget
(
maskButton
)
tooltip
=
'Enable/Disable input images masking '
\
'and select the mask image.<br>'
\
'A value different from 0 in the mask image '
\
'masks the corresponding pixel in input images.'
self
.
__imgMaskCBox
.
setToolTip
(
tooltip
)
self
.
__maskFileLineEdit
.
setToolTip
(
tooltip
)
maskButton
.
setToolTip
(
tooltip
)
imgGboxLayout
.
addRow
(
self
.
__imgMaskCBox
,
maskLayout
)
# Normalization
...
...
@@ -136,6 +148,12 @@ class ConversionParamsWidget(Qt.QWidget):
if
normalizers
is
not
None
:
self
.
__normalizationComboBox
.
addItems
(
normalizers
)
tooltip
=
'Enable/Disable input images normalization<br>'
\
'and select the data to use as normalizer'
self
.
__imgNormCBox
.
setToolTip
(
tooltip
)
self
.
__normalizationComboBox
.
setToolTip
(
tooltip
)
imgGboxLayout
.
addRow
(
self
.
__imgNormCBox
,
self
.
__normalizationComboBox
)
# Median filter
...
...
@@ -144,8 +162,6 @@ class ConversionParamsWidget(Qt.QWidget):
inputBase
=
Qt
.
QWidget
()
inputBase
.
setEnabled
(
False
)
inputBase
.
setContentsMargins
(
0
,
0
,
0
,
0
)
medfiltLayout
=
Qt
.
QHBoxLayout
(
inputBase
)
medfiltLayout
.
setContentsMargins
(
0
,
0
,
0
,
0
)
self
.
__medfiltCBox
.
toggled
.
connect
(
inputBase
.
setEnabled
)
...
...
@@ -159,11 +175,18 @@ class ConversionParamsWidget(Qt.QWidget):
self
.
__medfiltVEdit
.
setAlignment
(
Qt
.
Qt
.
AlignRight
)
# self.__medfiltVEdit.setText(str(medfiltDims[1]))
medfiltLayout
=
Qt
.
QHBoxLayout
(
inputBase
)
medfiltLayout
.
setContentsMargins
(
0
,
0
,
0
,
0
)
medfiltLayout
.
addWidget
(
Qt
.
QLabel
(
'w='
))
medfiltLayout
.
addWidget
(
self
.
__medfiltHEdit
)
medfiltLayout
.
addWidget
(
Qt
.
QLabel
(
'h='
))
medfiltLayout
.
addWidget
(
self
.
__medfiltVEdit
)
tooltip
=
'Enable/Disable median filter on input images '
\
'and set the window size: <b>W</b>idth and <b>H</b>eight'
self
.
__medfiltCBox
.
setToolTip
(
tooltip
)
inputBase
.
setToolTip
(
tooltip
)
imgGboxLayout
.
addRow
(
self
.
__medfiltCBox
,
inputBase
)
layout
.
addWidget
(
imageGbox
)
...
...
@@ -210,8 +233,8 @@ class ConversionParamsWidget(Qt.QWidget):
tooltip
.
append
(
'- <b>
%
s</b>:
%
s,
%
s and
%
s axes'
%
((
coordinates
.
capitalize
(),)
+
QSpaceCoordinates
.
axes_names
(
coordinates
)))
self
.
__coordinatesComboBox
.
setToolTip
(
'<br>'
.
join
(
tooltip
))
qspaceLayout
.
addRow
(
"Coordinates:"
,
self
.
__coordinatesComboBox
)
layout
.
addWidget
(
qspaceGbox
)
...
...
@@ -496,6 +519,7 @@ class QSpaceWidget(Qt.QDialog):
# ################
inputGbx
=
GroupBox
(
"Input"
)
inputGbx
.
setToolTip
(
"HDF5 'master' data file to process"
)
layout
=
Qt
.
QHBoxLayout
(
inputGbx
)
topLayout
.
addWidget
(
inputGbx
,
0
,
0
,
...
...
@@ -609,6 +633,7 @@ class QSpaceWidget(Qt.QDialog):
# ################
outputGbx
=
GroupBox
(
"Output"
)
outputGbx
.
setToolTip
(
'HDF5 file where QSpace will be saved'
)
layout
=
Qt
.
QHBoxLayout
(
outputGbx
)
topLayout
.
addWidget
(
outputGbx
,
3
,
0
,
1
,
2
)
lab
=
Qt
.
QLabel
(
'Output :'
)
...
...
xsocs/gui/widgets/AcqParamsWidget.py
View file @
886f788c
...
...
@@ -73,15 +73,22 @@ class AcqParamsWidget(Qt.QWidget):
# beam energy
# ===========
row
=
0
self
.
__energyWidget
=
Qt
.
QWidget
()
self
.
__energyWidget
=
Qt
.
QWidget
(
self
)
h_layout
=
Qt
.
QHBoxLayout
(
self
.
__energyWidget
)
self
.
__beam_nrg_edit
=
_dblLineEditWidget
(
12
,
read_only
)
h_layout
.
addWidget
(
self
.
__beam_nrg_edit
)
h_layout
.
addWidget
(
Qt
.
QLabel
(
'<b>eV</b>'
))
layout
.
addWidget
(
Qt
.
QLabel
(
'Beam energy :'
),
row
,
0
)
label
=
Qt
.
QLabel
(
'Beam energy:'
)
layout
.
addWidget
(
label
,
row
,
0
)
layout
.
addWidget
(
self
.
__energyWidget
,
row
,
1
,
alignment
=
Qt
.
Qt
.
AlignLeft
|
Qt
.
Qt
.
AlignTop
)
tooltip
=
'Incoming beam energy'
label
.
setToolTip
(
tooltip
)
self
.
__energyWidget
.
setToolTip
(
tooltip
)
# ===
row
+=
1
...
...
@@ -95,8 +102,9 @@ class AcqParamsWidget(Qt.QWidget):
# ===========
row
+=
1
h_layout
=
Qt
.
QHBoxLayout
()
layout
.
addLayout
(
h_layout
,
row
,
1
,
widget
=
Qt
.
QWidget
(
self
)
h_layout
=
Qt
.
QHBoxLayout
(
widget
)
layout
.
addWidget
(
widget
,
row
,
1
,
alignment
=
Qt
.
Qt
.
AlignLeft
|
Qt
.
Qt
.
AlignTop
)
self
.
__dir_beam_v_edit
=
_dblLineEditWidget
(
6
,
read_only
)
h_layout
.
addWidget
(
Qt
.
QLabel
(
'v='
))
...
...
@@ -105,7 +113,13 @@ class AcqParamsWidget(Qt.QWidget):
h_layout
.
addWidget
(
Qt
.
QLabel
(
' h='
))
h_layout
.
addWidget
(
self
.
__dir_beam_h_edit
)
h_layout
.
addWidget
(
Qt
.
QLabel
(
'<b>px</b>'
))
layout
.
addWidget
(
Qt
.
QLabel
(
'Direct beam :'
),
row
,
0
)
label
=
Qt
.
QLabel
(
'Direct beam:'
)
layout
.
addWidget
(
label
,
row
,
0
)
tooltip
=
'Set direct beam <b>V</b>ertical and <b>H</b>orizontal '
\
'calibration position on the detector'
widget
.
setToolTip
(
tooltip
)
label
.
setToolTip
(
tooltip
)
# ===
...
...
@@ -120,8 +134,9 @@ class AcqParamsWidget(Qt.QWidget):
# ===========
row
+=
1
h_layout
=
Qt
.
QHBoxLayout
()
layout
.
addLayout
(
h_layout
,
row
,
1
,
widget
=
Qt
.
QWidget
(
self
)
h_layout
=
Qt
.
QHBoxLayout
(
widget
)
layout
.
addWidget
(
widget
,
row
,
1
,
alignment
=
Qt
.
Qt
.
AlignLeft
|
Qt
.
Qt
.
AlignTop
)
self
.
__chpdeg_v_edit
=
_dblLineEditWidget
(
6
,
read_only
)
h_layout
.
addWidget
(
Qt
.
QLabel
(
'v='
))
...
...
@@ -130,7 +145,14 @@ class AcqParamsWidget(Qt.QWidget):
h_layout
.
addWidget
(
Qt
.
QLabel
(
' h='
))
h_layout
.
addWidget
(
self
.
__chpdeg_h_edit
)
h_layout
.
addWidget
(
Qt
.
QLabel
(
'<b>px</b>'
))
layout
.
addWidget
(
Qt
.
QLabel
(
'Chan. per deg. :'
),
row
,
0
)
label
=
Qt
.
QLabel
(
'Chan. per deg.:'
)
layout
.
addWidget
(
label
,
row
,
0
)
tooltip
=
'Set <b>V</b>ertical and <b>H</b>orizontal detector '
\
'pixels per degree calibration information'
widget
.
setToolTip
(
tooltip
)
label
.
setToolTip
(
tooltip
)
# ===
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment