From 4710e60dea97a9e98cedc11cea9954356a23f7a4 Mon Sep 17 00:00:00 2001 From: leomon Date: Thu, 29 Dec 2022 21:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OperationAanesthesia/DrawAnasReordBill.cs | 20 +- DrawGraph/AreaManage/DrugsManage.cs | 6 +- DrawGraph/AreaManage/InstrumentDataManage.cs | 24 +- DrawGraph/AreaManage/MonitorManage.cs | 4 +- DrawGraph/AreaManage/PhysioDataManage.cs | 8 +- DrawGraph/AreaManage/SapManage.cs | 6 +- DrawGraph/BoardPack/AbandonTablePackObj.cs | 8 +- DrawGraph/BoardPack/AbleEditPackObj.cs | 2 +- DrawGraph/BoardPack/BoxPackObj.cs | 2 +- DrawGraph/BoardPack/DottedLinePackObj.cs | 2 +- DrawGraph/BoardPack/DottedLinesPackObj.cs | 4 +- DrawGraph/BoardPack/ImagePackObj.cs | 2 +- DrawGraph/BoardPack/LinePackObj.cs | 2 +- DrawGraph/BoardPack/LinesPackObj.cs | 4 +- DrawGraph/BoardPack/RectangleFramePackObj.cs | 2 +- DrawGraph/BoardPack/RectanglePackObj.cs | 2 +- DrawGraph/BoardPack/TablePackObj.cs | 6 +- DrawGraph/BoardPack/TextPackObj.cs | 20 +- DrawGraph/DrawGraph.csproj | 25 - DrawGraph/GUtil/XmlUtil.cs | 512 ------------------ DrawGraph/Graph/Util.cs | 146 ----- DrawGraph/Graph/ZUtil.cs | 151 +++++- DrawGraph/Resources/Close.png | Bin 9662 -> 0 bytes DrawGraph/Resources/Dia.png | Bin 3735 -> 0 bytes DrawGraph/Resources/HR.png | Bin 3292 -> 0 bytes DrawGraph/Resources/Resp.png | Bin 3421 -> 0 bytes DrawGraph/Resources/SPO2f.png | Bin 2867 -> 0 bytes DrawGraph/Resources/Sys.png | Bin 3644 -> 0 bytes DrawGraph/Resources/T.png | Bin 3054 -> 0 bytes DrawGraph/Resources/Temp.png | Bin 3346 -> 0 bytes DrawGraph/Resources/TriangleDown.png | Bin 252 -> 0 bytes DrawGraph/Resources/cr.png | Bin 3152 -> 0 bytes DrawGraph/Resources/expand1.png | Bin 9662 -> 0 bytes DrawGraph/Resources/expand2.png | Bin 9662 -> 0 bytes DrawGraph/Resources/expand3.png | Bin 9662 -> 0 bytes DrawGraph/Resources/mb.png | Bin 3930 -> 0 bytes DrawGraph/Resources/ms.png | Bin 3640 -> 0 bytes DrawGraph/Resources/mz.png | Bin 416 -> 0 bytes DrawGraph/Resources/ok.png | Bin 1041 -> 0 bytes DrawGraph/Resources/pjy.png | Bin 3621 -> 0 bytes DrawGraph/Resources/sb.png | Bin 3488 -> 0 bytes DrawGraph/Resources/sb2.png | Bin 3546 -> 0 bytes DrawGraph/Resources/sb3.png | Bin 3456 -> 0 bytes DrawGraph/Resources/ss.png | Bin 9662 -> 0 bytes DrawGraph/Resources/ss1.png | Bin 369 -> 0 bytes 45 files changed, 185 insertions(+), 773 deletions(-) delete mode 100644 DrawGraph/GUtil/XmlUtil.cs delete mode 100644 DrawGraph/Graph/Util.cs delete mode 100644 DrawGraph/Resources/Close.png delete mode 100644 DrawGraph/Resources/Dia.png delete mode 100644 DrawGraph/Resources/HR.png delete mode 100644 DrawGraph/Resources/Resp.png delete mode 100644 DrawGraph/Resources/SPO2f.png delete mode 100644 DrawGraph/Resources/Sys.png delete mode 100644 DrawGraph/Resources/T.png delete mode 100644 DrawGraph/Resources/Temp.png delete mode 100644 DrawGraph/Resources/TriangleDown.png delete mode 100644 DrawGraph/Resources/cr.png delete mode 100644 DrawGraph/Resources/expand1.png delete mode 100644 DrawGraph/Resources/expand2.png delete mode 100644 DrawGraph/Resources/expand3.png delete mode 100644 DrawGraph/Resources/mb.png delete mode 100644 DrawGraph/Resources/ms.png delete mode 100644 DrawGraph/Resources/mz.png delete mode 100644 DrawGraph/Resources/ok.png delete mode 100644 DrawGraph/Resources/pjy.png delete mode 100644 DrawGraph/Resources/sb.png delete mode 100644 DrawGraph/Resources/sb2.png delete mode 100644 DrawGraph/Resources/sb3.png delete mode 100644 DrawGraph/Resources/ss.png delete mode 100644 DrawGraph/Resources/ss1.png diff --git a/AIMS/OperationAanesthesia/DrawAnasReordBill.cs b/AIMS/OperationAanesthesia/DrawAnasReordBill.cs index 81ef6c9..de397c0 100644 --- a/AIMS/OperationAanesthesia/DrawAnasReordBill.cs +++ b/AIMS/OperationAanesthesia/DrawAnasReordBill.cs @@ -27,8 +27,8 @@ namespace AIMS.OperationAanesthesia if (reVal) { templateManage.DrawArea(); - DrawGraph.Util.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.Util.Font16); - DrawGraph.Util.DrawText(" 麻醉记录单", 0.4, 0.04, Zgc, DrawGraph.Util.Font16); + DrawGraph.ZUtil.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.ZUtil.Font16); + DrawGraph.ZUtil.DrawText(" 麻醉记录单", 0.4, 0.04, Zgc, DrawGraph.ZUtil.Font16); #region 设置界面自适应 //在此处可随时设置板子的属性 @@ -78,8 +78,8 @@ namespace AIMS.OperationAanesthesia if (reVal) { templateManage.DrawArea(); - DrawGraph.Util.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.Util.Font16); - DrawGraph.Util.DrawText(" 恢复记录单", 0.4, 0.04, Zgc, DrawGraph.Util.Font16); + DrawGraph.ZUtil.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.ZUtil.Font16); + DrawGraph.ZUtil.DrawText(" 恢复记录单", 0.4, 0.04, Zgc, DrawGraph.ZUtil.Font16); #region 设置界面自适应 //在此处可随时设置板子的属性 @@ -166,8 +166,8 @@ namespace AIMS.OperationAanesthesia if (reVal) { templateManage.DrawArea(); - DrawGraph.Util.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.Util.Font16); - DrawGraph.Util.DrawText(" 器械清点单", 0.4, 0.04, Zgc, DrawGraph.Util.Font16); + DrawGraph.ZUtil.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.ZUtil.Font16); + DrawGraph.ZUtil.DrawText(" 器械清点单", 0.4, 0.04, Zgc, DrawGraph.ZUtil.Font16); templateManage.ZedControl.Width = templateManage.ZedControl.Parent.Width - 54; templateManage.ZedControl.Height = (templateManage.ZedControl.Parent.Width - 54) / 8 * 11; @@ -235,8 +235,8 @@ namespace AIMS.OperationAanesthesia if (reVal) { templateManage.DrawArea(); - DrawGraph.Util.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.Util.Font16); - DrawGraph.Util.DrawText(" 麻 醉 记 录", 0.42, 0.04, Zgc, DrawGraph.Util.Font14); + DrawGraph.ZUtil.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.018, Zgc, DrawGraph.ZUtil.Font16); + DrawGraph.ZUtil.DrawText(" 麻 醉 记 录", 0.42, 0.04, Zgc, DrawGraph.ZUtil.Font14); #region 设置界面自适应 //在此处可随时设置板子的属性 @@ -282,8 +282,8 @@ namespace AIMS.OperationAanesthesia if (reVal) { templateManage2.DrawArea(); - DrawGraph.Util.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.038, Zgc2, DrawGraph.Util.Font16); - DrawGraph.Util.DrawText(" 麻 醉 记 录", 0.42, 0.065, Zgc2, DrawGraph.Util.Font14); + DrawGraph.ZUtil.DrawText(AIMSExtension.PublicMethod.GetHospitalName(), 0.385, 0.038, Zgc2, DrawGraph.ZUtil.Font16); + DrawGraph.ZUtil.DrawText(" 麻 醉 记 录", 0.42, 0.065, Zgc2, DrawGraph.ZUtil.Font14); templateManage2.ZedControl.Width = templateManage.ZedControl.Width; templateManage2.ZedControl.Height = templateManage.ZedControl.Height; int LocationY = Convert.ToInt32(templateManage2.ZedControl.Height * 0.065); diff --git a/DrawGraph/AreaManage/DrugsManage.cs b/DrawGraph/AreaManage/DrugsManage.cs index 6641cfb..3c440d4 100644 --- a/DrawGraph/AreaManage/DrugsManage.cs +++ b/DrawGraph/AreaManage/DrugsManage.cs @@ -298,9 +298,9 @@ namespace DrawGraph { double height = getYPositionByListIndex(1, lines.RealY, lines.RealEndY, RowsCount) / 2; //double x = H3pack.RealX + 0.003f; - ZUtil.DrawLine(x, zhuy + height, x, y + height, ZedControl, "zhuyDrugs" + temp.Id, Color.Red); - ZUtil.DrawLine(x, zhuy + height, x + 0.0055f, zhuy + height, ZedControl, "zhuyDrugstop" + temp.Id, Color.Red); - ZUtil.DrawLine(x, y + height, x + 0.0055f, y + height, ZedControl, "zhuyDrugsend" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, zhuy + height, x, y + height, ZedControl, "zhuyDrugs" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, zhuy + height, x + 0.0055f, zhuy + height, ZedControl, "zhuyDrugstop" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, y + height, x + 0.0055f, y + height, ZedControl, "zhuyDrugsend" + temp.Id, Color.Red); } private void SetDrug(FactDrug temp, DateTime curTimeTemp, double y) { diff --git a/DrawGraph/AreaManage/InstrumentDataManage.cs b/DrawGraph/AreaManage/InstrumentDataManage.cs index 5fc038d..5c26a66 100644 --- a/DrawGraph/AreaManage/InstrumentDataManage.cs +++ b/DrawGraph/AreaManage/InstrumentDataManage.cs @@ -85,30 +85,30 @@ namespace DrawGraph if (index < ApplianceRecordList.Count) ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1(tablePackObj.X + tablePackObj.RealX, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordList" + index, Color.Black); + ZUtil.DrawLine(tablePackObj.X + tablePackObj.RealX, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordList" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "" && ApplianceRecordList[index].OpeFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeFront, tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1(tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); + ZUtil.DrawLine(tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "" && ApplianceRecordList[index].OpeDoing != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeDoing, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); + ZUtil.DrawLine((tablePackObj1.EndX - tablePackObj1.X) / Columns * 1 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "" && ApplianceRecordList[index].CloseFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseFront, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); + ZUtil.DrawLine((tablePackObj1.EndX - tablePackObj1.X) / Columns * 2 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "" && ApplianceRecordList[index].CloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseLast, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); + ZUtil.DrawLine((tablePackObj1.EndX - tablePackObj1.X) / Columns * 3 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); if (Columns == 5) if (index < ApplianceRecordList.Count && ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "" && ApplianceRecordList[index].SkinCloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 5 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); + ZUtil.DrawLine((tablePackObj1.EndX - tablePackObj1.X) / Columns * 4 + tablePackObj1.X + span, y + chaY, (tablePackObj1.EndX - tablePackObj1.X) / Columns * 5 + tablePackObj1.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); continue; //} @@ -121,30 +121,30 @@ namespace DrawGraph if (index < ApplianceRecordList.Count) ZUtil.DrawText(ApplianceRecordList[index].ApplianceName, (tablePackObj.EndX - tablePackObj.X) / 2 + tablePackObj.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordList" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj.EndX - tablePackObj.X) / 2 + tablePackObj.X + tablePackObj.RealX, y + chaY, tablePackObj2.X + span, y, ZedControl, "ApplianceRecordList" + index, Color.Black); + ZUtil.DrawLine((tablePackObj.EndX - tablePackObj.X) / 2 + tablePackObj.X + tablePackObj.RealX, y + chaY, tablePackObj2.X + span, y, ZedControl, "ApplianceRecordList" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].OpeFront != null && ApplianceRecordList[index].OpeFront != "" && ApplianceRecordList[index].OpeFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeFront, tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1(tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); + ZUtil.DrawLine(tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeFront" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].OpeDoing != null && ApplianceRecordList[index].OpeDoing != "" && ApplianceRecordList[index].OpeDoing != @"/") ZUtil.DrawText(ApplianceRecordList[index].OpeDoing, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); + ZUtil.DrawLine((tablePackObj2.EndX - tablePackObj2.X) / Columns * 1 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListOpeDoing" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].CloseFront != null && ApplianceRecordList[index].CloseFront != "" && ApplianceRecordList[index].CloseFront != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseFront, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); + ZUtil.DrawLine((tablePackObj2.EndX - tablePackObj2.X) / Columns * 2 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseFront" + index, Color.Black); if (index < ApplianceRecordList.Count && ApplianceRecordList[index].CloseLast != null && ApplianceRecordList[index].CloseLast != "" && ApplianceRecordList[index].CloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].CloseLast, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); + ZUtil.DrawLine((tablePackObj2.EndX - tablePackObj2.X) / Columns * 3 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListCloseLast" + index, Color.Black); if (Columns == 5) if (index < ApplianceRecordList.Count && ApplianceRecordList[index].SkinCloseLast != null && ApplianceRecordList[index].SkinCloseLast != "" && ApplianceRecordList[index].SkinCloseLast != @"/") ZUtil.DrawText(ApplianceRecordList[index].SkinCloseLast, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + tablePackObj.RealX, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black, fontsize, false); else - ZUtil.DrawLine1((tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 5 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); + ZUtil.DrawLine((tablePackObj2.EndX - tablePackObj2.X) / Columns * 4 + tablePackObj2.X + span, y + chaY, (tablePackObj2.EndX - tablePackObj2.X) / Columns * 5 + tablePackObj2.X + span, y, ZedControl, "ApplianceRecordListSkinCloseLast" + index, Color.Black); continue; //} diff --git a/DrawGraph/AreaManage/MonitorManage.cs b/DrawGraph/AreaManage/MonitorManage.cs index f7a321a..65761b9 100644 --- a/DrawGraph/AreaManage/MonitorManage.cs +++ b/DrawGraph/AreaManage/MonitorManage.cs @@ -90,7 +90,7 @@ namespace DrawGraph { pan.Controls.Clear(); int Width = pan.Width; - int Height = pan.Height / 3; + int Height = pan.Height / 4; List panPanels = new List(); //循环加载数值生命体征 for (int x = 0; x < myOpeRecord.PhysioConfigList.Count; x++) @@ -164,7 +164,7 @@ namespace DrawGraph } panPanels.Add(panel); } - for (int i = 2; i >= 0; i--) + for (int i = 3; i >= 0; i--) { pan.Controls.Add(panPanels[i]); } diff --git a/DrawGraph/AreaManage/PhysioDataManage.cs b/DrawGraph/AreaManage/PhysioDataManage.cs index 1963b92..3e50c2f 100644 --- a/DrawGraph/AreaManage/PhysioDataManage.cs +++ b/DrawGraph/AreaManage/PhysioDataManage.cs @@ -556,7 +556,7 @@ namespace DrawGraph } pp.ClearTagstr(ZedControl); //如果模板管理不为空 - if (pack != null && rowNum < 4 && pp.ShowText == true) + if (pack != null && rowNum < 5 && pp.ShowText == true) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname, 5.5f); @@ -602,7 +602,7 @@ namespace DrawGraph pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); - if (rowNum < 4) + if (rowNum < 5) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname + pp.Id, 5.5f); @@ -669,7 +669,7 @@ namespace DrawGraph myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); //如果模板管理不为空 - if (pack != null && rowNum < 4 && pp.ShowText == true) + if (pack != null && rowNum < 5 && pp.ShowText == true) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname, 5.5f); @@ -695,7 +695,7 @@ namespace DrawGraph pp.setAnasArr(ZedControl, chartPack.RealX, chartPack.RealEndX, myOpeRecord.pageBegin, myOpeRecord.pageBegin.AddMinutes(EVERY_PAGE_TIME_SPAN)); pp.ClearTagstr(ZedControl); - if (pp.ShowText == true && rowNum < 4) + if (pp.ShowText == true && rowNum < 5) { double y = pack.RealY + getYPositionByListIndex(YRows, pack.RealY, pack.RealEndY, RowsCount); ZUtil.DrawText(pp.Name, pack.RealX, y, ZedControl, "PP" + pp.Enname + pp.Id, 5.5f); diff --git a/DrawGraph/AreaManage/SapManage.cs b/DrawGraph/AreaManage/SapManage.cs index f494f33..638c2d0 100644 --- a/DrawGraph/AreaManage/SapManage.cs +++ b/DrawGraph/AreaManage/SapManage.cs @@ -276,9 +276,9 @@ namespace DrawGraph { double height = getYPositionByListIndex(1, sapPpack.RealY, sapPpack.RealEndY, RowsCount) / 2; //double x = H3pack.RealX + 0.003f; - ZUtil.DrawLine(x, zhuy + height, x, y + height, ZedControl, "zhuyDrugs" + temp.Id, Color.Red); - ZUtil.DrawLine(x, zhuy + height, x + 0.0055f, zhuy + height, ZedControl, "zhuyDrugstop" + temp.Id, Color.Red); - ZUtil.DrawLine(x, y + height, x + 0.0055f, y + height, ZedControl, "zhuyDrugsend" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, zhuy + height, x, y + height, ZedControl, "zhuyDrugs" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, zhuy + height, x + 0.0055f, zhuy + height, ZedControl, "zhuyDrugstop" + temp.Id, Color.Red); + ZUtil.DrawLine2(x, y + height, x + 0.0055f, y + height, ZedControl, "zhuyDrugsend" + temp.Id, Color.Red); } private void SetDrug(FactDrug temp, DateTime curTimeTemp, double y) { diff --git a/DrawGraph/BoardPack/AbandonTablePackObj.cs b/DrawGraph/BoardPack/AbandonTablePackObj.cs index 8159706..cc35b99 100644 --- a/DrawGraph/BoardPack/AbandonTablePackObj.cs +++ b/DrawGraph/BoardPack/AbandonTablePackObj.cs @@ -171,19 +171,19 @@ namespace DrawGraph } boxObj.Fill.IsVisible = false; boxObj.ZOrder = ZOrder.B_BehindLegend; - Util.DrawBox(boxObj, this.baseZed); + ZUtil.DrawBox(boxObj, this.baseZed); int num3 = 1; while ((long)num3 < (long)((ulong)this.rows)) { float num4 = this.RealStartY + (float)num3 * ((this.RealEndY - this.RealStartY) / this.rows); - Util.DrawLine((double)this.RealStartX, (double)num4, (double)this.RealEndX, (double)num4, this.baseZed, base.PackTag + "-" + num3.ToString(), boxObj.Border.Color); + ZUtil.DrawLine((double)this.RealStartX, (double)num4, (double)this.RealEndX, (double)num4, this.baseZed, base.PackTag + "-" + num3.ToString(), boxObj.Border.Color); num3++; } int num5 = 1; while ((long)num5 < (long)((ulong)this.columns)) { float num6 = this.RealStartX + (float)num5 * ((this.RealEndX - this.RealStartX) / this.columns); - Util.DrawLine((double)num6, (double)this.RealStartY, (double)num6, (double)this.RealEndY, this.baseZed, base.PackTag + "-" + num5.ToString(), boxObj.Border.Color); + ZUtil.DrawLine((double)num6, (double)this.RealStartY, (double)num6, (double)this.RealEndY, this.baseZed, base.PackTag + "-" + num5.ToString(), boxObj.Border.Color); num5++; } int num7 = 0; @@ -196,7 +196,7 @@ namespace DrawGraph float num10 = this.RealStartY + (float)(num7 + 1) * ((this.RealEndY - this.RealStartY) / this.rows); float num11 = this.RealStartX + (float)(num8 + 1) * ((this.RealEndX - this.RealStartX) / this.columns); float num12 = this.RealStartY + (float)num7 * ((this.RealEndY - this.RealStartY) / this.rows); - Util.DrawLine((double)num9, (double)num10, (double)num11, (double)num12, this.baseZed, base.PackTag + "-" + ((num7 + 1) * (num8 + 1)).ToString(), boxObj.Border.Color); + ZUtil.DrawLine((double)num9, (double)num10, (double)num11, (double)num12, this.baseZed, base.PackTag + "-" + ((num7 + 1) * (num8 + 1)).ToString(), boxObj.Border.Color); num8++; } num7++; diff --git a/DrawGraph/BoardPack/AbleEditPackObj.cs b/DrawGraph/BoardPack/AbleEditPackObj.cs index bfc9edf..f17819b 100644 --- a/DrawGraph/BoardPack/AbleEditPackObj.cs +++ b/DrawGraph/BoardPack/AbleEditPackObj.cs @@ -409,7 +409,7 @@ namespace DrawGraph FileStream fileStream = new FileStream(text, FileMode.Open, FileAccess.Read); Image image = Image.FromStream(fileStream); fileStream.Close(); - Util.DrawImage(new ImageObj(image, (double)base.RealX, (double)base.RealY, (double)(base.RealEndX - base.RealX), (double)(base.RealEndY - base.RealY)) + ZUtil.DrawImage(new ImageObj(image, (double)base.RealX, (double)base.RealY, (double)(base.RealEndX - base.RealX), (double)(base.RealEndY - base.RealY)) { IsVisible = true, ZOrder = ZOrder.A_InFront, diff --git a/DrawGraph/BoardPack/BoxPackObj.cs b/DrawGraph/BoardPack/BoxPackObj.cs index f458cf2..187dc9b 100644 --- a/DrawGraph/BoardPack/BoxPackObj.cs +++ b/DrawGraph/BoardPack/BoxPackObj.cs @@ -75,7 +75,7 @@ namespace DrawGraph boxObj.Fill.IsVisible = true; boxObj.Fill.Color = this.FillColor; boxObj.ZOrder = ZOrder.B_BehindLegend; - Util.DrawBox(boxObj, this.baseZed); + ZUtil.DrawBox(boxObj, this.baseZed); base.Refresh(); } } diff --git a/DrawGraph/BoardPack/DottedLinePackObj.cs b/DrawGraph/BoardPack/DottedLinePackObj.cs index 09d62c9..b37e3fc 100644 --- a/DrawGraph/BoardPack/DottedLinePackObj.cs +++ b/DrawGraph/BoardPack/DottedLinePackObj.cs @@ -43,7 +43,7 @@ namespace DrawGraph { red = Color.Red; } - Util.DrawLine((double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY, this.baseZed, base.PackTag, red, DashStyle.Dot); + ZUtil.DrawLine((double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY, this.baseZed, base.PackTag, red, DashStyle.Dot); base.Refresh(); } } diff --git a/DrawGraph/BoardPack/DottedLinesPackObj.cs b/DrawGraph/BoardPack/DottedLinesPackObj.cs index 790706d..bd018cf 100644 --- a/DrawGraph/BoardPack/DottedLinesPackObj.cs +++ b/DrawGraph/BoardPack/DottedLinesPackObj.cs @@ -135,7 +135,7 @@ namespace DrawGraph bool flag5 = i < this.lineCount - 1; if (flag5) { - Util.DrawLine((double)num, (double)base.RealY, (double)num, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + i.ToString(), red, DashStyle.Dot); + ZUtil.DrawLine((double)num, (double)base.RealY, (double)num, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + i.ToString(), red, DashStyle.Dot); } } else @@ -147,7 +147,7 @@ namespace DrawGraph bool flag7 = i < this.lineCount - 1; if (flag7) { - Util.DrawLine((double)base.RealX, (double)num2, (double)base.RealEndX, (double)num2, this.baseZed, base.PackTag + "-" + i.ToString(), red, DashStyle.Dot); + ZUtil.DrawLine((double)base.RealX, (double)num2, (double)base.RealEndX, (double)num2, this.baseZed, base.PackTag + "-" + i.ToString(), red, DashStyle.Dot); } } } diff --git a/DrawGraph/BoardPack/ImagePackObj.cs b/DrawGraph/BoardPack/ImagePackObj.cs index 78de393..d8a4dda 100644 --- a/DrawGraph/BoardPack/ImagePackObj.cs +++ b/DrawGraph/BoardPack/ImagePackObj.cs @@ -66,7 +66,7 @@ namespace DrawGraph bool flag3 = this.img == null; if (!flag3) { - Util.DrawImage(new ImageObj(this.img, (double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY) + ZUtil.DrawImage(new ImageObj(this.img, (double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY) { IsVisible = true, ZOrder = ZOrder.A_InFront, diff --git a/DrawGraph/BoardPack/LinePackObj.cs b/DrawGraph/BoardPack/LinePackObj.cs index 88b1d35..8f9a603 100644 --- a/DrawGraph/BoardPack/LinePackObj.cs +++ b/DrawGraph/BoardPack/LinePackObj.cs @@ -58,7 +58,7 @@ namespace DrawGraph { red = Color.Red; } - Util.DrawLineWidth((double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY, this.baseZed, base.PackTag, red, this.LineWidth); + ZUtil.DrawLineWidth((double)base.RealX, (double)base.RealY, (double)base.RealEndX, (double)base.RealEndY, this.baseZed, base.PackTag, red, this.LineWidth); base.Refresh(); } } diff --git a/DrawGraph/BoardPack/LinesPackObj.cs b/DrawGraph/BoardPack/LinesPackObj.cs index c4152e9..25d40e3 100644 --- a/DrawGraph/BoardPack/LinesPackObj.cs +++ b/DrawGraph/BoardPack/LinesPackObj.cs @@ -149,7 +149,7 @@ namespace DrawGraph bool flag5 = i < this.lineCount - 1; if (flag5) { - Util.DrawLineWidth((double)num, (double)base.RealY, (double)num, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + i.ToString(), red, this.LineWidth); + ZUtil.DrawLineWidth((double)num, (double)base.RealY, (double)num, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + i.ToString(), red, this.LineWidth); } } else @@ -161,7 +161,7 @@ namespace DrawGraph bool flag7 = i < this.lineCount - 1; if (flag7) { - Util.DrawLineWidth((double)base.RealX, (double)num2, (double)base.RealEndX, (double)num2, this.baseZed, base.PackTag + "-" + i.ToString(), red, this.LineWidth); + ZUtil.DrawLineWidth((double)base.RealX, (double)num2, (double)base.RealEndX, (double)num2, this.baseZed, base.PackTag + "-" + i.ToString(), red, this.LineWidth); } } } diff --git a/DrawGraph/BoardPack/RectangleFramePackObj.cs b/DrawGraph/BoardPack/RectangleFramePackObj.cs index 4f6ffa8..24c8819 100644 --- a/DrawGraph/BoardPack/RectangleFramePackObj.cs +++ b/DrawGraph/BoardPack/RectangleFramePackObj.cs @@ -73,7 +73,7 @@ namespace DrawGraph } boxObj.Fill.IsVisible = false; boxObj.ZOrder = ZOrder.B_BehindLegend; - Util.DrawBox(boxObj, this.baseZed); + ZUtil.DrawBox(boxObj, this.baseZed); base.Refresh(); } } diff --git a/DrawGraph/BoardPack/RectanglePackObj.cs b/DrawGraph/BoardPack/RectanglePackObj.cs index ae035e1..b19c134 100644 --- a/DrawGraph/BoardPack/RectanglePackObj.cs +++ b/DrawGraph/BoardPack/RectanglePackObj.cs @@ -75,7 +75,7 @@ namespace DrawGraph boxObj.Fill.IsVisible = true; boxObj.Fill.Color = this.FillColor; boxObj.ZOrder = ZOrder.B_BehindLegend; - Util.DrawBox(boxObj, this.baseZed); + ZUtil.DrawBox(boxObj, this.baseZed); base.Refresh(); } } diff --git a/DrawGraph/BoardPack/TablePackObj.cs b/DrawGraph/BoardPack/TablePackObj.cs index 793e89e..8f4942e 100644 --- a/DrawGraph/BoardPack/TablePackObj.cs +++ b/DrawGraph/BoardPack/TablePackObj.cs @@ -101,19 +101,19 @@ namespace DrawGraph } boxObj.Fill.IsVisible = false; boxObj.ZOrder = ZOrder.B_BehindLegend; - Util.DrawBox(boxObj, this.baseZed); + ZUtil.DrawBox(boxObj, this.baseZed); int num3 = 1; while ((long)num3 < (long)((ulong)this.rows)) { float num4 = base.RealY + (float)num3 * ((base.RealEndY - base.RealY) / this.rows); - Util.DrawLine((double)base.RealX, (double)num4, (double)base.RealEndX, (double)num4, this.baseZed, base.PackTag + "-" + num3.ToString(), boxObj.Border.Color); + ZUtil.DrawLine((double)base.RealX, (double)num4, (double)base.RealEndX, (double)num4, this.baseZed, base.PackTag + "-" + num3.ToString(), boxObj.Border.Color); num3++; } int num5 = 1; while ((long)num5 < (long)((ulong)this.columns)) { float num6 = base.RealX + (float)num5 * ((base.RealEndX - base.RealX) / this.columns); - Util.DrawLine((double)num6, (double)base.RealY, (double)num6, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + num5.ToString(), boxObj.Border.Color); + ZUtil.DrawLine((double)num6, (double)base.RealY, (double)num6, (double)base.RealEndY, this.baseZed, base.PackTag + "-" + num5.ToString(), boxObj.Border.Color); num5++; } base.Refresh(); diff --git a/DrawGraph/BoardPack/TextPackObj.cs b/DrawGraph/BoardPack/TextPackObj.cs index 77325d1..70984fc 100644 --- a/DrawGraph/BoardPack/TextPackObj.cs +++ b/DrawGraph/BoardPack/TextPackObj.cs @@ -296,9 +296,9 @@ namespace DrawGraph { base.PackText = base.PackText.Replace("\r", "\u3000").Replace("\n", "\u3000"); TextObj textObj = this.CreateTextObj(base.PackText, base.PackTag); - Util.DrawText(textObj, this.baseZed); - this.width = Util.GetColWidthFraction(textObj, this.baseZed); - this.height = Util.GetColHeightFraction(textObj, this.baseZed); + ZUtil.DrawText(textObj, this.baseZed); + this.width = ZUtil.GetColWidthFraction(textObj, this.baseZed); + this.height = ZUtil.GetColHeightFraction(textObj, this.baseZed); base.EndX = base.X + this.width; base.EndY = base.Y + this.height; } @@ -326,12 +326,12 @@ namespace DrawGraph TextObj textObj2 = this.CreateTextObj(text, base.PackTag + "_" + i.ToString()); try { - float colHeightFraction = Util.GetColHeightFraction(textObj2, this.baseZed); + float colHeightFraction = ZUtil.GetColHeightFraction(textObj2, this.baseZed); bool flag5 = i == 0 && base.X == base.EndX; if (flag5) { - this.width = Util.GetColWidthFraction(textObj2, this.baseZed); - this.height = Util.GetColHeightFraction(textObj2, this.baseZed); + this.width = ZUtil.GetColWidthFraction(textObj2, this.baseZed); + this.height = ZUtil.GetColHeightFraction(textObj2, this.baseZed); } this.height = (float)num - base.RealY + colHeightFraction; bool flag6 = base.X == base.EndX; @@ -346,7 +346,7 @@ namespace DrawGraph } textObj2.Location.X = (double)base.RealX; textObj2.Location.Y = num; - Util.DrawText(textObj2, this.baseZed); + ZUtil.DrawText(textObj2, this.baseZed); } } } @@ -373,9 +373,9 @@ namespace DrawGraph return result; } TextObj text2 = this.CreateTextObj(text.Substring(0, num3), base.PackTag); - float colWidthFraction = Util.GetColWidthFraction(text2, this.baseZed); + float colWidthFraction = ZUtil.GetColWidthFraction(text2, this.baseZed); TextObj text3 = this.CreateTextObj(text.Substring(0, num3 + 1), base.PackTag); - float colWidthFraction2 = Util.GetColWidthFraction(text3, this.baseZed); + float colWidthFraction2 = ZUtil.GetColWidthFraction(text3, this.baseZed); float num4 = base.RealEndX - base.RealX + 0.0002f; bool flag3 = colWidthFraction <= num4 && colWidthFraction2 > num4; if (flag3) @@ -437,7 +437,7 @@ namespace DrawGraph float num = base.RealY + (float)i * this.RowSpan; TextObj textObj = this.CreateTextObj(text, base.PackTag + "_" + i.ToString()); textObj.Location = new Location((double)base.RealX, (double)num, CoordType.PaneFraction); - Util.DrawText(textObj, this.baseZed); + ZUtil.DrawText(textObj, this.baseZed); } } } diff --git a/DrawGraph/DrawGraph.csproj b/DrawGraph/DrawGraph.csproj index aedaf63..8a3a0f1 100644 --- a/DrawGraph/DrawGraph.csproj +++ b/DrawGraph/DrawGraph.csproj @@ -201,7 +201,6 @@ - @@ -220,7 +219,6 @@ - @@ -281,45 +279,22 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/DrawGraph/GUtil/XmlUtil.cs b/DrawGraph/GUtil/XmlUtil.cs deleted file mode 100644 index b333ca3..0000000 --- a/DrawGraph/GUtil/XmlUtil.cs +++ /dev/null @@ -1,512 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Xml; - -namespace DrawGraph -{ - public class XmlUtil - { - private XmlDocument _document = new XmlDocument(); - - private string _xmlPath; - - private string _nodePath; - - public string XmlPath - { - get - { - return this._xmlPath; - } - set - { - this._xmlPath = value; - } - } - - public string NodePath - { - get - { - return this._nodePath; - } - set - { - this._nodePath = value; - } - } - - public XmlUtil(string xmlPath, string nodePath) - { - this._xmlPath = xmlPath; - this._nodePath = nodePath; - this._document.Load(xmlPath); - } - - public XmlUtil(string xmlPath) - { - this._xmlPath = xmlPath; - this._document.Load(xmlPath); - } - - public string Out() - { - return this._document.OuterXml; - } - - public List GetNode(string nodeName) - { - List result; - try - { - List list = new List(); - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(nodeName); - foreach (XmlNode xmlNode in elementsByTagName) - { - list.Add(xmlNode.InnerText); - } - result = list; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public List GetNode(string path, string nodeName) - { - List result; - try - { - List list = new List(); - XmlNodeList xmlNodeList = this._document.SelectNodes(path); - foreach (XmlNode xmlNode in xmlNodeList) - { - list.Add(xmlNode[nodeName].InnerText); - } - result = list; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public List> GetNodePair(string path, string nodeName, string nodeName2) - { - List> result; - try - { - List> list = new List>(); - XmlNodeList xmlNodeList = this._document.SelectNodes(path); - if (xmlNodeList != null) - { - foreach (XmlNode xmlNode in xmlNodeList) - { - XmlElement xmlElement = xmlNode[nodeName]; - if (xmlElement != null) - { - XmlElement xmlElement2 = xmlNode[nodeName2]; - if (xmlElement2 != null) - { - list.Add(new KeyValuePair(xmlElement.InnerText, xmlElement2.InnerText)); - } - } - } - } - result = list; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public string GetNode(int i, int j, string path) - { - string innerText; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(path); - innerText = xmlNodeList[i].ChildNodes[j].InnerText; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return innerText; - } - - public string GetNode(int i, int j) - { - string innerText; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(this._nodePath); - innerText = xmlNodeList[i].ChildNodes[j].InnerText; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return innerText; - } - - public string GetNode(int i, string nodePath, string nodeName) - { - string result; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(nodePath); - for (int j = 0; j <= xmlNodeList[i].ChildNodes.Count; j++) - { - if (xmlNodeList[i].ChildNodes[j].Name.Equals(nodeName)) - { - result = xmlNodeList[i].ChildNodes[j].InnerText; - return result; - } - } - result = "nofind"; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public string GetNode(string uncleName, string uncleValue, string nodePath, string parentName, string nodeName) - { - string result; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(nodePath); - for (int i = 0; i < xmlNodeList.Count; i++) - { - XmlElement xmlElement = (XmlElement)xmlNodeList[i]; - if (xmlElement.GetElementsByTagName(uncleName)[0].InnerText.Equals(uncleValue)) - { - result = (xmlElement.GetElementsByTagName(parentName)[0] as XmlElement).GetElementsByTagName(nodeName)[0].InnerText; - return result; - } - } - result = ""; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public string GetNode(string siblingName, string siblingValue, string nodePath, string nodeName) - { - string result; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(nodePath); - for (int i = 0; i < xmlNodeList.Count; i++) - { - XmlElement xmlElement = (XmlElement)xmlNodeList[i]; - string innerText = xmlElement.GetElementsByTagName(siblingName)[0].InnerText; - if (innerText.Equals(siblingValue)) - { - result = xmlElement.GetElementsByTagName(nodeName)[0].InnerText; - return result; - } - } - result = ""; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public string GetNode(int i, string nodeName) - { - string result; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(this._nodePath); - for (int j = 0; j <= xmlNodeList[i].ChildNodes.Count; j++) - { - if (xmlNodeList[i].ChildNodes[j].Name.Equals(nodeName)) - { - result = xmlNodeList[i].ChildNodes[j].InnerText; - return result; - } - } - result = "nofind"; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public int Count(string nodeName) - { - int count; - try - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(nodeName); - count = elementsByTagName.Count; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return count; - } - - public int Count() - { - int count; - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(this._nodePath); - count = xmlNodeList.Count; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return count; - } - - public int CountChilds(int i, string nodeName) - { - int result; - try - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(nodeName); - if (elementsByTagName.Count > 0) - { - result = elementsByTagName[i].ChildNodes.Count; - } - else - { - result = 0; - } - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public int CountChilds(string nodeName) - { - int result; - try - { - int num = 0; - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(nodeName); - if (elementsByTagName.Count > 0) - { - for (int i = 0; i < elementsByTagName.Count; i++) - { - num += elementsByTagName[i].ChildNodes.Count; - } - result = num; - } - else - { - result = 0; - } - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return result; - } - - public int SetNode(string nodeName, string newValue) - { - int count; - try - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(nodeName); - foreach (XmlNode xmlNode in elementsByTagName) - { - xmlNode.InnerText = newValue; - } - this._document.Save(this._xmlPath); - count = elementsByTagName.Count; - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - return count; - } - - public void SetNode(int i, string nodePath, string nodeName, string newValue) - { - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(nodePath); - if (xmlNodeList.Count <= 0 || xmlNodeList.Count <= i) - { - throw new Exception("并无此子集"); - } - for (int j = 0; j < xmlNodeList.Item(i).ChildNodes.Count; j++) - { - if (xmlNodeList[i].ChildNodes[j].Name == nodeName) - { - xmlNodeList[i].ChildNodes[j].InnerText = newValue; - } - } - this._document.Save(this._xmlPath); - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - } - - public void SetNode(int i, string nodeName, string newValue) - { - try - { - XmlNodeList xmlNodeList = this._document.SelectNodes(this._nodePath); - if (xmlNodeList.Count > 0 && xmlNodeList.Count > i) - { - for (int j = 0; j < xmlNodeList.Item(i).ChildNodes.Count; j++) - { - if (xmlNodeList.Item(i).ChildNodes.Item(j).Name == nodeName) - { - xmlNodeList.Item(i).ChildNodes.Item(j).InnerText = newValue; - } - } - this._document.Save(this._xmlPath); - } - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - } - - public void InsetNode(string parentName, string nodeName, string nodeVale) - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(parentName); - for (int i = 0; i < elementsByTagName.Count; i++) - { - XmlElement xmlElement = this._document.CreateElement(nodeName); - elementsByTagName.Item(i).AppendChild(xmlElement); - xmlElement.InnerText = nodeVale; - } - this._document.Save(this._xmlPath); - } - - public void InsetNode(int i, string parentName, string nodeName, string nodeValue) - { - try - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(parentName); - XmlElement xmlElement = this._document.CreateElement(nodeName); - if (elementsByTagName.Count <= 0) - { - throw new Exception("无此节点"); - } - elementsByTagName[i - 1].AppendChild(xmlElement); - xmlElement.InnerText = nodeValue; - this._document.Save(this._xmlPath); - } - catch (Exception ex) - { - throw new Exception(ex.Message); - } - } - - public void InsertRootNode(string rootName, string[] nodeName, string[] nodeValue) - { - XmlElement documentElement = this._document.DocumentElement; - XmlElement xmlElement = this._document.CreateElement(rootName); - documentElement.AppendChild(xmlElement); - for (int i = 0; i < nodeName.Length; i++) - { - XmlElement xmlElement2 = this._document.CreateElement(nodeName[i]); - xmlElement.AppendChild(xmlElement2); - xmlElement2.InnerText = nodeValue[i]; - } - this._document.Save(this._xmlPath); - } - - public void InsertNode(string nodePath, string parentName, string[] nodeName, string[] nodeValue) - { - XmlNodeList xmlNodeList = this._document.SelectNodes(nodePath); - XmlElement xmlElement = this._document.CreateElement(parentName); - xmlNodeList[0].AppendChild(xmlElement); - for (int i = 0; i < nodeName.Length; i++) - { - XmlElement xmlElement2 = this._document.CreateElement(nodeName[i]); - xmlElement2.InnerText = nodeValue[i]; - xmlElement.AppendChild(xmlElement2); - } - this._document.Save(this._xmlPath); - } - - public void DeleteNode(string parentName, string nodeName) - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(parentName); - foreach (XmlNode xmlNode in elementsByTagName) - { - foreach (XmlNode xmlNode2 in xmlNode.ChildNodes) - { - if (xmlNode2.Name == nodeName) - { - xmlNode.RemoveChild(xmlNode2); - } - } - } - this._document.Save(this._xmlPath); - } - - public void DeleteNode(string parentName) - { - XmlNodeList elementsByTagName = this._document.GetElementsByTagName(parentName); - foreach (XmlNode xmlNode in elementsByTagName) - { - xmlNode.RemoveAll(); - } - this._document.Save(this._xmlPath); - } - - public void DeleteAll() - { - XmlElement documentElement = this._document.DocumentElement; - documentElement.RemoveAll(); - this._document.Save(this._xmlPath); - } - - public bool Save(string xmlName, string rootElement) - { - bool result; - try - { - string filename = Directory.GetCurrentDirectory() + "\\" + xmlName; - XmlDocument xmlDocument = new XmlDocument(); - XmlElement newChild = xmlDocument.CreateElement(rootElement); - xmlDocument.AppendChild(newChild); - xmlDocument.Save(filename); - result = true; - } - catch (XmlException ex) - { - throw new Exception(ex.Message); - } - return result; - } - } -} diff --git a/DrawGraph/Graph/Util.cs b/DrawGraph/Graph/Util.cs deleted file mode 100644 index 93174d8..0000000 --- a/DrawGraph/Graph/Util.cs +++ /dev/null @@ -1,146 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; -using DrawGraph; -using System.Drawing; -using System.IO; -using System.Reflection; -using System.Resources; -using System.Drawing.Imaging; -using System.Drawing.Drawing2D; - -namespace DrawGraph -{ - public class Util - { - public static FontSpec Font14 = new FontSpec("宋体", 14.0f, Color.Black, true, false, false); - public static FontSpec Font16 = new FontSpec("宋体", 16.0f, Color.Black, true, false, false); - - public static void DrawText(string letter, double x, double y, ZedGraphControl zedGraph, FontSpec font) - { - TextObj text = new TextObj(letter, x, y, CoordType.PaneFraction); - text.FontSpec = font; - text.FontSpec.Border.IsVisible = false; - text.FontSpec.Fill.IsVisible = false; - text.Location.AlignH = AlignH.Left; - text.Location.AlignV = AlignV.Top; - text.ZOrder = ZOrder.A_InFront; - zedGraph.MasterPane.GraphObjList.Add(text); - } - - public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph) - { - LineObj line = new LineObj(Color.Gray, x1, y1, x2, y2); - line.IsVisible = true; - line.ZOrder = ZOrder.A_InFront; - line.Location.AlignH = AlignH.Left; - line.Location.AlignV = AlignV.Top; - line.Location.CoordinateFrame = CoordType.PaneFraction; - zedGraph.MasterPane.GraphObjList.Add(line); - } - - public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) - { - LineObj lineObj = new LineObj(LineColor, x1, y1, x2, y2); - lineObj.IsVisible = true; - lineObj.ZOrder = ZOrder.A_InFront; - lineObj.Location.AlignH = AlignH.Left; - lineObj.Location.AlignV = AlignV.Top; - lineObj.Location.CoordinateFrame = CoordType.PaneFraction; - lineObj.Tag = tag; - zedGraph.MasterPane.GraphObjList.Add(lineObj); - } - /// - /// 在Zedgraph上绘图 - /// - /// 已定义好的ImageObj对象 - /// ZedGraphControl - public static void DrawImage(ImageObj imgObj, ZedGraphControl zedGraph) - { - zedGraph.MasterPane.GraphObjList.Add(imgObj); - } - /// - /// 根据自定义好的TextObj绘制文字 - /// - /// 已定义的TextObj - /// ZedGraphControl - public static void DrawText(TextObj text, ZedGraphControl zedGraph) - { - zedGraph.MasterPane.GraphObjList.Add(text); - } - /// - /// 绘制矩形 - /// - /// 已定义的BoxObj对象 - /// ZedGraphControl - public static void DrawBox(BoxObj box, ZedGraphControl zedGraph) - { - zedGraph.MasterPane.GraphObjList.Add(box); - } - /// - /// 画出带标签的线 - /// - /// 起点X坐标 - /// 起点Y坐标 - /// 终点X坐标 - /// 终点Y坐标 - /// ZedGraphControl - /// 线标签 - public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor, DashStyle style = DashStyle.Solid) - { - LineObj line = new LineObj(LineColor, x1, y1, x2, y2); - line.IsVisible = true; - line.ZOrder = ZOrder.B_BehindLegend; - line.Location.AlignH = AlignH.Left; - line.Location.AlignV = AlignV.Top; - line.Location.CoordinateFrame = CoordType.PaneFraction; - line.Tag = tag; - line.Line.Style = style; - zedGraph.MasterPane.GraphObjList.Add(line); - } - - /// - /// 获取TextObj字体的相对宽度 - /// - /// - /// - public static float GetColWidthFraction(TextObj text, ZedGraphControl zgc) - { - GraphPane pane = zgc.GraphPane; - float ratio = pane.CalcScaleFactor(); - Graphics g = zgc.CreateGraphics(); - float absoluteWidth = text.FontSpec.GetWidth(g, text.Text, ratio); - float paneWidth = pane.Rect.Width; - return absoluteWidth / paneWidth; - } - /// - /// 获取TextObj字体的相对高度 - /// - /// - /// - /// - public static float GetColHeightFraction(TextObj text, ZedGraphControl zgc) - { - GraphPane pane = zgc.GraphPane; - float ratio = pane.CalcScaleFactor(); - Graphics g = zgc.CreateGraphics(); - float absoluteHeight = text.FontSpec.GetHeight(ratio); - float paneHeight = pane.Rect.Height; - return absoluteHeight / paneHeight; - } - ///////////////////////////////////////////////////////////////////////// - public static void DrawLineWidth(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor, int width = 1) - { - LineObj line = new LineObj(LineColor, x1, y1, x2, y2); - line.IsVisible = true; - line.ZOrder = ZOrder.A_InFront; - line.Location.AlignH = AlignH.Left; - line.Location.AlignV = AlignV.Top; - line.Location.CoordinateFrame = CoordType.PaneFraction; - line.Tag = tag; - line.Line.Style = DashStyle.Solid; - line.Line.Width = width; - zedGraph.MasterPane.GraphObjList.Add(line); - } - } -} diff --git a/DrawGraph/Graph/ZUtil.cs b/DrawGraph/Graph/ZUtil.cs index e0aaa29..f8aab09 100644 --- a/DrawGraph/Graph/ZUtil.cs +++ b/DrawGraph/Graph/ZUtil.cs @@ -18,6 +18,9 @@ namespace DrawGraph /// public class ZUtil { + public static FontSpec Font14 = new FontSpec("宋体", 14.0f, Color.Black, true, false, false); + public static FontSpec Font16 = new FontSpec("宋体", 16.0f, Color.Black, true, false, false); + /// /// 在ZedGraphControl上添加文字,默认使用宋体9号黑色字体 /// @@ -38,26 +41,6 @@ namespace DrawGraph text.Tag = tag; zedGraph.MasterPane.GraphObjList.Add(text); } - /// - /// 在ZedGraphControl上添加文字,默认使用宋体9号黑色字体 - /// - /// 要绘出的文字 - /// 绘制文字的左上起始点x坐标 - /// 绘制文字的左上起始点y坐标 - /// ZedGraphControl - /// 控件的标签名 - public static void DrawDrugText(string letter, double x, double y, ZedGraphControl zedGraph, string tag, Color color, float fontSize = 8.0f) - { - TextObj text = new TextObj(letter, x, y, CoordType.PaneFraction); - text.FontSpec = new FontSpec("微软雅黑", fontSize, color, false, false, false); - text.FontSpec.Border.IsVisible = false; - text.FontSpec.Fill.IsVisible = true; - text.Location.AlignH = AlignH.Left; - text.Location.AlignV = AlignV.Top; - text.ZOrder = ZOrder.B_BehindLegend; - text.Tag = tag; - zedGraph.MasterPane.GraphObjList.Add(text); - } public static void DrawText(string letter, double x, double y, ZedGraphControl zedGraph, string tag, Color fontColor, float fontSize = 8.0f, bool isBold = false) { TextObj text = new TextObj(letter, x, y, CoordType.PaneFraction); @@ -113,7 +96,6 @@ namespace DrawGraph text.Tag = tag; zedGraph.MasterPane.GraphObjList.Add(text); } - /// /// 在ZedGraphControl Chart上添加文字,默认使用宋体5号黑色字体 /// @@ -136,11 +118,76 @@ namespace DrawGraph text.Tag = tag; zedGraph.MasterPane.GraphObjList.Add(text); } + /// + /// 在ZedGraphControl上添加文字,默认使用宋体9号黑色字体 + /// + /// 要绘出的文字 + /// 绘制文字的左上起始点x坐标 + /// 绘制文字的左上起始点y坐标 + /// ZedGraphControl + /// 控件的标签名 + public static void DrawDrugText(string letter, double x, double y, ZedGraphControl zedGraph, string tag, Color color, float fontSize = 8.0f) + { + TextObj text = new TextObj(letter, x, y, CoordType.PaneFraction); + text.FontSpec = new FontSpec("微软雅黑", fontSize, color, false, false, false); + text.FontSpec.Border.IsVisible = false; + text.FontSpec.Fill.IsVisible = true; + text.Location.AlignH = AlignH.Left; + text.Location.AlignV = AlignV.Top; + text.ZOrder = ZOrder.B_BehindLegend; + text.Tag = tag; + zedGraph.MasterPane.GraphObjList.Add(text); + } - public static void DrawLine1(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) + public static void DrawText(string letter, double x, double y, ZedGraphControl zedGraph, FontSpec font) + { + TextObj text = new TextObj(letter, x, y, CoordType.PaneFraction); + text.FontSpec = font; + text.FontSpec.Border.IsVisible = false; + text.FontSpec.Fill.IsVisible = false; + text.Location.AlignH = AlignH.Left; + text.Location.AlignV = AlignV.Top; + text.ZOrder = ZOrder.A_InFront; + zedGraph.MasterPane.GraphObjList.Add(text); + } + + public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) + { + LineObj lineObj = new LineObj(LineColor, x1, y1, x2, y2); + lineObj.IsVisible = true; + lineObj.ZOrder = ZOrder.A_InFront; + lineObj.Location.AlignH = AlignH.Left; + lineObj.Location.AlignV = AlignV.Top; + lineObj.Location.CoordinateFrame = CoordType.PaneFraction; + lineObj.Tag = tag; + zedGraph.MasterPane.GraphObjList.Add(lineObj); + } + /// + /// 画出带标签的线 + /// + /// 起点X坐标 + /// 起点Y坐标 + /// 终点X坐标 + /// 终点Y坐标 + /// ZedGraphControl + /// 线标签 + public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor, DashStyle style = DashStyle.Solid) + { + LineObj line = new LineObj(LineColor, x1, y1, x2, y2); + line.IsVisible = true; + line.ZOrder = ZOrder.B_BehindLegend; + line.Location.AlignH = AlignH.Left; + line.Location.AlignV = AlignV.Top; + line.Location.CoordinateFrame = CoordType.PaneFraction; + line.Tag = tag; + line.Line.Style = style; + zedGraph.MasterPane.GraphObjList.Add(line); + } + + ///////////////////////////////////////////////////////////////////////// + public static void DrawLineWidth(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor, int width = 1) { LineObj line = new LineObj(LineColor, x1, y1, x2, y2); - line.Line.Width = 1; line.IsVisible = true; line.ZOrder = ZOrder.A_InFront; line.Location.AlignH = AlignH.Left; @@ -148,10 +195,11 @@ namespace DrawGraph line.Location.CoordinateFrame = CoordType.PaneFraction; line.Tag = tag; line.Line.Style = DashStyle.Solid; + line.Line.Width = width; zedGraph.MasterPane.GraphObjList.Add(line); - } + } - public static void DrawLine(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) + public static void DrawLine2(double x1, double y1, double x2, double y2, ZedGraphControl zedGraph, string tag, Color LineColor) { LineObj line = new LineObj(LineColor, x1, y1, x2, y2); line.Line.Width = 2; @@ -191,12 +239,12 @@ namespace DrawGraph if (x1 != x2 && arrow.IsArrowHead == false) { - DrawLine(x1, y1 + 0.004, x1, y1 - 0.004, zedGraph, "A" + tag, c); - DrawLine(x2, y1 + 0.004, x2, y2 - 0.004, zedGraph, "B" + tag, c); + DrawLine2(x1, y1 + 0.004, x1, y1 - 0.004, zedGraph, "A" + tag, c); + DrawLine2(x2, y1 + 0.004, x2, y2 - 0.004, zedGraph, "B" + tag, c); } else { - DrawLine(x1, y1 + 0.004, x1, y1 - 0.004, zedGraph, "A" + tag, c); + DrawLine2(x1, y1 + 0.004, x1, y1 - 0.004, zedGraph, "A" + tag, c); } } /// @@ -270,6 +318,53 @@ namespace DrawGraph zedGraph.MasterPane.GraphObjList.Add(imgObj); } + /// + /// 在Zedgraph上绘图 + /// + /// 已定义好的ImageObj对象 + /// ZedGraphControl + public static void DrawImage(ImageObj imgObj, ZedGraphControl zedGraph) + { + zedGraph.MasterPane.GraphObjList.Add(imgObj); + } + /// + /// 根据自定义好的TextObj绘制文字 + /// + /// 已定义的TextObj + /// ZedGraphControl + public static void DrawText(TextObj text, ZedGraphControl zedGraph) + { + zedGraph.MasterPane.GraphObjList.Add(text); + } + /// + /// 获取TextObj字体的相对宽度 + /// + /// + /// + public static float GetColWidthFraction(TextObj text, ZedGraphControl zgc) + { + GraphPane pane = zgc.GraphPane; + float ratio = pane.CalcScaleFactor(); + Graphics g = zgc.CreateGraphics(); + float absoluteWidth = text.FontSpec.GetWidth(g, text.Text, ratio); + float paneWidth = pane.Rect.Width; + return absoluteWidth / paneWidth; + } + /// + /// 获取TextObj字体的相对高度 + /// + /// + /// + /// + public static float GetColHeightFraction(TextObj text, ZedGraphControl zgc) + { + GraphPane pane = zgc.GraphPane; + float ratio = pane.CalcScaleFactor(); + Graphics g = zgc.CreateGraphics(); + float absoluteHeight = text.FontSpec.GetHeight(ratio); + float paneHeight = pane.Rect.Height; + return absoluteHeight / paneHeight; + } /// /// 绘制矩形 /// diff --git a/DrawGraph/Resources/Close.png b/DrawGraph/Resources/Close.png deleted file mode 100644 index 58af4edbe63f03a736caf0951fdd7cc88a6de79c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9662 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 B91{Ql diff --git a/DrawGraph/Resources/HR.png b/DrawGraph/Resources/HR.png deleted file mode 100644 index e5c311237a9cc8c7b4ccd798eafdb09687f48beb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3292 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 diff --git a/DrawGraph/Resources/SPO2f.png b/DrawGraph/Resources/SPO2f.png deleted file mode 100644 index 089624d8e69cf452c0341dba4b532591e966439b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2867 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 z2Xe;e$5X9HD+B-l000000000000000003|*J^26t000000PfoW009600{}cA30wCI RQE31G002ovPDHLkV1f+5W19c~ diff --git a/DrawGraph/Resources/Sys.png b/DrawGraph/Resources/Sys.png deleted file mode 100644 index 2924ed6d195114363de89ba59a8406067771bbf9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3644 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 diff --git a/DrawGraph/Resources/Temp.png b/DrawGraph/Resources/Temp.png deleted file mode 100644 index 810703de40bb0587c1b9f1dc9220f5152c39267a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3346 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 z ztz&g~3K#1IFcz6)JypWvBo19Iz(B0gLG{-t?$#RMc+$|OP%#X0f2{z9FpVu5r+s)> z&6|vB048xn<8`JQvs@40ATFWM1c05f7kbkG+)hww)hh}!=vpf&TTO=}0za^b5BME! z{2kvSnX8OWR~&_1(XSBgWxS6rxXLE5bb;gaCeNo9Ds$Gu*LY^Q!&=RrCs(vaR!h9WB?h! ce+}?w0FRqVxc`zMBLDyZ07*qoM6N<$g1z2Rg#Z8m diff --git a/DrawGraph/Resources/TriangleDown.png b/DrawGraph/Resources/TriangleDown.png deleted file mode 100644 index c6f2aaec37dd8a4f977a0fb0d5450da7be93fd12..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^x0q*&4&eH|GX)}JtE?Rp91OP07s zlmzFem6RtIr7}3ChpAQ45_&F=DH&vgCLK?#g~8i zbJH>nm42vP%J-MgoZS_4s`xh7#YL{&V!BZ!QY9`Aw*TQ#+|??_>oU)H>SdNcR$o5- zyZO#gddIrX*B883ZoRbJoiRdixpTjR#s@=_z?vU#E;dhIU&G?td{Of~zx(o|fhL^C xp1+jZ$*ogWF4vuRu)OhaFVJu+$zP%g3=?x14*4w1e*<(GgQu&X%Q~loCICp^V3_~_ diff --git a/DrawGraph/Resources/cr.png b/DrawGraph/Resources/cr.png deleted file mode 100644 index 19389188dc2970c86b06d3dc2415aca44fc3a810..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3152 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 TR3Cm(^a`pU1ZI7t{fmDAOUw${ diff --git a/DrawGraph/Resources/expand2.png b/DrawGraph/Resources/expand2.png deleted file mode 100644 index 27efa35025328e8a982ddc9a8f15f9a61b02a6b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9662 zcmeHLOODhq5G~Y;Ue1mcQf7n1a+d7o6zsVICz!qfcVLM)1uGVuB7y@D%>uPhrcJ$4 zs);-)yX++0LW+^6CLfpId-d#iAbP?7?(T?x-qPpSL@$Zx4R^jp@44eX+JT>KZBt-V zU@Zm0J0j^{I9h#pXDtk+dBcYRYv5Sg!I8&bqY3UG6_}?uBF}|*h(DIX9dkim_SafX zJRQ%u#x?tD$rfI*F5edNikC0u<9X*c!CvAQ%!@Uxd(k-Jeu)m4cLoPHcFa?_{@m+- z28XQQD{#ktaPg>E50W?K)rI^CK2qnLuL|lb`BK;`^oVtzy3W?yxfa4l*2KcU5_aX2 z$1CHJ>b+ZS%Z~*Wcmi!Guo?evIpXQtFOc%i5*y+-wp8ipa1{iTnEHSSl|TYQwuUCG0RTXPrq=9xY?(|9iNot{h{u=;wU2C*aBBeq04!~^3-1pEi06E!{EBl0MYJo1Cz2UeIq2t)y zgmB!CViQ8o*KN}`{f^^(w?9d2cV$t>^^J@}Ue41E`Qv#NkK$9jieLGJf!~>LJMdRM TR3Cm(^a`pU1ZI7t{fmDAOUw${ diff --git a/DrawGraph/Resources/expand3.png b/DrawGraph/Resources/expand3.png deleted file mode 100644 index 27efa35025328e8a982ddc9a8f15f9a61b02a6b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9662 zcmeHLOODhq5G~Y;Ue1mcQf7n1a+d7o6zsVICz!qfcVLM)1uGVuB7y@D%>uPhrcJ$4 zs);-)yX++0LW+^6CLfpId-d#iAbP?7?(T?x-qPpSL@$Zx4R^jp@44eX+JT>KZBt-V zU@Zm0J0j^{I9h#pXDtk+dBcYRYv5Sg!I8&bqY3UG6_}?uBF}|*h(DIX9dkim_SafX zJRQ%u#x?tD$rfI*F5edNikC0u<9X*c!CvAQ%!@Uxd(k-Jeu)m4cLoPHcFa?_{@m+- z28XQQD{#ktaPg>E50W?K)rI^CK2qnLuL|lb`BK;`^oVtzy3W?yxfa4l*2KcU5_aX2 z$1CHJ>b+ZS%Z~*Wcmi!Guo?evIpXQtFOc%i5*y+-wp8ipa1{iTnEHSSl|TYQwuUCG0RTXPrq=9xY?(|9iNot{h{u=;wU2C*aBBeq04!~^3-1pEi06E!{EBl0MYJo1Cz2UeIq2t)y zgmB!CViQ8o*KN}`{f^^(w?9d2cV$t>^^J@}Ue41E`Qv#NkK$9jieLGJf!~>LJMdRM TR3Cm(^a`pU1ZI7t{fmDAOUw${ diff --git a/DrawGraph/Resources/mb.png b/DrawGraph/Resources/mb.png deleted file mode 100644 index de76e05e555c4e2cc8293a6ef495bc4cf9147980..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3930 zcmV-g52f&lP)KLZ*U+5Lu!Sk^o_Z5E4Meg@_7P6crJiNL9pw)e1;Xm069{HJUZAPk55R%$-RIA z6-eL&AQ0xu!e<4=008gy@A0LT~suv4>S3ILP<0Bm`DLLvaF4FK%)Nj?Pt*r}7;7Xa9z9H|HZjR63e zC`Tj$K)V27Re@400>HumpsYY5E(E}?0f1SyGDiY{y#)Yvj#!WnKwtoXnL;eg03bL5 z07D)V%>y7z1E4U{zu>7~aD})?0RX_umCct+(lZpemCzb@^6=o|A>zVpu|i=NDG+7} zl4`aK{0#b-!z=TL9Wt0BGO&T{GJWpjryhdijfaIQ&2!o}p04JRKYg3k&Tf zVxhe-O!X z{f;To;xw^bEES6JSc$k$B2CA6xl)ltA<32E66t?3@gJ7`36pmX0IY^jz)rRYwaaY4 ze(nJRiw;=Qb^t(r^DT@T3y}a2XEZW-_W%Hszxj_qD**t_m!#tW0KDiJT&R>6OvVTR z07RgHDzHHZ48atvzz&?j9lXF70$~P3Knx_nJP<+#`N z#-MZ2bTkiLfR>_b(HgWKJ%F~Nr_oF3b#wrIijHG|(J>BYjM-sajE6;FiC7vY#};Gd zST$CUHDeuEH+B^pz@B062qXfFfD`NpUW5?BY=V%GM_5c)L#QR}BeW8_2v-S%gfYS= zB9o|3v?Y2H`NVi)In3rTB8+ej^> zQ=~r95NVuDChL%G$=>7$vVg20myx%S50Foi`^m%Pw-h?Xh~i8Mq9jtJloCocWk2Nv zrJpiFnV_ms&8eQ$2&#xWpIS+6pmtC%Q-`S&GF4Q#^mhymh7E(qNMa}%YZ-ePrx>>xFPTiH1=E+A$W$=bG8>s^ zm=Bn5Rah$aDtr}@$`X}2l~$F0mFKEdRdZE8)p@E5RI61Ft6o-prbbn>P~)iy)E2AN zsU20jsWz_8Qg>31P|s0cqrPALg8E|(vWA65poU1JRAaZs8I2(p#xiB`SVGovRs-uS zYnV-9TeA7=Om+qP8+I>yOjAR1s%ETak!GFdam@h^# z)@rS0t$wXH+Irf)+G6c;?H29p+V6F6oj{!|o%K3xI`?%6x;DB|x`n#ibhIR?(H}Q3Gzd138Ei2)WAMz7W9Vy`X}HnwgyEn!VS)>mv$8&{hQn>w4zwy3R}t;BYlZQm5)6pty=DfLrs+A-|>>;~;Q z_F?uV_HFjh9n2gO9o9Q^JA86v({H5aB!kjoO6 zc9$1ZZKsN-Zl8L~mE{`ly3)1N^`o1+o7}D0ZPeY&J;i;i`%NyJ8_8Y6J?}yE@b_5a zam?eLr<8@mESk|3$_SkmS{wQ>%qC18))9_|&j{ZT zes8AvOzF(F2#DZEY>2oYX&IRp`F#{ADl)1r>QS^)ba8a|EY_^#S^HO&t^Rgqwv=MZThqqEWH8 zxJo>d=ABlR_Bh=;eM9Tw|Ih34~oTE|= zX_mAr*D$vzw@+p(E0Yc6dFE}(8oqt`+R{gE3x4zjX+Sb3_cYE^= zgB=w+-tUy`ytONMS8KgRef4hA?t0j zufM;t32jm~jUGrkaOInTZ`zyfns>EuS}G30LFK_G-==(f<51|K&cocp&EJ`SxAh3? zNO>#LI=^+SEu(FqJ)ynt=!~PC9bO$rzPJB=?=j6w@a-(u02P7 zaQ)#(uUl{HW%tYNS3ItC^iAtK(eKlL`f9+{bJzISE?u8_z3;~C8@FyI-5j_jy7l;W z_U#vU3hqqYU3!mrul&B+{ptt$59)uk{;_4iZQ%G|z+lhASr6|H35TBkl>gI*;nGLU zN7W-nBaM%pA0HbH8olyl&XeJ%vZoWz%6?Y=dFykl=imL}`%BMQ{Mhgd`HRoLu6e2R za__6DuR6yg#~-}Tc|Gx_{H@O0eebyMy5GmWADJlpK>kqk(fVV@r_fLLKIeS?{4e)} z^ZO;zpECde03c&XQcVB=dL;k=fP(-4`Tqa_faw4Lbua(`>RI+y?e7jKeZ#YO-C z1cymPK~#9!?3!DMR#g>&4Xk`h)P5^f-KM=f~e@B ze6YNff(2!P74#BR4;GOGB4K3)4w7bG5_3|NEK{eMNgJKpzX#We<>`FW+2^|q(rj4F zxqN%A^rkVDE*t9nH{~S^ETKiXv*`OLg-GxA(Qc7;%^dk4FNDlu*n2`Ah@cC$~OvHjrS74 zs8Rqx&?5NB1ic`rDH4EBjOS6o0zpM705k|z3-$^626c59tr7GHx{T-d#@&O#FG5$tyso0viQCPAC=SS$F_ zJQ2y*A($Vz1A;FV^@q(@P?0v!50Oe~0+idO{LA79-t%b8r)`km`MFs%P zF11O}A$Zy{5`rlfP7*vP7@ZQphc@SH!36hwhG2^eB?(@#C%9ayTIkiw8VIx5?q(?{vKNwK3s3g0^sf#qs=jEd0K6Y`%m*qKIP{)o_FL;m#|WB z#>rkTs0{`1mW#(8%NQdEQSLLhQzvb5<6XEtm3Ol`Pd8h-jsUa@t_T4zQE<#L_%tDO z;#4cx?G|-??EP167q3sTPL>P)ayl#s0r0SeLp1rZ|FFJKjlbEPXDquQSSRSW{5~$_ zLT?syIvtjU0C>$}T7tcT%L7v6{VslQGw|JJ%_)Lh0I!WMBdresu+c0g!Mo0qY3Wtl zsZY3dbZ?3b6{i($bK4aH;Gkf@CO(lta1`_H#$%OWLlagP0}@ANm*ro`+?petl2Bwb$>`#BAPe=G!9|M zWRkn@4FS;M08AP}0F$HA9r!&2z%NmQ#W5-Or~;-rL$-wgIOsxY`VaxA1!mcGAFw9` zz&;0HrcpV^NMJs2t=;zkJ3|0`=dP=PyUGk;Oss*{32X~#Y+WhX?sD*M!Hs3g{ndhn zZUgHUyqT|{$>)JHz$SNpHE>^ zPvsU^k<|&7Ic9xUgikM#^0k6zV>LjVU{)bri3Y*vF^jA(0f;*5b{uxHP6`$k+SsZT z+-}XQh;gsr8^PQnDc@jW)8S-v3SKs^6x^Asv2*!;Cm^!W3c=)ziq{Js6?_}x+a-A2 zfEBGbI@&<&iV5qtg}zj9OG?GZ2^L$`cP_@SUGPex@_7K{62B8Ce`2Zvnt|tmISKE( zfGxmw+x8Ct$L&aP4R8Z66}Z*Xa(o;HRstUZr_+973jID1^>A*a2(> ojuiTpGB^Cc62k!g=K%g50A2x*{YuG|7ytkO07*qoM6N<$f^Cstwg3PC diff --git a/DrawGraph/Resources/ms.png b/DrawGraph/Resources/ms.png deleted file mode 100644 index 33dca702fd825174ad4be1ddc932aadc4a3a5b4b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3640 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 KMNUMnLSTYo(bjhW diff --git a/DrawGraph/Resources/mz.png b/DrawGraph/Resources/mz.png deleted file mode 100644 index 8a5e61b2110761565ef34a848a27060e0463f7ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 416 zcmV;R0bl-!P)3`4vB|7Zr|P_Hz00&N+ZG$u9nt5-tdvn)%P>R5rc zBZT8*^w*DLrMW&sfTB1Gp#D*%Sw#QTkemwBbm??vs@WB5xf_#URJ*u3Fv%9e)&3|` zQ(SI84>4)7&3>pA(>)6i)EYD(fns4&8qi&R9HZIXp!vaabv33O1M=j=(7*{@I|B9| zOwy1*Y)(844}>$BXiPu|la|-(ksg~*hd6Drzpcy!BzI-oCUT)c>|+LcHE0000< KMNUMnLSTZBO0W9> diff --git a/DrawGraph/Resources/ok.png b/DrawGraph/Resources/ok.png deleted file mode 100644 index 779ffda53a9967f3d3d710dce7c78920c3a58805..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1041 zcmV+s1n&EZP);SF>+I}~U(Yu`JG1Mqu0OK_4=Xc%^ZdN;yx&KhbE+6( z)XDcyic56Wxfh^HTs2Ih{cN1lG)X!s++YdkQLrKcG`b7oUVtb|l%ZfkwjcSQK%Di$ zxka8a$?<3K4^>3KL3Yk|PXbwz1UdAClKu;*X7ylt0!B$VH+aA#*C`|f_?*BYCd2s@ zm=r<2W(4f$L%1y<>;4MR=oZ-O1v$?${7AyJ4VhL+j`=6x06PtqVYlfd)4Ah*)e;c( zM?f6Wr)k2ednQ-&pcB0@gIVq*wuJj3j9JNbzK(nWP1oGU z-z1AIFWv(K>?Fva(O;@1u`EdjaD?XhV!nJqwEh5w3!MIY)eua8}Jy1i{9^85sDn~^_+>vsH-iKGqH6tN5( zrr+G!NElN<{0qcUmo(=bP)3^hhq29C%t~Msk*hQhwA*AZR&8h$hs_peAsVg|b&sYC z+^4LrpDu^o6`)cR5YLgT1>|WPI`z4|7wpS#y0C*Kq|jaN7wndxo7EupNo3b(#;+C# z(X3OAVFXSfdKtu@Jk!k_GLCw9j2!xM=UiaAjnAFm&Ni~~UZC;EI9QChGv2Lx z$`!LB+;4Xu+jKJu^6VJg-!Jybsa6s%y00000 LNkvXXu0mjfKKSL& diff --git a/DrawGraph/Resources/pjy.png b/DrawGraph/Resources/pjy.png deleted file mode 100644 index f8328e99a7800e3d9e3c8b8f7d52cf24eba7b9a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3621 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 diff --git a/DrawGraph/Resources/sb.png b/DrawGraph/Resources/sb.png deleted file mode 100644 index f099c0db63793afae1c1ecffeacb92e282742f0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3488 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 TR3Cm(^a`pU1ZI7t{fmDAOUw${ diff --git a/DrawGraph/Resources/ss1.png b/DrawGraph/Resources/ss1.png deleted file mode 100644 index c15d3407292eb733a7bb37c23bacfd639a593404..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 369 zcmV-%0gnEOP)WfPV*Qrng0WOIYs` zmjQ3{N=>9OuhecX0TihpYQCQ*HL=|MFOA7eV7YlC1X7qcKp>5IB?MBLSHu8II0^zO z%~vy50H;DgY&}3XPwt-(Vx9>p)o)hjL4J61BO(Y>7m>jjdTm9}>V*oR01Du