Skip to content

Commit

Permalink
Bug fix
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Thaler <dthaler1968@gmail.com>
  • Loading branch information
dthaler committed Feb 12, 2025
1 parent 5161fb6 commit e6cc881
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 10 deletions.
9 changes: 1 addition & 8 deletions OrcanodeMonitor/Pages/SpectralDensity.cshtml
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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',
Expand Down
5 changes: 3 additions & 2 deletions OrcanodeMonitor/Pages/SpectralDensity.cshtml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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());
Expand All @@ -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.
/// </summary>
public List<string> JsonChannelDatasets { get; set; }
public string JsonChannelDatasets { get; set; }

public string GetChannelColor(int channelIndex, double alpha)
{
Expand Down

0 comments on commit e6cc881

Please sign in to comment.