Skip to content

Commit 42a5c33

Browse files
author
David Baum
committed
Merge branch 'feature/polish_aframe' into development
2 parents e77238c + 722508d commit 42a5c33

2 files changed

Lines changed: 379 additions & 1 deletion

File tree

‎ui/aframe.html‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@
7373
<script type="text/javascript" src="scripts/InteractionLogger/InteractionLogger.js"></script>
7474
<script type="text/javascript" src="scripts/Email/EmailController.js"></script>
7575
<script type="text/javascript" src="scripts/Menu/MenuController.js"></script>
76+
<script type="text/javascript" src="scripts/Legend/LegendController.js"></script>
77+
<script type="text/javascript" src="scripts/Systeminfo/SysteminfoController.js"></script>
7678

7779
<!--user interface-->
7880
<script type="text/javascript" src="scripts/DefaultLogger.js"></script>
@@ -88,7 +90,7 @@
8890
<link rel="stylesheet" href="Style.css" type="text/css" />
8991

9092
<!--setup-->
91-
<script type="text/javascript" src="setups/test/flyTo.js"></script>
93+
<script type="text/javascript" src="setups/web_a-frame/City bank.js"></script>
9294

9395
</head>
9496
<body>

‎ui/setups/web_a-frame/City bank.js‎

Lines changed: 376 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,376 @@
1+
var setup = {
2+
3+
loadPopUp: true,
4+
5+
6+
controllers: [
7+
8+
{ name: "defaultLogger",
9+
10+
logInfoConsole : false,
11+
logActionConsole : false,
12+
logEventConsole : false
13+
},
14+
15+
{ name: "emailController",
16+
17+
createHeadSection: false
18+
},
19+
20+
{ name: "canvasHoverController",
21+
},
22+
23+
{ name: "canvasMarkController",
24+
},
25+
26+
{ name: "canvasSelectController"
27+
},
28+
29+
{ name: "canvasFilterController"
30+
},
31+
32+
{ name: "canvasFlyToController"
33+
},
34+
{ name: "searchController"
35+
},
36+
37+
{ name: "packageExplorerController",
38+
},
39+
{ name: "sourceCodeController",
40+
url: "https://raw.githubusercontent.com/softvis-research/Bank/master/src/"
41+
},
42+
{ name: "relationConnectorController",
43+
44+
showInnerRelations: false,
45+
sourceStartAtBorder: true,
46+
targetEndAtBorder: true,
47+
},
48+
{ name: "relationTransparencyController",
49+
},
50+
51+
{ name: "relationHighlightController"
52+
},
53+
{
54+
name: "systeminfoController",
55+
system: "Bank",
56+
link: "https://github.com/softvis-research/Bank",
57+
noc: true,
58+
loc: 192
59+
},
60+
{ name: "menuController",
61+
menuMapping: [
62+
63+
{
64+
title: "View",
65+
subMenu: true,
66+
items: [
67+
{
68+
title: "FlyTo",
69+
toggle: true,
70+
eventOn: "canvasFlyToController.activate",
71+
eventOff: "canvasFlyToController.deactivate",
72+
},
73+
74+
{
75+
title: "Reset Visualization",
76+
event: "application.reset",
77+
},
78+
]
79+
},
80+
81+
{
82+
title: "Relations",
83+
subMenu: true,
84+
items: [
85+
{
86+
title: "Relation Connectors",
87+
toggle: true,
88+
eventOn: "relationConnectorController.activate",
89+
eventOff: "relationConnectorController.deactivate",
90+
},
91+
{
92+
title: "Relation Transparency",
93+
toggle: true,
94+
eventOn: "relationTransparencyController.activate",
95+
eventOff: "relationTransparencyController.deactivate",
96+
},
97+
{
98+
title: "Relation Highlight",
99+
toggle: true,
100+
eventOn: "relationHighlightController.activate",
101+
eventOff: "relationHighlightController.deactivate",
102+
},
103+
]
104+
},
105+
106+
{
107+
title: "Visualizations",
108+
subMenu: true,
109+
items: [
110+
{
111+
title: "City Original",
112+
link: true,
113+
url: "index.php?setup=web/City freemind&model=City%20original%20freemind"
114+
},
115+
{
116+
title: "City Bricks",
117+
link: true,
118+
url: "index.php?setup=web/City freemind&model=City%20bricks%20freemind"
119+
},
120+
{
121+
title: "City Floors",
122+
link: true,
123+
url: "index.php?setup=web/City freemind&model=City%20floor%20freemind"
124+
},
125+
{
126+
title: "Recursive Disk",
127+
link: true,
128+
url: "index.php?setup=web/RD freemind&model=RD%20freemind"
129+
}, {
130+
title: "Recursive Disk 3D",
131+
link: true,
132+
url: "index.php?setup=web/RD reek&model=RD%203D%20reek"
133+
},
134+
]
135+
},
136+
137+
{
138+
title: "About",
139+
subMenu: true,
140+
items: [
141+
{
142+
title: "University Leipzig",
143+
link: true,
144+
url: "https://www.wifa.uni-leipzig.de/en/information-systems-institute/se/research/softwarevisualization-in-3d-and-vr.html"
145+
},
146+
{
147+
title: "Feedback!",
148+
event: "emailController.openMailPopUp",
149+
},
150+
{
151+
title: "Impressum",
152+
popup: true,
153+
text: "<b>Universität Leipzig</b><br\/\>"+
154+
" <br\/\>"+
155+
"Wirtschaftswissenschaftliche Fakultät<br\/\>"+
156+
"Institut für Wirtschaftsinformatik<br\/\>"+
157+
"Grimmaische Straße 12<br\/\>"+
158+
"D - 04109 Leipzig<br\/\>"+
159+
" <br\/\>"+
160+
"<b>Dr. Richard Müller</b><br\/\>"+
161+
"rmueller(-a-t-)wifa.uni-leipzig.de<br\/\>",
162+
height: 200,
163+
width: 2050,
164+
},
165+
{
166+
title: "Privacy Policy",
167+
link: true,
168+
url: "http://home.uni-leipzig.de/svis/privacy-policy/"
169+
}
170+
]
171+
},
172+
]
173+
},
174+
{
175+
name: "legendController",
176+
entries: [{
177+
name: "Package",
178+
icon: "grayCircle"
179+
}, {
180+
name: "Type",
181+
icon: "purpleCircle",
182+
}, {
183+
name: "Navigation",
184+
icon: "navigation",
185+
entries: [
186+
{
187+
name: "Rotate",
188+
icon: "leftMouseButton"
189+
}, {
190+
name: "Move",
191+
icon: "midMouseButton"
192+
}, {
193+
name: "Zoom",
194+
icon: "scrolling"
195+
}]
196+
}
197+
],
198+
}
199+
],
200+
201+
202+
203+
204+
uis: [
205+
206+
207+
{
208+
name: "UI0",
209+
210+
navigation: {
211+
//examine, walk, fly, helicopter, lookAt, turntable, game
212+
type: "turntable",
213+
214+
//turntable last 2 values - accepted values are between 0 and PI - 0.0 - 1,5 at Y-axis
215+
typeParams: "0.0 0.0 0.001 1.5",
216+
217+
//speed: 10
218+
},
219+
220+
221+
area: {
222+
name: "top",
223+
orientation: "horizontal",
224+
resizable: false,
225+
collapsible: false,
226+
first: {
227+
size: "25px",
228+
collapsible: false,
229+
controllers: [
230+
{name: "menuController"},
231+
//{name: "searchController"},
232+
{name: "emailController"},
233+
],
234+
},
235+
second: {
236+
size: "80%",
237+
collapsible: false,
238+
area: {
239+
orientation: "vertical",
240+
name: "leftPanel",
241+
size: "20%",
242+
first: {
243+
size: "20%",
244+
area: {
245+
size: "50%",
246+
collapsible: false,
247+
orientation: "horizontal",
248+
name: "packagePanel",
249+
first: {
250+
collapsible: false,
251+
size: "33%",
252+
expanders: [
253+
{
254+
name: "filterExplorer",
255+
title: "Filter",
256+
controllers: [
257+
// {name: "filterController"}
258+
],
259+
}
260+
]
261+
},
262+
second: {
263+
size: "50%",
264+
area: {
265+
orientation: "horizontal",
266+
name: "legendPanel",
267+
size: "50%%",
268+
collapsible: false,
269+
first: {
270+
size: "50%",
271+
expanders: [
272+
{
273+
name: "packageExplorer",
274+
title: "Package Explorer",
275+
controllers: [
276+
{name: "packageExplorerController"}
277+
],
278+
},
279+
]
280+
},
281+
second: {
282+
size: "50%",
283+
area: {
284+
orientation: "horizontal",
285+
name: "legendPanel2",
286+
size: "100%",
287+
collapsible: false,
288+
first: {
289+
size: "100%",
290+
expanders: [
291+
{
292+
name: "legend",
293+
title: "Legend",
294+
295+
controllers: [
296+
{name: "legendController"}
297+
],
298+
},
299+
]
300+
},
301+
second: {
302+
303+
}
304+
},
305+
},
306+
}
307+
},
308+
},
309+
},
310+
second: {
311+
collapsible: false,
312+
area: {
313+
orientation: "vertical",
314+
collapsible: false,
315+
name: "canvas",
316+
size: "50%",
317+
first: {
318+
size: "80%",
319+
collapsible: false,
320+
canvas: {},
321+
controllers: [
322+
{name: "defaultLogger"},
323+
{name: "canvasSelectController"},
324+
{name: "canvasMarkController"},
325+
{name: "canvasHoverController"},
326+
{name: "canvasFilterController"},
327+
{name: "canvasFlyToController"},
328+
{name: "relationConnectorController"},
329+
{name: "relationTransparencyController"},
330+
{name: "relationHighlightController"},
331+
],
332+
},
333+
second: {
334+
area: {
335+
orientation: "horizontal",
336+
collapsible: false,
337+
name: "rightPael",
338+
size: "80%",
339+
first: {
340+
size: "80%",
341+
min: "200",
342+
oriontation: "horizontal",
343+
expanders: [
344+
{
345+
name: "CodeViewer",
346+
title: "CodeViewer",
347+
controllers: [
348+
{name: "sourceCodeController"}
349+
],
350+
},
351+
],
352+
},
353+
second: {
354+
size: "20%",
355+
min: "200",
356+
oriontation: "horizontal",
357+
expanders: [
358+
{
359+
name: "systeminfo",
360+
title: "Info",
361+
controllers: [
362+
{name: "systeminfoController"}
363+
],
364+
},
365+
],
366+
}
367+
}
368+
}
369+
}
370+
}
371+
}
372+
}
373+
}
374+
}
375+
]
376+
};

0 commit comments

Comments
 (0)