Mercurial > hg > orthanc-stl
annotate Resources/CMake/3dhop-4.3.patch @ 74:ad9950628b35 default tip
use relative path to instances for reverse proxying
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 15 Oct 2024 14:46:48 +0200 |
parents | a5c1be2ec26a |
children |
rev | line source |
---|---|
62
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 diff -urEb 3dhop.orig/3DHOP_all_tools.html 3dhop/3DHOP_all_tools.html |
70
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
2 --- 3dhop.orig/3DHOP_all_tools.html 2024-10-04 15:38:25.961879494 +0200 |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
3 +++ 3dhop/3DHOP_all_tools.html 2024-10-04 15:39:42.273297957 +0200 |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
4 @@ -101,11 +101,30 @@ |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
5 </div> |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
6 <!--SECTIONS--> |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
7 |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
8 - <canvas id="draw-canvas" style="background-image: url(skins/backgrounds/light.jpg)"/> |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
9 + <canvas id="draw-canvas" style="${{CANVAS_STYLE}}"/> |
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
10 </div> |
62
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 </body> |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 <script type="text/javascript"> |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 +// http://stackoverflow.com/a/21903119/881731 |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
15 +function GetUrlParameter(sParam) |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 +{ |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
17 + var sPageURL = decodeURIComponent(window.location.search.substring(1)); |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
18 + var sURLVariables = sPageURL.split('&'); |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
19 + |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 + for (var i = 0; i < sURLVariables.length; i++) { |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 + var sParameterName = sURLVariables[i].split('='); |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 + |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 + if (sParameterName[0] === sParam) { |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 + return sParameterName[1] === undefined ? '' : sParameterName[1]; |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
25 + } |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
26 + } |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
27 + |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
28 + return ''; |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
29 +}; |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
30 + |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
31 +var instanceId = GetUrlParameter('instance'); |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
32 + |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
33 var presenter = null; |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
34 |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
35 function setup3dhop() { |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
36 @@ -113,7 +132,7 @@ |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
37 |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
38 presenter.setScene({ |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
39 meshes: { |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
40 - "mesh_1" : { url: "models/gargo.nxz" } |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
41 + "mesh_1" : { url: "../3dhop-instances/" + instanceId + ".nxz" } |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
42 }, |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
43 modelInstances : { |
b798387b085c
added 3DHOP viewer version 4.3
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
44 "model_1" : { |
70
a5c1be2ec26a
new configuration option: STL.3DHOP.CanvasStyle
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
62
diff
changeset
|
45 Only in 3dhop: 3DHOP_all_tools.html~ |