diff --git a/src/app/log-tool/data-setup/map-time-data/map-time-data.component.html b/src/app/log-tool/data-setup/map-time-data/map-time-data.component.html index cea94a1d82..5610d7ceca 100644 --- a/src/app/log-tool/data-setup/map-time-data/map-time-data.component.html +++ b/src/app/log-tool/data-setup/map-time-data/map-time-data.component.html @@ -2,7 +2,7 @@
-
    +
    • Timestamps are required for Day Type Analysis and time series data visualizations. Advance ahead if you won't be working with time data.
    • @@ -91,15 +91,24 @@
+
+
+
    +
  • MEASUR will try to detect your data collection interval. Please ensure the detected interval is correct. +
  • +
+
+
+ +
diff --git a/src/app/log-tool/data-setup/map-time-data/map-time-data.component.ts b/src/app/log-tool/data-setup/map-time-data/map-time-data.component.ts index 2ee4557061..1839c9f381 100644 --- a/src/app/log-tool/data-setup/map-time-data/map-time-data.component.ts +++ b/src/app/log-tool/data-setup/map-time-data/map-time-data.component.ts @@ -135,6 +135,17 @@ export class MapTimeDataComponent implements OnInit { return dataset; }); + if (this.selectedDataSet.hasDateField) { + let secondsInterval = this.logToolDataService.getSecondsIntervalDifference(this.selectedDataSet); + if (secondsInterval != undefined) { + let selectedInterval = this.dataCollectionIntervalOptions.find(option => option.value === secondsInterval); + if (selectedInterval) { + this.selectedDataSet.dataCollectionInterval = selectedInterval.value; + } + } + } + + if (this.applyToAll) { this.explorerData.isStepMapTimeDataComplete = this.logToolDataService.checkStepMapDatesComplete(this.explorerData.datasets); } diff --git a/src/app/log-tool/log-tool-data.service.ts b/src/app/log-tool/log-tool-data.service.ts index a8f9355eda..90ab942bd7 100644 --- a/src/app/log-tool/log-tool-data.service.ts +++ b/src/app/log-tool/log-tool-data.service.ts @@ -393,9 +393,7 @@ getCurrentIntervalStrings(currentInterval: number, useDayStartEndOffset: boolean } checkIntervalSeconds(dataset: ExplorerDataSet) { - let firstRowDate = new Date(dataset.csvImportData.data[0][dataset.dateField.fieldName]); - let secondRowDate = new Date(dataset.csvImportData.data[1][dataset.dateField.fieldName]); - let intervalDifference: number = (secondRowDate.getTime() - firstRowDate.getTime()) / 1000; + let intervalDifference = this.getSecondsIntervalDifference(dataset); let intervalIncrement: number = dataset.dataCollectionInterval; if (intervalIncrement !== undefined && intervalDifference <= 0) { dataset.csvImportData.data = this.addLostSecondsBack(dataset, intervalIncrement); @@ -403,6 +401,12 @@ getCurrentIntervalStrings(currentInterval: number, useDayStartEndOffset: boolean return dataset; } + getSecondsIntervalDifference(dataSet: ExplorerDataSet): number { + let firstRowDate = new Date(dataSet.csvImportData.data[0][dataSet.dateField.fieldName]); + let secondRowDate = new Date(dataSet.csvImportData.data[1][dataSet.dateField.fieldName]); + return (secondRowDate.getTime() - firstRowDate.getTime()) / 1000; + } + addLostSecondsBack(csvData: IndividualDataFromCsv, intervalIncrement: number) { let secondsCounter: number = 0; csvData.csvImportData.data.map(dataItem => { diff --git a/src/app/log-tool/visualize/visualize-sidebar/graph-series/graph-series.component.html b/src/app/log-tool/visualize/visualize-sidebar/graph-series/graph-series.component.html index e452cd0c84..c5c88148c8 100644 --- a/src/app/log-tool/visualize/visualize-sidebar/graph-series/graph-series.component.html +++ b/src/app/log-tool/visualize/visualize-sidebar/graph-series/graph-series.component.html @@ -73,7 +73,7 @@
-