diff --git a/OrcanodeMonitor/Pages/SpectralDensity.cshtml b/OrcanodeMonitor/Pages/SpectralDensity.cshtml index 038ee7d..374079d 100644 --- a/OrcanodeMonitor/Pages/SpectralDensity.cshtml +++ b/OrcanodeMonitor/Pages/SpectralDensity.cshtml @@ -26,10 +26,6 @@ // Channel Count = @Model.ChannelCount - // DEBUGGING... - var dataset = jsonChannelDatasets[0]; - console.info('channel[0]: ' + dataset); - @for (int i = 0; i < Model.ChannelCount; i++) { string backgroundColor = Model.GetChannelColor(i, 0.2); @@ -52,16 +48,13 @@ function initializeCharts() { var labels = @Html.Raw(Json.Serialize(Model.Labels)); - var jsonChannelDatasets = @Html.Raw(Json.Serialize(Model.JsonChannelDatasets)); + var jsonChannelDatasets = @Html.Raw(Model.JsonChannelDatasets); initializeCharts2(labels, jsonChannelDatasets); } // Client side function to initialize a chart. function initializeChart(elementId, labels, jsonChannelDataset, maxSilenceMagnitude, minNoiseMagnitude, i, backgroundColor, borderColor) { - console.info('initializeChart ' + i); - console.info(jsonChannelDataset); - var ctx = document.getElementById(elementId).getContext('2d'); var myLineChart = new Chart(ctx, { type: 'line', diff --git a/OrcanodeMonitor/Pages/SpectralDensity.cshtml.cs b/OrcanodeMonitor/Pages/SpectralDensity.cshtml.cs index 71a3231..e5aac39 100644 --- a/OrcanodeMonitor/Pages/SpectralDensity.cshtml.cs +++ b/OrcanodeMonitor/Pages/SpectralDensity.cshtml.cs @@ -5,6 +5,7 @@ using OrcanodeMonitor.Core; using OrcanodeMonitor.Data; using OrcanodeMonitor.Models; +using System.Collections.Generic; using System.Text.Json; using static OrcanodeMonitor.Core.Fetcher; @@ -156,7 +157,7 @@ private void UpdateFrequencyInfo() // Serialise to JSON. JsonSummaryDataset = JsonSerializer.Serialize(summaryDataset); - JsonChannelDatasets = channelDatasets.Select(dataset => JsonSerializer.Serialize(dataset)).ToList(); + JsonChannelDatasets = JsonSerializer.Serialize(channelDatasets); // channelDatasets.Select(dataset => JsonSerializer.Serialize(dataset)).ToList(); MaxMagnitude = (int)Math.Round(_frequencyInfo.GetMaxMagnitude()); MaxNonHumMagnitude = (int)Math.Round(_frequencyInfo.GetMaxNonHumMagnitude()); @@ -177,7 +178,7 @@ private void UpdateFrequencyInfo() /// Gets or sets the JSON-serialized datasets containing per-channel frequency magnitudes. /// Used by Chart.js for visualization when multiple channels are present. /// - public List JsonChannelDatasets { get; set; } + public string JsonChannelDatasets { get; set; } public string GetChannelColor(int channelIndex, double alpha) {