更改了CAN和LIN的标志着色问题
保存图片触发两次 CANLIN的一些数据回读到PLC
This commit is contained in:
@@ -532,7 +532,7 @@ namespace CapMachine.Wpf.Models.LightChart
|
||||
|
||||
//Reduce memory usage and increase performance. Destroys out-scrolled data.
|
||||
LgChart.ViewXY.DropOldSeriesData = false;
|
||||
|
||||
|
||||
//多个Y曲线摆放形式
|
||||
LgChart.ViewXY.AxisLayout.YAxesLayout = YAxesLayout.Layered;
|
||||
//网格带
|
||||
@@ -600,8 +600,8 @@ namespace CapMachine.Wpf.Models.LightChart
|
||||
//CursorValueDisplay.LocationScreenCoords.X = 1480;
|
||||
|
||||
//光标注释相对的位置 左上侧
|
||||
CursorValueDisplay.LocationScreenCoords.Y = 30;
|
||||
CursorValueDisplay.LocationScreenCoords.X = 250;
|
||||
CursorValueDisplay.LocationScreenCoords.Y = 35;
|
||||
CursorValueDisplay.LocationScreenCoords.X = 1380;
|
||||
|
||||
//CursorValueDisplay.TargetAxisValues.X = 0;
|
||||
//CursorValueDisplay.TargetAxisValues.Y = 0;
|
||||
@@ -693,7 +693,7 @@ namespace CapMachine.Wpf.Models.LightChart
|
||||
/// <exception cref="NotImplementedException"></exception>
|
||||
private void UpdateRecordData(RecordChannelData data)
|
||||
{
|
||||
|
||||
|
||||
|
||||
if (data.Data != null)
|
||||
{
|
||||
@@ -1462,6 +1462,7 @@ namespace CapMachine.Wpf.Models.LightChart
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
////当前是否是给自己的指令的信息
|
||||
//if (par.GroupTabIndex == CurSelectedGroupTabIndex)
|
||||
//{
|
||||
@@ -1518,9 +1519,20 @@ namespace CapMachine.Wpf.Models.LightChart
|
||||
|
||||
break;
|
||||
case "保存照片":
|
||||
|
||||
//只保存当前TabIndex的图片截图
|
||||
if (par.GroupTabIndex == CurSelectedGroupTabIndex)
|
||||
{
|
||||
//临时屏蔽状态,保存会执行两次
|
||||
if (ConfigService.ChartSavePageTempState)
|
||||
{
|
||||
ConfigService.ChartSavePageTempState = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var PicPath = GetFilePath();
|
||||
if (PicPath != null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user