winzer/elwig
2
1
Fork 0
Code Issues 8 Pull Requests Actions Releases 46 Activity

ChartWindow: use System.Text.Json instead of Newtonsoft.Json

Browse Source
This commit is contained in:
Lorenz Stechauner
2023-09-06 14:00:30 +02:00
parent faaeefe6ce
commit 324c5db94e
2 changed files with 40 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Elwig/Models/Graph.cs
View File

@ -1,12 +1,8 @@
using Newtonsoft.Json.Linq;
using ScottPlot; using ScottPlot;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics.Contracts;
using System.Linq; using System.Linq;
using System.Text; using System.Text.Json.Nodes;
using System.Threading.Tasks;
using System.Windows.Markup;
namespace Elwig.Models { namespace Elwig.Models {
public class Graph : ICloneable { public class Graph : ICloneable {
@ -30,7 +26,7 @@ namespace Elwig.Models {
DataY = DataGen.Zeros(MaxX - MinX + 1); DataY = DataGen.Zeros(MaxX - MinX + 1);
} }
public Graph(string type, int num, JToken graphData, string contracts, int minX, int maxX) { public Graph(string type, int num, JsonObject graphData, string contracts, int minX, int maxX) {
Type = type; Type = type;
Num = num; Num = num;
Contracts = contracts; Contracts = contracts;
@ -52,8 +48,8 @@ namespace Elwig.Models {
DataY = dataY; DataY = dataY;
} }
private void ParseGraphData(JToken graphData) { private void ParseGraphData(JsonObject graphData) {
var GraphPoints = graphData.Children().OfType<JProperty>().ToDictionary(p => int.Parse(p.Name[..^2]), p => (double)p.Value); var GraphPoints = graphData.ToDictionary(p => int.Parse(p.Key[..^2]), p => (double)p.Value?.AsValue());
if (GraphPoints.Keys.Count < 1) { if (GraphPoints.Keys.Count < 1) {
return; return;
@ -99,19 +95,19 @@ namespace Elwig.Models {
} }
} }
public JObject ToJson() { public JsonObject ToJson() {
JObject graph = new(); JsonObject graph = new();
if (DataY[0] != DataY[1]) { if (DataY[0] != DataY[1]) {
graph.Add(new JProperty(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4))); graph.Add(new KeyValuePair<string, JsonNode?>(DataX[0] + Type.ToLower(), Math.Round(DataY[0], 4)));
} }
for (int i = 1; i < DataX.Length - 1; i++) { for (int i = 1; i < DataX.Length - 1; i++) {
if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) { if (Math.Round(DataY[i] - DataY[i - 1], 4) != Math.Round(DataY[i + 1] - DataY[i], 4)) {
graph.Add(new JProperty(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4))); graph.Add(new KeyValuePair<string, JsonNode?>(DataX[i] + Type.ToLower(), Math.Round(DataY[i], 4)));
} }
} }
if (DataY[^1] != DataY[^2]) { if (DataY[^1] != DataY[^2]) {
graph.Add(new JProperty(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4))); graph.Add(new KeyValuePair<string, JsonNode?>(DataX[^1] + Type.ToLower(), Math.Round(DataY[^1], 4)));
} }
return graph; return graph;
} }

73
Elwig/Windows/ChartWindow.xaml.cs
View File

@ -1,21 +1,16 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Diagnostics;
using System.Diagnostics.Contracts;
using System.Drawing; using System.Drawing;
using System.Linq; using System.Linq;
using System.Text.Json.Nodes;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input; using System.Windows.Input;
using Elwig.Helpers; using Elwig.Helpers;
using Elwig.Models; using Elwig.Models;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ChangeTracking;
using Newtonsoft.Json.Linq;
using ScottPlot; using ScottPlot;
using ScottPlot.Plottable; using ScottPlot.Plottable;
@ -69,14 +64,14 @@ namespace Elwig.Windows {
} }
PaymentVar paymentVar = paymentVars[0]; PaymentVar paymentVar = paymentVars[0];
var data = JToken.Parse(paymentVar.Data); var data = JsonNode.Parse(paymentVar.Data).AsObject();
var auszahlungsSorten = data["AuszahlungSorten"]; var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
if (auszahlungsSorten == null) { if (auszahlungsSorten == null) {
return; return;
} }
var Graphs = auszahlungsSorten["Kurven"]; var Graphs = auszahlungsSorten["Kurven"]?.AsArray();
if (Graphs == null) { if (Graphs == null) {
return; return;
@ -86,7 +81,7 @@ namespace Elwig.Windows {
int i = 1; int i = 1;
foreach (var graph in Graphs) { foreach (var graph in Graphs) {
GraphsList.Add(new Graph("Oe", i, graph, ParseContracts(auszahlungsSorten, i - 1), 50, 140)); GraphsList.Add(new Graph("Oe", i, graph?.AsObject(), ParseContracts(auszahlungsSorten, i - 1), 50, 140));
i++; i++;
} }
@ -98,17 +93,15 @@ namespace Elwig.Windows {
RefreshInputs(); RefreshInputs();
} }
private String ParseContracts(JToken auszahlungsSorten, int num) { private String ParseContracts(JsonObject auszahlungsSorten, int num) {
List<string> contracts = new(); List<string> contracts = new();
foreach (var sorte in auszahlungsSorten.Children().OfType<JToken>()) { foreach (var sorte in auszahlungsSorten) {
if (((JProperty)sorte).Name == "Kurven") { if (sorte.Key == "Kurven") continue;
continue; foreach (var attribut in sorte.Value.AsObject()) {
} foreach (var bindung in attribut.Value.AsObject()) {
foreach (var attribut in sorte.Values().OfType<JToken>()) { if ((int)bindung.Value.AsValue() == num) {
foreach (var bindung in attribut.Values().OfType<JProperty>()) { contracts.Add($"{sorte.Key}/{attribut.Key}/{bindung.Key}");
if ((int)(bindung).Value == num) {
contracts.Add($"{((JProperty)sorte).Name}/{((JProperty)attribut).Name}/{bindung.Name}");
} }
} }
} }
@ -125,15 +118,14 @@ namespace Elwig.Windows {
} }
PaymentVar paymentVar = paymentVars[0]; PaymentVar paymentVar = paymentVars[0];
var data = JToken.Parse(paymentVar.Data); var data = JsonNode.Parse(paymentVar.Data).AsObject();
var auszahlungsSorten = data["AuszahlungSorten"]; var auszahlungsSorten = data["AuszahlungSorten"]?.AsObject();
if (auszahlungsSorten == null) { if (auszahlungsSorten == null) {
return false; return false;
} }
var Graphs = auszahlungsSorten["Kurven"]; var Graphs = auszahlungsSorten["Kurven"]?.AsObject();
if (Graphs == null) { if (Graphs == null) {
return false; return false;
} }
@ -141,26 +133,24 @@ namespace Elwig.Windows {
int i = 1; int i = 1;
foreach (var graph in Graphs) { foreach (var graph in Graphs) {
if (i == num) { if (i == num) {
graph.Remove(); Graphs.Remove(graph.Key);
break; break;
} }
i++; i++;
} }
foreach (var sorte in auszahlungsSorten.Children().OfType<JToken>()) { foreach (var sorte in auszahlungsSorten) {
if (((JProperty)sorte).Name == "Kurven") { if (sorte.Key == "Kurven") continue;
continue; foreach (var attribut in sorte.Value.AsObject()) {
} var bindungen = attribut.Value.AsObject();
foreach (var attribut in sorte.Values().OfType<JToken>()) { foreach (var bindung in bindungen) {
List<JProperty> itemsToRemove = new(); int v = (int)bindung.Value;
foreach (var bindung in attribut.Values().OfType<JProperty>()) { if (v == num - 1) {
if ((int)bindung.Value == num - 1) { bindungen.Remove(bindung.Key);
itemsToRemove.Add(bindung); } else if (v > num - 1) {
} else if ((int)bindung.Value > num - 1) { bindungen[bindung.Key] = v - 1;
bindung.Value = (int)bindung.Value - 1;
} }
} }
itemsToRemove.ForEach(i => i.Remove());
} }
} }
@ -671,23 +661,22 @@ namespace Elwig.Windows {
} }
PaymentVar paymentVar = paymentVars[0]; PaymentVar paymentVar = paymentVars[0];
var data = JToken.Parse(paymentVar.Data); var data = JsonNode.Parse(paymentVar.Data).AsObject();
var auszahlungsSorten = data["AuszahlungSorten"]; var auszahlungsSorten = data["AuszahlungSorten"];
if (auszahlungsSorten == null) { if (auszahlungsSorten == null) {
return null; return null;
} }
var Graphs = auszahlungsSorten["Kurven"]; var Graphs = auszahlungsSorten["Kurven"].AsArray();
if (Graphs == null) { if (Graphs == null) {
return null; return null;
} }
if (IsEditing) { if (IsEditing) {
((JArray)Graphs)[g.Num - 1] = g.ToJson(); Graphs[g.Num - 1] = g.ToJson();
} else if(IsCreating) { } else if(IsCreating) {
((JArray)Graphs).Add(g.ToJson()); Graphs.Add(g.ToJson());
} else { } else {
return null; return null;
} }