Compare commits
8
Commits
1667fd0403
...
0d861d7cdd
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0d861d7cdd | ||
|
|
a1cc86b44e | ||
|
|
12a2702f30 | ||
|
|
3fdeb082ec | ||
|
|
d0f69a3838 | ||
|
|
1381e2506b | ||
|
|
6dc717dd6b | ||
|
|
bc2260b505 |
@@ -120,6 +120,7 @@ export default {
|
|||||||
|
|
||||||
let activeEntites = this.getActiveEntites(this.entites);
|
let activeEntites = this.getActiveEntites(this.entites);
|
||||||
// this.getSalientPoints()
|
// this.getSalientPoints()
|
||||||
|
console.log('this concernement id', this.cid);
|
||||||
this.sailentEntites = this.concernement.sailentEntites = this.getJarvisEnvelopeConvexeEntites(activeEntites)
|
this.sailentEntites = this.concernement.sailentEntites = this.getJarvisEnvelopeConvexeEntites(activeEntites)
|
||||||
|
|
||||||
// define init position of the item
|
// define init position of the item
|
||||||
@@ -498,7 +499,7 @@ export default {
|
|||||||
|
|
||||||
let activeEntites = [];
|
let activeEntites = [];
|
||||||
for (let i = 0; i < entites.length; i++) {
|
for (let i = 0; i < entites.length; i++) {
|
||||||
if (entites[i].active) {
|
if (entites[i].active) { // && (entities[i].actuelfuture != 0 && entities[i].menacemaintien != 0 && entities[i].prise != 100)
|
||||||
activeEntites.push(entites[i])
|
activeEntites.push(entites[i])
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -539,7 +540,7 @@ export default {
|
|||||||
// console.log(`this.salientPoints ${this.concernement.id}`, this.salientPoints);
|
// console.log(`this.salientPoints ${this.concernement.id}`, this.salientPoints);
|
||||||
},
|
},
|
||||||
getJarvisEnvelopeConvexeEntites(entites){
|
getJarvisEnvelopeConvexeEntites(entites){
|
||||||
// console.log(`getJarvisEnvelopeConvexeEntites cid:${this.cid}`, entites);
|
console.log(`getJarvisEnvelopeConvexeEntites cid:${this.cid}`, entites);
|
||||||
if (entites.length === 0) {
|
if (entites.length === 0) {
|
||||||
console.error('getJarvisEnvelopeConvexeEntites entites must not be empty')
|
console.error('getJarvisEnvelopeConvexeEntites entites must not be empty')
|
||||||
return;
|
return;
|
||||||
@@ -1019,7 +1020,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
getPaddedRoundedSegments(points, scale){
|
getPaddedRoundedSegments(points, scale){
|
||||||
// console.log(`setPaperContour ${this.concernement.id}, points`, points);
|
console.log(`getPaddedRoundedSegments ${this.concernement.id}, points`, points);
|
||||||
let getSegmentProps = (b,a,c) => {
|
let getSegmentProps = (b,a,c) => {
|
||||||
const ac = { x: c.x - a.x, y: c.y - a.y } // get ac vecteur
|
const ac = { x: c.x - a.x, y: c.y - a.y } // get ac vecteur
|
||||||
const lac = Math.sqrt(Math.pow(ac.x, 2) + Math.pow(ac.y, 2)); // get ac longueur ac
|
const lac = Math.sqrt(Math.pow(ac.x, 2) + Math.pow(ac.y, 2)); // get ac longueur ac
|
||||||
@@ -1417,6 +1418,8 @@ export default {
|
|||||||
|
|
||||||
// convert points to rouded and padded segments props
|
// convert points to rouded and padded segments props
|
||||||
let segments = this.getPaddedRoundedSegments(points, scaledown)
|
let segments = this.getPaddedRoundedSegments(points, scaledown)
|
||||||
|
console.log('segments', segments);
|
||||||
|
|
||||||
// create "real" Paper Segments from previous segments props
|
// create "real" Paper Segments from previous segments props
|
||||||
let paper_segments = [];
|
let paper_segments = [];
|
||||||
segments.forEach(seg => {
|
segments.forEach(seg => {
|
||||||
|
|||||||
+14
-14
@@ -23,27 +23,27 @@ import 'vue-plyr/dist/vue-plyr.css'
|
|||||||
// integrations: [new Integrations.Vue()],
|
// integrations: [new Integrations.Vue()],
|
||||||
// });
|
// });
|
||||||
import * as Sentry from "@sentry/vue";
|
import * as Sentry from "@sentry/vue";
|
||||||
import { createSentryPiniaPlugin } from "@sentry/vue";
|
// import { createSentryPiniaPlugin } from "@sentry/vue";
|
||||||
|
|
||||||
|
|
||||||
const app = createApp(App)
|
const app = createApp(App)
|
||||||
|
|
||||||
Sentry.init({
|
// Sentry.init({
|
||||||
app,
|
// app,
|
||||||
dsn: "https://d1780f9da2fc4dd28c9c17cb344a088f@frontlog.figli.io/2",
|
// dsn: "https://d1780f9da2fc4dd28c9c17cb344a088f@frontlog.figli.io/2",
|
||||||
integrations: [
|
// integrations: [
|
||||||
Sentry.browserTracingIntegration({ router }),
|
// Sentry.browserTracingIntegration({ router }),
|
||||||
],
|
// ],
|
||||||
tracesSampleRate: 0.01,
|
// tracesSampleRate: 0.01,
|
||||||
normalizeDepth: 10, // Or however deep you want your state context to be.
|
// normalizeDepth: 10, // Or however deep you want your state context to be.
|
||||||
environment: "prod",
|
// environment: "prod",
|
||||||
// release : '1'
|
// // release : '1'
|
||||||
release: __SENTRY_RELEASE__
|
// release: __SENTRY_RELEASE__
|
||||||
});
|
// });
|
||||||
|
|
||||||
const pinia = createPinia()
|
const pinia = createPinia()
|
||||||
pinia.use( ({store}) => { store.router = router } )
|
pinia.use( ({store}) => { store.router = router } )
|
||||||
pinia.use(createSentryPiniaPlugin());
|
// pinia.use(createSentryPiniaPlugin());
|
||||||
|
|
||||||
app.use(pinia)
|
app.use(pinia)
|
||||||
app.use(router)
|
app.use(router)
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ export const ConcernementsStore = defineStore({
|
|||||||
console.log('parse concernements');
|
console.log('parse concernements');
|
||||||
let temp_allSuperpositions = [];
|
let temp_allSuperpositions = [];
|
||||||
allconcernements.forEach((concernement) => {
|
allconcernements.forEach((concernement) => {
|
||||||
// console.log(`parsing concernement ${concernement.id}`);
|
console.log(`parsing concernement ${concernement.id}`);
|
||||||
concernement.visible = true;
|
concernement.visible = true;
|
||||||
|
|
||||||
concernement.entites_byid = {};
|
concernement.entites_byid = {};
|
||||||
@@ -128,7 +128,7 @@ export const ConcernementsStore = defineStore({
|
|||||||
|
|
||||||
// PROXIMITES
|
// PROXIMITES
|
||||||
if (entite.entite.proximite.length) {
|
if (entite.entite.proximite.length) {
|
||||||
// console.log("proximite", entite.entite.proximite);
|
console.log("proximite", entite.entite.proximite);
|
||||||
concernement.has_proximites = true;
|
concernement.has_proximites = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -181,12 +181,8 @@ export const ConcernementsStore = defineStore({
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}); // end of concernement.entites loop
|
}); // end of concernement.entites loop
|
||||||
|
|
||||||
|
|
||||||
// revisions
|
// revisions
|
||||||
concernement.active_revision = concernement.revision_id;
|
concernement.active_revision = concernement.revision_id;
|
||||||
|
|||||||
+13
-13
@@ -5,7 +5,7 @@ import vue from '@vitejs/plugin-vue'
|
|||||||
import graphql from '@rollup/plugin-graphql';
|
import graphql from '@rollup/plugin-graphql';
|
||||||
import { viteRequire } from 'vite-require'
|
import { viteRequire } from 'vite-require'
|
||||||
import svgLoader from 'vite-svg-loader'
|
import svgLoader from 'vite-svg-loader'
|
||||||
import { sentryVitePlugin } from "@sentry/vite-plugin";
|
// import { sentryVitePlugin } from "@sentry/vite-plugin";
|
||||||
import { execSync } from 'child_process'
|
import { execSync } from 'child_process'
|
||||||
|
|
||||||
require('dotenv').config();
|
require('dotenv').config();
|
||||||
@@ -30,16 +30,16 @@ export default defineConfig({
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}), graphql(), viteRequire(), svgLoader({defaultImport: 'raw'}),
|
}), graphql(), viteRequire(), svgLoader({defaultImport: 'raw'}),
|
||||||
sentryVitePlugin({
|
// sentryVitePlugin({
|
||||||
org: "figures-libres",
|
// org: "figures-libres",
|
||||||
project: "atlas-atterrissage.com",
|
// project: "atlas-atterrissage.com",
|
||||||
authToken: process.env.AUTH_TOKEN,
|
// authToken: process.env.AUTH_TOKEN,
|
||||||
release: {
|
// release: {
|
||||||
// name: "ouatterrir",
|
// // name: "ouatterrir",
|
||||||
name: release
|
// name: release
|
||||||
},
|
// },
|
||||||
url: "https://frontlog.figli.io",
|
// url: "https://frontlog.figli.io",
|
||||||
})
|
// })
|
||||||
],
|
],
|
||||||
resolve: {
|
resolve: {
|
||||||
alias: {
|
alias: {
|
||||||
@@ -69,9 +69,9 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
// https://github.com/vitejs/vite/discussions/7920
|
// https://github.com/vitejs/vite/discussions/7920
|
||||||
esbuild: {
|
esbuild: {
|
||||||
drop: ['console', 'debugger'],
|
// drop: ['console', 'debugger'],
|
||||||
},
|
},
|
||||||
define: {
|
define: {
|
||||||
__SENTRY_RELEASE__: JSON.stringify(release),
|
// __SENTRY_RELEASE__: JSON.stringify(release),
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user