Skip to content

Commit 1681fe5

Browse files
dcwhitedcwhite
committed
Sync up combobox signals
1 parent 7085ba4 commit 1681fe5

File tree

2 files changed

+243
-1
lines changed

2 files changed

+243
-1
lines changed

‎src/ExampleNets/regression/showColorMap.srn5‎

Lines changed: 242 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,242 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2+
<!DOCTYPE boost_serialization>
3+
<boost_serialization signature="serialization::archive" version="11">
4+
<networkFile class_id="0" tracking_level="0" version="2">
5+
<networkInfo class_id="1" tracking_level="0" version="0">
6+
<modules class_id="2" tracking_level="0" version="0">
7+
<count>3</count>
8+
<item_version>0</item_version>
9+
<item class_id="3" tracking_level="0" version="0">
10+
<first>CreateStandardColorMap:0</first>
11+
<second class_id="4" tracking_level="0" version="0">
12+
<module class_id="5" tracking_level="0" version="0">
13+
<package_name_>SCIRun</package_name_>
14+
<category_name_>Visualization</category_name_>
15+
<module_name_>CreateStandardColorMap</module_name_>
16+
</module>
17+
<state class_id="6" tracking_level="0" version="0">
18+
<stateMap class_id="7" tracking_level="0" version="0">
19+
<count>1</count>
20+
<item_version>0</item_version>
21+
<item class_id="8" tracking_level="0" version="0">
22+
<first class_id="9" tracking_level="0" version="0">
23+
<name>ColorMapName</name>
24+
</first>
25+
<second class_id="10" tracking_level="0" version="0">
26+
<name>ColorMapName</name>
27+
<value class_id="11" tracking_level="0" version="0">
28+
<which>2</which>
29+
<value>Gray</value>
30+
</value>
31+
</second>
32+
</item>
33+
</stateMap>
34+
</state>
35+
</second>
36+
</item>
37+
<item>
38+
<first>ShowColorMap:0</first>
39+
<second>
40+
<module>
41+
<package_name_>SCIRun</package_name_>
42+
<category_name_>Visualization</category_name_>
43+
<module_name_>ShowColorMap</module_name_>
44+
</module>
45+
<state>
46+
<stateMap>
47+
<count>9</count>
48+
<item_version>0</item_version>
49+
<item>
50+
<first>
51+
<name>AddExtraSpace</name>
52+
</first>
53+
<second>
54+
<name>AddExtraSpace</name>
55+
<value>
56+
<which>3</which>
57+
<value>0</value>
58+
</value>
59+
</second>
60+
</item>
61+
<item>
62+
<first>
63+
<name>DisplayLength</name>
64+
</first>
65+
<second>
66+
<name>DisplayLength</name>
67+
<value>
68+
<which>0</which>
69+
<value>0</value>
70+
</value>
71+
</second>
72+
</item>
73+
<item>
74+
<first>
75+
<name>DisplaySide</name>
76+
</first>
77+
<second>
78+
<name>DisplaySide</name>
79+
<value>
80+
<which>0</which>
81+
<value>0</value>
82+
</value>
83+
</second>
84+
</item>
85+
<item>
86+
<first>
87+
<name>Labels</name>
88+
</first>
89+
<second>
90+
<name>Labels</name>
91+
<value>
92+
<which>3</which>
93+
<value>1</value>
94+
</value>
95+
</second>
96+
</item>
97+
<item>
98+
<first>
99+
<name>Scale</name>
100+
</first>
101+
<second>
102+
<name>Scale</name>
103+
<value>
104+
<which>3</which>
105+
<value>1</value>
106+
</value>
107+
</second>
108+
</item>
109+
<item>
110+
<first>
111+
<name>SignificantDigits</name>
112+
</first>
113+
<second>
114+
<name>SignificantDigits</name>
115+
<value>
116+
<which>3</which>
117+
<value>1</value>
118+
</value>
119+
</second>
120+
</item>
121+
<item>
122+
<first>
123+
<name>TextColor</name>
124+
</first>
125+
<second>
126+
<name>TextColor</name>
127+
<value>
128+
<which>2</which>
129+
<value>Color(255,255,255)</value>
130+
</value>
131+
</second>
132+
</item>
133+
<item>
134+
<first>
135+
<name>TextSize</name>
136+
</first>
137+
<second>
138+
<name>TextSize</name>
139+
<value>
140+
<which>0</which>
141+
<value>0</value>
142+
</value>
143+
</second>
144+
</item>
145+
<item>
146+
<first>
147+
<name>Units</name>
148+
</first>
149+
<second>
150+
<name>Units</name>
151+
<value>
152+
<which>3</which>
153+
<value>1</value>
154+
</value>
155+
</second>
156+
</item>
157+
</stateMap>
158+
</state>
159+
</second>
160+
</item>
161+
<item>
162+
<first>ViewScene:1</first>
163+
<second>
164+
<module>
165+
<package_name_>SCIRun</package_name_>
166+
<category_name_>Render</category_name_>
167+
<module_name_>ViewScene</module_name_>
168+
</module>
169+
<state>
170+
<stateMap>
171+
<count>0</count>
172+
<item_version>0</item_version>
173+
</stateMap>
174+
</state>
175+
</second>
176+
</item>
177+
</modules>
178+
<connections class_id="12" tracking_level="0" version="0">
179+
<count>2</count>
180+
<item_version>0</item_version>
181+
<item class_id="13" tracking_level="0" version="0">
182+
<moduleId1_>CreateStandardColorMap:0</moduleId1_>
183+
<port1_ class_id="14" tracking_level="0" version="0">
184+
<name>ColorMapObject</name>
185+
<id>0</id>
186+
</port1_>
187+
<moduleId2_>ShowColorMap:0</moduleId2_>
188+
<port2_>
189+
<name>ColorMapObject</name>
190+
<id>0</id>
191+
</port2_>
192+
</item>
193+
<item>
194+
<moduleId1_>ShowColorMap:0</moduleId1_>
195+
<port1_>
196+
<name>GeometryOutput</name>
197+
<id>0</id>
198+
</port1_>
199+
<moduleId2_>ViewScene:1</moduleId2_>
200+
<port2_>
201+
<name>GeneralGeom</name>
202+
<id>0</id>
203+
</port2_>
204+
</item>
205+
</connections>
206+
</networkInfo>
207+
<modulePositions class_id="15" tracking_level="0" version="0">
208+
<count>3</count>
209+
<item_version>0</item_version>
210+
<item class_id="16" tracking_level="0" version="0">
211+
<first>CreateStandardColorMap:0</first>
212+
<second class_id="17" tracking_level="0" version="0">
213+
<first>-8.36000000000000000e+002</first>
214+
<second>-5.32000000000000000e+002</second>
215+
</second>
216+
</item>
217+
<item>
218+
<first>ShowColorMap:0</first>
219+
<second>
220+
<first>-1.52000000000000000e+003</first>
221+
<second>-9.12000000000000000e+002</second>
222+
</second>
223+
</item>
224+
<item>
225+
<first>ViewScene:1</first>
226+
<second>
227+
<first>-1.82400000000000000e+003</first>
228+
<second>-9.88000000000000000e+002</second>
229+
</second>
230+
</item>
231+
</modulePositions>
232+
<moduleNotes class_id="18" tracking_level="0" version="0">
233+
<count>0</count>
234+
<item_version>0</item_version>
235+
</moduleNotes>
236+
<connectionNotes>
237+
<count>0</count>
238+
<item_version>0</item_version>
239+
</connectionNotes>
240+
</networkFile>
241+
</boost_serialization>
242+

‎src/Interface/Modules/Base/ModuleDialogGeneric.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void ModuleDialogGeneric::connectButtonToExecuteSignal(QAbstractButton* button)
8282

8383
void ModuleDialogGeneric::connectComboToExecuteSignal(QComboBox* box)
8484
{
85-
connect(box, SIGNAL(currentIndexChanged(QString)), this, SIGNAL(executeActionTriggered()));
85+
connect(box, SIGNAL(activated(const QString&)), this, SIGNAL(executeActionTriggered()));
8686
if (disablerAdd_ && disablerRemove_)
8787
{
8888
disablerAdd_(box);

0 commit comments

Comments
 (0)