Skip to content

Commit 69e1734

Browse files
dcwhitedcwhite
authored
Merge pull request #1643 from SCIInstitute/interactive-slice
Closes #1642
2 parents d5127e0 + fe4764f commit 69e1734

File tree

6 files changed

+245
-129
lines changed

6 files changed

+245
-129
lines changed

‎src/ExampleNets/regression/probeMovesWithSliceSnappingToNode.srn5‎

Lines changed: 41 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@
246246
<name>ZLocation</name>
247247
<value>
248248
<which>1</which>
249-
<value>4.28571428571428381e-01</value>
249+
<value>1.42857142857142794e-01</value>
250250
</value>
251251
</second>
252252
</item>
@@ -264,8 +264,20 @@
264264
</module>
265265
<state>
266266
<stateMap>
267-
<count>7</count>
267+
<count>10</count>
268268
<item_version>0</item_version>
269+
<item>
270+
<first>
271+
<name>AxisReexecute</name>
272+
</first>
273+
<second>
274+
<name>AxisReexecute</name>
275+
<value>
276+
<which>3</which>
277+
<value>1</value>
278+
</value>
279+
</second>
280+
</item>
269281
<item>
270282
<first>
271283
<name>Axis_ijk</name>
@@ -322,7 +334,7 @@
322334
<name>Index_i</name>
323335
<value>
324336
<which>0</which>
325-
<value>0</value>
337+
<value>2</value>
326338
</value>
327339
</second>
328340
</item>
@@ -334,7 +346,7 @@
334346
<name>Index_j</name>
335347
<value>
336348
<which>0</which>
337-
<value>0</value>
349+
<value>5</value>
338350
</value>
339351
</second>
340352
</item>
@@ -346,7 +358,31 @@
346358
<name>Index_k</name>
347359
<value>
348360
<which>0</which>
349-
<value>5</value>
361+
<value>4</value>
362+
</value>
363+
</second>
364+
</item>
365+
<item>
366+
<first>
367+
<name>SliderReexecute</name>
368+
</first>
369+
<second>
370+
<name>SliderReexecute</name>
371+
<value>
372+
<which>3</which>
373+
<value>0</value>
374+
</value>
375+
</second>
376+
</item>
377+
<item>
378+
<first>
379+
<name>SpinBoxReexecute</name>
380+
</first>
381+
<second>
382+
<name>SpinBoxReexecute</name>
383+
<value>
384+
<which>3</which>
385+
<value>1</value>
350386
</value>
351387
</second>
352388
</item>

‎src/Interface/Modules/Fields/GetSliceFromStructuredFieldByIndices.ui‎

Lines changed: 103 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -6,110 +6,144 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>404</width>
10-
<height>179</height>
9+
<width>741</width>
10+
<height>205</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
1414
<size>
15-
<width>404</width>
16-
<height>179</height>
15+
<width>741</width>
16+
<height>205</height>
1717
</size>
1818
</property>
1919
<property name="windowTitle">
2020
<string>Dialog</string>
2121
</property>
2222
<layout class="QGridLayout" name="gridLayout_2">
2323
<item row="0" column="0">
24-
<widget class="QGroupBox" name="groupBox">
24+
<widget class="QGroupBox" name="groupBox_2">
2525
<property name="title">
26-
<string/>
26+
<string>Axis</string>
2727
</property>
28-
<layout class="QGridLayout" name="gridLayout">
29-
<item row="3" column="2">
30-
<widget class="QSpinBox" name="kAxisSpinBox_">
31-
<property name="maximum">
32-
<number>9999</number>
33-
</property>
34-
</widget>
35-
</item>
36-
<item row="3" column="1">
37-
<widget class="QSlider" name="kAxisHorizontalSlider_">
38-
<property name="maximum">
39-
<number>9999</number>
40-
</property>
41-
<property name="orientation">
42-
<enum>Qt::Horizontal</enum>
43-
</property>
44-
</widget>
45-
</item>
46-
<item row="3" column="0">
47-
<widget class="QRadioButton" name="kAxisRadioButton_">
28+
<layout class="QVBoxLayout" name="verticalLayout">
29+
<item>
30+
<widget class="QRadioButton" name="iAxisRadioButton_">
4831
<property name="text">
49-
<string>k axis</string>
50-
</property>
51-
</widget>
52-
</item>
53-
<item row="2" column="2">
54-
<widget class="QSpinBox" name="jAxisSpinBox_">
55-
<property name="maximum">
56-
<number>9999</number>
57-
</property>
58-
</widget>
59-
</item>
60-
<item row="2" column="1">
61-
<widget class="QSlider" name="jAxisHorizontalSlider_">
62-
<property name="maximum">
63-
<number>9999</number>
64-
</property>
65-
<property name="orientation">
66-
<enum>Qt::Horizontal</enum>
32+
<string>i axis</string>
6733
</property>
6834
</widget>
6935
</item>
70-
<item row="2" column="0">
36+
<item>
7137
<widget class="QRadioButton" name="jAxisRadioButton_">
7238
<property name="text">
7339
<string>j axis</string>
7440
</property>
7541
</widget>
7642
</item>
77-
<item row="0" column="1">
78-
<widget class="QLabel" name="label_2">
43+
<item>
44+
<widget class="QRadioButton" name="kAxisRadioButton_">
7945
<property name="text">
80-
<string>Slice Node</string>
81-
</property>
82-
</widget>
83-
</item>
84-
<item row="1" column="2">
85-
<widget class="QSpinBox" name="iAxisSpinBox_">
86-
<property name="maximum">
87-
<number>9999</number>
46+
<string>k axis</string>
8847
</property>
8948
</widget>
9049
</item>
91-
<item row="0" column="0">
92-
<widget class="QLabel" name="label">
50+
<item>
51+
<widget class="QCheckBox" name="axisExecuteCheckBox_">
9352
<property name="text">
94-
<string>Axis</string>
53+
<string>Execute on click</string>
9554
</property>
9655
</widget>
9756
</item>
98-
<item row="1" column="0">
99-
<widget class="QRadioButton" name="iAxisRadioButton_">
100-
<property name="text">
101-
<string>i axis</string>
57+
</layout>
58+
</widget>
59+
</item>
60+
<item row="0" column="1">
61+
<widget class="QGroupBox" name="groupBox_3">
62+
<property name="title">
63+
<string>Slice Node</string>
64+
</property>
65+
<layout class="QHBoxLayout" name="horizontalLayout">
66+
<item>
67+
<widget class="QGroupBox" name="groupBox_4">
68+
<property name="title">
69+
<string/>
10270
</property>
71+
<layout class="QVBoxLayout" name="verticalLayout_2">
72+
<item>
73+
<widget class="QSlider" name="iAxisHorizontalSlider_">
74+
<property name="maximum">
75+
<number>9999</number>
76+
</property>
77+
<property name="orientation">
78+
<enum>Qt::Horizontal</enum>
79+
</property>
80+
</widget>
81+
</item>
82+
<item>
83+
<widget class="QSlider" name="jAxisHorizontalSlider_">
84+
<property name="maximum">
85+
<number>9999</number>
86+
</property>
87+
<property name="orientation">
88+
<enum>Qt::Horizontal</enum>
89+
</property>
90+
</widget>
91+
</item>
92+
<item>
93+
<widget class="QSlider" name="kAxisHorizontalSlider_">
94+
<property name="maximum">
95+
<number>9999</number>
96+
</property>
97+
<property name="orientation">
98+
<enum>Qt::Horizontal</enum>
99+
</property>
100+
</widget>
101+
</item>
102+
<item>
103+
<widget class="QCheckBox" name="sliderExecuteCheckBox_">
104+
<property name="text">
105+
<string>Execute on release</string>
106+
</property>
107+
</widget>
108+
</item>
109+
</layout>
103110
</widget>
104111
</item>
105-
<item row="1" column="1">
106-
<widget class="QSlider" name="iAxisHorizontalSlider_">
107-
<property name="maximum">
108-
<number>9999</number>
109-
</property>
110-
<property name="orientation">
111-
<enum>Qt::Horizontal</enum>
112+
<item>
113+
<widget class="QGroupBox" name="groupBox_5">
114+
<property name="title">
115+
<string/>
112116
</property>
117+
<layout class="QVBoxLayout" name="verticalLayout_3">
118+
<item>
119+
<widget class="QSpinBox" name="iAxisSpinBox_">
120+
<property name="maximum">
121+
<number>9999</number>
122+
</property>
123+
</widget>
124+
</item>
125+
<item>
126+
<widget class="QSpinBox" name="jAxisSpinBox_">
127+
<property name="maximum">
128+
<number>9999</number>
129+
</property>
130+
</widget>
131+
</item>
132+
<item>
133+
<widget class="QSpinBox" name="kAxisSpinBox_">
134+
<property name="maximum">
135+
<number>9999</number>
136+
</property>
137+
</widget>
138+
</item>
139+
<item>
140+
<widget class="QCheckBox" name="spinBoxExecuteCheckBox_">
141+
<property name="text">
142+
<string>Execute on click</string>
143+
</property>
144+
</widget>
145+
</item>
146+
</layout>
113147
</widget>
114148
</item>
115149
</layout>
@@ -119,54 +153,6 @@
119153
</widget>
120154
<resources/>
121155
<connections>
122-
<connection>
123-
<sender>iAxisHorizontalSlider_</sender>
124-
<signal>valueChanged(int)</signal>
125-
<receiver>iAxisSpinBox_</receiver>
126-
<slot>setValue(int)</slot>
127-
<hints>
128-
<hint type="sourcelabel">
129-
<x>203</x>
130-
<y>68</y>
131-
</hint>
132-
<hint type="destinationlabel">
133-
<x>359</x>
134-
<y>68</y>
135-
</hint>
136-
</hints>
137-
</connection>
138-
<connection>
139-
<sender>jAxisHorizontalSlider_</sender>
140-
<signal>valueChanged(int)</signal>
141-
<receiver>jAxisSpinBox_</receiver>
142-
<slot>setValue(int)</slot>
143-
<hints>
144-
<hint type="sourcelabel">
145-
<x>203</x>
146-
<y>94</y>
147-
</hint>
148-
<hint type="destinationlabel">
149-
<x>359</x>
150-
<y>94</y>
151-
</hint>
152-
</hints>
153-
</connection>
154-
<connection>
155-
<sender>kAxisHorizontalSlider_</sender>
156-
<signal>valueChanged(int)</signal>
157-
<receiver>kAxisSpinBox_</receiver>
158-
<slot>setValue(int)</slot>
159-
<hints>
160-
<hint type="sourcelabel">
161-
<x>203</x>
162-
<y>120</y>
163-
</hint>
164-
<hint type="destinationlabel">
165-
<x>359</x>
166-
<y>120</y>
167-
</hint>
168-
</hints>
169-
</connection>
170156
<connection>
171157
<sender>iAxisSpinBox_</sender>
172158
<signal>valueChanged(int)</signal>

0 commit comments

Comments
 (0)