diff --git a/hexrdgui/cal_tree_view.py b/hexrdgui/cal_tree_view.py
index c58f2111a..3f386d7d1 100644
--- a/hexrdgui/cal_tree_view.py
+++ b/hexrdgui/cal_tree_view.py
@@ -285,8 +285,8 @@ def __init__(self, parent=None):
self.resizeColumnToContents(VALUE_COL)
self.resizeColumnToContents(STATUS_COL)
- self.header().resizeSection(KEY_COL, 200)
- self.header().resizeSection(VALUE_COL, 200)
+ self.header().resizeSection(KEY_COL, 180)
+ self.header().resizeSection(VALUE_COL, 170)
self.setup_connections()
diff --git a/hexrdgui/resources/ui/color_map_editor.ui b/hexrdgui/resources/ui/color_map_editor.ui
index 42cffa107..542b312c3 100644
--- a/hexrdgui/resources/ui/color_map_editor.ui
+++ b/hexrdgui/resources/ui/color_map_editor.ui
@@ -6,8 +6,8 @@
0
0
- 459
- 143
+ 352
+ 145
@@ -61,7 +61,7 @@
0
- -
+
-
Qt::Vertical
@@ -77,32 +77,28 @@
-
- Maximum Value:
+ Max:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
- reverse
+
-
+
+
+ false
-
-
- -
-
-
- Qt::Horizontal
+
+ -999999999
-
-
- 40
- 20
-
+
+ 999999999
-
+
+ 10
+
+
-
@@ -114,24 +110,14 @@
- 40
+ 20
20
- -
-
-
- Minimum Value:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
+
-
+
false
@@ -141,61 +127,72 @@
999999999
-
- 10
+
+ 429
- -
-
-
- false
+
-
+
+
+ Colormap:
-
- -999999999
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
- 999999999
+
+
+ -
+
+
+ Min:
-
- 429
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
- -
-
-
- false
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+ -
+
- <html><head/><body><p>Brightness and Contrast editor</p></body></html>
+ Color under values as blue
- B&&C
+ show under
- -
-
+
-
+
- Color Map:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+ reverse
- -
-
-
- combobox-popup: 0;
+
-
+
+
+ <html><head/><body><p>Display invalid (nan) pixels with a specified color.</p></body></html>
-
- 5
+
+ show invalid
- -
+
-
Color over values as red
@@ -205,33 +202,39 @@
- -
+
-
+
+
+ combobox-popup: 0;
+
+
+ 5
+
+
+
+ -
Scaling:
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
- -
+
-
- -
-
-
- Color under values as blue
-
-
- show under
+
-
+
+
+ false
-
-
- -
-
- <html><head/><body><p>Display invalid (nan) pixels with a specified color.</p></body></html>
+ <html><head/><body><p>Brightness and Contrast editor</p></body></html>
- show invalid
+ B&&C
@@ -251,14 +254,8 @@
color_map
- reverse
minimum
- show_under
maximum
- show_over
- show_invalid
- bc_editor_button
- scaling
diff --git a/hexrdgui/resources/ui/image_mode_widget.ui b/hexrdgui/resources/ui/image_mode_widget.ui
index 051cb5f0f..590b4d347 100644
--- a/hexrdgui/resources/ui/image_mode_widget.ui
+++ b/hexrdgui/resources/ui/image_mode_widget.ui
@@ -6,8 +6,8 @@
0
0
- 817
- 779
+ 524
+ 720
@@ -38,7 +38,7 @@
QTabWidget::Rounded
- 1
+ 2
@@ -331,342 +331,504 @@
-
-
-
-
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- max
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- min
-
-
-
- -
-
-
- η:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- false
-
-
- Apply binary erosion to eliminate edge artifacts.
-
-
- Apply erosion?
-
-
-
- -
-
-
- 0
-
-
-
- -
-
-
- Pixel Size:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- true
-
-
- w:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- false
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- 0.000010000000000
-
-
- 100.000000000000000
-
-
- 0.100000000000000
-
-
- 0.200000000000000
-
-
-
- -
-
-
- max
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- 0.000010000000000
-
-
- 180.000000000000000
-
-
- 0.010000000000000
-
-
- 1.000000000000000
-
-
-
- -
-
-
- 2θ Range:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
+
+
-
+
+
+
+
+
+
-
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ 0.000100000000000
+
+
+ 360.000000000000000
+
+
+ 0.100000000000000
+
+
+ 0.200000000000000
+
+
+
+ -
+
+
+ <html><head/><body><p>Set the X-Ray Source used to create the polar view. This X-Ray Source will also be used in any place int he program where a single x-ray source is expected.</p><p>This option is only visible if an instrument with multiple x-ray sources is loaded.</p></body></html>
+
+
+
+ -
+
+
+ <html><head/><body><p>Set the X-Ray Source used to create the polar view. This X-Ray Source will also be used in any place int he program where a single x-ray source is expected.</p><p>This option is only visible if an instrument with multiple x-ray sources is loaded.</p></body></html>
+
+
+ X-Ray Source:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+
+
+
+ °
+
+
+ 8
+
+
+ 0.000100000000000
+
+
+ 10.000000000000000
+
+
+ 0.010000000000000
+
+
+ 0.050000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ -360.000000000000000
+
+
+ 360.000000000000000
+
+
+ -180.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ -360.000000000000000
+
+
+ 360.000000000000000
+
+
+ 180.000000000000000
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ η Range:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ η:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 2θ Range:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ 0.000010000000000
+
+
+ 180.000000000000000
+
+
+ 0.010000000000000
+
+
+ 20.000000000000000
+
+
+
+ -
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ 0.000010000000000
+
+
+ 180.000000000000000
+
+
+ 0.010000000000000
+
+
+ 1.000000000000000
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ -
+
+
+ Qt::AlignCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 2θ:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Pixel Size:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+
- -
-
+
-
+
Qt::Horizontal
- -
-
-
- true
-
-
- <html><head/><body><p>Apply 2θ distortion from an overlay to the polar view.</p><p>2θ distortion may only be applied using an overlay that has Sample Layer Distortion enabled.</p></body></html>
-
-
- Apply 2θ distortion?
-
-
-
- -
-
-
- η Range:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- 0.000100000000000
-
-
- 10.000000000000000
-
-
- 0.010000000000000
-
-
- 0.050000000000000
-
-
-
- -
-
-
- Show SNIP
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- -360.000000000000000
-
-
- 360.000000000000000
-
-
- -180.000000000000000
-
+
-
+
+
+
+
+
+
-
+
+
+ Show SNIP
+
+
+
+ -
+
+
+ Apply SNIP?
+
+
+
+ -
+
+
-
+
+ Fast SNIP 1D
+
+
+ -
+
+ SNIP 1D
+
+
+ -
+
+ SNIP 2D
+
+
+
+
+ -
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ °
+
+
+ 8
+
+
+ 0.000010000000000
+
+
+ 100.000000000000000
+
+
+ 0.100000000000000
+
+
+ 0.200000000000000
+
+
+
+ -
+
+
+ true
+
+
+ w:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ true
+
+
+ n iter:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ false
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+ false
+
+
+ 1
+
+
+ 100
+
+
+ 2
+
+
+
+ -
+
+
+ false
+
+
+ Apply binary erosion to eliminate edge artifacts.
+
+
+ Apply erosion?
+
+
+
+
- -
-
+
-
+
Qt::Horizontal
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- 0.000100000000000
-
-
- 360.000000000000000
-
-
- 0.100000000000000
-
-
- 0.200000000000000
-
- -
-
-
-
-
- Fast SNIP 1D
-
-
- -
-
- SNIP 1D
-
-
- -
-
- SNIP 2D
-
-
-
-
- -
-
+
-
+
-
-
+
+
+ true
+
- <html><head/><body><p>If checked, the scaling from the color map will also be applied to the lineout.</p><p><br/></p><p>If the scaling is applied to the lineout, note that the lineout is generated as follows: </p><p><br/></p><p><span style=" font-style:italic;">mean(sum(scale(img - min(img)), axis=0))</span></p><p><br/></p><p>The minimum of the image is subtracted before scaling. The sum is performed after scaling. And the mean is performed at the end so that masked values are not treated as zero.</p></body></html>
+ <html><head/><body><p>Apply 2θ distortion from an overlay to the polar view.</p><p>2θ distortion may only be applied using an overlay that has Sample Layer Distortion enabled.</p></body></html>
- Apply scaling to lineout?
+ Apply 2θ distortion?
-
-
-
- Qt::Horizontal
+
+
+ false
-
-
- 40
- 20
-
+
+ <html><head/><body><p>Apply 2θ distortion from an overlay to the polar view.</p><p>2θ distortion may only be applied using an overlay that has Sample Layer Distortion enabled.</p></body></html>
-
+
- -
+
+
+ -
+
+
+ Azimuthal Overlays
+
+
+
+ -
+
+
-
- Offset
+ Offset:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
@@ -683,19 +845,10 @@
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
+
+
+ -
+
-
@@ -728,167 +881,32 @@
- -
-
-
- false
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- 1
-
-
- 10000
-
-
- 2
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Azimuthal Overlays
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- -360.000000000000000
-
-
- 360.000000000000000
-
-
- 180.000000000000000
-
-
-
- -
-
-
- Apply SNIP?
-
-
-
- -
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
- false
-
-
- °
-
-
- 8
-
-
- 0.000010000000000
-
-
- 180.000000000000000
-
-
- 0.010000000000000
-
-
- 20.000000000000000
-
-
-
- -
-
-
- false
-
-
- <html><head/><body><p>Apply 2θ distortion from an overlay to the polar view.</p><p>2θ distortion may only be applied using an overlay that has Sample Layer Distortion enabled.</p></body></html>
-
-
-
- -
-
-
- 2θ:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- min
-
-
-
- -
-
-
- true
-
-
- n iter:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- <html><head/><body><p>Set the X-Ray Source used to create the polar view. This X-Ray Source will also be used in any place int he program where a single x-ray source is expected.</p><p>This option is only visible if an instrument with multiple x-ray sources is loaded.</p></body></html>
-
-
-
- -
-
-
- <html><head/><body><p>Set the X-Ray Source used to create the polar view. This X-Ray Source will also be used in any place int he program where a single x-ray source is expected.</p><p>This option is only visible if an instrument with multiple x-ray sources is loaded.</p></body></html>
-
-
- X-Ray Source:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
+
-
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ <html><head/><body><p>If checked, the scaling from the color map will also be applied to the lineout.</p><p><br/></p><p>If the scaling is applied to the lineout, note that the lineout is generated as follows: </p><p><br/></p><p><span style=" font-style:italic;">mean(sum(scale(img - min(img)), axis=0))</span></p><p><br/></p><p>The minimum of the image is subtracted before scaling. The sum is performed after scaling. And the mean is performed at the end so that masked values are not treated as zero.</p></body></html>
+
+
+ Apply scaling to lineout?
+
+
+
+
@@ -1033,25 +1051,8 @@
cartesian_plane_normal_rotate_x
cartesian_virtual_plane_distance
cartesian_plane_normal_rotate_y
- polar_active_beam
- polar_pixel_size_tth
- polar_pixel_size_eta
- polar_res_tth_min
- polar_res_tth_max
- polar_res_eta_min
- polar_res_eta_max
- polar_apply_snip1d
- polar_snip1d_width
- polar_snip1d_numiter
- polar_snip1d_algorithm
- polar_show_snip1d
- polar_apply_erosion
- polar_apply_tth_distortion
- polar_tth_distortion_overlay
polar_azimuthal_overlays
- polar_apply_scaling_to_lineout
azimuthal_offset
- polar_x_axis_type
stereo_size
stereo_show_border
stereo_project_from_polar
diff --git a/hexrdgui/resources/ui/instrument_form_view_widget.ui b/hexrdgui/resources/ui/instrument_form_view_widget.ui
index 912e96325..43f06dfc6 100644
--- a/hexrdgui/resources/ui/instrument_form_view_widget.ui
+++ b/hexrdgui/resources/ui/instrument_form_view_widget.ui
@@ -6,7 +6,7 @@
0
0
- 843
+ 765
903
@@ -307,24 +307,24 @@
- -
-
-
-
- 0
- 0
-
+
-
+
+
+ QLabel { font: italic; }
- Xₗ:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
false
@@ -345,34 +345,45 @@
- -
-
-
- QLabel { font: italic; }
-
-
-
-
-
+
-
+
+
-
+
+
+ Vector Convention:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ <html><head/><body><p>"Propagation" is the negative of the "X-Ray Source" method.</p></body></html>
+
+
-
+
+ X-Ray Source
+
+
+ -
+
+ Propagation
+
+
+
+
+
-
-
+
-
+
0
0
-
- Yₗ:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
false
@@ -393,24 +404,14 @@
- -
-
+
-
+
-
+
0
0
-
- Zₗ:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
false
@@ -431,37 +432,6 @@
- -
-
-
-
-
-
- Vector Convention:
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
- -
-
-
- <html><head/><body><p>"Propagation" is the negative of the "X-Ray Source" method.</p></body></html>
-
-
-
-
- X-Ray Source
-
-
- -
-
- Propagation
-
-
-
-
-
-
@@ -665,7 +635,7 @@
-
- Rotation Parameters:
+ Rotation:
Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
diff --git a/hexrdgui/resources/ui/main_window.ui b/hexrdgui/resources/ui/main_window.ui
index 1de087036..0fd7b47c7 100644
--- a/hexrdgui/resources/ui/main_window.ui
+++ b/hexrdgui/resources/ui/main_window.ui
@@ -41,7 +41,7 @@
0
0
1600
- 20
+ 26