Skip to content

Commit 933cb71

Browse files
MaxNumeriquegithub-actions[bot]
authored andcommitted
Apply prepare changes
1 parent 9954c87 commit 933cb71

File tree

2 files changed

+75
-32
lines changed

2 files changed

+75
-32
lines changed

stores/hybrid_viewer.js

Lines changed: 63 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,10 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
6868
textEncoder.encode(value.vtk_js.binary_light_viewable),
6969
)
7070
const polydata = reader.getOutputData(0)
71-
console.log("[hybrid_viewer] addItem polydata bounds", polydata?.getBounds?.())
71+
console.log(
72+
"[hybrid_viewer] addItem polydata bounds",
73+
polydata?.getBounds?.(),
74+
)
7275
const mapper = vtkMapper.newInstance()
7376
mapper.setInputData(polydata)
7477
const actor = vtkActor.newInstance()
@@ -77,7 +80,10 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
7780
const renderer = genericRenderWindow.value.getRenderer()
7881
const renderWindow = genericRenderWindow.value.getRenderWindow()
7982
renderer.addActor(actor)
80-
console.log("[hybrid_viewer] addItem actors count", renderer.getActors().length)
83+
console.log(
84+
"[hybrid_viewer] addItem actors count",
85+
renderer.getActors().length,
86+
)
8187
renderer.resetCamera()
8288
renderWindow.render()
8389
console.log("[hybrid_viewer] addItem render done")
@@ -128,7 +134,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
128134
const renderer = genericRenderWindow.value.getRenderer()
129135
renderer.resetCameraClippingRange()
130136
const camera = renderer.getActiveCamera()
131-
137+
132138
const raw = {
133139
focal_point: camera.getFocalPoint(),
134140
view_up: camera.getViewUp(),
@@ -143,39 +149,54 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
143149
view_angle: raw.view_angle,
144150
clipping_range: raw.clipping_range,
145151
types: {
146-
focal_point: Array.isArray(raw.focal_point) ? "array" : typeof raw.focal_point,
152+
focal_point: Array.isArray(raw.focal_point)
153+
? "array"
154+
: typeof raw.focal_point,
147155
view_up: Array.isArray(raw.view_up) ? "array" : typeof raw.view_up,
148156
position: Array.isArray(raw.position) ? "array" : typeof raw.position,
149-
clipping_range: Array.isArray(raw.clipping_range) ? "array" : typeof raw.clipping_range,
157+
clipping_range: Array.isArray(raw.clipping_range)
158+
? "array"
159+
: typeof raw.clipping_range,
150160
},
151161
})
152-
162+
153163
const fp = toNumArray(raw.focal_point, 3)
154164
const vu = toNumArray(raw.view_up, 3)
155165
const pos = toNumArray(raw.position, 3)
156166
const cr = toNumArray(raw.clipping_range, 2)
157167
const va = Number(raw.view_angle)
158-
159-
const normalized = { focal_point: fp, view_up: vu, position: pos, view_angle: va, clipping_range: cr }
168+
169+
const normalized = {
170+
focal_point: fp,
171+
view_up: vu,
172+
position: pos,
173+
view_angle: va,
174+
clipping_range: cr,
175+
}
160176
console.log("[hybrid_viewer] camera normalized", normalized)
161-
177+
162178
const valid = fp && vu && pos && cr && Number.isFinite(va)
163179
if (!valid) {
164-
console.warn("[hybrid_viewer] syncRemoteCamera skipped: invalid camera", normalized)
180+
console.warn(
181+
"[hybrid_viewer] syncRemoteCamera skipped: invalid camera",
182+
normalized,
183+
)
165184
return
166185
}
167-
186+
168187
const params = { camera_options: normalized }
169188
console.log("[hybrid_viewer] viewer.update_camera request", params)
170-
189+
171190
viewer_call(
172191
{
173192
schema: viewer_schemas.opengeodeweb_viewer.viewer.update_camera,
174193
params,
175194
},
176195
{
177196
response_function: () => {
178-
console.log("[hybrid_viewer] viewer.update_camera response: ok -> render")
197+
console.log(
198+
"[hybrid_viewer] viewer.update_camera response: ok -> render",
199+
)
179200
remoteRender()
180201
Object.assign(camera_options, params.camera_options)
181202
},
@@ -212,7 +233,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
212233
imageStyle.zIndex = 1
213234
resize(container.value.$el.offsetWidth, container.value.$el.offsetHeight)
214235
console.log("setContainer", container.value.$el)
215-
236+
216237
useMousePressed({
217238
target: container,
218239
onPressed: (event) => {
@@ -242,7 +263,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
242263
syncRemoteCamera()
243264
},
244265
})
245-
266+
246267
let wheelEventEndTimeout = null
247268
useEventListener(container, "wheel", () => {
248269
is_moving.value = true
@@ -315,41 +336,54 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
315336
if (z_scale != null) {
316337
await setZScaling(z_scale)
317338
}
318-
339+
319340
const cam = snapshot?.camera_options
320341
if (cam) {
321342
console.log("[hybrid_viewer] importStores snapshot camera", cam)
322343
const renderer = genericRenderWindow.value.getRenderer()
323344
const camera = renderer.getActiveCamera()
324-
345+
325346
const fp = toNumArray(cam.focal_point, 3)
326347
const vu = toNumArray(cam.view_up, 3)
327348
const pos = toNumArray(cam.position, 3)
328349
const cr = toNumArray(cam.clipping_range, 2)
329350
const va = Number(cam.view_angle)
330-
331-
const valid =
332-
fp && vu && pos && cr && Number.isFinite(va)
333-
351+
352+
const valid = fp && vu && pos && cr && Number.isFinite(va)
353+
334354
console.log("[hybrid_viewer] importStores normalized camera", {
335-
focal_point: fp, view_up: vu, position: pos, view_angle: va, clipping_range: cr, valid
355+
focal_point: fp,
356+
view_up: vu,
357+
position: pos,
358+
view_angle: va,
359+
clipping_range: cr,
360+
valid,
336361
})
337-
362+
338363
if (!valid) {
339-
console.warn("[hybrid_viewer] importStores camera skipped: invalid snapshot camera", cam)
364+
console.warn(
365+
"[hybrid_viewer] importStores camera skipped: invalid snapshot camera",
366+
cam,
367+
)
340368
return
341369
}
342-
370+
343371
camera.setFocalPoint(fp)
344372
camera.setViewUp(vu)
345373
camera.setPosition(pos)
346374
camera.setViewAngle(va)
347375
camera.setClippingRange(cr)
348-
376+
349377
genericRenderWindow.value.getRenderWindow().render()
350-
378+
351379
console.log("[hybrid_viewer] importStores -> viewer.update_camera", {
352-
camera_options: { focal_point: fp, view_up: vu, position: pos, view_angle: va, clipping_range: cr },
380+
camera_options: {
381+
focal_point: fp,
382+
view_up: vu,
383+
position: pos,
384+
view_angle: va,
385+
clipping_range: cr,
386+
},
353387
})
354388
await viewer_call({
355389
schema: viewer_schemas.opengeodeweb_viewer.viewer.update_camera,
@@ -363,7 +397,7 @@ export const useHybridViewerStore = defineStore("hybridViewer", () => {
363397
},
364398
},
365399
})
366-
400+
367401
Object.assign(camera_options, {
368402
focal_point: fp,
369403
view_up: vu,

utils/file_import_workflow.js

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,18 +119,27 @@ async function importWorkflowFromSnapshot(items) {
119119
console.log("[importWorkflowFromSnapshot] hybridViewer.addItem ok", item.id)
120120

121121
await dataStyleStore.addDataStyle(item.id, item.geode_object)
122-
console.log("[importWorkflowFromSnapshot] dataStyle.addDataStyle ok", item.id)
122+
console.log(
123+
"[importWorkflowFromSnapshot] dataStyle.addDataStyle ok",
124+
item.id,
125+
)
123126

124127
if (item.object_type === "model") {
125128
await Promise.all([
126129
dataBaseStore.fetchMeshComponents(item.id),
127130
dataBaseStore.fetchUuidToFlatIndexDict(item.id),
128131
])
129-
console.log("[importWorkflowFromSnapshot] model components fetched", item.id)
132+
console.log(
133+
"[importWorkflowFromSnapshot] model components fetched",
134+
item.id,
135+
)
130136
}
131137

132138
await dataStyleStore.applyDefaultStyle(item.id)
133-
console.log("[importWorkflowFromSnapshot] dataStyle.applyDefaultStyle ok", item.id)
139+
console.log(
140+
"[importWorkflowFromSnapshot] dataStyle.applyDefaultStyle ok",
141+
item.id,
142+
)
134143

135144
ids.push(item.id)
136145
}

0 commit comments

Comments
 (0)