Skip to content

Commit 7b57603

Browse files
MaxNumeriqueMaxNumerique
committed
logs everywhere
1 parent 63f07e2 commit 7b57603

File tree

5 files changed

+63
-33
lines changed

5 files changed

+63
-33
lines changed

‎composables/project_manager.js‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,27 +50,24 @@ export function useProjectManager() {
5050
method: "POST",
5151
body: form,
5252
})
53+
console.log("[ProjectManager] snapshot keys:", Object.keys(result?.snapshot || {}))
5354

54-
await viewer_call({
55-
schema: viewer_schemas.opengeodeweb_viewer.import_project,
56-
params: {},
57-
})
58-
59-
await viewer_call({
60-
schema: viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization,
61-
params: {},
62-
})
55+
await viewer_call({ schema: viewer_schemas.opengeodeweb_viewer.import_project, params: {} })
56+
await viewer_call({ schema: viewer_schemas.opengeodeweb_viewer.viewer.reset_visualization, params: {} })
6357

6458
const treeviewStore = useTreeviewStore()
6559
treeviewStore.isImporting = true
60+
console.log("[ProjectManager] isImporting = true")
6661

6762
await appStore.importStores(result.snapshot)
63+
console.log("[ProjectManager] stores imported")
6864

6965
const dataStyleStore = useDataStyleStore()
7066
await dataStyleStore.applyAllStylesFromState()
67+
console.log("[ProjectManager] styles applied")
7168

7269
treeviewStore.isImporting = false
73-
console.log("[ProjectManager] Import finished")
70+
console.log("[ProjectManager] isImporting = false")
7471
} finally {
7572
geode.stop_request()
7673
}

‎internal_stores/mesh/index.js‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,19 +36,20 @@ export default function useMeshStyle() {
3636

3737
function applyMeshDefaultStyle(id) {
3838
const style = dataStyleStore.getStyle(id)
39+
console.log("[MeshStyle] applyMeshDefaultStyle for id:", id, "style:", style)
3940
const promise_array = []
40-
for (const [key, value] of Object.entries(style)) {
41-
if (key == "visibility") {
41+
for (const [key, value] of Object.entries(style || {})) {
42+
if (key === "visibility") {
4243
promise_array.push(setMeshVisibility(id, value))
43-
} else if (key == "points") {
44+
} else if (key === "points") {
4445
promise_array.push(pointsStyleStore.applyMeshPointsStyle(id, value))
45-
} else if (key == "edges") {
46+
} else if (key === "edges") {
4647
promise_array.push(edgesStyleStore.applyMeshEdgesStyle(id, value))
47-
} else if (key == "polygons") {
48+
} else if (key === "polygons") {
4849
promise_array.push(
4950
meshPolygonsStyleStore.applyMeshPolygonsStyle(id, value),
5051
)
51-
} else if (key == "polyhedra") {
52+
} else if (key === "polyhedra") {
5253
promise_array.push(
5354
meshPolyhedraStyleStore.applyMeshPolyhedraStyle(id, value),
5455
)

‎stores/data_base.js‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,21 @@ export const useDataBaseStore = defineStore("dataBase", () => {
5757
vtk_js: { binary_light_viewable },
5858
},
5959
) {
60+
console.log("[DataBase] addItem start", { id, object_type: value.object_type, geode_object: value.geode_object })
6061
db[id] = value
6162

6263
if (value.object_type === "model") {
6364
await fetchMeshComponents(id)
6465
await fetchUuidToFlatIndexDict(id)
6566
}
66-
treeview_store.addItem(
67-
value.geode_object,
68-
value.displayed_name,
69-
id,
70-
value.object_type,
71-
)
72-
hybridViewerStore.addItem(id, value.vtk_js)
67+
68+
treeview_store.addItem(value.geode_object, value.displayed_name, id, value.object_type)
69+
console.log("[DataBase] addItem -> treeview.addItem done", id)
70+
71+
console.log("[DataBase] addItem -> hybridViewer.addItem start", id)
72+
// Ajout viewer (potentiellement asynchrone)
73+
await hybridViewerStore.addItem(id, value.vtk_js)
74+
console.log("[DataBase] addItem -> hybridViewer.addItem done", id)
7375
}
7476

7577
async function fetchMeshComponents(id) {

‎stores/data_style.js‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,25 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
1313

1414
/** Actions **/
1515
function addDataStyle(id, geode_object, object_type) {
16+
const already = !!dataStyleState.styles[id]
17+
console.log("[DataStyle] addDataStyle", {
18+
id,
19+
geode_object,
20+
object_type,
21+
already,
22+
})
23+
// Idempotent: si le style existe (ex: import), ne pas réappliquer les defaults
24+
if (already) {
25+
console.log("[DataStyle] addDataStyle -> skip (style already exists)")
26+
return Promise.resolve([])
27+
}
28+
1629
dataStyleState.styles[id] = getDefaultStyle(geode_object)
30+
console.log("[DataStyle] addDataStyle -> default created", {
31+
id,
32+
styleKeys: Object.keys(dataStyleState.styles[id] || {}),
33+
})
34+
1735
const promise_array = []
1836
if (object_type === "mesh") {
1937
promise_array.push(meshStyleStore.applyMeshDefaultStyle(id))
@@ -74,33 +92,35 @@ export const useDataStyleStore = defineStore("dataStyle", () => {
7492
const stylesSnapshot = snapshot?.styles || {}
7593
console.log("[DataStyle] importStores snapshot ids:", Object.keys(stylesSnapshot))
7694

77-
for (const id of Object.keys(dataStyleState.styles)) {
78-
delete dataStyleState.styles[id]
79-
}
95+
// Conserver la référence réactive -> clear + merge
96+
for (const id of Object.keys(dataStyleState.styles)) delete dataStyleState.styles[id]
8097
for (const [id, style] of Object.entries(stylesSnapshot)) {
8198
dataStyleState.styles[id] = style
8299
}
100+
console.log("[DataStyle] importStores merged ids:", Object.keys(dataStyleState.styles))
83101
}
84102

85103
async function applyAllStylesFromState() {
86104
const ids = Object.keys(dataStyleState.styles || {})
87-
console.log("[DataStyle] applyAllStylesFromState ids:", ids)
88-
const applyTasks = []
105+
console.log("[DataStyle] applyAllStylesFromState start ids:", ids)
106+
107+
// Séquentiel par id pour mieux tracer et éviter les courses
89108
for (const id of ids) {
90109
const meta = dataBaseStore.itemMetaDatas(id)
91110
const objectType = meta?.object_type
92111
const style = dataStyleState.styles[id]
93-
if (!style) {
94-
console.warn("[DataStyle] No style for id:", id, "skip")
112+
if (!style || !objectType) {
113+
console.warn("[DataStyle] applyAllStylesFromState skip:", { id, hasStyle: !!style, objectType })
95114
continue
96115
}
116+
console.log("[DataStyle] applyAllStylesFromState applying:", { id, objectType })
97117
if (objectType === "mesh") {
98-
applyTasks.push(Promise.all(meshStyleStore.applyMeshDefaultStyle(id)))
118+
await meshStyleStore.applyMeshDefaultStyle(id)
99119
} else if (objectType === "model") {
100-
applyTasks.push(modelStyleStore.applyModelDefaultStyle(id))
120+
await modelStyleStore.applyModelDefaultStyle(id)
101121
}
122+
console.log("[DataStyle] applyAllStylesFromState applied:", id)
102123
}
103-
await Promise.all(applyTasks)
104124
console.log("[DataStyle] applyAllStylesFromState finished")
105125
}
106126

‎stores/treeview.js‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,18 @@ export const useTreeviewStore = defineStore("treeview", () => {
1515

1616
/** Functions **/
1717
function addItem(geodeObject, displayed_name, id, object_type) {
18+
console.log("[Treeview] addItem", {
19+
id,
20+
object_type,
21+
geodeObject,
22+
isImporting: isImporting.value,
23+
})
24+
1825
if (!isImporting.value) {
26+
console.log("[Treeview] addItem -> apply default style")
1927
dataStyleStore.addDataStyle(id, geodeObject, object_type)
28+
} else {
29+
console.log("[Treeview] addItem -> skip default style (import)")
2030
}
2131

2232
const child = { title: displayed_name, id, object_type }

0 commit comments

Comments
 (0)