Skip to content

Commit 898d279

Browse files
author
David Baum
committed
Merge branch 'feature/unify_setup_files' into development
2 parents caa68be + a7d0b47 commit 898d279

22 files changed

Lines changed: 29 additions & 542 deletions

ui/mrt-demo.html

Lines changed: 0 additions & 102 deletions
This file was deleted.

ui/mrt.html

Lines changed: 0 additions & 102 deletions
This file was deleted.

ui/scripts/Legend/LegendController.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,24 @@ var legendController = (function() {
66
let items = [];
77

88
let icons = {
9+
// circles
910
redCircle: "scripts/Legend/images/circle_red.png",
1011
blueCircle: "scripts/Legend/images/circle_blue.png",
1112
greenCircle: "scripts/Legend/images/circle_green.png",
13+
orangeCircle: "scripts/Legend/images/circle_orange.png",
14+
blackCircle: "scripts/Legend/images/circle_black.png",
1215
grayCircle: "scripts/Legend/images/circle_gray.png",
1316
purpleCircle: "scripts/Legend/images/circle_purple.png",
1417
yellowCircle: "scripts/Legend/images/circle_yellow.png",
1518
lightBlueCircle: "scripts/Legend/images/circle_blue_light.png",
19+
// cylinders
20+
blueCylinderHeight: "scripts/Legend/images/cylinder_blue_height.png",
21+
orangeCylinderHeight: "scripts/Legend/images/cylinder_orange_height.png",
22+
// gradients
1623
greenRedGradient: "scripts/Legend/images/gradient_green-red.png",
24+
// measurements
1725
circleWidth: "scripts/Legend/images/circle_width.png",
26+
// mouse navigation
1827
navigation: "scripts/Legend/images/navigation.png",
1928
leftMouseButton: "scripts/Legend/images/left.png",
2029
rightMouseButton: "scripts/Legend/images/right.png",
File renamed without changes.

ui/setups/mrt/issues.png renamed to ui/scripts/Legend/images/cylinder_blue_height.png

File renamed without changes.
File renamed without changes.

ui/setups/mrt/class.png

-3.09 KB
Binary file not shown.

ui/setups/mrt/double.png

-10.7 KB
Binary file not shown.

ui/setups/mrt/frequency.png

-997 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)