sc/DyeingComputer
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

图表问题修改

Browse Source
This commit is contained in:
sc committed 2025-08-16 23:02:22 +08:00
2 parents a946dc8b47 4d6e4f0707
commit 5798d8ba00
7 files changed
+110 -45
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

View/CurveDiagramView.xaml
+2
View File
@@ -5,11 +5,13 @@
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">
<Grid>
<lvc:CartesianChart x:Name="OscChart" MinWidth="1280" MinHeight="600" EasingFunction="{x:Null}"
Series="{Binding Series}" YAxes="{Binding YAxes}" XAxes="{Binding XAxes}"/>
</Grid>
</UserControl>
View/CurveDiagramView.xaml.cs
+9 -7
View File
@@ -1,10 +1,16 @@
using DyeingComputer.ViewModel;
using LiveChartsCore.SkiaSharpView;
using DyeingComputer.UserClass;
using DyeingComputer.ViewModel;
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;
using System.Linq;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -17,11 +23,6 @@ using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using static DyeingComputer.UserClass.SqliteHelper;
using DyeingComputer.UserClass;
using LiveChartsCore.Kernel.Sketches;
using LiveChartsCore.Measure;
using ScottPlot.Plottables;
using System.Runtime.InteropServices;
namespace DyeingComputer.View
{
@@ -38,6 +39,7 @@ namespace DyeingComputer.View
private void UserControl_Loaded(object sender, RoutedEventArgs e)
{
}
}
}
View/TechnologicalProcessView.xaml.cs
+4 -4
View File
@@ -348,10 +348,10 @@ namespace DyeingComputer.View
dr["StepName"] = e.StepNAME;
dr["ParameterName"] = e.PNAME;
dr["Parameter1"] = e.Row_DAT.Field<double>("Parameter1");
dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter1");
dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter1");
dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter1");
dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter1");
dr["Parameter2"] = e.Row_DAT.Field<double>("Parameter2");
dr["Parameter3"] = e.Row_DAT.Field<double>("Parameter3");
dr["Parameter4"] = e.Row_DAT.Field<double>("Parameter4");
dr["Parameter5"] = e.Row_DAT.Field<double>("Parameter5");
dr["Parameter1_S1"] = e.Row_DAT.Field<double>("Parameter1_S1");
dr["Parameter2_S1"] = e.Row_DAT.Field<double>("Parameter2_S1");
dr["Parameter3_S1"] = e.Row_DAT.Field<double>("Parameter3_S1");
ViewModel/CurveDiagramViewModel.cs
+29 -28
View File
@@ -36,6 +36,7 @@ namespace DyeingComputer.ViewModel
CrosshairLabelsBackground = SKColors.DarkGray.AsLvcColor(),
CrosshairLabelsPaint = new SolidColorPaint(SKColors.DarkSlateBlue, 1),
CrosshairPaint = new SolidColorPaint(SKColors.DarkSlateGray, 1),
},
};
//颜色
@@ -101,11 +102,10 @@ namespace DyeingComputer.ViewModel
CrosshairSnapEnabled = true,
Position = LiveChartsCore.Measure.AxisPosition.End
}, //PH轴
//new AnimatableAxisBounds
};
private Random _r = new Random();
//private Random _r = new Random();
private List<DateTimePoint> MTT_values;
private List<DateTimePoint> MTL_values;
private List<DateTimePoint> MTH_values;
@@ -193,15 +193,15 @@ namespace DyeingComputer.ViewModel
{
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.MasterCylinder +"PH",
Values = MTH_values,
Stroke = new SolidColorPaint(s_yellow, 2),
Name = Properties.Resources.MasterCylinder+Properties.Resources.Temperature,
Values = MTT_values,
Stroke = new SolidColorPaint(s_blue, 2),
GeometrySize = 0,
GeometryStroke = new SolidColorPaint(s_yellow, 2),
GeometryStroke = new SolidColorPaint(s_blue, 2),
Fill = null,
LineSmoothness = 0,
ScalesYAt = 2,
}, //PH
ScalesYAt = 0,
}, //主缸
new LineSeries<DateTimePoint>
{
Name = Resources.Target + Resources.Temperature,
@@ -215,15 +215,26 @@ namespace DyeingComputer.ViewModel
}, //目标温度
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.Temperature +"1("+Properties.Resources.MasterCylinder+")",
Values = MTT_values,
Stroke = new SolidColorPaint(s_blue, 2),
Name =Properties.Resources.MasterCylinder+Properties.Resources.WaterLevel,
Values = MTL_values,
Stroke = new SolidColorPaint(s_red, 2),
GeometrySize = 0,
GeometryStroke = new SolidColorPaint(s_blue, 2),
GeometryStroke = new SolidColorPaint(s_red, 2),
Fill = null,
LineSmoothness = 0,
ScalesYAt = 0,
}, //主缸
ScalesYAt = 1,
}, //主缸液位
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.MasterCylinder +"PH",
Values = MTH_values,
Stroke = new SolidColorPaint(s_yellow, 2),
GeometrySize = 0,
GeometryStroke = new SolidColorPaint(s_yellow, 2),
Fill = null,
LineSmoothness = 0,
ScalesYAt = 2,
}, //PH
/*new LineSeries<DateTimePoint>
{
Name = Properties.Resources.Temperature +"2("+Properties.Resources.MasterCylinder+Properties.Resources.Bottom+")",
@@ -237,7 +248,7 @@ namespace DyeingComputer.ViewModel
}, */ //缸底
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.Temperature +"3("+Resources.Medicine + Resources.Tank +"1)",
Name = Properties.Resources.Temperature +"("+Resources.Medicine + Resources.Tank +"1)",
Values = STTA_values,
Stroke = new SolidColorPaint(s_blue_1, 2),
GeometrySize = 0,
@@ -248,7 +259,7 @@ namespace DyeingComputer.ViewModel
}, //附缸1
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.Temperature +"4("+Resources.Medicine + Resources.Tank +"2)",
Name = Properties.Resources.Temperature +"("+Resources.Medicine + Resources.Tank +"2)",
Values = STTB_values,
Stroke = new SolidColorPaint(s_blue_2, 2),
GeometrySize = 0,
@@ -259,7 +270,7 @@ namespace DyeingComputer.ViewModel
}, //附缸2
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.Temperature +"5("+Resources.Medicine + Resources.Tank +"3)",
Name = Properties.Resources.Temperature +"("+Resources.Medicine + Resources.Tank +"3)",
Values = STTC_values,
Stroke = new SolidColorPaint(s_blue_3, 2),
GeometrySize = 0,
@@ -269,17 +280,6 @@ namespace DyeingComputer.ViewModel
ScalesYAt = 0,
}, //附缸3
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.WaterLevel +"("+Properties.Resources.MasterCylinder+")",
Values = MTL_values,
Stroke = new SolidColorPaint(s_red, 2),
GeometrySize = 0,
GeometryStroke = new SolidColorPaint(s_red, 2),
Fill = null,
LineSmoothness = 0,
ScalesYAt = 1,
}, //主缸液位
new LineSeries<DateTimePoint>
{
Name = Properties.Resources.WaterLevel +"("+Resources.Medicine + Resources.Tank +"1)",
Values = STLA_values,
@@ -313,6 +313,7 @@ namespace DyeingComputer.ViewModel
ScalesYAt = 1,
}, //附缸3液位
};
}
}
}
ViewModel/MainWindowViewModel.cs
-1
View File
@@ -506,7 +506,6 @@ namespace DyeingComputer.ViewModel
if(WORK_RUN !=0) Chart();//写入记录
if(!UserButton) TechnologicalProcess_view();//刷新步骤页面
if ((Selet_dtm("1025") > 0) && (Selet_dtd("3021") || Selet_dtd("3022")))
{
if (Selet_dtm("1030") == 0)
Windows/ViewStep.xaml
+5 -5
View File
@@ -43,35 +43,35 @@
<TextBox x:Name="P1" HorizontalAlignment="Right" Height="30" Margin="0,120,10,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
Text="0" PreviewTextInput="Tb_KeyP1" InputMethod.IsInputMethodEnabled="False"
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P1_TextChanged"/>
<TextBlock x:Name="P2N" HorizontalAlignment="Left" Height="30" Margin="210,155,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
Background="#FFEFEEEE" Visibility="Hidden"/>
<TextBox x:Name="P2" HorizontalAlignment="Right" Height="30" Margin="0,155,10,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
Text="0" PreviewTextInput="Tb_KeyP2" InputMethod.IsInputMethodEnabled="False"
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P2_TextChanged"/>
<TextBlock x:Name="P3N" HorizontalAlignment="Left" Height="30" Margin="210,190,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
Background="#FFEFEEEE" Visibility="Hidden"/>
<TextBox x:Name="P3" HorizontalAlignment="Right" Height="30" Margin="0,190,10,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
Text="0" PreviewTextInput="Tb_KeyP3" InputMethod.IsInputMethodEnabled="False"
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P3_TextChanged"/>
<TextBlock x:Name="P4N" HorizontalAlignment="Left" Height="30" Margin="210,225,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
Background="#FFEFEEEE" Visibility="Hidden"/>
<TextBox x:Name="P4" HorizontalAlignment="Right" Height="30" Margin="0,225,10,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
Text="0" PreviewTextInput="Tb_KeyP4" InputMethod.IsInputMethodEnabled="False"
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P4_TextChanged"/>
<TextBlock x:Name="P5N" HorizontalAlignment="Left" Height="30" Margin="210,260,0,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="20"
Background="#FFEFEEEE" Visibility="Hidden"/>
<TextBox x:Name="P5" HorizontalAlignment="Right" Height="30" Margin="0,260,10,0"
TextWrapping="Wrap" VerticalAlignment="Top" Width="230" MaxLines="1" ClipToBounds="True"
Text="0" PreviewTextInput="Tb_KeyP5" InputMethod.IsInputMethodEnabled="False"
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" />
FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P5_TextChanged"/>
</Grid>
<Grid Grid.Row="1">
Windows/ViewStep.xaml.cs
+61
View File
@@ -154,6 +154,56 @@ namespace DyeingComputer.Windows
P5P.SelectionStart, e.Text));
P5P.Text = P5P.Text.Trim();
}
private void P1_TextChanged(object sender, TextChangedEventArgs e)
{
try
{
dat_D.BeginEdit();
dat_D["Parameter1"] = Convert.ToDouble(P1.Text);
dat_D.EndEdit();
}
catch (Exception) { }
}
private void P2_TextChanged(object sender, TextChangedEventArgs e)
{
try
{
dat_D.BeginEdit();
dat_D["Parameter2"] = Convert.ToDouble(P2.Text);
dat_D.EndEdit();
}
catch (Exception) { }
}
private void P3_TextChanged(object sender, TextChangedEventArgs e)
{
try
{
dat_D.BeginEdit();
dat_D["Parameter3"] = Convert.ToDouble(P3.Text);
dat_D.EndEdit();
}
catch (Exception) { }
}
private void P4_TextChanged(object sender, TextChangedEventArgs e)
{
try
{
dat_D.BeginEdit();
dat_D["Parameter4"] = Convert.ToDouble(P4.Text);
dat_D.EndEdit();
}
catch (Exception) { }
}
private void P5_TextChanged(object sender, TextChangedEventArgs e)
{
try
{
dat_D.BeginEdit();
dat_D["Parameter5"] = Convert.ToDouble(P5.Text);
dat_D.EndEdit();
}
catch (Exception) { }
}
private void P1P_TextChanged(object sender, TextChangedEventArgs e)
{
try
@@ -394,6 +444,11 @@ namespace DyeingComputer.Windows
int i = boxID.SelectedIndex;
boxNAME.Text = id_dat.ElementAt(i);
Set(id_dat[i]);
P1.Text.Remove(0);
P2.Text.Remove(0);
P3.Text.Remove(0);
P4.Text.Remove(0);
P5.Text.Remove(0);
}
}
private void boxIDp_SelectionChanged(object sender, SelectionChangedEventArgs e)
@@ -422,6 +477,12 @@ namespace DyeingComputer.Windows
}
dat_D.EndEdit();
}
P1P.Text.Remove(0);
P2P.Text.Remove(0);
P3P.Text.Remove(0);
P4P.Text.Remove(0);
P5P.Text.Remove(0);
}
private void YES_Click(object sender, RoutedEventArgs e)//确认
{