曲线图逻辑错误修改，模拟题添加信息
This commit is contained in:
sc committed
commit
70a9133f5e
5 files changed
+238
-113
No files matched your search
@@ -117,79 +117,73 @@ namespace DyeingComputer.ViewModel
|
||||
private List<DateTimePoint> STTC_values;
|
||||
private List<DateTimePoint> STLC_values;
|
||||
|
||||
private SQLiteHelper SQLiteHelpers = null; //定义数据库
|
||||
private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
|
||||
DataTable CDB = new DataTable();
|
||||
private int CDB_Count;//长度
|
||||
|
||||
public CurveDiagramViewModel()
|
||||
{
|
||||
if (MainWindowViewModel.WorkNumder.ToString() != "----------")
|
||||
CDB = MainWindow.SQLiteChartAdress.ExecuteDataSet("select * from Chart where Time > '" +
|
||||
DateTime.Now.AddHours(-6).ToString("yyyy/MM/dd HH:mm:ss") + "'order by Time", null).Tables[0];
|
||||
CDB_Count = CDB.Rows.Count;
|
||||
|
||||
var MTT_items = new List<DateTimePoint>();
|
||||
var MTL_items = new List<DateTimePoint>();
|
||||
var MTH_items = new List<DateTimePoint>();
|
||||
var MST_items = new List<DateTimePoint>();
|
||||
var MUT_items = new List<DateTimePoint>();
|
||||
var STTA_items = new List<DateTimePoint>();
|
||||
var STLA_items = new List<DateTimePoint>();
|
||||
var STTB_items = new List<DateTimePoint>();
|
||||
var STLB_items = new List<DateTimePoint>();
|
||||
var STTC_items = new List<DateTimePoint>();
|
||||
var STLC_items = new List<DateTimePoint>();
|
||||
for (var i = 0; i < CDB_Count; i=i+10)
|
||||
{
|
||||
SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
||||
SQLiteHelpers.Open(); //打开数据库
|
||||
CDB = SQLiteHelpers.ExecuteDataSet("select * from Chart where DYELOT = '" + MainWindowViewModel.WorkNumder + "'order by Time", null).Tables[0];
|
||||
SQLiteHelpers.Close();
|
||||
CDB_Count = CDB.Rows.Count;
|
||||
|
||||
var MTT_items = new List<DateTimePoint>();
|
||||
var MTL_items = new List<DateTimePoint>();
|
||||
var MTH_items = new List<DateTimePoint>();
|
||||
var MST_items = new List<DateTimePoint>();
|
||||
var MUT_items = new List<DateTimePoint>();
|
||||
var STTA_items = new List<DateTimePoint>();
|
||||
var STLA_items = new List<DateTimePoint>();
|
||||
var STTB_items = new List<DateTimePoint>();
|
||||
var STLB_items = new List<DateTimePoint>();
|
||||
var STTC_items = new List<DateTimePoint>();
|
||||
var STLC_items = new List<DateTimePoint>();
|
||||
for (var i = 0; i < CDB_Count; i++)
|
||||
{
|
||||
DateTime TIME = Convert.ToDateTime(CDB.Rows[i].Field<string>("Time"));
|
||||
MTT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTT")));
|
||||
MTL_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTL")));
|
||||
MTH_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTH")));
|
||||
MST_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MST")));
|
||||
MUT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MUT")));
|
||||
if (MainWindowViewModel.SM01 == 1)
|
||||
{
|
||||
STTA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTA")));
|
||||
STLA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLA")));
|
||||
}
|
||||
if (MainWindowViewModel.SM02 == 1)
|
||||
{
|
||||
STTB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTB")));
|
||||
STLB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLB")));
|
||||
}
|
||||
if (MainWindowViewModel.SM03 == 1)
|
||||
{
|
||||
STTC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTC")));
|
||||
STLC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLC")));
|
||||
}
|
||||
}
|
||||
|
||||
MTT_values = new List<DateTimePoint>(MTT_items);
|
||||
MTL_values = new List<DateTimePoint>(MTL_items);
|
||||
MTH_values = new List<DateTimePoint>(MTH_items);
|
||||
MST_values = new List<DateTimePoint>(MST_items);
|
||||
MUT_values = new List<DateTimePoint>(MUT_items);
|
||||
DateTime TIME = Convert.ToDateTime(CDB.Rows[i].Field<string>("Time"));
|
||||
MTT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTT")));
|
||||
MTL_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTL")));
|
||||
MTH_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MTH")));
|
||||
MST_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MST")));
|
||||
MUT_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("MUT")));
|
||||
if (MainWindowViewModel.SM01 == 1)
|
||||
{
|
||||
STTA_values = new List<DateTimePoint>(STTA_items);
|
||||
STLA_values = new List<DateTimePoint>(STLA_items);
|
||||
STTA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTA")));
|
||||
STLA_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLA")));
|
||||
}
|
||||
if (MainWindowViewModel.SM02 == 1)
|
||||
{
|
||||
STTB_values = new List<DateTimePoint>(STTB_items);
|
||||
STLB_values = new List<DateTimePoint>(STLB_items);
|
||||
STTB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTB")));
|
||||
STLB_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLB")));
|
||||
}
|
||||
if (MainWindowViewModel.SM03 == 1)
|
||||
{
|
||||
STTC_values = new List<DateTimePoint>(STTC_items);
|
||||
STLC_values = new List<DateTimePoint>(STLC_items);
|
||||
STTC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STTC")));
|
||||
STLC_items.Add(new DateTimePoint(TIME, CDB.Rows[i].Field<double>("STLC")));
|
||||
}
|
||||
Series = new ISeries[]
|
||||
{
|
||||
}
|
||||
|
||||
MTT_values = new List<DateTimePoint>(MTT_items);
|
||||
MTL_values = new List<DateTimePoint>(MTL_items);
|
||||
MTH_values = new List<DateTimePoint>(MTH_items);
|
||||
MST_values = new List<DateTimePoint>(MST_items);
|
||||
MUT_values = new List<DateTimePoint>(MUT_items);
|
||||
if (MainWindowViewModel.SM01 == 1)
|
||||
{
|
||||
STTA_values = new List<DateTimePoint>(STTA_items);
|
||||
STLA_values = new List<DateTimePoint>(STLA_items);
|
||||
}
|
||||
if (MainWindowViewModel.SM02 == 1)
|
||||
{
|
||||
STTB_values = new List<DateTimePoint>(STTB_items);
|
||||
STLB_values = new List<DateTimePoint>(STLB_items);
|
||||
}
|
||||
if (MainWindowViewModel.SM03 == 1)
|
||||
{
|
||||
STTC_values = new List<DateTimePoint>(STTC_items);
|
||||
STLC_values = new List<DateTimePoint>(STLC_items);
|
||||
}
|
||||
Series = new ISeries[]
|
||||
{
|
||||
new LineSeries<DateTimePoint>
|
||||
{
|
||||
Name = Properties.Resources.MasterCylinder+Properties.Resources.Temperature,
|
||||
@@ -212,16 +206,16 @@ namespace DyeingComputer.ViewModel
|
||||
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.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>
|
||||
{
|
||||
@@ -311,9 +305,8 @@ namespace DyeingComputer.ViewModel
|
||||
LineSmoothness = 0,
|
||||
ScalesYAt = 1,
|
||||
}, //附缸3液位
|
||||
};
|
||||
};
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -68,7 +68,7 @@ namespace DyeingComputer.ViewModel
|
||||
System.Windows.Media.Brush Status_Black = new SolidColorBrush() { Color = System.Windows.Media.Color.FromArgb(255, 0, 0, 0) };
|
||||
// private static SQLiteHelper SQLiteHelpers = null; //定义数据库
|
||||
//private readonly static string DBAddress = Environment.CurrentDirectory + "\\DataBase\\800COMPUTER.db"; //数据库路径
|
||||
private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
|
||||
// private readonly string ChartAdress = Environment.CurrentDirectory + "\\DataBase\\Chart.db"; //数据库路径
|
||||
private IniFile.IniFiles Configini = new IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "DyeingComputer.ini");
|
||||
private PID pid = new PID();
|
||||
public static DataTable errTabler = new DataTable();//错误表
|
||||
@@ -778,7 +778,7 @@ namespace DyeingComputer.ViewModel
|
||||
|
||||
//SQLiteHelpers = new SQLiteHelper(ChartAdress); //数据库连接路径
|
||||
//SQLiteHelpers.Open(); //打开数据库
|
||||
MainWindow.SQLiteHelpers.InsertData("Chart", Chart_new);// 执行插入
|
||||
MainWindow.SQLiteChartAdress.InsertData("Chart", Chart_new);// 执行插入
|
||||
//SQLiteHelpers.Close();
|
||||
}//历史记录
|
||||
|
||||
@@ -3630,10 +3630,10 @@ namespace DyeingComputer.ViewModel
|
||||
Updata_dtm("1014", (Convert.ToDouble(Selet_dta("4005")) + MS03) / 10);
|
||||
Updata_dta("5003", Convert.ToInt16(Selet_dtm("1020")));
|
||||
Updata_dta("5004", Convert.ToInt16(Selet_dtm("1021")));
|
||||
Updata_dta("5005", Convert.ToInt16(Selet_dtm("1022")));
|
||||
Updata_dta("5006", Convert.ToInt16(Selet_dtm("1023")));
|
||||
Updata_dta("5007", Convert.ToInt16(Selet_dtm("1024")));
|
||||
Updata_dta("5008", Convert.ToInt16(Selet_dtm("1041")));
|
||||
// Updata_dta("5005", Convert.ToInt16(Selet_dtm("1022")));
|
||||
// Updata_dta("5006", Convert.ToInt16(Selet_dtm("1023")));
|
||||
// Updata_dta("5007", Convert.ToInt16(Selet_dtm("1024")));
|
||||
Updata_dta("5008", Convert.ToInt16(Selet_dtm("1030")));
|
||||
Updata_dta("5009", Convert.ToInt16(Selet_dtm("1025")));
|
||||
Updata_dta("5010", Convert.ToInt16(Selet_dtm("1026")));
|
||||
Updata_dta("5011", Convert.ToInt16(Selet_dtm("1027")));
|
||||
|
||||
Reference in new issue
Block a user