Skip to content

Commit 0834f39

Browse files
cbrightscicbrightsci
committed
closes #1285 added test network and fixed crash
network proves non crashing with create matrices because matrices I used for testing were rather large. They functioned fine. crash had to do with pointclouds.
1 parent fbbc2cc commit 0834f39

File tree

4 files changed

+291
-48
lines changed

4 files changed

+291
-48
lines changed

‎src/ExampleNets/regression/convertMatricesToMeshSimple.srn5‎

Lines changed: 250 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,250 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
2+
<!DOCTYPE boost_serialization>
3+
<boost_serialization signature="serialization::archive" version="12">
4+
<networkFile class_id="0" tracking_level="0" version="3">
5+
<networkInfo class_id="1" tracking_level="0" version="0">
6+
<modules class_id="2" tracking_level="0" version="0">
7+
<count>4</count>
8+
<item_version>0</item_version>
9+
<item class_id="3" tracking_level="0" version="0">
10+
<first>ConvertMatricesToMesh: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_>NewField</category_name_>
15+
<module_name_>ConvertMatricesToMesh</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>2</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>DataType</name>
24+
</first>
25+
<second class_id="10" tracking_level="0" version="0">
26+
<name>DataType</name>
27+
<value class_id="11" tracking_level="0" version="0">
28+
<which>2</which>
29+
<value>double</value>
30+
</value>
31+
</second>
32+
</item>
33+
<item>
34+
<first>
35+
<name>FieldBaseType</name>
36+
</first>
37+
<second>
38+
<name>FieldBaseType</name>
39+
<value>
40+
<which>2</which>
41+
<value>PointCloud</value>
42+
</value>
43+
</second>
44+
</item>
45+
</stateMap>
46+
</state>
47+
</second>
48+
</item>
49+
<item>
50+
<first>CreateMatrix:0</first>
51+
<second>
52+
<module>
53+
<package_name_>SCIRun</package_name_>
54+
<category_name_>Math</category_name_>
55+
<module_name_>CreateMatrix</module_name_>
56+
</module>
57+
<state>
58+
<stateMap>
59+
<count>1</count>
60+
<item_version>0</item_version>
61+
<item>
62+
<first>
63+
<name>TextEntry</name>
64+
</first>
65+
<second>
66+
<name>TextEntry</name>
67+
<value>
68+
<which>2</which>
69+
<value>5.4186e-005 0.000117615 0.0111203
70+
0.000167722 0.000247175 0.0110736</value>
71+
</value>
72+
</second>
73+
</item>
74+
</stateMap>
75+
</state>
76+
</second>
77+
</item>
78+
<item>
79+
<first>CreateMatrix:1</first>
80+
<second>
81+
<module>
82+
<package_name_>SCIRun</package_name_>
83+
<category_name_>Math</category_name_>
84+
<module_name_>CreateMatrix</module_name_>
85+
</module>
86+
<state>
87+
<stateMap>
88+
<count>1</count>
89+
<item_version>0</item_version>
90+
<item>
91+
<first>
92+
<name>TextEntry</name>
93+
</first>
94+
<second>
95+
<name>TextEntry</name>
96+
<value>
97+
<which>2</which>
98+
<value>9 11 40 12
99+
12 19 40 9
100+
39 9 40 19
101+
11 12 35 42
102+
42 40 11 12
103+
41 23 40 43
104+
41 34 23 43
105+
40 12 43 23
106+
40 43 12 42
107+
11 40 42 44
108+
42 11 44 35
109+
46 26 6 1
110+
47 4 16 15
111+
4 47 16 0
112+
4 1 47 0
113+
47 1 4 15
114+
11 40 48 9
115+
9 48 11 13
116+
16 48 9 0
117+
47 48 16 0
118+
48 44 40 11
119+
9 16 39 48
120+
9 39 40 48
121+
48 13 9 0
122+
47 0 1 49</value>
123+
</value>
124+
</second>
125+
</item>
126+
</stateMap>
127+
</state>
128+
</second>
129+
</item>
130+
<item>
131+
<first>ReportFieldInfo:0</first>
132+
<second>
133+
<module>
134+
<package_name_>SCIRun</package_name_>
135+
<category_name_>MiscField</category_name_>
136+
<module_name_>ReportFieldInfo</module_name_>
137+
</module>
138+
<state>
139+
<stateMap>
140+
<count>0</count>
141+
<item_version>0</item_version>
142+
</stateMap>
143+
</state>
144+
</second>
145+
</item>
146+
</modules>
147+
<connections class_id="12" tracking_level="0" version="0">
148+
<count>3</count>
149+
<item_version>0</item_version>
150+
<item class_id="13" tracking_level="0" version="0">
151+
<moduleId1_>ConvertMatricesToMesh:0</moduleId1_>
152+
<port1_ class_id="14" tracking_level="0" version="0">
153+
<name>OutputField</name>
154+
<id>0</id>
155+
</port1_>
156+
<moduleId2_>ReportFieldInfo:0</moduleId2_>
157+
<port2_>
158+
<name>InputField</name>
159+
<id>0</id>
160+
</port2_>
161+
</item>
162+
<item>
163+
<moduleId1_>CreateMatrix:0</moduleId1_>
164+
<port1_>
165+
<name>EnteredMatrix</name>
166+
<id>0</id>
167+
</port1_>
168+
<moduleId2_>ConvertMatricesToMesh:0</moduleId2_>
169+
<port2_>
170+
<name>MeshPositions</name>
171+
<id>0</id>
172+
</port2_>
173+
</item>
174+
<item>
175+
<moduleId1_>CreateMatrix:1</moduleId1_>
176+
<port1_>
177+
<name>EnteredMatrix</name>
178+
<id>0</id>
179+
</port1_>
180+
<moduleId2_>ConvertMatricesToMesh:0</moduleId2_>
181+
<port2_>
182+
<name>MeshElements</name>
183+
<id>0</id>
184+
</port2_>
185+
</item>
186+
</connections>
187+
</networkInfo>
188+
<modulePositions class_id="15" tracking_level="0" version="0">
189+
<count>4</count>
190+
<item_version>0</item_version>
191+
<item class_id="16" tracking_level="0" version="0">
192+
<first>ConvertMatricesToMesh:0</first>
193+
<second class_id="17" tracking_level="0" version="0">
194+
<first>-4.90000000000000000e+001</first>
195+
<second>-1.05000000000000000e+002</second>
196+
</second>
197+
</item>
198+
<item>
199+
<first>CreateMatrix:0</first>
200+
<second>
201+
<first>7.60000000000000000e+001</first>
202+
<second>-2.28000000000000000e+002</second>
203+
</second>
204+
</item>
205+
<item>
206+
<first>CreateMatrix:1</first>
207+
<second>
208+
<first>-3.80000000000000000e+002</first>
209+
<second>-2.28000000000000000e+002</second>
210+
</second>
211+
</item>
212+
<item>
213+
<first>ReportFieldInfo:0</first>
214+
<second>
215+
<first>9.00000000000000000e+001</first>
216+
<second>1.24000000000000000e+002</second>
217+
</second>
218+
</item>
219+
</modulePositions>
220+
<moduleNotes class_id="18" tracking_level="0" version="0">
221+
<count>0</count>
222+
<item_version>0</item_version>
223+
</moduleNotes>
224+
<connectionNotes>
225+
<count>0</count>
226+
<item_version>0</item_version>
227+
</connectionNotes>
228+
<moduleTags class_id="19" tracking_level="0" version="0">
229+
<count>4</count>
230+
<item_version>0</item_version>
231+
<item class_id="20" tracking_level="0" version="0">
232+
<first>ConvertMatricesToMesh:0</first>
233+
<second>0</second>
234+
</item>
235+
<item>
236+
<first>CreateMatrix:0</first>
237+
<second>0</second>
238+
</item>
239+
<item>
240+
<first>CreateMatrix:1</first>
241+
<second>0</second>
242+
</item>
243+
<item>
244+
<first>ReportFieldInfo:0</first>
245+
<second>0</second>
246+
</item>
247+
</moduleTags>
248+
</networkFile>
249+
</boost_serialization>
250+

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<x>0</x>
88
<y>0</y>
99
<width>500</width>
10-
<height>201</height>
10+
<height>250</height>
1111
</rect>
1212
</property>
1313
<property name="minimumSize">
1414
<size>
1515
<width>250</width>
16-
<height>200</height>
16+
<height>250</height>
1717
</size>
1818
</property>
1919
<property name="windowTitle">
@@ -40,17 +40,17 @@
4040
</property>
4141
</widget>
4242
</item>
43-
<item row="1" column="0">
44-
<widget class="QLabel" name="label_2">
43+
<item row="1" column="1">
44+
<widget class="QLabel" name="typeNameTextLabel_">
4545
<property name="text">
46-
<string>Type Name :</string>
46+
<string/>
4747
</property>
4848
</widget>
4949
</item>
50-
<item row="1" column="1">
51-
<widget class="QLabel" name="typeNameTextLabel_">
50+
<item row="1" column="0">
51+
<widget class="QLabel" name="label_2">
5252
<property name="text">
53-
<string/>
53+
<string>Type Name :</string>
5454
</property>
5555
</widget>
5656
</item>

0 commit comments

Comments
 (0)