Skip to content

Commit 853534a

Browse files
psaverypsavery
authored
Merge pull request #1912 from HEXRD/fiddle-improvements
Keep waterfall plot in front of the application
2 parents 4338c29 + 4fd0f92 commit 853534a

File tree

2 files changed

+77
-76
lines changed

2 files changed

+77
-76
lines changed

‎hexrdgui/resources/ui/physics_package_manager_dialog.ui‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -644,14 +644,34 @@
644644
<attribute name="title">
645645
<string>Window</string>
646646
</attribute>
647-
<layout class="QGridLayout" name="gridLayout_2">
648-
<item row="3" column="1" colspan="3">
649-
<widget class="ScientificDoubleSpinBox" name="window_thickness">
650-
<property name="suffix">
651-
<string> μm</string>
647+
<layout class="QGridLayout" name="gridLayout_2" columnstretch="0,0,0,0,0,0">
648+
<item row="1" column="0" colspan="6">
649+
<widget class="QLineEdit" name="window_material_input">
650+
<property name="enabled">
651+
<bool>false</bool>
652652
</property>
653-
<property name="singleStep">
654-
<double>0.100000000000000</double>
653+
</widget>
654+
</item>
655+
<item row="4" column="0">
656+
<spacer name="window_vertical_spacer">
657+
<property name="orientation">
658+
<enum>Qt::Vertical</enum>
659+
</property>
660+
<property name="sizeHint" stdset="0">
661+
<size>
662+
<width>20</width>
663+
<height>40</height>
664+
</size>
665+
</property>
666+
</spacer>
667+
</item>
668+
<item row="3" column="0">
669+
<widget class="QLabel" name="window_thickness_label">
670+
<property name="text">
671+
<string>Thickness</string>
672+
</property>
673+
<property name="buddy">
674+
<cstring>window_thickness</cstring>
655675
</property>
656676
</widget>
657677
</item>
@@ -665,9 +685,6 @@
665685
</property>
666686
</widget>
667687
</item>
668-
<item row="0" column="1" colspan="3">
669-
<widget class="QComboBox" name="window_material"/>
670-
</item>
671688
<item row="2" column="0">
672689
<widget class="QLabel" name="window_density_label">
673690
<property name="text">
@@ -678,17 +695,17 @@
678695
</property>
679696
</widget>
680697
</item>
681-
<item row="3" column="0">
682-
<widget class="QLabel" name="window_thickness_label">
683-
<property name="text">
684-
<string>Thickness</string>
698+
<item row="3" column="1" colspan="5">
699+
<widget class="ScientificDoubleSpinBox" name="window_thickness">
700+
<property name="suffix">
701+
<string> μm</string>
685702
</property>
686-
<property name="buddy">
687-
<cstring>window_thickness</cstring>
703+
<property name="singleStep">
704+
<double>0.100000000000000</double>
688705
</property>
689706
</widget>
690707
</item>
691-
<item row="2" column="1" colspan="3">
708+
<item row="2" column="1" colspan="5">
692709
<widget class="ScientificDoubleSpinBox" name="window_density">
693710
<property name="enabled">
694711
<bool>true</bool>
@@ -698,25 +715,8 @@
698715
</property>
699716
</widget>
700717
</item>
701-
<item row="1" column="0" colspan="4">
702-
<widget class="QLineEdit" name="window_material_input">
703-
<property name="enabled">
704-
<bool>false</bool>
705-
</property>
706-
</widget>
707-
</item>
708-
<item row="4" column="0">
709-
<spacer name="window_vertical_spacer">
710-
<property name="orientation">
711-
<enum>Qt::Vertical</enum>
712-
</property>
713-
<property name="sizeHint" stdset="0">
714-
<size>
715-
<width>20</width>
716-
<height>40</height>
717-
</size>
718-
</property>
719-
</spacer>
718+
<item row="0" column="1" colspan="5">
719+
<widget class="QComboBox" name="window_material"/>
720720
</item>
721721
</layout>
722722
</widget>
@@ -725,6 +725,16 @@
725725
<string>Pinhole</string>
726726
</attribute>
727727
<layout class="QGridLayout" name="gridLayout_6">
728+
<item row="0" column="1" colspan="4">
729+
<widget class="QComboBox" name="pinhole_material"/>
730+
</item>
731+
<item row="1" column="0" colspan="5">
732+
<widget class="QLineEdit" name="pinhole_material_input">
733+
<property name="enabled">
734+
<bool>false</bool>
735+
</property>
736+
</widget>
737+
</item>
728738
<item row="0" column="0">
729739
<widget class="QLabel" name="pinhole_material_label">
730740
<property name="text">
@@ -735,7 +745,17 @@
735745
</property>
736746
</widget>
737747
</item>
738-
<item row="3" column="1" colspan="3">
748+
<item row="3" column="0">
749+
<widget class="QLabel" name="pinhole_thickness_label">
750+
<property name="text">
751+
<string>Thickness</string>
752+
</property>
753+
<property name="buddy">
754+
<cstring>pinhole_thickness</cstring>
755+
</property>
756+
</widget>
757+
</item>
758+
<item row="3" column="1" colspan="4">
739759
<widget class="ScientificDoubleSpinBox" name="pinhole_thickness">
740760
<property name="suffix">
741761
<string> μm</string>
@@ -745,6 +765,23 @@
745765
</property>
746766
</widget>
747767
</item>
768+
<item row="4" column="0">
769+
<widget class="QLabel" name="pinhole_diameter_label">
770+
<property name="text">
771+
<string>Diameter</string>
772+
</property>
773+
<property name="buddy">
774+
<cstring>pinhole_diameter</cstring>
775+
</property>
776+
</widget>
777+
</item>
778+
<item row="4" column="1" colspan="4">
779+
<widget class="ScientificDoubleSpinBox" name="pinhole_diameter">
780+
<property name="suffix">
781+
<string> μm</string>
782+
</property>
783+
</widget>
784+
</item>
748785
<item row="6" column="0">
749786
<spacer name="pinhole_vertical_spacer">
750787
<property name="orientation">
@@ -758,10 +795,7 @@
758795
</property>
759796
</spacer>
760797
</item>
761-
<item row="0" column="1" colspan="3">
762-
<widget class="QComboBox" name="pinhole_material"/>
763-
</item>
764-
<item row="2" column="1" colspan="3">
798+
<item row="2" column="1" colspan="4">
765799
<widget class="ScientificDoubleSpinBox" name="pinhole_density">
766800
<property name="enabled">
767801
<bool>true</bool>
@@ -771,33 +805,6 @@
771805
</property>
772806
</widget>
773807
</item>
774-
<item row="3" column="0">
775-
<widget class="QLabel" name="pinhole_thickness_label">
776-
<property name="text">
777-
<string>Thickness</string>
778-
</property>
779-
<property name="buddy">
780-
<cstring>pinhole_thickness</cstring>
781-
</property>
782-
</widget>
783-
</item>
784-
<item row="4" column="0">
785-
<widget class="QLabel" name="pinhole_diameter_label">
786-
<property name="text">
787-
<string>Diameter</string>
788-
</property>
789-
<property name="buddy">
790-
<cstring>pinhole_diameter</cstring>
791-
</property>
792-
</widget>
793-
</item>
794-
<item row="1" column="0" colspan="4">
795-
<widget class="QLineEdit" name="pinhole_material_input">
796-
<property name="enabled">
797-
<bool>false</bool>
798-
</property>
799-
</widget>
800-
</item>
801808
<item row="2" column="0">
802809
<widget class="QLabel" name="pinhole_density_label">
803810
<property name="text">
@@ -808,13 +815,6 @@
808815
</property>
809816
</widget>
810817
</item>
811-
<item row="4" column="1" colspan="3">
812-
<widget class="ScientificDoubleSpinBox" name="pinhole_diameter">
813-
<property name="suffix">
814-
<string> μm</string>
815-
</property>
816-
</widget>
817-
</item>
818818
<item row="5" column="0">
819819
<widget class="QLabel" name="absorption_length_label">
820820
<property name="text">
@@ -825,7 +825,7 @@
825825
</property>
826826
</widget>
827827
</item>
828-
<item row="5" column="1" colspan="3">
828+
<item row="5" column="1" colspan="4">
829829
<widget class="ScientificDoubleSpinBox" name="absorption_length">
830830
<property name="singleStep">
831831
<double>0.100000000000000</double>

‎hexrdgui/waterfall_plot.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,7 @@ def __init__(self, ax: Axes, line_data: LineData, parent: QWidget = None):
195195

196196
# Add minimize, maximize, and close buttons
197197
self.setWindowFlags(
198+
Qt.Tool |
198199
Qt.WindowMinimizeButtonHint |
199200
Qt.WindowMaximizeButtonHint |
200201
Qt.WindowCloseButtonHint

0 commit comments

Comments
 (0)