Skip to content

Commit 7f1d1bf

Browse files
dcwhitedcwhite
committed
Merge branch 'master' into guiQuirks
2 parents c2c051e + 6eddae6 commit 7f1d1bf

14 files changed

+1416
-345
lines changed

src/ExampleNets/IBBM2015/Isosurfacing_Cube_NEEDS_MODULE.srn5 renamed to src/ExampleNets/IBBM2015/Isosurfacing_Cube.srn5

Lines changed: 107 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<networkFile class_id="0" tracking_level="0" version="3">
55
<networkInfo class_id="1" tracking_level="0" version="0">
66
<modules class_id="2" tracking_level="0" version="0">
7-
<count>9</count>
7+
<count>10</count>
88
<item_version>0</item_version>
99
<item class_id="3" tracking_level="0" version="0">
1010
<first>CalculateDistanceToField:0</first>
@@ -62,7 +62,7 @@
6262
<name>TruncateDistance</name>
6363
<value>
6464
<which>1</which>
65-
<value>1.00000000000000000e+000</value>
65+
<value>1.00000000000000000e+00</value>
6666
</value>
6767
</second>
6868
</item>
@@ -114,7 +114,7 @@
114114
<name>PadPercent</name>
115115
<value>
116116
<which>1</which>
117-
<value>0.00000000000000000e+000</value>
117+
<value>0.00000000000000000e+00</value>
118118
</value>
119119
</second>
120120
</item>
@@ -214,7 +214,7 @@
214214
<name>ColorMapShift</name>
215215
<value>
216216
<which>1</which>
217-
<value>0.00000000000000000e+000</value>
217+
<value>0.00000000000000000e+00</value>
218218
</value>
219219
</second>
220220
</item>
@@ -242,14 +242,30 @@
242242
<name>GUIIsoValue</name>
243243
<value>
244244
<which>1</which>
245-
<value>0.00000000000000000e+000</value>
245+
<value>0.00000000000000000e+00</value>
246246
</value>
247247
</second>
248248
</item>
249249
</stateMap>
250250
</state>
251251
</second>
252252
</item>
253+
<item>
254+
<first>GenerateSinglePointProbeFromField:0</first>
255+
<second>
256+
<module>
257+
<package_name_>SCIRun</package_name_>
258+
<category_name_>NewField</category_name_>
259+
<module_name_>GenerateSinglePointProbeFromField</module_name_>
260+
</module>
261+
<state>
262+
<stateMap>
263+
<count>0</count>
264+
<item_version>0</item_version>
265+
</stateMap>
266+
</state>
267+
</second>
268+
</item>
253269
<item>
254270
<first>GetFieldBoundary:0</first>
255271
<second>
@@ -298,7 +314,7 @@
298314
<name>FixedMax</name>
299315
<value>
300316
<which>1</which>
301-
<value>1.00000000000000000e+000</value>
317+
<value>1.00000000000000000e+00</value>
302318
</value>
303319
</second>
304320
</item>
@@ -310,7 +326,7 @@
310326
<name>FixedMin</name>
311327
<value>
312328
<which>1</which>
313-
<value>0.00000000000000000e+000</value>
329+
<value>0.00000000000000000e+00</value>
314330
</value>
315331
</second>
316332
</item>
@@ -350,7 +366,7 @@
350366
<name>CylinderRadius</name>
351367
<value>
352368
<which>1</which>
353-
<value>1.00000000000000010e-001</value>
369+
<value>1.00000000000000006e-01</value>
354370
</value>
355371
</second>
356372
</item>
@@ -398,7 +414,7 @@
398414
<name>EdgeTransparencyValue</name>
399415
<value>
400416
<which>1</which>
401-
<value>6.49999976158142090e-001</value>
417+
<value>6.49999976158142090e-01</value>
402418
</value>
403419
</second>
404420
</item>
@@ -434,7 +450,7 @@
434450
<name>FaceTransparencyValue</name>
435451
<value>
436452
<which>1</which>
437-
<value>6.49999976158142090e-001</value>
453+
<value>6.49999976158142090e-01</value>
438454
</value>
439455
</second>
440456
</item>
@@ -470,7 +486,7 @@
470486
<name>NodeTransparencyValue</name>
471487
<value>
472488
<which>1</which>
473-
<value>6.49999976158142090e-001</value>
489+
<value>6.49999976158142090e-01</value>
474490
</value>
475491
</second>
476492
</item>
@@ -518,7 +534,7 @@
518534
<name>SphereScaleValue</name>
519535
<value>
520536
<which>1</which>
521-
<value>2.99999999999999990e-002</value>
537+
<value>2.99999999999999989e-02</value>
522538
</value>
523539
</second>
524540
</item>
@@ -546,7 +562,7 @@
546562
<name>CylinderRadius</name>
547563
<value>
548564
<which>1</which>
549-
<value>1.00000000000000010e-001</value>
565+
<value>1.00000000000000006e-01</value>
550566
</value>
551567
</second>
552568
</item>
@@ -594,7 +610,7 @@
594610
<name>EdgeTransparencyValue</name>
595611
<value>
596612
<which>1</which>
597-
<value>6.49999976158142090e-001</value>
613+
<value>6.49999976158142090e-01</value>
598614
</value>
599615
</second>
600616
</item>
@@ -630,7 +646,7 @@
630646
<name>FaceTransparencyValue</name>
631647
<value>
632648
<which>1</which>
633-
<value>6.49999976158142090e-001</value>
649+
<value>6.49999976158142090e-01</value>
634650
</value>
635651
</second>
636652
</item>
@@ -666,7 +682,7 @@
666682
<name>NodeTransparencyValue</name>
667683
<value>
668684
<which>1</which>
669-
<value>6.49999976158142090e-001</value>
685+
<value>6.49999976158142090e-01</value>
670686
</value>
671687
</second>
672688
</item>
@@ -714,7 +730,7 @@
714730
<name>SphereScaleValue</name>
715731
<value>
716732
<which>1</which>
717-
<value>2.99999999999999990e-002</value>
733+
<value>2.99999999999999989e-02</value>
718734
</value>
719735
</second>
720736
</item>
@@ -752,7 +768,7 @@
752768
</item>
753769
</modules>
754770
<connections class_id="12" tracking_level="0" version="0">
755-
<count>10</count>
771+
<count>13</count>
756772
<item_version>0</item_version>
757773
<item class_id="13" tracking_level="0" version="0">
758774
<moduleId1_>CalculateDistanceToField:0</moduleId1_>
@@ -790,6 +806,18 @@
790806
<id>0</id>
791807
</port2_>
792808
</item>
809+
<item>
810+
<moduleId1_>CreateLatVol:0</moduleId1_>
811+
<port1_>
812+
<name>OutputField</name>
813+
<id>0</id>
814+
</port1_>
815+
<moduleId2_>GenerateSinglePointProbeFromField:0</moduleId2_>
816+
<port2_>
817+
<name>InputField</name>
818+
<id>0</id>
819+
</port2_>
820+
</item>
793821
<item>
794822
<moduleId1_>CreateLatVol:0</moduleId1_>
795823
<port1_>
@@ -826,6 +854,30 @@
826854
<id>0</id>
827855
</port2_>
828856
</item>
857+
<item>
858+
<moduleId1_>GenerateSinglePointProbeFromField:0</moduleId1_>
859+
<port1_>
860+
<name>GeneratedPoint</name>
861+
<id>0</id>
862+
</port1_>
863+
<moduleId2_>CalculateDistanceToField:0</moduleId2_>
864+
<port2_>
865+
<name>ObjectField</name>
866+
<id>0</id>
867+
</port2_>
868+
</item>
869+
<item>
870+
<moduleId1_>GenerateSinglePointProbeFromField:0</moduleId1_>
871+
<port1_>
872+
<name>GeneratedWidget</name>
873+
<id>0</id>
874+
</port1_>
875+
<moduleId2_>ViewScene:0</moduleId2_>
876+
<port2_>
877+
<name>GeneralGeom</name>
878+
<id>2</id>
879+
</port2_>
880+
</item>
829881
<item>
830882
<moduleId1_>GetFieldBoundary:0</moduleId1_>
831883
<port1_>
@@ -877,69 +929,76 @@
877929
</connections>
878930
</networkInfo>
879931
<modulePositions class_id="15" tracking_level="0" version="0">
880-
<count>9</count>
932+
<count>10</count>
881933
<item_version>0</item_version>
882934
<item class_id="16" tracking_level="0" version="0">
883935
<first>CalculateDistanceToField:0</first>
884936
<second class_id="17" tracking_level="0" version="0">
885-
<first>-8.29000000000000000e+002</first>
886-
<second>-9.14000000000000000e+002</second>
937+
<first>-8.29000000000000000e+02</first>
938+
<second>-9.14000000000000000e+02</second>
887939
</second>
888940
</item>
889941
<item>
890942
<first>CreateLatVol:0</first>
891943
<second>
892-
<first>-1.06400000000000000e+003</first>
893-
<second>-1.14000000000000000e+003</second>
944+
<first>-1.06400000000000000e+03</first>
945+
<second>-1.21600000000000000e+03</second>
894946
</second>
895947
</item>
896948
<item>
897949
<first>CreateStandardColorMap:0</first>
898950
<second>
899-
<first>-1.05700000000000000e+003</first>
900-
<second>-7.85000000000000000e+002</second>
951+
<first>-1.05700000000000000e+03</first>
952+
<second>-7.85000000000000000e+02</second>
901953
</second>
902954
</item>
903955
<item>
904956
<first>ExtractSimpleIsosurface:0</first>
905957
<second>
906-
<first>-1.44400000000000000e+003</first>
907-
<second>-6.84000000000000000e+002</second>
958+
<first>-1.44400000000000000e+03</first>
959+
<second>-6.84000000000000000e+02</second>
960+
</second>
961+
</item>
962+
<item>
963+
<first>GenerateSinglePointProbeFromField:0</first>
964+
<second>
965+
<first>-6.84000000000000000e+02</first>
966+
<second>-1.06400000000000000e+03</second>
908967
</second>
909968
</item>
910969
<item>
911970
<first>GetFieldBoundary:0</first>
912971
<second>
913-
<first>-1.27200000000000000e+003</first>
914-
<second>-9.28000000000000000e+002</second>
972+
<first>-1.27200000000000000e+03</first>
973+
<second>-9.28000000000000000e+02</second>
915974
</second>
916975
</item>
917976
<item>
918977
<first>RescaleColorMap:0</first>
919978
<second>
920-
<first>-1.11000000000000000e+003</first>
921-
<second>-6.76000000000000000e+002</second>
979+
<first>-1.11000000000000000e+03</first>
980+
<second>-6.76000000000000000e+02</second>
922981
</second>
923982
</item>
924983
<item>
925984
<first>ShowField:0</first>
926985
<second>
927-
<first>-1.14100000000000000e+003</first>
928-
<second>-5.63000000000000000e+002</second>
986+
<first>-1.14100000000000000e+03</first>
987+
<second>-5.63000000000000000e+02</second>
929988
</second>
930989
</item>
931990
<item>
932991
<first>ShowField:1</first>
933992
<second>
934-
<first>-8.07000000000000000e+002</first>
935-
<second>-5.62000000000000000e+002</second>
993+
<first>-8.07000000000000000e+02</first>
994+
<second>-5.62000000000000000e+02</second>
936995
</second>
937996
</item>
938997
<item>
939998
<first>ViewScene:0</first>
940999
<second>
941-
<first>-1.08100000000000000e+003</first>
942-
<second>-4.26000000000000000e+002</second>
1000+
<first>-1.08100000000000000e+03</first>
1001+
<second>-4.26000000000000000e+02</second>
9431002
</second>
9441003
</item>
9451004
</modulePositions>
@@ -952,11 +1011,11 @@
9521011
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
9531012
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
9541013
p, li { white-space: pre-wrap; }
955-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
956-
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt;ID: 0&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1014+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1015+
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; color:#ffffff;&quot;&gt;ID: 0&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
9571016
<noteText>ID: 0</noteText>
9581017
<position>0</position>
959-
<fontSize>8</fontSize>
1018+
<fontSize>13</fontSize>
9601019
</second>
9611020
</item>
9621021
<item>
@@ -965,11 +1024,11 @@ p, li { white-space: pre-wrap; }
9651024
<noteHTML>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
9661025
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
9671026
p, li { white-space: pre-wrap; }
968-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
969-
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; color:#ffffff;&quot;&gt;ID: 1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
1027+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Lucida Grande&apos;; font-size:13pt; font-weight:400; font-style:normal;&quot;&gt;
1028+
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8pt; color:#ffffff;&quot;&gt;ID: 1&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</noteHTML>
9701029
<noteText>ID: 1</noteText>
9711030
<position>0</position>
972-
<fontSize>8</fontSize>
1031+
<fontSize>13</fontSize>
9731032
</second>
9741033
</item>
9751034
</moduleNotes>
@@ -978,7 +1037,7 @@ p, li { white-space: pre-wrap; }
9781037
<item_version>0</item_version>
9791038
</connectionNotes>
9801039
<moduleTags class_id="21" tracking_level="0" version="0">
981-
<count>9</count>
1040+
<count>10</count>
9821041
<item_version>0</item_version>
9831042
<item class_id="22" tracking_level="0" version="0">
9841043
<first>CalculateDistanceToField:0</first>
@@ -996,6 +1055,10 @@ p, li { white-space: pre-wrap; }
9961055
<first>ExtractSimpleIsosurface:0</first>
9971056
<second>0</second>
9981057
</item>
1058+
<item>
1059+
<first>GenerateSinglePointProbeFromField:0</first>
1060+
<second>0</second>
1061+
</item>
9991062
<item>
10001063
<first>GetFieldBoundary:0</first>
10011064
<second>0</second>

0 commit comments

Comments
 (0)