Skip to content

Commit 4338c29

Browse files
psaverypsavery
authored
Merge pull request #1913 from HEXRD/bug-fix
Bug fix
2 parents c626d32 + e5d51ec commit 4338c29

File tree

2 files changed

+94
-90
lines changed

2 files changed

+94
-90
lines changed

‎hexrdgui/image_canvas.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2282,6 +2282,7 @@ def draw_mask_boundaries(self, axis, det=None):
22822282
def highlight_masks(self, axis, det=None):
22832283
all_verts = self.get_mask_verts('highlights', det)
22842284
if not all_verts:
2285+
self.blit_manager.update()
22852286
return
22862287

22872288
kwargs = {

‎hexrdgui/resources/ui/mask_manager_dialog.ui‎

Lines changed: 93 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,66 @@
1010
<x>0</x>
1111
<y>0</y>
1212
<width>670</width>
13-
<height>309</height>
13+
<height>325</height>
1414
</rect>
1515
</property>
1616
<property name="windowTitle">
1717
<string>Mask Management</string>
1818
</property>
1919
<layout class="QGridLayout" name="gridLayout">
20+
<item row="2" column="0">
21+
<widget class="QTreeWidget" name="masks_tree">
22+
<property name="minimumSize">
23+
<size>
24+
<width>500</width>
25+
<height>0</height>
26+
</size>
27+
</property>
28+
<property name="contextMenuPolicy">
29+
<enum>Qt::CustomContextMenu</enum>
30+
</property>
31+
<property name="sizeAdjustPolicy">
32+
<enum>QAbstractScrollArea::AdjustToContents</enum>
33+
</property>
34+
<property name="editTriggers">
35+
<set>QAbstractItemView::NoEditTriggers</set>
36+
</property>
37+
<property name="alternatingRowColors">
38+
<bool>true</bool>
39+
</property>
40+
<property name="selectionMode">
41+
<enum>QAbstractItemView::ExtendedSelection</enum>
42+
</property>
43+
<property name="selectionBehavior">
44+
<enum>QAbstractItemView::SelectRows</enum>
45+
</property>
46+
<property name="sortingEnabled">
47+
<bool>false</bool>
48+
</property>
49+
<attribute name="headerCascadingSectionResizes">
50+
<bool>true</bool>
51+
</attribute>
52+
<attribute name="headerStretchLastSection">
53+
<bool>true</bool>
54+
</attribute>
55+
<column>
56+
<property name="text">
57+
<string>Name</string>
58+
</property>
59+
<property name="textAlignment">
60+
<set>AlignCenter</set>
61+
</property>
62+
</column>
63+
<column>
64+
<property name="text">
65+
<string>Presentation</string>
66+
</property>
67+
<property name="textAlignment">
68+
<set>AlignCenter</set>
69+
</property>
70+
</column>
71+
</widget>
72+
</item>
2073
<item row="1" column="0">
2174
<layout class="QHBoxLayout" name="horizontalLayout_2">
2275
<item>
@@ -49,42 +102,6 @@
49102
</item>
50103
</layout>
51104
</item>
52-
<item row="3" column="0">
53-
<layout class="QHBoxLayout" name="horizontalLayout">
54-
<item>
55-
<widget class="QDialogButtonBox" name="button_box">
56-
<property name="standardButtons">
57-
<set>QDialogButtonBox::NoButton</set>
58-
</property>
59-
<property name="centerButtons">
60-
<bool>true</bool>
61-
</property>
62-
</widget>
63-
</item>
64-
<item>
65-
<widget class="QPushButton" name="apply_changes">
66-
<property name="enabled">
67-
<bool>false</bool>
68-
</property>
69-
<property name="sizePolicy">
70-
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
71-
<horstretch>0</horstretch>
72-
<verstretch>0</verstretch>
73-
</sizepolicy>
74-
</property>
75-
<property name="minimumSize">
76-
<size>
77-
<width>400</width>
78-
<height>0</height>
79-
</size>
80-
</property>
81-
<property name="text">
82-
<string>Apply Changes</string>
83-
</property>
84-
</widget>
85-
</item>
86-
</layout>
87-
</item>
88105
<item row="1" column="1" rowspan="3">
89106
<layout class="QVBoxLayout" name="verticalLayout">
90107
<item alignment="Qt::AlignHCenter|Qt::AlignVCenter">
@@ -204,6 +221,19 @@
204221
</property>
205222
</widget>
206223
</item>
224+
<item>
225+
<spacer name="verticalSpacer_2">
226+
<property name="orientation">
227+
<enum>Qt::Vertical</enum>
228+
</property>
229+
<property name="sizeHint" stdset="0">
230+
<size>
231+
<width>20</width>
232+
<height>40</height>
233+
</size>
234+
</property>
235+
</spacer>
236+
</item>
207237
<item>
208238
<spacer name="verticalSpacer">
209239
<property name="orientation">
@@ -219,64 +249,37 @@
219249
</item>
220250
</layout>
221251
</item>
222-
<item row="2" column="0">
223-
<widget class="QTreeWidget" name="masks_tree">
224-
<property name="minimumSize">
225-
<size>
226-
<width>500</width>
227-
<height>0</height>
228-
</size>
229-
</property>
230-
<property name="contextMenuPolicy">
231-
<enum>Qt::CustomContextMenu</enum>
232-
</property>
233-
<property name="sizeAdjustPolicy">
234-
<enum>QAbstractScrollArea::AdjustToContents</enum>
235-
</property>
236-
<property name="editTriggers">
237-
<set>QAbstractItemView::NoEditTriggers</set>
238-
</property>
239-
<property name="alternatingRowColors">
240-
<bool>true</bool>
241-
</property>
242-
<property name="selectionMode">
243-
<enum>QAbstractItemView::ExtendedSelection</enum>
244-
</property>
245-
<property name="selectionBehavior">
246-
<enum>QAbstractItemView::SelectRows</enum>
247-
</property>
248-
<property name="sortingEnabled">
249-
<bool>false</bool>
250-
</property>
251-
<attribute name="headerCascadingSectionResizes">
252-
<bool>true</bool>
253-
</attribute>
254-
<attribute name="headerStretchLastSection">
255-
<bool>true</bool>
256-
</attribute>
257-
<column>
258-
<property name="text">
259-
<string>Name</string>
260-
</property>
261-
<property name="textAlignment">
262-
<set>AlignCenter</set>
263-
</property>
264-
</column>
265-
<column>
266-
<property name="text">
267-
<string>Presentation</string>
268-
</property>
269-
<property name="textAlignment">
270-
<set>AlignCenter</set>
271-
</property>
272-
</column>
273-
</widget>
252+
<item row="3" column="0">
253+
<layout class="QHBoxLayout" name="horizontalLayout">
254+
<item>
255+
<widget class="QDialogButtonBox" name="button_box">
256+
<property name="standardButtons">
257+
<set>QDialogButtonBox::NoButton</set>
258+
</property>
259+
<property name="centerButtons">
260+
<bool>true</bool>
261+
</property>
262+
</widget>
263+
</item>
264+
<item>
265+
<spacer name="horizontalSpacer">
266+
<property name="orientation">
267+
<enum>Qt::Horizontal</enum>
268+
</property>
269+
<property name="sizeHint" stdset="0">
270+
<size>
271+
<width>500</width>
272+
<height>20</height>
273+
</size>
274+
</property>
275+
</spacer>
276+
</item>
277+
</layout>
274278
</item>
275279
</layout>
276280
</widget>
277281
<tabstops>
278282
<tabstop>masks_tree</tabstop>
279-
<tabstop>apply_changes</tabstop>
280283
<tabstop>import_masks</tabstop>
281284
<tabstop>export_masks</tabstop>
282285
<tabstop>panel_buffer</tabstop>

0 commit comments

Comments
 (0)