Skip to content

Commit aa892cf

Browse files
JulienChampagnolJulienChampagnol
committed
save
1 parent 5150786 commit aa892cf

File tree

16 files changed

+176
-182
lines changed

16 files changed

+176
-182
lines changed

‎composables/viewer_call.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export function viewer_call(
2727
.getSession()
2828
.call(schema.$id, [params])
2929
.then(
30-
(value) => {
30+
async (value) => {
3131
if (response_function) {
3232
response_function(value)
3333
}

‎internal_stores/mesh/index.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ export default function useMeshStyle() {
5959
throw new Error("Unknown mesh key: " + key)
6060
}
6161
}
62-
return promise_array
62+
console.log(0, { promise_array })
63+
return Promise.all(promise_array)
6364
}
6465

6566
return {

‎internal_stores/model/blocks.js‎

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export function useModelBlocksStyle() {
1515
if (!modelBlocksStyle(id)[block_id]) {
1616
modelBlocksStyle(id)[block_id] = {}
1717
}
18-
return modelBlocksStyle[block_id]
18+
return modelBlocksStyle(id)[block_id]
1919
}
2020

2121
function modelBlockVisibility(id, block_id) {
@@ -26,11 +26,11 @@ export function useModelBlocksStyle() {
2626
modelBlockStyle(id, block_id).visibility = visibility
2727
}
2828
function setModelBlocksVisibility(id, block_ids, visibility) {
29-
const block_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
29+
const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
3030
return viewer_call(
3131
{
3232
schema: model_blocks_schemas.visibility,
33-
params: { id, block_ids: block_flat_indexes, visibility },
33+
params: { id, block_ids: blocks_flat_indexes, visibility },
3434
},
3535
{
3636
response_function: () => {
@@ -56,17 +56,18 @@ export function useModelBlocksStyle() {
5656
}
5757

5858
function setModelBlocksColor(id, block_ids, color) {
59-
const block_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
59+
const blocks_flat_indexes = dataBaseStore.getFlatIndexes(id, block_ids)
6060
return viewer_call(
6161
{
6262
schema: model_blocks_schemas.color,
63-
params: { id, block_ids: block_flat_indexes, color },
63+
params: { id, block_ids: blocks_flat_indexes, color },
6464
},
6565
{
6666
response_function: () => {
6767
for (const block_id of block_ids) {
6868
saveModelBlockColor(id, block_id, color)
6969
}
70+
7071
console.log(
7172
setModelBlocksColor.name,
7273
{ id },
@@ -78,26 +79,12 @@ export function useModelBlocksStyle() {
7879
)
7980
}
8081

81-
function setModelBlocksDefaultStyle(id) {
82-
const blocks = dataBaseStore.getBlocksUuids(id)
83-
return Promise.all([
84-
setModelBlocksVisibility(
85-
id,
86-
blocks,
87-
dataStyleStore.styles[id].blocks.visibility,
88-
),
89-
setModelBlocksColor(id, blocks, dataStyleStore.styles[id].blocks.color),
90-
])
91-
}
92-
9382
function applyModelBlocksStyle(id) {
94-
console.log("applyModelBlocksStyle", id)
9583
const blocks_style = modelBlocksStyle(id)
96-
console.log("blocks_style", blocks_style)
97-
const block_ids = dataBaseStore.getBlocksUuids(id)
84+
const blocks_ids = dataBaseStore.getBlocksUuids(id)
9885
return Promise.all([
99-
setModelBlocksVisibility(id, block_ids, blocks_style.visibility),
100-
setModelBlocksColor(id, block_ids, blocks_style.color),
86+
setModelBlocksVisibility(id, blocks_ids, blocks_style.visibility),
87+
setModelBlocksColor(id, blocks_ids, blocks_style.color),
10188
])
10289
}
10390

@@ -106,7 +93,6 @@ export function useModelBlocksStyle() {
10693
modelBlockColor,
10794
setModelBlocksVisibility,
10895
setModelBlocksColor,
109-
setModelBlocksDefaultStyle,
11096
applyModelBlocksStyle,
11197
}
11298
}

‎internal_stores/model/corners.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export function useModelCornersStyle() {
5959
}
6060

6161
function setModelCornersColor(id, corner_ids, color) {
62+
console.log("setModelCornersColor", id, corner_ids, color)
6263
const corner_flat_indexes = dataBaseStore.getFlatIndexes(id, corner_ids)
6364
return viewer_call(
6465
{

‎internal_stores/model/edges.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ export function useModelEdgesStyle() {
1515
}
1616

1717
function setModelEdgesVisibility(id, visibility) {
18+
console.log("setModelEdgesVisibility", id, visibility)
1819
return viewer_call(
1920
{
2021
schema: model_edges_schemas.visibility,

‎internal_stores/model/index.js‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ export default function useModelStyle() {
2727
return dataStyleStore.getStyle(id).visibility
2828
}
2929
function setModelVisibility(id, visibility) {
30+
console.log("setModelVisibility", id, visibility)
3031
return viewer_call(
3132
{
3233
schema: model_schemas.visibility,
@@ -83,6 +84,7 @@ export default function useModelStyle() {
8384
return dataStyleStore.getStyle(id).color
8485
}
8586
function setModelColor(id, color) {
87+
console.log("setModelColor", id, color)
8688
return viewer_call(
8789
{
8890
schema: model_schemas.color,
@@ -137,25 +139,26 @@ export default function useModelStyle() {
137139
console.log("applyModelDefaultStyle", id, style)
138140
const promise_array = []
139141
for (const [key, value] of Object.entries(style)) {
140-
if (key === "visibility") {
141-
promise_array.push(setModelVisibility(id, value))
142-
} else if (key === "edges") {
143-
promise_array.push(modelEdgesStyleStore.applyModelEdgesStyle(id))
144-
} else if (key === "points") {
145-
promise_array.push(modelPointsStyleStore.applyModelPointsStyle(id))
146-
} else if (key === "corners") {
147-
promise_array.push(modelCornersStyleStore.applyModelCornersStyle(id))
148-
} else if (key === "lines") {
142+
// if (key === "visibility") {
143+
// promise_array.push(setModelVisibility(id, value))
144+
// if (key === "corners") {
145+
// promise_array.push(modelCornersStyleStore.applyModelCornersStyle(id))
146+
if (key === "lines") {
149147
promise_array.push(modelLinesStyleStore.applyModelLinesStyle(id))
150-
} else if (key === "surfaces") {
151-
promise_array.push(modelSurfacesStyleStore.applyModelSurfacesStyle(id))
152-
} else if (key === "blocks") {
153-
promise_array.push(modelBlocksStyleStore.applyModelBlocksStyle(id))
154-
} else {
155-
throw new Error("Unknown key: " + key)
148+
// if (key === "surfaces") {
149+
// promise_array.push(modelSurfacesStyleStore.applyModelSurfacesStyle(id))
150+
// } else if (key === "blocks") {
151+
// promise_array.push(modelBlocksStyleStore.applyModelBlocksStyle(id))
152+
// } else if (key === "points") {
153+
// promise_array.push(modelPointsStyleStore.applyModelPointsStyle(id))
154+
// } else if (key === "edges") {
155+
// promise_array.push(modelEdgesStyleStore.applyModelEdgesStyle(id))
156+
// } else {
157+
// throw new Error("Unknown model key: " + key)
156158
}
157159
}
158-
return promise_array
160+
console.log("applyModelDefaultStyle", { promise_array })
161+
return Promise.all(promise_array)
159162
}
160163

161164
function setModelMeshComponentsDefaultStyle(id) {

‎internal_stores/model/lines.js‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export function useModelLinesStyle() {
2626
modelLineStyle(id, line_id).visibility = visibility
2727
}
2828
function setModelLinesVisibility(id, line_ids, visibility) {
29+
console.log("setModelLinesVisibility", id, line_ids, visibility)
2930
const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
3031
return viewer_call(
3132
{
@@ -51,10 +52,11 @@ export function useModelLinesStyle() {
5152
return modelLineStyle(id, line_id).color
5253
}
5354
function saveModelLineColor(id, line_id, color) {
54-
modelLineColorStyle(id, line_id).color = color
55+
modelLineStyle(id, line_id).color = color
5556
}
5657

5758
function setModelLinesColor(id, line_ids, color) {
59+
console.log("setModelLinesColor", id, line_ids, color)
5860
const line_flat_indexes = dataBaseStore.getFlatIndexes(id, line_ids)
5961
return viewer_call(
6062
{
@@ -63,9 +65,11 @@ export function useModelLinesStyle() {
6365
},
6466
{
6567
response_function: () => {
68+
console.log("response setModelLinesColor")
6669
for (const line_id of line_ids) {
6770
saveModelLineColor(id, line_id, color)
6871
}
72+
console.log("end response setModelLinesColor")
6973
console.log(
7074
setModelLinesColor.name,
7175
{ id },
@@ -81,11 +85,13 @@ export function useModelLinesStyle() {
8185
console.log("applyModelLinesStyle", id)
8286
const lines_style = modelLinesStyle(id)
8387
console.log("lines_style", lines_style)
84-
const line_ids = dataBaseStore.getLinesUuids(id)
85-
return Promise.all([
86-
setModelLinesVisibility(id, line_ids, lines_style.visibility),
87-
setModelLinesColor(id, line_ids, lines_style.color),
88-
])
88+
const lines_ids = dataBaseStore.getLinesUuids(id)
89+
const promise_array = [
90+
setModelLinesVisibility(id, lines_ids, lines_style.visibility),
91+
setModelLinesColor(id, lines_ids, lines_style.color),
92+
]
93+
console.log("applyModelLinesStyle", { promise_array })
94+
return Promise.all(promise_array)
8995
}
9096

9197
return {

‎internal_stores/model/points.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ export function useModelPointsStyle() {
1414
return modelPointsStyle(id).visibility
1515
}
1616
function setModelPointsVisibility(id, visibility) {
17+
console.log("setModelPointsVisibility", id, visibility)
1718
return viewer_call(
1819
{
1920
schema: model_points_schemas.visibility,
@@ -36,6 +37,7 @@ export function useModelPointsStyle() {
3637
return modelPointsStyle(id).size
3738
}
3839
function setModelPointsSize(id, size) {
40+
console.log("setModelPointsSize", id, size)
3941
return viewer_call(
4042
{
4143
schema: model_points_schemas.size,

‎internal_stores/model/surfaces.js‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export function useModelSurfacesStyle() {
2222
modelSurfaceStyle(id, surface_id).visibility = visibility
2323
}
2424
function setModelSurfacesVisibility(id, surface_ids, visibility) {
25+
console.log("setModelSurfacesVisibility", id, surface_ids, visibility)
2526
const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
2627
return viewer_call(
2728
{
@@ -51,6 +52,7 @@ export function useModelSurfacesStyle() {
5152
}
5253

5354
function setModelSurfacesColor(id, surface_ids, color) {
55+
console.log("setModelSurfacesColor", id, surface_ids, color)
5456
const surface_flat_indexes = dataBaseStore.getFlatIndexes(id, surface_ids)
5557
return viewer_call(
5658
{
@@ -73,15 +75,6 @@ export function useModelSurfacesStyle() {
7375
)
7476
}
7577

76-
function setModelSurfacesDefaultStyle(id) {
77-
const surface_ids = dataBaseStore.getSurfacesUuids(id)
78-
setModelSurfacesVisibility(
79-
id,
80-
surface_ids,
81-
dataStyleStore.styles[id].surfaces.visibility,
82-
)
83-
}
84-
8578
function applyModelSurfacesStyle(id) {
8679
console.log("applyModelSurfacesStyle", id)
8780
const surfaces_style = dataStyleStore.getStyle(id).surfaces
@@ -98,7 +91,6 @@ export function useModelSurfacesStyle() {
9891
modelSurfaceColor,
9992
setModelSurfacesVisibility,
10093
setModelSurfacesColor,
101-
setModelSurfacesDefaultStyle,
10294
applyModelSurfacesStyle,
10395
}
10496
}

‎stores/data_base.js‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ const back_model_schemas = back_schemas.opengeodeweb_back.models
77
const viewer_generic_schemas = viewer_schemas.opengeodeweb_viewer.generic
88

99
export const useDataBaseStore = defineStore("dataBase", () => {
10-
const treeview_store = useTreeviewStore()
11-
const hybridViewerStore = useHybridViewerStore()
12-
1310
const db = reactive({})
1411

1512
function itemMetaDatas(id) {
@@ -63,18 +60,6 @@ export const useDataBaseStore = defineStore("dataBase", () => {
6360
},
6461
) {
6562
db[id] = value
66-
67-
if (value.object_type === "model") {
68-
await Promise.all([fetchMeshComponents(id), fetchUuidToFlatIndexDict(id)])
69-
}
70-
treeview_store.addItem(
71-
value.geode_object,
72-
value.displayed_name,
73-
id,
74-
value.object_type,
75-
)
76-
77-
hybridViewerStore.addItem(id, value.vtk_js)
7863
}
7964

8065
async function fetchMeshComponents(id) {

0 commit comments

Comments
 (0)