diff --git a/View/CurveDiagramView.xaml b/View/CurveDiagramView.xaml
index 1982546..17a103b 100644
--- a/View/CurveDiagramView.xaml
+++ b/View/CurveDiagramView.xaml
@@ -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">
+
diff --git a/View/CurveDiagramView.xaml.cs b/View/CurveDiagramView.xaml.cs
index db131c9..11b5581 100644
--- a/View/CurveDiagramView.xaml.cs
+++ b/View/CurveDiagramView.xaml.cs
@@ -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)
{
+
}
}
}
diff --git a/View/TechnologicalProcessView.xaml.cs b/View/TechnologicalProcessView.xaml.cs
index 8080407..e603a1b 100644
--- a/View/TechnologicalProcessView.xaml.cs
+++ b/View/TechnologicalProcessView.xaml.cs
@@ -348,10 +348,10 @@ namespace DyeingComputer.View
dr["StepName"] = e.StepNAME;
dr["ParameterName"] = e.PNAME;
dr["Parameter1"] = e.Row_DAT.Field("Parameter1");
- dr["Parameter2"] = e.Row_DAT.Field("Parameter1");
- dr["Parameter3"] = e.Row_DAT.Field("Parameter1");
- dr["Parameter4"] = e.Row_DAT.Field("Parameter1");
- dr["Parameter5"] = e.Row_DAT.Field("Parameter1");
+ dr["Parameter2"] = e.Row_DAT.Field("Parameter2");
+ dr["Parameter3"] = e.Row_DAT.Field("Parameter3");
+ dr["Parameter4"] = e.Row_DAT.Field("Parameter4");
+ dr["Parameter5"] = e.Row_DAT.Field("Parameter5");
dr["Parameter1_S1"] = e.Row_DAT.Field("Parameter1_S1");
dr["Parameter2_S1"] = e.Row_DAT.Field("Parameter2_S1");
dr["Parameter3_S1"] = e.Row_DAT.Field("Parameter3_S1");
diff --git a/ViewModel/CurveDiagramViewModel.cs b/ViewModel/CurveDiagramViewModel.cs
index 0b70696..b47e3e1 100644
--- a/ViewModel/CurveDiagramViewModel.cs
+++ b/ViewModel/CurveDiagramViewModel.cs
@@ -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 MTT_values;
private List MTL_values;
private List MTH_values;
@@ -193,15 +193,15 @@ namespace DyeingComputer.ViewModel
{
new LineSeries
{
- 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
{
Name = Resources.Target + Resources.Temperature,
@@ -212,18 +212,29 @@ namespace DyeingComputer.ViewModel
Fill = null,
LineSmoothness = 0,
ScalesYAt = 0,
- }, //目标温度
+ }, //目标温度
+ new LineSeries
+ {
+ Name =Properties.Resources.MasterCylinder+Properties.Resources.WaterLevel,
+ 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
{
- Name = Properties.Resources.Temperature +"1("+Properties.Resources.MasterCylinder+")",
- Values = MTT_values,
- Stroke = new SolidColorPaint(s_blue, 2),
+ Name = Properties.Resources.MasterCylinder +"PH",
+ Values = MTH_values,
+ Stroke = new SolidColorPaint(s_yellow, 2),
GeometrySize = 0,
- GeometryStroke = new SolidColorPaint(s_blue, 2),
+ GeometryStroke = new SolidColorPaint(s_yellow, 2),
Fill = null,
LineSmoothness = 0,
- ScalesYAt = 0,
- }, //主缸
+ ScalesYAt = 2,
+ }, //PH
/*new LineSeries
{
Name = Properties.Resources.Temperature +"2("+Properties.Resources.MasterCylinder+Properties.Resources.Bottom+")",
@@ -237,7 +248,7 @@ namespace DyeingComputer.ViewModel
}, */ //缸底
new LineSeries
{
- 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
{
- 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
{
- 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,
@@ -267,18 +278,7 @@ namespace DyeingComputer.ViewModel
Fill = null,
LineSmoothness = 0,
ScalesYAt = 0,
- }, //附缸3
- new LineSeries
- {
- 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,
- }, //主缸液位
+ }, //附缸3
new LineSeries
{
Name = Properties.Resources.WaterLevel +"("+Resources.Medicine + Resources.Tank +"1)",
@@ -313,6 +313,7 @@ namespace DyeingComputer.ViewModel
ScalesYAt = 1,
}, //附缸3液位
};
+
}
}
}
diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs
index 40944c4..5b0e561 100644
--- a/ViewModel/MainWindowViewModel.cs
+++ b/ViewModel/MainWindowViewModel.cs
@@ -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)
diff --git a/Windows/ViewStep.xaml b/Windows/ViewStep.xaml
index a7ce84f..fb6b0a0 100644
--- a/Windows/ViewStep.xaml
+++ b/Windows/ViewStep.xaml
@@ -43,35 +43,35 @@
+ FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P1_TextChanged"/>
+ FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P2_TextChanged"/>
+ FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P3_TextChanged"/>
+ FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P4_TextChanged"/>
+ FontSize="20" HorizontalContentAlignment="Right" Visibility="Hidden" TextChanged="P5_TextChanged"/>
diff --git a/Windows/ViewStep.xaml.cs b/Windows/ViewStep.xaml.cs
index 1abb965..ab8a739 100644
--- a/Windows/ViewStep.xaml.cs
+++ b/Windows/ViewStep.xaml.cs
@@ -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)//确认
{