Skip to content

Commit ba9ff53

Browse files
bbfrederickbbfrederick
committed
Fixed image pane resizing
1 parent 684e489 commit ba9ff53

File tree

5 files changed

+256
-274
lines changed

5 files changed

+256
-274
lines changed

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
# History of changes
22

3+
## Version 1.4.4 (6/29/23)
4+
* Fixed image pane resizing.
5+
36
## Version 1.4.3 (6/9/23)
47
* Added reference file matching - if you specify a set of reference components, any IC with a spatial correlation with any reference component above a threshold is retained.
58

‎picachooser/picachooserTemplate.py‎

Lines changed: 27 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ class Ui_MainWindow(object):
1515
def setupUi(self, MainWindow):
1616
MainWindow.setObjectName("MainWindow")
1717
MainWindow.resize(1746, 839)
18+
MainWindow.setMinimumSize(QtCore.QSize(0, 100))
1819
self.centralwidget = QtWidgets.QWidget(MainWindow)
19-
sizePolicy = QtWidgets.QSizePolicy(
20-
QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred
21-
)
20+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Preferred)
2221
sizePolicy.setHorizontalStretch(0)
2322
sizePolicy.setVerticalStretch(0)
2423
sizePolicy.setHeightForWidth(self.centralwidget.sizePolicy().hasHeightForWidth())
@@ -33,14 +32,10 @@ def setupUi(self, MainWindow):
3332
self.verticalLayout.setObjectName("verticalLayout")
3433
self.translation_graphicsView = GraphicsLayoutWidget(self.centralwidget)
3534
self.translation_graphicsView.setEnabled(True)
36-
sizePolicy = QtWidgets.QSizePolicy(
37-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
38-
)
35+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
3936
sizePolicy.setHorizontalStretch(0)
4037
sizePolicy.setVerticalStretch(0)
41-
sizePolicy.setHeightForWidth(
42-
self.translation_graphicsView.sizePolicy().hasHeightForWidth()
43-
)
38+
sizePolicy.setHeightForWidth(self.translation_graphicsView.sizePolicy().hasHeightForWidth())
4439
self.translation_graphicsView.setSizePolicy(sizePolicy)
4540
self.translation_graphicsView.setMinimumSize(QtCore.QSize(400, 100))
4641
self.translation_graphicsView.setMaximumSize(QtCore.QSize(610, 1000))
@@ -49,9 +44,7 @@ def setupUi(self, MainWindow):
4944
self.verticalLayout.addWidget(self.translation_graphicsView)
5045
self.rotation_graphicsView = GraphicsLayoutWidget(self.centralwidget)
5146
self.rotation_graphicsView.setEnabled(True)
52-
sizePolicy = QtWidgets.QSizePolicy(
53-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
54-
)
47+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
5548
sizePolicy.setHorizontalStretch(0)
5649
sizePolicy.setVerticalStretch(0)
5750
sizePolicy.setHeightForWidth(self.rotation_graphicsView.sizePolicy().hasHeightForWidth())
@@ -63,9 +56,7 @@ def setupUi(self, MainWindow):
6356
self.verticalLayout.addWidget(self.rotation_graphicsView)
6457
self.timecourse_graphicsView = GraphicsLayoutWidget(self.centralwidget)
6558
self.timecourse_graphicsView.setEnabled(True)
66-
sizePolicy = QtWidgets.QSizePolicy(
67-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
68-
)
59+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
6960
sizePolicy.setHorizontalStretch(0)
7061
sizePolicy.setVerticalStretch(0)
7162
sizePolicy.setHeightForWidth(self.timecourse_graphicsView.sizePolicy().hasHeightForWidth())
@@ -77,9 +68,7 @@ def setupUi(self, MainWindow):
7768
self.verticalLayout.addWidget(self.timecourse_graphicsView)
7869
self.spectrum_graphicsView = GraphicsLayoutWidget(self.centralwidget)
7970
self.spectrum_graphicsView.setEnabled(True)
80-
sizePolicy = QtWidgets.QSizePolicy(
81-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
82-
)
71+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
8372
sizePolicy.setHorizontalStretch(0)
8473
sizePolicy.setVerticalStretch(0)
8574
sizePolicy.setHeightForWidth(self.spectrum_graphicsView.sizePolicy().hasHeightForWidth())
@@ -91,37 +80,31 @@ def setupUi(self, MainWindow):
9180
self.verticalLayout.addWidget(self.spectrum_graphicsView)
9281
self.horizontalLayout.addLayout(self.verticalLayout)
9382
self.stackedWidget = QtWidgets.QStackedWidget(self.centralwidget)
94-
sizePolicy = QtWidgets.QSizePolicy(
95-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
96-
)
83+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
9784
sizePolicy.setHorizontalStretch(0)
9885
sizePolicy.setVerticalStretch(0)
9986
sizePolicy.setHeightForWidth(self.stackedWidget.sizePolicy().hasHeightForWidth())
10087
self.stackedWidget.setSizePolicy(sizePolicy)
10188
self.stackedWidget.setSizeIncrement(QtCore.QSize(1, 1))
10289
self.stackedWidget.setObjectName("stackedWidget")
10390
self.page = QtWidgets.QWidget()
104-
sizePolicy = QtWidgets.QSizePolicy(
105-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
106-
)
91+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
10792
sizePolicy.setHorizontalStretch(0)
10893
sizePolicy.setVerticalStretch(0)
10994
sizePolicy.setHeightForWidth(self.page.sizePolicy().hasHeightForWidth())
11095
self.page.setSizePolicy(sizePolicy)
96+
self.page.setMinimumSize(QtCore.QSize(100, 100))
11197
self.page.setSizeIncrement(QtCore.QSize(1, 1))
11298
self.page.setObjectName("page")
113-
self.horizontalLayoutWidget = QtWidgets.QWidget(self.page)
114-
self.horizontalLayoutWidget.setGeometry(QtCore.QRect(0, 0, 861, 741))
115-
self.horizontalLayoutWidget.setObjectName("horizontalLayoutWidget")
116-
self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget)
99+
self.verticalLayout_2 = QtWidgets.QVBoxLayout(self.page)
100+
self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
101+
self.verticalLayout_2.setObjectName("verticalLayout_2")
102+
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
117103
self.horizontalLayout_2.setSizeConstraint(QtWidgets.QLayout.SetNoConstraint)
118-
self.horizontalLayout_2.setContentsMargins(0, 0, 0, 0)
119104
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
120-
self.image_graphicsView = GraphicsLayoutWidget(self.horizontalLayoutWidget)
105+
self.image_graphicsView = GraphicsLayoutWidget(self.page)
121106
self.image_graphicsView.setEnabled(True)
122-
sizePolicy = QtWidgets.QSizePolicy(
123-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
124-
)
107+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
125108
sizePolicy.setHorizontalStretch(0)
126109
sizePolicy.setVerticalStretch(0)
127110
sizePolicy.setHeightForWidth(self.image_graphicsView.sizePolicy().hasHeightForWidth())
@@ -131,29 +114,26 @@ def setupUi(self, MainWindow):
131114
self.image_graphicsView.setSizeIncrement(QtCore.QSize(1, 1))
132115
self.image_graphicsView.setObjectName("image_graphicsView")
133116
self.horizontalLayout_2.addWidget(self.image_graphicsView)
117+
self.verticalLayout_2.addLayout(self.horizontalLayout_2)
134118
self.stackedWidget.addWidget(self.page)
135119
self.page_2 = QtWidgets.QWidget()
136-
sizePolicy = QtWidgets.QSizePolicy(
137-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
138-
)
120+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
139121
sizePolicy.setHorizontalStretch(0)
140122
sizePolicy.setVerticalStretch(0)
141123
sizePolicy.setHeightForWidth(self.page_2.sizePolicy().hasHeightForWidth())
142124
self.page_2.setSizePolicy(sizePolicy)
125+
self.page_2.setMinimumSize(QtCore.QSize(100, 100))
143126
self.page_2.setSizeIncrement(QtCore.QSize(1, 1))
144127
self.page_2.setObjectName("page_2")
145-
self.horizontalLayoutWidget_2 = QtWidgets.QWidget(self.page_2)
146-
self.horizontalLayoutWidget_2.setGeometry(QtCore.QRect(1, 1, 861, 741))
147-
self.horizontalLayoutWidget_2.setObjectName("horizontalLayoutWidget_2")
148-
self.horizontalLayout_3 = QtWidgets.QHBoxLayout(self.horizontalLayoutWidget_2)
128+
self.verticalLayout_3 = QtWidgets.QVBoxLayout(self.page_2)
129+
self.verticalLayout_3.setContentsMargins(0, 0, 0, 0)
130+
self.verticalLayout_3.setObjectName("verticalLayout_3")
131+
self.horizontalLayout_3 = QtWidgets.QHBoxLayout()
149132
self.horizontalLayout_3.setSizeConstraint(QtWidgets.QLayout.SetNoConstraint)
150-
self.horizontalLayout_3.setContentsMargins(0, 0, 0, 0)
151133
self.horizontalLayout_3.setObjectName("horizontalLayout_3")
152-
self.image_altgraphicsView = GraphicsLayoutWidget(self.horizontalLayoutWidget_2)
134+
self.image_altgraphicsView = GraphicsLayoutWidget(self.page_2)
153135
self.image_altgraphicsView.setEnabled(True)
154-
sizePolicy = QtWidgets.QSizePolicy(
155-
QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding
156-
)
136+
sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Expanding)
157137
sizePolicy.setHorizontalStretch(0)
158138
sizePolicy.setVerticalStretch(0)
159139
sizePolicy.setHeightForWidth(self.image_altgraphicsView.sizePolicy().hasHeightForWidth())
@@ -163,6 +143,7 @@ def setupUi(self, MainWindow):
163143
self.image_altgraphicsView.setSizeIncrement(QtCore.QSize(1, 1))
164144
self.image_altgraphicsView.setObjectName("image_altgraphicsView")
165145
self.horizontalLayout_3.addWidget(self.image_altgraphicsView)
146+
self.verticalLayout_3.addLayout(self.horizontalLayout_3)
166147
self.stackedWidget.addWidget(self.page_2)
167148
self.horizontalLayout.addWidget(self.stackedWidget)
168149
self.gridLayout.addLayout(self.horizontalLayout, 0, 0, 1, 1)
@@ -185,12 +166,5 @@ def setupUi(self, MainWindow):
185166
def retranslateUi(self, MainWindow):
186167
_translate = QtCore.QCoreApplication.translate
187168
MainWindow.setWindowTitle(_translate("MainWindow", "MainWindow"))
188-
self.label.setText(
189-
_translate(
190-
"MainWindow",
191-
'Right and left arrows step through components. Up and down arrows toggle component retention. "r" to reset component. "a", "c", and "s" select axial, coronal, or sagittal views. ESC to write component file.',
192-
)
193-
)
194-
195-
169+
self.label.setText(_translate("MainWindow", "Right and left arrows step through components. Up and down arrows toggle component retention. \"r\" to reset component. \"a\", \"c\", and \"s\" select axial, coronal, or sagittal views. ESC to write component file."))
196170
from pyqtgraph import GraphicsLayoutWidget

‎picachooser/picachooserTemplate.ui‎

Lines changed: 103 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@
175175
</size>
176176
</property>
177177
<property name="currentIndex">
178-
<number>1</number>
178+
<number>0</number>
179179
</property>
180180
<widget class="QWidget" name="page">
181181
<property name="sizePolicy">
@@ -196,52 +196,58 @@
196196
<height>1</height>
197197
</size>
198198
</property>
199-
<widget class="QWidget" name="horizontalLayoutWidget">
200-
<property name="geometry">
201-
<rect>
202-
<x>0</x>
203-
<y>0</y>
204-
<width>861</width>
205-
<height>741</height>
206-
</rect>
199+
<layout class="QVBoxLayout" name="verticalLayout_2">
200+
<property name="leftMargin">
201+
<number>0</number>
207202
</property>
208-
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0">
209-
<property name="sizeConstraint">
210-
<enum>QLayout::SetNoConstraint</enum>
211-
</property>
212-
<item>
213-
<widget class="GraphicsLayoutWidget" name="image_graphicsView">
214-
<property name="enabled">
215-
<bool>true</bool>
216-
</property>
217-
<property name="sizePolicy">
218-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
219-
<horstretch>0</horstretch>
220-
<verstretch>0</verstretch>
221-
</sizepolicy>
222-
</property>
223-
<property name="minimumSize">
224-
<size>
225-
<width>100</width>
226-
<height>100</height>
227-
</size>
228-
</property>
229-
<property name="maximumSize">
230-
<size>
231-
<width>16384</width>
232-
<height>8192</height>
233-
</size>
234-
</property>
235-
<property name="sizeIncrement">
236-
<size>
237-
<width>1</width>
238-
<height>1</height>
239-
</size>
240-
</property>
241-
</widget>
242-
</item>
243-
</layout>
244-
</widget>
203+
<property name="topMargin">
204+
<number>0</number>
205+
</property>
206+
<property name="rightMargin">
207+
<number>0</number>
208+
</property>
209+
<property name="bottomMargin">
210+
<number>0</number>
211+
</property>
212+
<item>
213+
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0">
214+
<property name="sizeConstraint">
215+
<enum>QLayout::SetNoConstraint</enum>
216+
</property>
217+
<item>
218+
<widget class="GraphicsLayoutWidget" name="image_graphicsView">
219+
<property name="enabled">
220+
<bool>true</bool>
221+
</property>
222+
<property name="sizePolicy">
223+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
224+
<horstretch>0</horstretch>
225+
<verstretch>0</verstretch>
226+
</sizepolicy>
227+
</property>
228+
<property name="minimumSize">
229+
<size>
230+
<width>600</width>
231+
<height>100</height>
232+
</size>
233+
</property>
234+
<property name="maximumSize">
235+
<size>
236+
<width>16384</width>
237+
<height>8192</height>
238+
</size>
239+
</property>
240+
<property name="sizeIncrement">
241+
<size>
242+
<width>1</width>
243+
<height>1</height>
244+
</size>
245+
</property>
246+
</widget>
247+
</item>
248+
</layout>
249+
</item>
250+
</layout>
245251
</widget>
246252
<widget class="QWidget" name="page_2">
247253
<property name="sizePolicy">
@@ -262,52 +268,58 @@
262268
<height>1</height>
263269
</size>
264270
</property>
265-
<widget class="QWidget" name="horizontalLayoutWidget_2">
266-
<property name="geometry">
267-
<rect>
268-
<x>1</x>
269-
<y>1</y>
270-
<width>861</width>
271-
<height>741</height>
272-
</rect>
271+
<layout class="QVBoxLayout" name="verticalLayout_3">
272+
<property name="leftMargin">
273+
<number>0</number>
273274
</property>
274-
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0">
275-
<property name="sizeConstraint">
276-
<enum>QLayout::SetNoConstraint</enum>
277-
</property>
278-
<item>
279-
<widget class="GraphicsLayoutWidget" name="image_altgraphicsView">
280-
<property name="enabled">
281-
<bool>true</bool>
282-
</property>
283-
<property name="sizePolicy">
284-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
285-
<horstretch>0</horstretch>
286-
<verstretch>0</verstretch>
287-
</sizepolicy>
288-
</property>
289-
<property name="minimumSize">
290-
<size>
291-
<width>600</width>
292-
<height>100</height>
293-
</size>
294-
</property>
295-
<property name="maximumSize">
296-
<size>
297-
<width>16384</width>
298-
<height>8192</height>
299-
</size>
300-
</property>
301-
<property name="sizeIncrement">
302-
<size>
303-
<width>1</width>
304-
<height>1</height>
305-
</size>
306-
</property>
307-
</widget>
308-
</item>
309-
</layout>
310-
</widget>
275+
<property name="topMargin">
276+
<number>0</number>
277+
</property>
278+
<property name="rightMargin">
279+
<number>0</number>
280+
</property>
281+
<property name="bottomMargin">
282+
<number>0</number>
283+
</property>
284+
<item>
285+
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0">
286+
<property name="sizeConstraint">
287+
<enum>QLayout::SetNoConstraint</enum>
288+
</property>
289+
<item>
290+
<widget class="GraphicsLayoutWidget" name="image_altgraphicsView">
291+
<property name="enabled">
292+
<bool>true</bool>
293+
</property>
294+
<property name="sizePolicy">
295+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
296+
<horstretch>0</horstretch>
297+
<verstretch>0</verstretch>
298+
</sizepolicy>
299+
</property>
300+
<property name="minimumSize">
301+
<size>
302+
<width>600</width>
303+
<height>100</height>
304+
</size>
305+
</property>
306+
<property name="maximumSize">
307+
<size>
308+
<width>16384</width>
309+
<height>8192</height>
310+
</size>
311+
</property>
312+
<property name="sizeIncrement">
313+
<size>
314+
<width>1</width>
315+
<height>1</height>
316+
</size>
317+
</property>
318+
</widget>
319+
</item>
320+
</layout>
321+
</item>
322+
</layout>
311323
</widget>
312324
</widget>
313325
</item>

0 commit comments

Comments
 (0)