diff --git a/DyeingComputer.csproj b/DyeingComputer.csproj index 242d020..7cafc64 100644 --- a/DyeingComputer.csproj +++ b/DyeingComputer.csproj @@ -33,7 +33,7 @@ true - x64 + AnyCPU true full false @@ -379,7 +379,7 @@ 2.0.7 - 8.3.2 + 8.4.0 2.0.0-rc3.3 @@ -393,9 +393,6 @@ 3.0.81 - - 5.0.39 - 4.6.1 diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 1da8fef..406aa29 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -12,7 +12,7 @@ using System.Windows; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("DyeingComputer")] -[assembly: AssemblyCopyright("Copyright © 2024")] +[assembly: AssemblyCopyright("Copyright © 2025")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/UserClass/APILog.cs b/UserClass/APILog.cs index 1f85515..4397794 100644 --- a/UserClass/APILog.cs +++ b/UserClass/APILog.cs @@ -1,8 +1,5 @@ using DyeingComputer.View; using DyeingComputer.ViewModel; -using OpenTK.Audio.OpenAL; -using ScottPlot.Colormaps; -using ScottPlot.TickGenerators.TimeUnits; using System; using System.Collections.Generic; using System.Data; diff --git a/UserClass/AsyncTcpServer.cs b/UserClass/AsyncTcpServer.cs index 217f513..9a41e9e 100644 --- a/UserClass/AsyncTcpServer.cs +++ b/UserClass/AsyncTcpServer.cs @@ -15,7 +15,6 @@ using TouchSocket.Core; using TouchSocket.Sockets; using DyeingComputer.ViewModel; using System.Runtime.InteropServices; -using ScottPlot.Colormaps; using static System.Windows.Forms.AxHost; using static System.Windows.Forms.VisualStyles.VisualStyleElement.TaskbarClock; using static System.Windows.Forms.VisualStyles.VisualStyleElement; diff --git a/UserClass/SQLDATA.cs b/UserClass/SQLDATA.cs index 77819f0..6dba347 100644 --- a/UserClass/SQLDATA.cs +++ b/UserClass/SQLDATA.cs @@ -1,6 +1,5 @@ using DyeingComputer.View; using DyeingComputer.ViewModel; -using ScottPlot.Colormaps; using System; using System.Collections.Generic; using System.Data; diff --git a/View/CurveDiagramView.xaml b/View/CurveDiagramView.xaml index 17a103b..d31bb89 100644 --- a/View/CurveDiagramView.xaml +++ b/View/CurveDiagramView.xaml @@ -5,7 +5,6 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF" xmlns:viewmodel="clr-namespace:DyeingComputer.ViewModel" - xmlns:wpf="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF" mc:Ignorable="d" Loaded="UserControl_Loaded" d:DataContext="{d:DesignInstance Type=viewmodel:CurveDiagramViewModel}" d:DesignHeight="630" d:DesignWidth="1280"> diff --git a/View/CurveDiagramView.xaml.cs b/View/CurveDiagramView.xaml.cs index 11b5581..f95721b 100644 --- a/View/CurveDiagramView.xaml.cs +++ b/View/CurveDiagramView.xaml.cs @@ -4,8 +4,6 @@ using LiveChartsCore; using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.Measure; using LiveChartsCore.SkiaSharpView; -using ScottPlot; -using ScottPlot.Plottables; using System; using System.Collections.Generic; using System.Data; diff --git a/View/HistoryRecordsView.xaml.cs b/View/HistoryRecordsView.xaml.cs index 6f65613..c9568f6 100644 --- a/View/HistoryRecordsView.xaml.cs +++ b/View/HistoryRecordsView.xaml.cs @@ -1,5 +1,4 @@ using DyeingComputer.ViewModel; -using ScottPlot.Hatches; using System; using System.Collections.Generic; using System.Data; diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs index e603a1b..4da7a06 100644 --- a/View/TechnologicalProcessView.xaml.cs +++ b/View/TechnologicalProcessView.xaml.cs @@ -1,7 +1,6 @@ using DyeingComputer.UserClass; using DyeingComputer.ViewModel; using DyeingComputer.Windows; -using ScottPlot; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/View/WorkOrderView.xaml b/View/WorkOrderView.xaml index 9973d67..ad52f34 100644 --- a/View/WorkOrderView.xaml +++ b/View/WorkOrderView.xaml @@ -3,7 +3,6 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:ScottPlot="clr-namespace:ScottPlot.WPF;assembly=ScottPlot.WPF" xmlns:local="clr-namespace:DyeingComputer.View" xmlns:lvc="clr-namespace:LiveChartsCore.SkiaSharpView.WPF;assembly=LiveChartsCore.SkiaSharpView.WPF" xmlns:lang="clr-namespace:DyeingComputer.Properties" diff --git a/View/WorkOrderView.xaml.cs b/View/WorkOrderView.xaml.cs index e1a8c4c..358af6e 100644 --- a/View/WorkOrderView.xaml.cs +++ b/View/WorkOrderView.xaml.cs @@ -1,7 +1,6 @@ using DyeingComputer.UserClass; using DyeingComputer.ViewModel; using DyeingComputer.Windows; -using ScottPlot; using SkiaSharp; using System; using System.Collections.Generic; diff --git a/ViewModel/CurveDiagramViewModel.cs b/ViewModel/CurveDiagramViewModel.cs index b47e3e1..5afc554 100644 --- a/ViewModel/CurveDiagramViewModel.cs +++ b/ViewModel/CurveDiagramViewModel.cs @@ -10,7 +10,6 @@ using static DyeingComputer.UserClass.SqliteHelper; using CommunityToolkit.Mvvm.ComponentModel; using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.SkiaSharpView.Painting; -using ScottPlot.Colormaps; using System.Drawing; using System.Windows.Media.TextFormatting; using System.Xml.Linq; diff --git a/ViewModel/CurveTempModel.cs b/ViewModel/CurveTempModel.cs index e17c1eb..a1d620a 100644 --- a/ViewModel/CurveTempModel.cs +++ b/ViewModel/CurveTempModel.cs @@ -9,7 +9,6 @@ using System.Threading.Tasks; using CommunityToolkit.Mvvm.ComponentModel; using LiveChartsCore.Kernel.Sketches; using LiveChartsCore.SkiaSharpView.Painting; -using ScottPlot.Colormaps; using System.Drawing; using System.Windows.Media.TextFormatting; using System.Xml.Linq; @@ -20,7 +19,6 @@ using System.Collections.ObjectModel; using DyeingComputer.Properties; using LiveChartsCore.Measure; using LiveChartsCore.Motion; -using DyeingComputer.Properties; using static DyeingComputer.UserClass.SqliteHelper; using TouchSocket.Core; using System.ComponentModel; diff --git a/ViewModel/HistoryRecordsViewModel.cs b/ViewModel/HistoryRecordsViewModel.cs index 39ed758..76f32a7 100644 --- a/ViewModel/HistoryRecordsViewModel.cs +++ b/ViewModel/HistoryRecordsViewModel.cs @@ -14,11 +14,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using static DyeingComputer.UserClass.SqliteHelper; -using ScottPlot.Hatches; using System.Windows.Controls; -using ScottPlot; using System.Windows.Threading; -using ScottPlot.Statistics; using System.Management.Instrumentation; namespace DyeingComputer.ViewModel diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index 39f3234..01e775f 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -9,7 +9,6 @@ using Microsoft.Win32; using Newtonsoft.Json.Linq; using NModbus; using NModbus.Serial; -using OpenTK.Graphics.ES11; using System; using System.Collections.Generic; using System.Collections.ObjectModel; diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs index 6a8c987..91f352b 100644 --- a/Windows/ViewStep.xaml.cs +++ b/Windows/ViewStep.xaml.cs @@ -1,6 +1,4 @@ using DyeingComputer.View; -using ScottPlot.Palettes; -using ScottPlot.TickGenerators.TimeUnits; using System; using System.Collections.Generic; using System.Data;