Plotly: remove title of x axis

Williangalvani · Williangalvani · commit 499e9669e48b · 2020-09-06T16:00:35.000-03:00
diff --git a/src/components/Plotly.vue b/src/components/Plotly.vue
@@ -653,7 +653,7 @@ export default {
             plotOptions.xaxis = {
                 rangeslider: {},
                 domain: this.calculateXAxisDomain(),
-                title: 'time_boot (ms)',
+                title: ' ',
                 tickformat: ':04,2f'
             }
             if (this.plotInstance !== null) {
diff --git a/src/tools/dataflashDataExtractor.js b/src/tools/dataflashDataExtractor.js
@@ -260,15 +260,15 @@ export class DataflashDataExtractor {
                     }
                     trajectory.push(
                         [
-                            gpsData.Lng[i] / 1e7,
-                            gpsData.Lat[i] / 1e7,
+                            gpsData.Lng[i],
+                            gpsData.Lat[i],
                             gpsData.Alt[i] - startAltitude,
                             gpsData.time_boot_ms[i]
                         ]
                     )
                     timeTrajectory[gpsData.time_boot_ms[i]] = [
-                        gpsData.Lng[i] / 1e7,
-                        gpsData.Lat[i] / 1e7,
+                        gpsData.Lng[i],
+                        gpsData.Lat[i],
                         (gpsData.Alt[i] - startAltitude) / 1000,
                         gpsData.time_boot_ms[i]]
                 }
@@ -293,15 +293,15 @@ export class DataflashDataExtractor {
                     }
                     trajectory.push(
                         [
-                            gpsData.Lng[i] * 1e-7,
-                            gpsData.Lat[i] * 1e-7,
+                            gpsData.Lng[i],
+                            gpsData.Lat[i],
                             gpsData.Alt[i] - startAltitude,
                             gpsData.time_boot_ms[i]
                         ]
                     )
                     timeTrajectory[gpsData.time_boot_ms[i]] = [
-                        gpsData.Lng[i] * 1e-7,
-                        gpsData.Lat[i] * 1e-7,
+                        gpsData.Lng[i],
+                        gpsData.Lat[i],
                         (gpsData.Alt[i] - startAltitude) / 1000,
                         gpsData.time_boot_ms[i]]
                 }
@@ -326,15 +326,15 @@ export class DataflashDataExtractor {
                     }
                     trajectory.push(
                         [
-                            gpsData.Lng[i] / 1e7,
-                            gpsData.Lat[i] / 1e7,
+                            gpsData.Lng[i],
+                            gpsData.Lat[i],
                             gpsData.Alt[i] - startAltitude,
                             gpsData.time_boot_ms[i]
                         ]
                     )
                     timeTrajectory[gpsData.time_boot_ms[i]] = [
-                        gpsData.Lng[i] / 1e7,
-                        gpsData.Lat[i] / 1e7,
+                        gpsData.Lng[i],
+                        gpsData.Lat[i],
                         gpsData.Alt[i] - startAltitude,
                         gpsData.time_boot_ms[i]]
                 }
diff --git a/src/tools/parsers/dataflashParser.js b/src/tools/parsers/dataflashParser.js
@@ -563,13 +563,12 @@ export class DataflashParser {
     fixDataOnce (name) {
         if (['GPS', 'ATT', 'AHR2', 'MODE'].indexOf(name) === -1) {
             if (this.messageTypes.hasOwnProperty(name)) {
-                let fields = this.messages[name][0].fieldnames
+                let fields = this.messageTypes[name].complexFields
                 if (this.messageTypes[name].hasOwnProperty('multipliers')) {
-                    for (let message in this.messages[name]) {
-                        for (let i = 1; i < fields.length; i++) {
-                            let fieldname = fields[i]
-                            if (!isNaN(this.messageTypes[name].multipliers[i])) {
-                                this.messages[name][message][fieldname] *= this.messageTypes[name].multipliers[i]
+                    for (let [fieldname, field] of Object.entries(fields)) {
+                        if (!isNaN(field.multiplier) && field.multiplier !== 0) {
+                            for (let i = 0; i < this.messages[name].length; i++) {
+                                this.messages[name][i][fieldname] *= field.multiplier
                             }
                         }
                     }
@@ -668,15 +667,15 @@ export class DataflashParser {
                             messageTypes[msg.Name + '[' + instance + ']'] = {
                                 expressions: fields,
                                 units: msg.units,
-                                multipiers: msg.multipliers,
+                                multipliers: msg.multipliers,
                                 complexFields: complexFields
                             }
                         }
                     } else {
                         messageTypes[msg.Name] = {
                             expressions: fields,
                             units: msg.units,
-                            multipiers: msg.multipliers,
+                            multipliers: msg.multipliers,
                             complexFields: complexFields
                         }
                     }
diff --git a/src/tools/parsers/mavlinkParser.js b/src/tools/parsers/mavlinkParser.js
@@ -296,7 +296,7 @@ export class MavlinkParser {
             messageTypes[msg] = {
                 expressions: fields,
                 units: null,
-                multipiers: null,
+                multipliers: null,
                 complexFields: complexFields
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -653,7 +653,7 @@ export default {`
`653`	`653`	`plotOptions.xaxis = {`
`654`	`654`	`rangeslider: {},`
`655`	`655`	`domain: this.calculateXAxisDomain(),`
`656`		`- title: 'time_boot (ms)',`
	`656`	`+ title: ' ',`
`657`	`657`	`tickformat: ':04,2f'`
`658`	`658`	`}`
`659`	`659`	`if (this.plotInstance !== null) {`
Original file line number	Diff line number	Diff line change
`@@ -260,15 +260,15 @@ export class DataflashDataExtractor {`
`260`	`260`	`}`
`261`	`261`	`trajectory.push(`
`262`	`262`	`[`
`263`		`- gpsData.Lng[i] / 1e7,`
`264`		`- gpsData.Lat[i] / 1e7,`
	`263`	`+ gpsData.Lng[i],`
	`264`	`+ gpsData.Lat[i],`
`265`	`265`	`gpsData.Alt[i] - startAltitude,`
`266`	`266`	`gpsData.time_boot_ms[i]`
`267`	`267`	`]`
`268`	`268`	`)`
`269`	`269`	`timeTrajectory[gpsData.time_boot_ms[i]] = [`
`270`		`- gpsData.Lng[i] / 1e7,`
`271`		`- gpsData.Lat[i] / 1e7,`
	`270`	`+ gpsData.Lng[i],`
	`271`	`+ gpsData.Lat[i],`
`272`	`272`	`(gpsData.Alt[i] - startAltitude) / 1000,`
`273`	`273`	`gpsData.time_boot_ms[i]]`
`274`	`274`	`}`
`@@ -293,15 +293,15 @@ export class DataflashDataExtractor {`
`293`	`293`	`}`
`294`	`294`	`trajectory.push(`
`295`	`295`	`[`
`296`		`- gpsData.Lng[i] * 1e-7,`
`297`		`- gpsData.Lat[i] * 1e-7,`
	`296`	`+ gpsData.Lng[i],`
	`297`	`+ gpsData.Lat[i],`
`298`	`298`	`gpsData.Alt[i] - startAltitude,`
`299`	`299`	`gpsData.time_boot_ms[i]`
`300`	`300`	`]`
`301`	`301`	`)`
`302`	`302`	`timeTrajectory[gpsData.time_boot_ms[i]] = [`
`303`		`- gpsData.Lng[i] * 1e-7,`
`304`		`- gpsData.Lat[i] * 1e-7,`
	`303`	`+ gpsData.Lng[i],`
	`304`	`+ gpsData.Lat[i],`
`305`	`305`	`(gpsData.Alt[i] - startAltitude) / 1000,`
`306`	`306`	`gpsData.time_boot_ms[i]]`
`307`	`307`	`}`
`@@ -326,15 +326,15 @@ export class DataflashDataExtractor {`
`326`	`326`	`}`
`327`	`327`	`trajectory.push(`
`328`	`328`	`[`
`329`		`- gpsData.Lng[i] / 1e7,`
`330`		`- gpsData.Lat[i] / 1e7,`
	`329`	`+ gpsData.Lng[i],`
	`330`	`+ gpsData.Lat[i],`
`331`	`331`	`gpsData.Alt[i] - startAltitude,`
`332`	`332`	`gpsData.time_boot_ms[i]`
`333`	`333`	`]`
`334`	`334`	`)`
`335`	`335`	`timeTrajectory[gpsData.time_boot_ms[i]] = [`
`336`		`- gpsData.Lng[i] / 1e7,`
`337`		`- gpsData.Lat[i] / 1e7,`
	`336`	`+ gpsData.Lng[i],`
	`337`	`+ gpsData.Lat[i],`
`338`	`338`	`gpsData.Alt[i] - startAltitude,`
`339`	`339`	`gpsData.time_boot_ms[i]]`
`340`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -563,13 +563,12 @@ export class DataflashParser {`
`563`	`563`	`fixDataOnce (name) {`
`564`	`564`	`if (['GPS', 'ATT', 'AHR2', 'MODE'].indexOf(name) === -1) {`
`565`	`565`	`if (this.messageTypes.hasOwnProperty(name)) {`
`566`		`- let fields = this.messages[name][0].fieldnames`
	`566`	`+ let fields = this.messageTypes[name].complexFields`
`567`	`567`	`if (this.messageTypes[name].hasOwnProperty('multipliers')) {`
`568`		`- for (let message in this.messages[name]) {`
`569`		`- for (let i = 1; i < fields.length; i++) {`
`570`		`- let fieldname = fields[i]`
`571`		`- if (!isNaN(this.messageTypes[name].multipliers[i])) {`
`572`		`- this.messages[name][message][fieldname] *= this.messageTypes[name].multipliers[i]`
	`568`	`+ for (let [fieldname, field] of Object.entries(fields)) {`
	`569`	`+ if (!isNaN(field.multiplier) && field.multiplier !== 0) {`
	`570`	`+ for (let i = 0; i < this.messages[name].length; i++) {`
	`571`	`+ this.messages[name][i][fieldname] *= field.multiplier`
`573`	`572`	`}`
`574`	`573`	`}`
`575`	`574`	`}`
`@@ -668,15 +667,15 @@ export class DataflashParser {`
`668`	`667`	`messageTypes[msg.Name + '[' + instance + ']'] = {`
`669`	`668`	`expressions: fields,`
`670`	`669`	`units: msg.units,`
`671`		`- multipiers: msg.multipliers,`
	`670`	`+ multipliers: msg.multipliers,`
`672`	`671`	`complexFields: complexFields`
`673`	`672`	`}`
`674`	`673`	`}`
`675`	`674`	`} else {`
`676`	`675`	`messageTypes[msg.Name] = {`
`677`	`676`	`expressions: fields,`
`678`	`677`	`units: msg.units,`
`679`		`- multipiers: msg.multipliers,`
	`678`	`+ multipliers: msg.multipliers,`
`680`	`679`	`complexFields: complexFields`
`681`	`680`	`}`
`682`	`681`	`}`
Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,7 @@ export class MavlinkParser {`
`296`	`296`	`messageTypes[msg] = {`
`297`	`297`	`expressions: fields,`
`298`	`298`	`units: null,`
`299`		`- multipiers: null,`
	`299`	`+ multipliers: null,`
`300`	`300`	`complexFields: complexFields`
`301`	`301`	`}`
`302`	`302`	`}`