diff --git a/backend/requirements.txt b/backend/requirements.txt index 626a46d44..aed590a0d 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -9,4 +9,4 @@ ujson == 4.0.2 sklearn == 0.0 kafka-python == 2.0.2 openapi_spec_validator == 0.2.8 -PyYAML == 5.4.1 \ No newline at end of file +PyYAML == 6.0 \ No newline at end of file diff --git a/backend/swagger.yaml b/backend/swagger.yaml index b62f3a0dd..91c360801 100644 --- a/backend/swagger.yaml +++ b/backend/swagger.yaml @@ -1,6 +1,6 @@ swagger: "2.0" info: - version: 0.24.4 + version: 0.24.5 title: DebiAI_BACKEND_API description: DebiAI backend api contact: diff --git a/frontend/cspell.json b/frontend/cspell.json new file mode 100644 index 000000000..f12d241a5 --- /dev/null +++ b/frontend/cspell.json @@ -0,0 +1,29 @@ +{ + "version": "0.2", + "language": "en", + "words": [ + "cmax", + "cmin", + "colorscale", + "confianceai", + "Debi", + "DebiAI", + "groundtruth", + "irtsysx", + "rgba", + "showscale", + "systemx", + "websrv", + "xaxis", + "yaxis" + ], + "flagWords": [], + "ignorePaths": [ + "*.svg", + "*.xml", + "*.bat", + "node_modules/", + "build/", + ".vscode/" + ] +} diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 0d32fb334..d0d74cede 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -1,12 +1,12 @@ { "name": "debiai_frontend", - "version": "0.24.4", + "version": "0.24.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "debiai_frontend", - "version": "0.24.4", + "version": "0.24.5", "license": "Apache-2.0", "dependencies": { "axios": "^0.21.4", diff --git a/frontend/package.json b/frontend/package.json index 62708c5ff..2f1b63841 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "debiai_frontend", - "version": "0.24.4", + "version": "0.24.5", "description": "Frontend for Debiai, made with Vuejs", "license": "Apache-2.0", "scripts": { diff --git a/frontend/public/documentation/images/Night stars plot/main.png b/frontend/public/documentation/images/Night stars plot/main.png new file mode 100644 index 000000000..5c5904914 Binary files /dev/null and b/frontend/public/documentation/images/Night stars plot/main.png differ diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widget/Widget.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widget/Widget.vue index 8bb265960..b300ad863 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widget/Widget.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widget/Widget.vue @@ -348,7 +348,7 @@ export default { this.$on("loading", (loading) => (this.loading = loading)); this.$on("errorMessage", this.errorMessage); this.$on("setExport", this.setExport); - this.$on("drawed", this.drawed); + this.$on("drawn", this.drawn); this.timeout = null; this.name = this.title; }, @@ -485,7 +485,7 @@ export default { }); this.$emit("filterCleared"); }, - drawed() { + drawn() { this.selectedDataWarning = false; // The plot has been drawn, we can save a copy of the local filters diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ConfusionMatrix/ConfusionMatrix.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ConfusionMatrix/ConfusionMatrix.vue index 698fa6e7a..acf11fa75 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ConfusionMatrix/ConfusionMatrix.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ConfusionMatrix/ConfusionMatrix.vue @@ -99,7 +99,7 @@ Draw @@ -137,10 +137,10 @@ export default { // Settings settings: true, - plotDrawed: false, + plotDrawn: false, trueAxisSelection: false, predAxisSelection: false, - currentDrawedColorIndex: null, + currentDrawnColorIndex: null, }; }, props: { @@ -260,7 +260,7 @@ export default { matrixList.push(this.fillMatrix(allUniques, colorTruth, colorPred)); }); - this.currentDrawedColorIndex = this.coloredColumnIndex; + this.currentDrawnColorIndex = this.coloredColumnIndex; } this.drawMatrix(matrixList, allUniques); console.timeEnd("ConfusionMatrix"); @@ -417,8 +417,8 @@ export default { responsive: true, }); - this.matrixDrawed = true; - this.$parent.$emit("drawed"); + this.matrixDrawn = true; + this.$parent.$emit("drawn"); // Set the filter events this.divConfusionMatrix.removeListener("plotly_click", this.selectDataOnPlot); @@ -434,12 +434,12 @@ export default { xAxiesSelect(index) { this.columnTindex = index; this.trueAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, yAxiesSelect(index) { this.columnPindex = index; this.predAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, swap() { let temp = this.columnPindex; @@ -561,7 +561,7 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.dividePerColor && this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.dividePerColor && this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: { diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/CorrelationMatrix/CorrelationMatrix.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/CorrelationMatrix/CorrelationMatrix.vue index 092b1fccd..79b8c6ab8 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/CorrelationMatrix/CorrelationMatrix.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/CorrelationMatrix/CorrelationMatrix.vue @@ -116,7 +116,7 @@ export default { // Settings settings: true, significativOnly: false, - matrixDrawed: false, + matrixDrawn: false, axisSelection: false, selectedMatrixType: "pearson", error: false, @@ -152,7 +152,7 @@ export default { .filter((c) => c.nbOccu > 1); this.axisSelection = false; - this.matrixDrawed = false; + this.matrixDrawn = false; this.calculate(); }, @@ -270,8 +270,8 @@ export default { responsive: true, }); - this.$parent.$emit("drawed"); - this.matrixDrawed = true; + this.$parent.$emit("drawn"); + this.matrixDrawn = true; }, // Export @@ -285,7 +285,7 @@ export default { this.$parent.$emit("loading", this.loading); }, selectedData() { - this.matrixDrawed = false; + this.matrixDrawn = false; this.$parent.selectedDataWarning = true; }, significativOnly() { diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/DistributionPlot/DistributionPlot.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/DistributionPlot/DistributionPlot.vue index 8d720e0fc..db340b9d2 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/DistributionPlot/DistributionPlot.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/DistributionPlot/DistributionPlot.vue @@ -185,7 +185,7 @@ type="number" v-model="bins" :min="1" - @change="plotDrawed = false" + @change="plotDrawn = false" /> @@ -197,7 +197,7 @@ id="drawBtn" type="submit" @click="checkPlot" - :disabled="plotDrawed" + :disabled="plotDrawn" > Draw @@ -241,10 +241,10 @@ export default { bins: 0, // Other - plotDrawed: false, + plotDrawn: false, xAxisSelection: false, secondAxisSelection: false, - currentDrawedColorIndex: null, + currentDrawnColorIndex: null, }; }, props: { @@ -538,9 +538,9 @@ export default { displayModeBar: false, responsive: true, }); - this.currentDrawedColorIndex = this.coloredColumnIndex; - this.plotDrawed = true; - this.$parent.$emit("drawed"); + this.currentDrawnColorIndex = this.coloredColumnIndex; + this.plotDrawn = true; + this.$parent.$emit("drawn"); // Set selection events this.divRepPlot.removeListener("plotly_click", this.selectDataOnPlot); @@ -549,7 +549,7 @@ export default { clearPlot() { Plotly.purge(this.divRepPlot); - this.plotDrawed = false; + this.plotDrawn = false; }, // Filters @@ -587,9 +587,9 @@ export default { if (this.coloredColumnIndex != null && this.dividePerColor) { filters.push({ type: "values", - columnIndex: this.currentDrawedColorIndex, + columnIndex: this.currentDrawnColorIndex, values: [ - "" + this.data.columns[this.currentDrawedColorIndex].uniques[selec.curveNumber], + "" + this.data.columns[this.currentDrawnColorIndex].uniques[selec.curveNumber], ], }); } @@ -641,7 +641,7 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: { @@ -655,10 +655,10 @@ export default { this.checkPlot(); }, selectedData: function () { - if (!this.$parent.startFiltering && this.plotDrawed) this.$parent.selectedDataWarning = true; + if (!this.$parent.startFiltering && this.plotDrawn) this.$parent.selectedDataWarning = true; }, coloredColumnIndex: function () { - this.plotDrawed = false; + this.plotDrawn = false; }, redrawRequiered(o, n) { this.$parent.colorWarning = n; diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/IntervalPlot/IntervalPlot.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/IntervalPlot/IntervalPlot.vue index 655b30865..266aab7ee 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/IntervalPlot/IntervalPlot.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/IntervalPlot/IntervalPlot.vue @@ -127,7 +127,7 @@ class="customCbx" v-model="smooth" style="display: none" - @click="intervalPlotDrawed = false" + @click="intervalPlotDrawn = false" /> Draw @@ -184,7 +184,7 @@ export default { columnLowerIndex: 0, // === Other === - intervalPlotDrawed: false, + intervalPlotDrawn: false, }; }, props: { @@ -265,7 +265,7 @@ export default { } // Boolean operation to prevent string or object if ("smooth" in conf) this.smooth = conf.smooth === true; - this.intervalPlotDrawed = false; + this.intervalPlotDrawn = false; }, defConfChangeUpdate() { this.$watch( @@ -371,8 +371,8 @@ export default { let layout = this.gerenateLayout({ colX, colY }); this.drawPlot([upperTrace, lowerTrace, yTrace], layout); // regenererate or generate plot - this.intervalPlotDrawed = true; - this.$parent.$emit("drawed"); + this.intervalPlotDrawn = true; + this.$parent.$emit("drawn"); }, // Draw @@ -416,22 +416,22 @@ export default { xAxiesSelect(index) { this.columnXindex = index; this.xAxisSelection = false; - this.intervalPlotDrawed = false; + this.intervalPlotDrawn = false; }, yAxiesSelect(index) { this.columnYindex = index; this.yAxisSelection = false; - this.intervalPlotDrawed = false; + this.intervalPlotDrawn = false; }, upperAxisSelect(index) { this.columnUpperIndex = index; this.upperAxisSelection = false; - this.intervalPlotDrawed = false; + this.intervalPlotDrawn = false; }, lowerAxisSelect(index) { this.columnLowerIndex = index; this.lowerAxisSelection = false; - this.intervalPlotDrawed = false; + this.intervalPlotDrawn = false; }, // Export @@ -447,7 +447,7 @@ export default { }, watch: { selectedData() { - if (this.intervalPlotDrawed) this.$parent.selectedDataWarning = true; + if (this.intervalPlotDrawn) this.$parent.selectedDataWarning = true; }, }, }; diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/NightStarsPlot.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/NightStarsPlot.vue new file mode 100644 index 000000000..5cb6fac89 --- /dev/null +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/NightStarsPlot.vue @@ -0,0 +1,519 @@ + + + + + + Night stars plot settings + + + + + + X axis + + + + Absolute value : + + + + + + + + + Y axis + + + + Absolute value : + + + + + + + + + Divided per color + + + + + + + + + + + + Draw + + + + + + + + + + + + + + + + + + + + diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/configuration.json b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/configuration.json new file mode 100644 index 000000000..dfd0db864 --- /dev/null +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/configuration.json @@ -0,0 +1,5 @@ +{ + "name": "Night stars plot", + "description": "Standard deviation of categorical in a 2D plot", + "layout": {} +} \ No newline at end of file diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/guide.md b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/guide.md new file mode 100644 index 000000000..c8cccd4f7 --- /dev/null +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/guide.md @@ -0,0 +1,7 @@ +# Night Stars Plot + + + +## Description + +This plot shows the average and standard deviation of different categories according to 2 axis. It is useful to compare the performance of different models with 2 different metrics. \ No newline at end of file diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/icon.png b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/icon.png new file mode 100644 index 000000000..e249c4a02 Binary files /dev/null and b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/NightStarsPlot/icon.png differ diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCategories/ParallelCategories.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCategories/ParallelCategories.vue index 4ce1f040b..d152b1e60 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCategories/ParallelCategories.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCategories/ParallelCategories.vue @@ -36,7 +36,7 @@ export default { data() { return { settings: true, - currentDrawedColorIndex: null, + currentDrawnColorIndex: null, // Conf selectedColumnsIds: [], @@ -166,8 +166,8 @@ export default { this.divParCat.removeListener("plotly_click", this.selectDataOnPlot); this.divParCat.on("plotly_click", this.selectDataOnPlot); - this.currentDrawedColorIndex = colColor ? colColor.index : null; - this.$parent.$emit("drawed"); + this.currentDrawnColorIndex = colColor ? colColor.index : null; + this.$parent.$emit("drawn"); }, selectColumns(selectedColumnsId) { @@ -185,13 +185,13 @@ export default { let filters = []; Object.keys(parCatSelections).forEach((columnIdx) => { if (columnIdx === "color") { - if (!this.selectedColumnsIds.includes(this.currentDrawedColorIndex)) { + if (!this.selectedColumnsIds.includes(this.currentDrawnColorIndex)) { filters.push({ type: "values", - columnIndex: this.currentDrawedColorIndex, + columnIndex: this.currentDrawnColorIndex, values: [ "" + - this.data.columns[this.currentDrawedColorIndex].uniques[parCatSelections.color], + this.data.columns[this.currentDrawnColorIndex].uniques[parCatSelections.color], ], }); } @@ -222,7 +222,7 @@ export default { computed: { redrawRequiered() { return !( - this.currentDrawedColorIndex !== this.$store.state.StatisticalAnalysis.coloredColumnIndex && + this.currentDrawnColorIndex !== this.$store.state.StatisticalAnalysis.coloredColumnIndex && !this.settings && this.selectedColumnsIds.length > 0 ); diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCoordinate/ParallelCoordinate.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCoordinate/ParallelCoordinate.vue index 953bf9c27..309ee7a88 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCoordinate/ParallelCoordinate.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/ParallelCoordinate/ParallelCoordinate.vue @@ -40,7 +40,7 @@ export default { return { settings: true, selectedColumnsIds: [], - currentDrawedColorIndex: null, + currentDrawnColorIndex: null, }; }, props: { @@ -96,7 +96,7 @@ export default { // Color let coloredColIndex = this.$store.state.StatisticalAnalysis.coloredColumnIndex; let colColor = this.data.columns[coloredColIndex]; - this.currentDrawedColorIndex = coloredColIndex; + this.currentDrawnColorIndex = coloredColIndex; let colorscale = "Portland"; let showscale = false; @@ -137,7 +137,7 @@ export default { responsive: true, }); - this.$parent.$emit("drawed"); + this.$parent.$emit("drawn"); // Plot selection update this.divParCord.removeListener("plotly_restyle", this.selectDataOnPlot); @@ -216,7 +216,7 @@ export default { computed: { redrawRequiered() { return !( - this.currentDrawedColorIndex !== this.$store.state.StatisticalAnalysis.coloredColumnIndex && + this.currentDrawnColorIndex !== this.$store.state.StatisticalAnalysis.coloredColumnIndex && !this.settings && this.selectedColumnsIds.length > 0 ); diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot/PointPlot.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot/PointPlot.vue index 7b55f8319..90711e118 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot/PointPlot.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot/PointPlot.vue @@ -120,7 +120,7 @@ Draw 2D points @@ -147,7 +147,7 @@ class="red" @click=" columnSizeIndex = null; - pointPlotDrawed = false; + pointPlotDrawn = false; " > Remove @@ -177,7 +177,7 @@ v-model="maxPointSize" :min="1" :step="5" - @change="pointPlotDrawed = false" + @change="pointPlotDrawn = false" /> @@ -218,7 +218,7 @@ Draw statistics @@ -237,7 +237,7 @@ type="number" v-model="bins" :min="1" - @change="linePlotDrawed = false" + @change="linePlotDrawn = false" /> @@ -412,9 +412,9 @@ export default { axisYMax: 1, // === Other === - pointPlotDrawed: false, - linePlotDrawed: false, - currentDrawedColorIndex: null, + pointPlotDrawn: false, + linePlotDrawn: false, + currentDrawnColorIndex: null, }; }, props: { @@ -583,8 +583,8 @@ export default { // Plot updateTraces() { - if (this.pointPlotDrawed) this.pointPlot(); - if (this.linePlotDrawed) this.checkLinePlot(); + if (this.pointPlotDrawn) this.pointPlot(); + if (this.linePlotDrawn) this.checkLinePlot(); }, // Point plot @@ -669,18 +669,18 @@ export default { // Draw this.clearPointPlot(); - if (this.linePlotDrawed) { + if (this.linePlotDrawn) { Plotly.addTraces(this.divPointPlot, [pointData], 0); this.updateLayout(layout); } else this.drawPlot([pointData], layout); // regenererate or generate plot - this.pointPlotDrawed = true; - this.$parent.$emit("drawed"); - this.currentDrawedColorIndex = this.coloredColumnIndex; + this.pointPlotDrawn = true; + this.$parent.$emit("drawn"); + this.currentDrawnColorIndex = this.coloredColumnIndex; }, clearPointPlot() { // remove the first trace - if (!this.linePlotDrawed) Plotly.purge(this.divPointPlot); + if (!this.linePlotDrawn) Plotly.purge(this.divPointPlot); else { let tracesToDelete = []; this.divPointPlot.data.forEach((trace, i) => { @@ -689,7 +689,7 @@ export default { Plotly.deleteTraces(this.divPointPlot, tracesToDelete); } - this.pointPlotDrawed = false; + this.pointPlotDrawn = false; }, // Line plot @@ -863,18 +863,18 @@ export default { let layout = this.gerenateLayout({ colX, colY, colColor }); this.clearLinePlot(); - if (this.pointPlotDrawed) { + if (this.pointPlotDrawn) { Plotly.addTraces(this.divPointPlot, traces); this.updateLayout(layout); } else this.drawPlot(traces, layout); // regenererate or generate plot - this.linePlotDrawed = true; - this.$parent.$emit("drawed"); - this.currentDrawedColorIndex = this.coloredColumnIndex; + this.linePlotDrawn = true; + this.$parent.$emit("drawn"); + this.currentDrawnColorIndex = this.coloredColumnIndex; }, clearLinePlot() { // remove the last two traces - if (!this.pointPlotDrawed) Plotly.purge(this.divPointPlot); + if (!this.pointPlotDrawn) Plotly.purge(this.divPointPlot); else { let tracesToDelete = []; this.divPointPlot.data.forEach((trace, i) => { @@ -883,7 +883,7 @@ export default { Plotly.deleteTraces(this.divPointPlot, tracesToDelete); } - this.linePlotDrawed = false; + this.linePlotDrawn = false; }, // Draw @@ -1146,19 +1146,19 @@ export default { }, filterStarted() { // Set the layout on select mod - if (this.pointPlotDrawed || this.linePlotDrawed) + if (this.pointPlotDrawn || this.linePlotDrawn) Plotly.relayout(this.divPointPlot, { dragmode: "select" }); }, filterEnded() { // Remove the layout select mod - if (this.pointPlotDrawed || this.linePlotDrawed) + if (this.pointPlotDrawn || this.linePlotDrawn) Plotly.relayout(this.divPointPlot, { dragmode: "zoom" }); this.$parent.$emit("setExport", null); }, filterCleared() { // Remove the selection on the plot - if (this.pointPlotDrawed || this.linePlotDrawed) + if (this.pointPlotDrawn || this.linePlotDrawn) Plotly.restyle(this.divPointPlot, "selectedpoints", null); this.$parent.$emit("setExport", null); @@ -1168,44 +1168,44 @@ export default { xAxiesSelect(index) { this.columnXindex = index; this.xAxisSelection = false; - this.pointPlotDrawed = false; - this.linePlotDrawed = false; + this.pointPlotDrawn = false; + this.linePlotDrawn = false; this.setBins(); }, yAxiesSelect(index) { this.columnYindex = index; this.yAxisSelection = false; - this.pointPlotDrawed = false; - this.linePlotDrawed = false; + this.pointPlotDrawn = false; + this.linePlotDrawn = false; }, sizeAxiesSelect(index) { this.columnSizeIndex = index; this.sizeAxisSelection = false; - this.pointPlotDrawed = false; + this.pointPlotDrawn = false; }, swap() { - let memoryLinePlotDrawed = this.linePlotDrawed; + let memoryLinePlotDrawn = this.linePlotDrawn; let temp = this.columnYindex; this.columnYindex = this.columnXindex; this.columnXindex = temp; this.setBins(); - this.linePlotDrawed = memoryLinePlotDrawed; + this.linePlotDrawn = memoryLinePlotDrawn; this.updateTraces(); }, setBins() { let colX = this.data.columns[this.columnXindex]; if (colX.type == String) this.bins = Math.min(colX.nbOccu, 300); else this.bins = Math.min(colX.nbOccu, 30); - this.linePlotDrawed = false; + this.linePlotDrawn = false; }, setPointOpacity() { this.pointOpacity = parseFloat((1 / Math.pow(this.selectedData.length, 0.2)).toFixed(2)); }, axisRangeSelect({ axisXAuto, axisXMin, axisXMax, axisYAuto, axisYMin, axisYMax }) { this.axisRangeModal = false; - this.pointPlotDrawed = false; - this.linePlotDrawed = false; + this.pointPlotDrawn = false; + this.linePlotDrawn = false; this.axisXAuto = axisXAuto; this.axisXMin = axisXMin; this.axisXMax = axisXMax; @@ -1225,7 +1225,7 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: { @@ -1236,19 +1236,19 @@ export default { if (newVal) this.setPointOpacity(); }, pointOpacity: function () { - this.pointPlotDrawed = false; + this.pointPlotDrawn = false; }, absolute: function () { this.updateTraces(); }, displayNull: function () { - if (this.linePlotDrawed) this.checkLinePlot(); + if (this.linePlotDrawn) this.checkLinePlot(); }, averageAsBar: function () { - if (this.linePlotDrawed) this.checkLinePlot(); + if (this.linePlotDrawn) this.checkLinePlot(); }, selectedData: function () { - if (!this.$parent.startFiltering && (this.pointPlotDrawed || this.linePlotDrawed)) + if (!this.$parent.startFiltering && (this.pointPlotDrawn || this.linePlotDrawn)) this.$parent.selectedDataWarning = true; }, redrawRequiered(o, n) { diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot3D/PointPlot3D.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot3D/PointPlot3D.vue index 38621cf97..43cd9b8f7 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot3D/PointPlot3D.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/PointPlot3D/PointPlot3D.vue @@ -130,7 +130,7 @@ Draw @@ -174,8 +174,8 @@ export default { pointOpacity: 0, // Other - currentDrawedColorIndex: null, - plotDrawed: false, + currentDrawnColorIndex: null, + plotDrawn: false, }; }, props: { @@ -335,9 +335,9 @@ export default { responsive: true, }); - this.plotDrawed = true; - this.$parent.$emit("drawed"); - this.currentDrawedColorIndex = this.coloredColumnIndex; + this.plotDrawn = true; + this.$parent.$emit("drawn"); + this.currentDrawnColorIndex = this.coloredColumnIndex; }, // axies selection @@ -362,17 +362,17 @@ export default { xAxiesSelect(index) { this.columnXindex = index; this.xAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, yAxiesSelect(index) { this.columnYindex = index; this.yAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, zAxiesSelect(index) { this.columnZindex = index; this.zAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, setPointOpacity() { this.pointOpacity = parseFloat((1 / Math.pow(this.selectedData.length, 0.2)).toFixed(2)); @@ -388,7 +388,7 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: { @@ -396,18 +396,18 @@ export default { if (newVal) this.setPointOpacity(); }, pointOpacity: function () { - this.plotDrawed = false; + this.plotDrawn = false; }, pointSize: function () { - this.plotDrawed = false; + this.plotDrawn = false; }, selectedData: function () { - this.plotDrawed = false; + this.plotDrawn = false; this.$parent.selectedDataWarning = true; if (this.autoPointOpacity) this.setPointOpacity(); }, coloredColumnIndex: function () { - this.plotDrawed = false; + this.plotDrawn = false; }, redrawRequiered(o, n) { this.$parent.colorWarning = n; diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/RangesliderPlot/RangesliderPlot.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/RangesliderPlot/RangesliderPlot.vue index d2e936ea8..a2c8435b8 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/RangesliderPlot/RangesliderPlot.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/RangesliderPlot/RangesliderPlot.vue @@ -159,7 +159,7 @@ class="red" @click=" columnTagIndex = null; - plotDrawed = false; + plotDrawn = false; " > Remove @@ -203,7 +203,7 @@ Draw @@ -248,8 +248,8 @@ export default { columnTagIndex: null, // Other - currentDrawedColorIndex: null, - plotDrawed: false, + currentDrawnColorIndex: null, + plotDrawn: false, }; }, props: { @@ -342,7 +342,7 @@ export default { if (c) this.columnTagIndex = c.index; else sendColNotFoundMessage(conf.columnTag); } - this.plotDrawed = false; + this.plotDrawn = false; }, defConfChangeUpdate() { this.$watch( @@ -549,9 +549,9 @@ export default { this.plotDiv.removeListener("plotly_click", this.selectDataOnPlot); this.plotDiv.on("plotly_click", this.selectDataOnPlot); - this.plotDrawed = true; - this.$parent.$emit("drawed"); - this.currentDrawedColorIndex = this.coloredColumnIndex; + this.plotDrawn = true; + this.$parent.$emit("drawn"); + this.currentDrawnColorIndex = this.coloredColumnIndex; }, drawLine(x) { const lineStyle = { @@ -657,17 +657,17 @@ export default { xAxiesSelect(index) { this.columnXindex = index; this.xAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, yAxiesSelect(index) { this.columnYindex = index; this.yAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, yMultipleAxisSelect(indexs) { this.selectedYColumnsIds = indexs; this.yMultipleAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, swap() { let temp = this.columnYindex; @@ -678,7 +678,7 @@ export default { tagAxiesSelect(index) { this.columnTagIndex = index; this.tagAxisSelection = false; - this.plotDrawed = false; + this.plotDrawn = false; }, // Filters selectDataOnPlot(data) { @@ -808,12 +808,12 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.dividePerColor && this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.dividePerColor && this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: { dividePerColor() { - this.plotDrawed = false; + this.plotDrawn = false; }, selectedData() { if (!this.$parent.startFiltering) this.$parent.selectedDataWarning = true; @@ -822,7 +822,7 @@ export default { this.$parent.colorWarning = n; }, multipleYAxis() { - this.plotDrawed = false; + this.plotDrawn = false; }, }, }; diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/SampleArray/SampleArray.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/SampleArray/SampleArray.vue index 093dff054..871c31950 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/SampleArray/SampleArray.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/SampleArray/SampleArray.vue @@ -114,7 +114,7 @@ export default { this.params.data = data; this.params.sort = this.selectedColumnsIds.map((c, i) => i); - this.$parent.$emit("drawed"); + this.$parent.$emit("drawn"); }, columnsSelect(columnIndexs) { this.selectedColumnsIds = columnIndexs; diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/Statistics/Statistics.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/Statistics/Statistics.vue index 534e37e92..003fd6490 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/Statistics/Statistics.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/Statistics/Statistics.vue @@ -377,7 +377,7 @@ export default { this.colColorDisplayed = null; } - this.$parent.$emit("drawed"); + this.$parent.$emit("drawn"); this.$parent.colorWarning = false; }, }, diff --git a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/WidgetTemplateFull/WidgetTemplateFull.vue b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/WidgetTemplateFull/WidgetTemplateFull.vue index 9cc31a59d..2631e1eda 100644 --- a/frontend/src/components/debiai/statistics/dataAnalysis/widgets/WidgetTemplateFull/WidgetTemplateFull.vue +++ b/frontend/src/components/debiai/statistics/dataAnalysis/widgets/WidgetTemplateFull/WidgetTemplateFull.vue @@ -223,7 +223,7 @@ export default { // We tell the parent that the widget was displayed // This will remove some warning and store the current filters - this.$parent.$emit("drawed"); + this.$parent.$emit("drawn"); }, // =============== Widget configuration =============== @@ -408,7 +408,7 @@ export default { return this.$store.state.StatisticalAnalysis.coloredColumnIndex; }, redrawRequiered() { - return !(this.currentDrawedColorIndex !== this.coloredColumnIndex); + return !(this.currentDrawnColorIndex !== this.coloredColumnIndex); }, }, watch: {