图表问题修改
This commit is contained in:
commit
5798d8ba00
7 files changed
+112
-47
No files matched your search
@@ -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,
|
||||
@@ -212,18 +212,29 @@ namespace DyeingComputer.ViewModel
|
||||
Fill = null,
|
||||
LineSmoothness = 0,
|
||||
ScalesYAt = 0,
|
||||
}, //目标温度
|
||||
}, //目标温度
|
||||
new LineSeries<DateTimePoint>
|
||||
{
|
||||
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<DateTimePoint>
|
||||
{
|
||||
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<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,
|
||||
@@ -267,18 +278,7 @@ namespace DyeingComputer.ViewModel
|
||||
Fill = null,
|
||||
LineSmoothness = 0,
|
||||
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,
|
||||
}, //主缸液位
|
||||
}, //附缸3
|
||||
new LineSeries<DateTimePoint>
|
||||
{
|
||||
Name = Properties.Resources.WaterLevel +"("+Resources.Medicine + Resources.Tank +"1)",
|
||||
@@ -313,6 +313,7 @@ namespace DyeingComputer.ViewModel
|
||||
ScalesYAt = 1,
|
||||
}, //附缸3液位
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in new issue
Block a user