Skip to content

Commit 6db1e55

Browse files
dcwhitedcwhite
committed
Add dummy ospray module
1 parent b28f1c3 commit 6db1e55

File tree

9 files changed

+2413
-21
lines changed

9 files changed

+2413
-21
lines changed

‎src/ExampleNets/regression/interfaceWithOspray.srn5‎

Lines changed: 266 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,266 @@
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="6">
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>ConvertQuadSurfToTriSurf: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_>ChangeMesh</category_name_>
15+
<module_name_>ConvertQuadSurfToTriSurf</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>0</count>
20+
<item_version>0</item_version>
21+
</stateMap>
22+
</state>
23+
</second>
24+
</item>
25+
<item>
26+
<first>CreateLatVol:0</first>
27+
<second>
28+
<module>
29+
<package_name_>SCIRun</package_name_>
30+
<category_name_>NewField</category_name_>
31+
<module_name_>CreateLatVol</module_name_>
32+
</module>
33+
<state>
34+
<stateMap>
35+
<count>6</count>
36+
<item_version>0</item_version>
37+
<item class_id="8" tracking_level="0" version="0">
38+
<first class_id="9" tracking_level="0" version="0">
39+
<name>DataAtLocation</name>
40+
</first>
41+
<second class_id="10" tracking_level="0" version="0">
42+
<name>DataAtLocation</name>
43+
<value class_id="11" tracking_level="0" version="0">
44+
<which>0</which>
45+
<value>0</value>
46+
</value>
47+
</second>
48+
</item>
49+
<item>
50+
<first>
51+
<name>ElementSizeNormalized</name>
52+
</first>
53+
<second>
54+
<name>ElementSizeNormalized</name>
55+
<value>
56+
<which>0</which>
57+
<value>0</value>
58+
</value>
59+
</second>
60+
</item>
61+
<item>
62+
<first>
63+
<name>PadPercent</name>
64+
</first>
65+
<second>
66+
<name>PadPercent</name>
67+
<value>
68+
<which>1</which>
69+
<value>0.00000000000000000e+00</value>
70+
</value>
71+
</second>
72+
</item>
73+
<item>
74+
<first>
75+
<name>XSize</name>
76+
</first>
77+
<second>
78+
<name>XSize</name>
79+
<value>
80+
<which>0</which>
81+
<value>16</value>
82+
</value>
83+
</second>
84+
</item>
85+
<item>
86+
<first>
87+
<name>YSize</name>
88+
</first>
89+
<second>
90+
<name>YSize</name>
91+
<value>
92+
<which>0</which>
93+
<value>16</value>
94+
</value>
95+
</second>
96+
</item>
97+
<item>
98+
<first>
99+
<name>ZSize</name>
100+
</first>
101+
<second>
102+
<name>ZSize</name>
103+
<value>
104+
<which>0</which>
105+
<value>16</value>
106+
</value>
107+
</second>
108+
</item>
109+
</stateMap>
110+
</state>
111+
</second>
112+
</item>
113+
<item>
114+
<first>GetFieldBoundary:0</first>
115+
<second>
116+
<module>
117+
<package_name_>SCIRun</package_name_>
118+
<category_name_>NewField</category_name_>
119+
<module_name_>GetFieldBoundary</module_name_>
120+
</module>
121+
<state>
122+
<stateMap>
123+
<count>0</count>
124+
<item_version>0</item_version>
125+
</stateMap>
126+
</state>
127+
</second>
128+
</item>
129+
<item>
130+
<first>InterfaceWithOspray:0</first>
131+
<second>
132+
<module>
133+
<package_name_>SCIRun</package_name_>
134+
<category_name_>Visualization</category_name_>
135+
<module_name_>InterfaceWithOspray</module_name_>
136+
</module>
137+
<state>
138+
<stateMap>
139+
<count>0</count>
140+
<item_version>0</item_version>
141+
</stateMap>
142+
</state>
143+
</second>
144+
</item>
145+
</modules>
146+
<connections class_id="12" tracking_level="0" version="0">
147+
<count>3</count>
148+
<item_version>0</item_version>
149+
<item class_id="13" tracking_level="0" version="0">
150+
<moduleId1_>ConvertQuadSurfToTriSurf:0</moduleId1_>
151+
<port1_ class_id="14" tracking_level="0" version="0">
152+
<name>TriSurf</name>
153+
<id>0</id>
154+
</port1_>
155+
<moduleId2_>InterfaceWithOspray:0</moduleId2_>
156+
<port2_>
157+
<name>Field</name>
158+
<id>0</id>
159+
</port2_>
160+
</item>
161+
<item>
162+
<moduleId1_>CreateLatVol:0</moduleId1_>
163+
<port1_>
164+
<name>OutputField</name>
165+
<id>0</id>
166+
</port1_>
167+
<moduleId2_>GetFieldBoundary:0</moduleId2_>
168+
<port2_>
169+
<name>InputField</name>
170+
<id>0</id>
171+
</port2_>
172+
</item>
173+
<item>
174+
<moduleId1_>GetFieldBoundary:0</moduleId1_>
175+
<port1_>
176+
<name>BoundaryField</name>
177+
<id>0</id>
178+
</port1_>
179+
<moduleId2_>ConvertQuadSurfToTriSurf:0</moduleId2_>
180+
<port2_>
181+
<name>QuadSurf</name>
182+
<id>0</id>
183+
</port2_>
184+
</item>
185+
</connections>
186+
</networkInfo>
187+
<modulePositions class_id="15" tracking_level="0" version="0">
188+
<count>4</count>
189+
<item_version>0</item_version>
190+
<item class_id="16" tracking_level="0" version="0">
191+
<first>ConvertQuadSurfToTriSurf:0</first>
192+
<second class_id="17" tracking_level="0" version="0">
193+
<first>-3.04000000000000000e+02</first>
194+
<second>-1.52000000000000000e+02</second>
195+
</second>
196+
</item>
197+
<item>
198+
<first>CreateLatVol:0</first>
199+
<second>
200+
<first>-3.04000000000000000e+02</first>
201+
<second>-3.04000000000000000e+02</second>
202+
</second>
203+
</item>
204+
<item>
205+
<first>GetFieldBoundary:0</first>
206+
<second>
207+
<first>-7.60000000000000000e+01</first>
208+
<second>-2.28000000000000000e+02</second>
209+
</second>
210+
</item>
211+
<item>
212+
<first>InterfaceWithOspray:0</first>
213+
<second>
214+
<first>-1.52000000000000000e+02</first>
215+
<second>0.00000000000000000e+00</second>
216+
</second>
217+
</item>
218+
</modulePositions>
219+
<moduleNotes class_id="18" tracking_level="0" version="0">
220+
<count>0</count>
221+
<item_version>0</item_version>
222+
</moduleNotes>
223+
<connectionNotes>
224+
<count>0</count>
225+
<item_version>0</item_version>
226+
</connectionNotes>
227+
<moduleTags class_id="19" tracking_level="0" version="0">
228+
<count>4</count>
229+
<item_version>0</item_version>
230+
<item class_id="20" tracking_level="0" version="0">
231+
<first>ConvertQuadSurfToTriSurf:0</first>
232+
<second>-1</second>
233+
</item>
234+
<item>
235+
<first>CreateLatVol:0</first>
236+
<second>-1</second>
237+
</item>
238+
<item>
239+
<first>GetFieldBoundary:0</first>
240+
<second>-1</second>
241+
</item>
242+
<item>
243+
<first>InterfaceWithOspray:0</first>
244+
<second>-1</second>
245+
</item>
246+
</moduleTags>
247+
<disabledModules class_id="21" tracking_level="0" version="0">
248+
<count>0</count>
249+
<item_version>0</item_version>
250+
</disabledModules>
251+
<disabledConnections>
252+
<count>0</count>
253+
<item_version>0</item_version>
254+
</disabledConnections>
255+
<moduleTagLabels class_id="22" tracking_level="0" version="0">
256+
<count>0</count>
257+
<item_version>0</item_version>
258+
</moduleTagLabels>
259+
<loadTagGroups>0</loadTagGroups>
260+
<subnetworks class_id="23" tracking_level="0" version="0">
261+
<count>0</count>
262+
<item_version>0</item_version>
263+
</subnetworks>
264+
</networkFile>
265+
</boost_serialization>
266+

‎src/Interface/Modules/Visualization/CMakeLists.txt‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11

22
#
33
# For more information, please see: http://software.sci.utah.edu
4-
#
4+
#
55
# The MIT License
6-
#
6+
#
77
# Copyright (c) 2015 Scientific Computing and Imaging Institute,
88
# University of Utah.
9-
#
10-
#
9+
#
10+
#
1111
# Permission is hereby granted, free of charge, to any person obtaining a
1212
# copy of this software and associated documentation files (the "Software"),
1313
# to deal in the Software without restriction, including without limitation
1414
# the rights to use, copy, modify, merge, publish, distribute, sublicense,
1515
# and/or sell copies of the Software, and to permit persons to whom the
1616
# Software is furnished to do so, subject to the following conditions:
17-
#
17+
#
1818
# The above copyright notice and this permission notice shall be included
19-
# in all copies or substantial portions of the Software.
20-
#
19+
# in all copies or substantial portions of the Software.
20+
#
2121
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
2222
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
2323
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -39,23 +39,25 @@ SET(Interface_Modules_Visualization_FORMS
3939
ShowString.ui
4040
ShowColorMap.ui
4141
RescaleColorMap.ui
42+
InterfaceWithOspray.ui
4243
)
4344

4445
SET(Interface_Modules_Visualization_HEADERS
4546
CreateStandardColorMapDialog.h
4647
GenerateStreamLinesDialog.h
4748
share.h
48-
ShowFieldDialog.h
49+
ShowFieldDialog.h
4950
ShowFieldGlyphsDialog.h
5051
ShowFieldGlyphsScalarTabDialog.h
5152
ShowFieldGlyphsVectorTabDialog.h
5253
ShowFieldGlyphsTensorTabDialog.h
5354
ShowStringDialog.h
5455
ShowColorMapDialog.h
5556
RescaleColorMapDialog.h
57+
InterfaceWithOsprayDialog.h
5658
)
5759

58-
SET(Interface_Modules_Visualization_SOURCES
60+
SET(Interface_Modules_Visualization_SOURCES
5961
CreateStandardColorMapDialog.cc
6062
GenerateStreamLinesDialog.cc
6163
ShowFieldDialog.cc
@@ -66,19 +68,20 @@ SET(Interface_Modules_Visualization_SOURCES
6668
ShowStringDialog.cc
6769
ShowColorMapDialog.cc
6870
RescaleColorMapDialog.cc
71+
InterfaceWithOsprayDialog.cc
6972
)
7073

7174
QT4_WRAP_UI(Interface_Modules_Visualization_FORMS_HEADERS ${Interface_Modules_Visualization_FORMS})
7275
QT4_WRAP_CPP(Interface_Modules_Visualization_HEADERS_MOC ${Interface_Modules_Visualization_HEADERS})
7376

74-
SCIRUN_ADD_LIBRARY(Interface_Modules_Visualization
77+
SCIRUN_ADD_LIBRARY(Interface_Modules_Visualization
7578
${Interface_Modules_Visualization_HEADERS}
7679
${Interface_Modules_Visualization_FORMS_HEADERS}
7780
${Interface_Modules_Visualization_HEADERS_MOC}
7881
${Interface_Modules_Visualization_SOURCES}
7982
)
8083

81-
TARGET_LINK_LIBRARIES(Interface_Modules_Visualization
84+
TARGET_LINK_LIBRARIES(Interface_Modules_Visualization
8285
Modules_Visualization
8386
Core_Algorithms_Legacy_Fields
8487
Interface_Modules_Base
@@ -90,5 +93,5 @@ TARGET_LINK_LIBRARIES(Interface_Modules_Visualization
9093
IF(BUILD_SHARED_LIBS)
9194
ADD_DEFINITIONS(-DBUILD_Interface_Modules_Visualization)
9295
ENDIF(BUILD_SHARED_LIBS)
93-
96+
9497
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})

0 commit comments

Comments
 (0)