Skip to content

Commit

Permalink
Issues with chart and map markers being out of sync sorted.
Browse files Browse the repository at this point in the history
Still issue with interference between zooming and selection on charts.
  • Loading branch information
steps39 committed Feb 8, 2024
1 parent 7c7915e commit 5ec03c3
Show file tree
Hide file tree
Showing 5 changed files with 233 additions and 166 deletions.
4 changes: 3 additions & 1 deletion SedimentDataExplorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
const annotationPlugin = window['chartjs-plugin-annotation'];
Chart.register(annotationPlugin);

markerPath = 'markers/';
markerPngs = ['marker-icon-red.png', 'marker-icon-orange.png', 'marker-icon-yellow.png',
'marker-icon-green.png', 'marker-icon-blue.png', 'marker-icon-violet.png',
'marker-icon-grey.png', 'marker-icon-gold.png','marker-icon-black.png'];
Expand All @@ -18,6 +19,7 @@
let instanceType = [];
let instanceSheet = [];
let highlighted = [];
let highlightMarkers = {};
for (i = 1; i < noInstances; i++) {
chartInstance[i] = null;
instanceType[i] = null;
Expand Down Expand Up @@ -957,7 +959,7 @@ function filenameDisplay() {

iconNo = 0;
for (dateSampled in selectedSampleInfo) {
currentIcon = markerPngs[iconNo];
currentIcon = markerPath + markerPngs[iconNo];
iconNo = (iconNo + 1) % 9;

const fileURL = sampleInfo[dateSampled].fileURL;
Expand Down
Binary file added markers/marker-icon-highlight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 5ec03c3

Please sign in to comment.