Skip to content

Commit 3b66bc3

Browse files
jourdainjourdain
committed
start updating tutorial for trame v2
1 parent 72af531 commit 3b66bc3

18 files changed

Lines changed: 323 additions & 329 deletions

‎00_setup/app.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
from trame.layouts import SinglePage
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
4+
# -----------------------------------------------------------------------------
5+
# Get a server to work with
6+
# -----------------------------------------------------------------------------
7+
8+
server = get_server()
29

310
# -----------------------------------------------------------------------------
411
# GUI
512
# -----------------------------------------------------------------------------
613

7-
layout = SinglePage("Hello trame")
8-
layout.title.set_text("Hello trame")
14+
with SinglePageLayout(server) as layout:
15+
layout.title.set_text("Hello trame")
916

1017
# -----------------------------------------------------------------------------
1118
# Main
1219
# -----------------------------------------------------------------------------
1320

1421
if __name__ == "__main__":
15-
layout.start()
22+
server.start()

‎01_vtk/app_cone.py‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,22 @@
1-
from trame.layouts import SinglePage
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
4+
# -----------------------------------------------------------------------------
5+
# Get a server to work with
6+
# -----------------------------------------------------------------------------
7+
8+
server = get_server()
29

310
# -----------------------------------------------------------------------------
411
# GUI
512
# -----------------------------------------------------------------------------
613

7-
layout = SinglePage("Hello trame")
8-
layout.title.set_text("Hello trame")
14+
with SinglePageLayout(server) as layout:
15+
layout.title.set_text("Hello trame")
916

1017
# -----------------------------------------------------------------------------
1118
# Main
1219
# -----------------------------------------------------------------------------
1320

1421
if __name__ == "__main__":
15-
layout.start()
22+
server.start()

‎01_vtk/app_flow.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from trame.layouts import SinglePage
2-
from trame.html import vtk, vuetify
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
from trame.widgets import vtk, vuetify
34

45
from vtkmodules.vtkFiltersSources import vtkConeSource
56
from vtkmodules.vtkRenderingCore import (
@@ -40,25 +41,27 @@
4041
renderer.ResetCamera()
4142

4243
# -----------------------------------------------------------------------------
43-
# GUI
44+
# Trame
4445
# -----------------------------------------------------------------------------
4546

46-
html_view = vtk.VtkLocalView(renderWindow)
47+
server = get_server()
48+
ctrl = server.controller
4749

48-
layout = SinglePage("Hello trame", on_ready=html_view.update)
49-
layout.title.set_text("Hello trame")
50+
with SinglePageLayout(server) as layout:
51+
layout.title.set_text("Hello trame")
52+
53+
with layout.content:
54+
with vuetify.VContainer(
55+
fluid=True,
56+
classes="pa-0 fill-height",
57+
):
58+
view = vtk.VtkLocalView(renderWindow)
59+
ctrl.on_server_ready.add(view.update)
5060

51-
layout.content.children += [
52-
vuetify.VContainer(
53-
fluid=True,
54-
classes="pa-0 fill-height",
55-
children=[html_view],
56-
)
57-
]
5861

5962
# -----------------------------------------------------------------------------
6063
# Main
6164
# -----------------------------------------------------------------------------
6265

6366
if __name__ == "__main__":
64-
layout.start()
67+
server.start()

‎01_vtk/solution_cone.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from trame.layouts import SinglePage
2-
from trame.html import vtk, vuetify
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
from trame.widgets import vtk, vuetify
34

45
from vtkmodules.vtkFiltersSources import vtkConeSource
56
from vtkmodules.vtkRenderingCore import (
@@ -40,25 +41,27 @@
4041
renderer.ResetCamera()
4142

4243
# -----------------------------------------------------------------------------
43-
# GUI
44+
# Trame
4445
# -----------------------------------------------------------------------------
4546

46-
html_view = vtk.VtkLocalView(renderWindow)
47+
server = get_server()
48+
ctrl = server.controller
4749

48-
layout = SinglePage("Hello trame", on_ready=html_view.update)
49-
layout.title.set_text("Hello trame")
50+
with SinglePageLayout(server) as layout:
51+
layout.title.set_text("Hello trame")
52+
53+
with layout.content:
54+
with vuetify.VContainer(
55+
fluid=True,
56+
classes="pa-0 fill-height",
57+
):
58+
view = vtk.VtkLocalView(renderWindow)
59+
ctrl.on_server_ready.add(view.update)
5060

51-
layout.content.children += [
52-
vuetify.VContainer(
53-
fluid=True,
54-
classes="pa-0 fill-height",
55-
children=[html_view],
56-
)
57-
]
5861

5962
# -----------------------------------------------------------------------------
6063
# Main
6164
# -----------------------------------------------------------------------------
6265

6366
if __name__ == "__main__":
64-
layout.start()
67+
server.start()

‎01_vtk/solution_flow.py‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import os
2-
from trame.layouts import SinglePage
3-
from trame.html import vtk, vuetify
2+
from trame.app import get_server
3+
from trame.ui.vuetify import SinglePageLayout
4+
from trame.widgets import vtk, vuetify
45

56
from vtkmodules.vtkCommonColor import vtkNamedColors
67
from vtkmodules.vtkCommonCore import vtkLookupTable
@@ -126,22 +127,24 @@
126127
# GUI
127128
# -----------------------------------------------------------------------------
128129

129-
html_view = vtk.VtkLocalView(renderWindow)
130+
server = get_server()
131+
ctrl = server.controller
130132

131-
layout = SinglePage("Hello trame", on_ready=html_view.update)
132-
layout.title.set_text("Hello trame")
133+
with SinglePageLayout(server) as layout:
134+
layout.title.set_text("Hello trame")
135+
136+
with layout.content:
137+
with vuetify.VContainer(
138+
fluid=True,
139+
classes="pa-0 fill-height",
140+
):
141+
view = vtk.VtkLocalView(renderWindow)
142+
ctrl.on_server_ready.add(view.update)
133143

134-
layout.content.children += [
135-
vuetify.VContainer(
136-
fluid=True,
137-
classes="pa-0 fill-height",
138-
children=[html_view],
139-
)
140-
]
141144

142145
# -----------------------------------------------------------------------------
143146
# Main
144147
# -----------------------------------------------------------------------------
145148

146149
if __name__ == "__main__":
147-
layout.start()
150+
server.start()

‎01_vtk/solution_ray_cast.py‎

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22

33
# Web imports
44
import os
5-
from trame.layouts import SinglePage
6-
from trame.html import vtk, vuetify
5+
from trame.app import get_server
6+
from trame.ui.vuetify import SinglePageLayout
7+
from trame.widgets import vtk, vuetify
78

89
# -----------------------------------------------------------------------------
910
# Example: SimpleRayCast
@@ -96,21 +97,25 @@
9697
# Web Application setup
9798
# -----------------------------------------------------------------------------
9899

99-
layout = SinglePage("Hello trame")
100-
layout.title.set_text("Hello trame")
100+
server = get_server()
101+
ctrl = server.controller
101102

102-
html_view = vtk.VtkRemoteView(renWin)
103-
# html_view = vtk.VtkLocalView(renWin)
103+
with SinglePageLayout(server) as layout:
104+
layout.title.set_text("Hello trame")
104105

105-
layout.content.children += [
106-
vuetify.VContainer(
107-
fluid=True,
108-
classes="pa-0 fill-height",
109-
children=[html_view],
110-
)
111-
]
106+
with layout.content:
107+
with vuetify.VContainer(
108+
fluid=True,
109+
classes="pa-0 fill-height",
110+
):
111+
view = vtk.VtkRemoteView(renWin)
112+
# view = vtk.VtkLocalView(renWin)
113+
ctrl.on_server_ready.add(view.update)
112114

113-
layout.on_ready = html_view.update
115+
116+
# -----------------------------------------------------------------------------
117+
# Main
118+
# -----------------------------------------------------------------------------
114119

115120
if __name__ == "__main__":
116-
layout.start()
121+
server.start()

‎02_layouts/app_cone.py‎

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from trame.layouts import SinglePage
2-
from trame.html import vtk, vuetify
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
from trame.widgets import vtk, vuetify
34

45
from vtkmodules.vtkFiltersSources import vtkConeSource
56
from vtkmodules.vtkRenderingCore import (
@@ -40,25 +41,27 @@
4041
renderer.ResetCamera()
4142

4243
# -----------------------------------------------------------------------------
43-
# GUI
44+
# Trame
4445
# -----------------------------------------------------------------------------
4546

46-
html_view = vtk.VtkLocalView(renderWindow)
47+
server = get_server()
48+
ctrl = server.controller
4749

48-
layout = SinglePage("Hello trame", on_ready=html_view.update)
49-
layout.title.set_text("Hello trame")
50+
with SinglePageLayout(server) as layout:
51+
layout.title.set_text("Hello trame")
52+
53+
with layout.content:
54+
with vuetify.VContainer(
55+
fluid=True,
56+
classes="pa-0 fill-height",
57+
):
58+
view = vtk.VtkLocalView(renderWindow)
59+
ctrl.on_server_ready.add(view.update)
5060

51-
layout.content.children += [
52-
vuetify.VContainer(
53-
fluid=True,
54-
classes="pa-0 fill-height",
55-
children=[html_view],
56-
)
57-
]
5861

5962
# -----------------------------------------------------------------------------
6063
# Main
6164
# -----------------------------------------------------------------------------
6265

6366
if __name__ == "__main__":
64-
layout.start()
67+
server.start()

‎02_layouts/solution_FullScreenPage.py‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from trame.layouts import FullScreenPage
2-
from trame.html import vtk, vuetify
1+
from trame.app import get_server
2+
from trame.ui.vuetify import VAppLayout
3+
from trame.widgets import vtk, vuetify
34

45
from vtkmodules.vtkFiltersSources import vtkConeSource
56
from vtkmodules.vtkRenderingCore import (
@@ -40,24 +41,24 @@
4041
renderer.ResetCamera()
4142

4243
# -----------------------------------------------------------------------------
43-
# GUI
44+
# Trame
4445
# -----------------------------------------------------------------------------
4546

46-
html_view = vtk.VtkLocalView(renderWindow)
47+
server = get_server()
48+
ctrl = server.controller
4749

48-
layout = FullScreenPage("Hello trame", on_ready=html_view.update)
49-
50-
layout.children += [
51-
vuetify.VContainer(
52-
fluid=True,
53-
classes="pa-0 fill-height",
54-
children=[html_view],
55-
)
56-
]
50+
with VAppLayout(server) as layout:
51+
with layout.root:
52+
with vuetify.VContainer(
53+
fluid=True,
54+
classes="pa-0 fill-height",
55+
):
56+
view = vtk.VtkLocalView(renderWindow)
57+
ctrl.on_server_ready.add(view.update)
5758

5859
# -----------------------------------------------------------------------------
5960
# Main
6061
# -----------------------------------------------------------------------------
6162

6263
if __name__ == "__main__":
63-
layout.start()
64+
server.start()

‎02_layouts/solution_SinglePage.py‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
from trame.layouts import SinglePage
2-
from trame.html import vtk, vuetify
1+
from trame.app import get_server
2+
from trame.ui.vuetify import SinglePageLayout
3+
from trame.widgets import vtk, vuetify
34

45
from vtkmodules.vtkFiltersSources import vtkConeSource
56
from vtkmodules.vtkRenderingCore import (
@@ -40,25 +41,26 @@
4041
renderer.ResetCamera()
4142

4243
# -----------------------------------------------------------------------------
43-
# GUI
44+
# Trame
4445
# -----------------------------------------------------------------------------
4546

46-
html_view = vtk.VtkLocalView(renderWindow)
47+
server = get_server()
48+
ctrl = server.controller
4749

48-
layout = SinglePage("Hello trame", on_ready=html_view.update)
49-
layout.title.set_text("Hello trame")
50+
with SinglePageLayout(server) as layout:
51+
layout.title.set_text("Hello trame")
5052

51-
layout.content.children += [
52-
vuetify.VContainer(
53-
fluid=True,
54-
classes="pa-0 fill-height",
55-
children=[html_view],
56-
)
57-
]
53+
with layout.content:
54+
with vuetify.VContainer(
55+
fluid=True,
56+
classes="pa-0 fill-height",
57+
):
58+
view = vtk.VtkLocalView(renderWindow)
59+
ctrl.on_server_ready.add(view.update)
5860

5961
# -----------------------------------------------------------------------------
6062
# Main
6163
# -----------------------------------------------------------------------------
6264

6365
if __name__ == "__main__":
64-
layout.start()
66+
server.start()

0 commit comments

Comments
 (0)