Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 25 additions & 25 deletions assets/geode_objects.js → app/assets/geode_objects.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
import BRep from "@ogw_f/assets/img/geode_objects/BRep.svg"
import CrossSection from "@ogw_f/assets/img/geode_objects/CrossSection.svg"
import EdgedCurve2D from "@ogw_f/assets/img/geode_objects/EdgedCurve2D.svg"
import EdgedCurve3D from "@ogw_f/assets/img/geode_objects/EdgedCurve3D.svg"
import Graph from "@ogw_f/assets/img/geode_objects/Graph.svg"
import HybridSolid3D from "@ogw_f/assets/img/geode_objects/HybridSolid3D.svg"
import ImplicitCrossSection from "@ogw_f/assets/img/geode_objects/ImplicitCrossSection.svg"
import ImplicitStructuralModel from "@ogw_f/assets/img/geode_objects/ImplicitStructuralModel.svg"
import LightRegularGrid2D from "@ogw_f/assets/img/geode_objects/LightRegularGrid2D.svg"
import LightRegularGrid3D from "@ogw_f/assets/img/geode_objects/LightRegularGrid3D.svg"
import PointSet2D from "@ogw_f/assets/img/geode_objects/PointSet2D.svg"
import PointSet3D from "@ogw_f/assets/img/geode_objects/PointSet3D.svg"
import PolygonalSurface2D from "@ogw_f/assets/img/geode_objects/PolygonalSurface2D.svg"
import PolygonalSurface3D from "@ogw_f/assets/img/geode_objects/PolygonalSurface3D.svg"
import PolyhedralSolid3D from "@ogw_f/assets/img/geode_objects/PolyhedralSolid3D.svg"
import RasterImage2D from "@ogw_f/assets/img/geode_objects/RasterImage2D.svg"
import RasterImage3D from "@ogw_f/assets/img/geode_objects/RasterImage3D.svg"
import RegularGrid2D from "@ogw_f/assets/img/geode_objects/RegularGrid2D.svg"
import RegularGrid3D from "@ogw_f/assets/img/geode_objects/RegularGrid3D.svg"
import Section from "@ogw_f/assets/img/geode_objects/Section.svg"
import StructuralModel from "@ogw_f/assets/img/geode_objects/StructuralModel.svg"
import TetrahedralSolid3D from "@ogw_f/assets/img/geode_objects/TetrahedralSolid3D.svg"
import TriangulatedSurface2D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface2D.svg"
import TriangulatedSurface3D from "@ogw_f/assets/img/geode_objects/TriangulatedSurface3D.svg"
import VertexSet from "@ogw_f/assets/img/geode_objects/VertexSet.svg"
import BRep from "@ogw_front/assets/img/geode_objects/BRep.svg"
import CrossSection from "@ogw_front/assets/img/geode_objects/CrossSection.svg"
import EdgedCurve2D from "@ogw_front/assets/img/geode_objects/EdgedCurve2D.svg"
import EdgedCurve3D from "@ogw_front/assets/img/geode_objects/EdgedCurve3D.svg"
import Graph from "@ogw_front/assets/img/geode_objects/Graph.svg"
import HybridSolid3D from "@ogw_front/assets/img/geode_objects/HybridSolid3D.svg"
import ImplicitCrossSection from "@ogw_front/assets/img/geode_objects/ImplicitCrossSection.svg"
import ImplicitStructuralModel from "@ogw_front/assets/img/geode_objects/ImplicitStructuralModel.svg"
import LightRegularGrid2D from "@ogw_front/assets/img/geode_objects/LightRegularGrid2D.svg"
import LightRegularGrid3D from "@ogw_front/assets/img/geode_objects/LightRegularGrid3D.svg"
import PointSet2D from "@ogw_front/assets/img/geode_objects/PointSet2D.svg"
import PointSet3D from "@ogw_front/assets/img/geode_objects/PointSet3D.svg"
import PolygonalSurface2D from "@ogw_front/assets/img/geode_objects/PolygonalSurface2D.svg"
import PolygonalSurface3D from "@ogw_front/assets/img/geode_objects/PolygonalSurface3D.svg"
import PolyhedralSolid3D from "@ogw_front/assets/img/geode_objects/PolyhedralSolid3D.svg"
import RasterImage2D from "@ogw_front/assets/img/geode_objects/RasterImage2D.svg"
import RasterImage3D from "@ogw_front/assets/img/geode_objects/RasterImage3D.svg"
import RegularGrid2D from "@ogw_front/assets/img/geode_objects/RegularGrid2D.svg"
import RegularGrid3D from "@ogw_front/assets/img/geode_objects/RegularGrid3D.svg"
import Section from "@ogw_front/assets/img/geode_objects/Section.svg"
import StructuralModel from "@ogw_front/assets/img/geode_objects/StructuralModel.svg"
import TetrahedralSolid3D from "@ogw_front/assets/img/geode_objects/TetrahedralSolid3D.svg"
import TriangulatedSurface2D from "@ogw_front/assets/img/geode_objects/TriangulatedSurface2D.svg"
import TriangulatedSurface3D from "@ogw_front/assets/img/geode_objects/TriangulatedSurface3D.svg"
import VertexSet from "@ogw_front/assets/img/geode_objects/VertexSet.svg"

const geode_objects = {
BRep: {
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@

<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"

const schema = schemas.opengeodeweb_back.geode_objects_and_output_extensions
const emit = defineEmits([
"update_values",
Expand Down
File renamed without changes.
File renamed without changes.
15 changes: 14 additions & 1 deletion components/FileSelector.vue → app/components/FileSelector.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,17 @@
<FetchingData v-if="loading" />
<FileUploader
v-else
v-bind="{ multiple, accept, files, auto_upload }"
v-bind="{ multiple, accept, files: internal_files, auto_upload }"
@files_uploaded="files_uploaded_event"
/>
</template>

<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"
import FetchingData from "@ogw_front/components/FetchingData.vue"
import FileUploader from "@ogw_front/components/FileUploader.vue"
const schema = schemas.opengeodeweb_back.allowed_files
const emit = defineEmits([
"update_values",
Expand All @@ -25,9 +28,19 @@
})
const { auto_upload, multiple, supported_feature } = props
const internal_files = ref(props.files)
const accept = ref("")
const loading = ref(false)
watch(
() => props.files,
(newVal) => {
internal_files.value = newVal
},
{ deep: true },
)
const toggle_loading = useToggle(loading)
function files_uploaded_event(value) {
Expand Down
10 changes: 9 additions & 1 deletion components/FileUploader.vue → app/components/FileUploader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
const label = props.multiple
? "Please select file(s) to import"
: "Please select a file to import"
const internal_files = ref([])
const internal_files = ref(props.files)
const loading = ref(false)
const files_uploaded = ref(false)

Expand Down Expand Up @@ -96,6 +96,14 @@
emit("files_uploaded", internal_files.value)
}

watch(
() => props.files,
(newVal) => {
internal_files.value = newVal
},
{ deep: true },
)

watch(internal_files, (value) => {
files_uploaded.value = false
if (props.auto_upload) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
</template>

<script setup>
import VeaseViewToolbar from "@ogw_front/components/VeaseViewToolbar.vue"

const emit = defineEmits(["click"])

const container = useTemplateRef("viewer")
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
</template>

<script setup>
import InspectorResultPanel from "@ogw_front/components/Inspector/ResultPanel.vue"

const props = defineProps({
inspection_result: { type: Array, required: true },
})
Expand Down
5 changes: 3 additions & 2 deletions components/Launcher.vue → app/components/Launcher.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@
</template>

<script setup>
import Status from "@ogw_f/utils/status.js"
import Status from "@ogw_front/utils/status.js"
import Loading from "@ogw_front/components/Loading.vue"
import Recaptcha from "@ogw_front/components/Recaptcha.vue"

const infra_store = useInfraStore()
const site_key = useRuntimeConfig().public.RECAPTCHA_SITE_KEY

watch(
() => infra_store.is_captcha_validated,
Expand Down
24 changes: 13 additions & 11 deletions components/Loading.vue → app/components/Loading.vue
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,19 @@
</template>

<script setup>
import ying_yang from "@ogw_f/assets/img/energy_sobriety/ying_yang.png"
import chemin from "@ogw_f/assets/img/energy_sobriety/chemin.png"
import vert from "@ogw_f/assets/img/energy_sobriety/vert.png"
import lampadaire from "@ogw_f/assets/img/energy_sobriety/lampadaire.png"
import collegue from "@ogw_f/assets/img/energy_sobriety/collegue.png"
import sobene from "@ogw_f/assets/img/energy_sobriety/sobene.png"
import etincelle from "@ogw_f/assets/img/energy_sobriety/etincelle.png"
import geste from "@ogw_f/assets/img/energy_sobriety/geste.png"
import socle from "@ogw_f/assets/img/energy_sobriety/socle.png"
import derniere from "@ogw_f/assets/img/energy_sobriety/derniere.png"
import salon from "@ogw_f/assets/img/energy_sobriety/salon.png"
import ying_yang from "@ogw_front/assets/img/energy_sobriety/ying_yang.png"
import chemin from "@ogw_front/assets/img/energy_sobriety/chemin.png"
import vert from "@ogw_front/assets/img/energy_sobriety/vert.png"
import lampadaire from "@ogw_front/assets/img/energy_sobriety/lampadaire.png"
import collegue from "@ogw_front/assets/img/energy_sobriety/collegue.png"
import sobene from "@ogw_front/assets/img/energy_sobriety/sobene.png"
import etincelle from "@ogw_front/assets/img/energy_sobriety/etincelle.png"
import geste from "@ogw_front/assets/img/energy_sobriety/geste.png"
import socle from "@ogw_front/assets/img/energy_sobriety/socle.png"
import derniere from "@ogw_front/assets/img/energy_sobriety/derniere.png"
import salon from "@ogw_front/assets/img/energy_sobriety/salon.png"

import Carousel from "@ogw_front/components/Carousel.vue"

const users_list = [
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@
<script setup>
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"
import FileUploader from "@ogw_front/components/FileUploader.vue"

const schema = schemas.opengeodeweb_back.missing_files

const emit = defineEmits([
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,11 @@
</template>

<script setup>
import geode_objects from "@ogw_f/assets/geode_objects"
import geode_objects from "@ogw_front/assets/geode_objects"
import schemas from "@geode/opengeodeweb-back/opengeodeweb_back_schemas.json"

import FetchingData from "@ogw_front/components/FetchingData.vue"

const schema = schemas.opengeodeweb_back.allowed_objects

const emit = defineEmits(["update_values", "increment_step"])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</template>

<script setup>
import Status from "@ogw_f/utils/status.js"
import Status from "@ogw_front/utils/status.js"

const props = defineProps({
schema: { type: Object, required: true },
Expand Down
4 changes: 3 additions & 1 deletion components/Recaptcha.vue → app/components/Recaptcha.vue
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
</template>

<script setup>
import { appMode } from "@ogw_front/utils/app_mode.js"

const props = defineProps({
button_label: {
type: String,
Expand Down Expand Up @@ -74,7 +76,7 @@
if (import.meta.client) {
if (
process.env.NODE_ENV !== "production" ||
infra_store.app_mode !== appMode.appMode.CLOUD
infra_store.app_mode !== appMode.CLOUD
) {
infra_store.$patch({ is_captcha_validated: true })
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<ClientOnly>
<div style="position: relative; width: 100%; height: calc(100vh - 80px)">
<view-toolbar />
<ViewToolbar />
<slot name="ui"></slot>
<v-col
ref="viewer"
Expand All @@ -24,7 +24,9 @@
import vtkRemoteView from "@kitware/vtk.js/Rendering/Misc/RemoteView"
import { useElementSize, useWindowSize } from "@vueuse/core"
import viewer_schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
import Status from "@ogw_f/utils/status.js"
import Status from "@ogw_front/utils/status.js"

import ViewToolbar from "@ogw_front/components/ViewToolbar.vue"

const props = defineProps({
viewId: { type: String, default: "-1" },
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 2 additions & 0 deletions components/Stepper.vue → app/components/Stepper.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
</template>

<script setup>
import Step from "@ogw_front/components/Step.vue"

const stepper_tree = inject("stepper_tree")
const { steps, current_step_index } = toRefs(stepper_tree)
</script>
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<script setup>
import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"
import Screenshot from "@ogw_front/components/Screenshot.vue"
import ZScaling from "@ogw_front/components/ZScaling.vue"
const hybridViewerStore = useHybridViewerStore()
const take_screenshot = ref(false)
const showZScaling = ref(false)
Expand Down
2 changes: 2 additions & 0 deletions components/ViewToolbar.vue → app/components/ViewToolbar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<script setup>
import schemas from "@geode/opengeodeweb-viewer/opengeodeweb_viewer_schemas.json"

import Screenshot from "@ogw_front/components/Screenshot.vue"

const take_screenshot = ref(false)
const grid_scale = ref(false)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
</template>

<script setup>
import EdgedCurveEdges from "@ogw_f/assets/viewer_svgs/edged_curve_edges.svg"
import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
import EdgedCurveEdges from "@ogw_front/assets/viewer_svgs/edged_curve_edges.svg"

const props = defineProps({
itemProps: { type: Object, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
</template>

<script setup>
import EdgedCurvePoints from "@ogw_f/assets/viewer_svgs/edged_curve_points.svg"
import ViewerGenericMeshPointsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PointsOptions.vue"
import EdgedCurvePoints from "@ogw_front/assets/viewer_svgs/edged_curve_points.svg"

const props = defineProps({
itemProps: { type: Object, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
</template>

<script setup>
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"

const props = defineProps({
itemProps: { type: Object, required: true },
btn_image: { type: String, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
</template>

<script setup>
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"

const dataStyleStore = useDataStyleStore()
const hybridViewerStore = useHybridViewerStore()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
</template>

<script setup>
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"

const dataStyleStore = useDataStyleStore()
const hybridViewerStore = useHybridViewerStore()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
</template>

<script setup>
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import ViewerOptionsColoringTypeSelector from "@ogw_front/components/Viewer/Options/ColoringTypeSelector.vue"

const dataStyleStore = useDataStyleStore()
const hybridViewerStore = useHybridViewerStore()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@
</template>

<script setup>
import SurfaceEdges from "@ogw_f/assets/viewer_svgs/surface_edges.svg"
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import SurfaceEdges from "@ogw_front/assets/viewer_svgs/surface_edges.svg"
const props = defineProps({
itemProps: { type: Object, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,9 @@
</template>

<script setup>
import SurfacePoints from "@ogw_f/assets/viewer_svgs/surface_points.svg"
import ViewerContextMenuItem from "@ogw_front/components/Viewer/ContextMenuItem.vue"
import ViewerOptionsVisibilitySwitch from "@ogw_front/components/Viewer/Options/VisibilitySwitch.vue"
import SurfacePoints from "@ogw_front/assets/viewer_svgs/surface_points.svg"

const dataStyleStore = useDataStyleStore()
const hybridViewerStore = useHybridViewerStore()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
</template>

<script setup>
import Grid2D_Cells from "@ogw_f/assets/viewer_svgs/grid_2d_cells.svg"
import ViewerGenericMeshPolygonsOptions from "@ogw_front/components/Viewer/Generic/Mesh/PolygonsOptions.vue"
import Grid2D_Cells from "@ogw_front/assets/viewer_svgs/grid_2d_cells.svg"

const props = defineProps({
itemProps: { type: Object, required: true },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
</template>

<script setup>
import Grid2D_Edges from "@ogw_f/assets/viewer_svgs/grid_2d_edges.svg"
import ViewerGenericMeshEdgesOptions from "@ogw_front/components/Viewer/Generic/Mesh/EdgesOptions.vue"
import Grid2D_Edges from "@ogw_front/assets/viewer_svgs/grid_2d_edges.svg"

const props = defineProps({
itemProps: { type: Object, required: true },
Expand Down
Loading