diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/bin/x64/Debug/Cyberpipe.exe +++ b/bin/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/bin/x64/Debug/Cyberpipe.exe +++ b/bin/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/bin/x64/Debug/Cyberpipe.pdb +++ b/bin/x64/Debug/Cyberpipe.pdb Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/bin/x64/Debug/Cyberpipe.exe +++ b/bin/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/bin/x64/Debug/Cyberpipe.pdb +++ b/bin/x64/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/obj/Debug/Cyberpipe.exe +++ b/obj/Debug/Cyberpipe.exe Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/bin/x64/Debug/Cyberpipe.exe +++ b/bin/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/bin/x64/Debug/Cyberpipe.pdb +++ b/bin/x64/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/obj/Debug/Cyberpipe.exe +++ b/obj/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/obj/Debug/Cyberpipe.pdb +++ b/obj/Debug/Cyberpipe.pdb Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 5134263..9746370 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -46,18 +46,29 @@ comboBoxExLayer.Items.Add(layer.Caption); } - pipelineTypeCbo.Items.Add("雨水"); - pipelineTypeCbo.Items.Add("污水"); - pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("电力"); + pipelineTypeCbo.Items.Add("通信"); pipelineTypeCbo.Items.Add("给水"); - pipelineTypeCbo.Items.Add("供电"); - pipelineTypeCbo.Items.Add("天然气"); - pipelineTypeCbo.Items.Add("共通"); - pipelineTypeCbo.Items.Add("电通"); - pipelineTypeCbo.Items.Add("路灯"); - pipelineTypeCbo.Items.Add("监控"); + pipelineTypeCbo.Items.Add("污水"); + pipelineTypeCbo.Items.Add("雨水"); + pipelineTypeCbo.Items.Add("中水"); + pipelineTypeCbo.Items.Add("燃气"); + pipelineTypeCbo.Items.Add("热力"); + pipelineTypeCbo.Items.Add("工业"); + pipelineTypeCbo.Items.Add("不明"); + pipelineTypeCbo.Items.Add("垃圾"); + pipelineTypeCbo.Items.Add("空调"); + pipelineTypeCbo.Items.Add("消防"); + pipelineTypeCbo.Items.Add("加药"); + pipelineTypeCbo.Items.Add("排空"); + pipelineTypeCbo.Items.Add("泡沫"); + pipelineTypeCbo.Items.Add("排沙"); + pipelineTypeCbo.Items.Add("输油"); + pipelineTypeCbo.Items.Add("有线电视"); - + pipelineTypeCbo.Items.Add("雨污合流"); + pipelineTypeCbo.Items.Add("综合管沟"); + cmbReference.Items.Clear(); cmbReference.Items.Add("管顶"); cmbReference.Items.Add("管底"); @@ -257,13 +268,12 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; - if (cmbRadius.Items.Contains("管径_毫米")) + if (cmbRadius.Items.Contains("管径")) { - cmbRadius.SelectedItem = "管径_毫米"; + cmbRadius.SelectedItem = "管径"; } else { @@ -330,41 +340,64 @@ switch (pipelineTypeCbo.Text) { + case "电力": + btnPipelineColor.BackColor = Color.FromArgb(255,0,0); + break; + case "通信": + btnPipelineColor.BackColor = Color.FromArgb(0,255,0); + break; case "给水": - btnPipelineColor.BackColor = Color.FromArgb(0, 0, 255); - break; - case "供电": - btnPipelineColor.BackColor = Color.FromArgb(255, 100, 150); - break; - case "雨水": - btnPipelineColor.BackColor = Color.FromArgb(230, 120, 0); + btnPipelineColor.BackColor = Color.FromArgb(0,191,255); break; case "污水": - btnPipelineColor.BackColor = Color.FromArgb(128, 64, 0); + btnPipelineColor.BackColor = Color.FromArgb(128,64,0); break; - case "天然气": - btnPipelineColor.BackColor = Color.FromArgb(215, 0, 64); + case "雨水": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "共通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "雨污合流": + btnPipelineColor.BackColor = Color.FromArgb(127,0,0); break; - case "电通": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "中水": + btnPipelineColor.BackColor = Color.FromArgb(0,255,255); break; - case "有线电视": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "燃气": + btnPipelineColor.BackColor = Color.FromArgb(255,127,233); break; - case "监控": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "工业": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "交通信号": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "综合管沟": + btnPipelineColor.BackColor = Color.FromArgb(255,255,255); break; - case "路灯": - btnPipelineColor.BackColor = Color.FromArgb(255, 0, 150); + case "不明": + btnPipelineColor.BackColor = Color.FromArgb(0,120,50); break; - case "通讯": - btnPipelineColor.BackColor = Color.FromArgb(0, 255, 0); + case "垃圾": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + case "空调": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "消防": + btnPipelineColor.BackColor=Color.FromArgb(250,240,120); + break; + case "加药": + btnPipelineColor.BackColor=Color.FromArgb(215,0,64); + break; + case "排空": + btnPipelineColor.BackColor=Color.FromArgb(0,120,50); + break; + case "泡沫": + btnPipelineColor.BackColor=Color.FromArgb(0,255,0); + break; + case "排沙": + btnPipelineColor.BackColor=Color.FromArgb(255,102,0); + break; + case "输油": + btnPipelineColor.BackColor=Color.FromArgb(84,57,44); + break; + default: break; } } @@ -397,7 +430,6 @@ endH.SelectedItem = "终止" + cmbReference.Text + "高"; } - /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/LSPipeline.suo b/LSPipeline.suo index ec48f90..cf621bc 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.exe b/bin/x64/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/bin/x64/Debug/Cyberpipe.exe +++ b/bin/x64/Debug/Cyberpipe.exe Binary files differ diff --git a/bin/x64/Debug/Cyberpipe.pdb b/bin/x64/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/bin/x64/Debug/Cyberpipe.pdb +++ b/bin/x64/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/Debug/Cyberpipe.exe b/obj/Debug/Cyberpipe.exe index 8f5105c..bb0111e 100644 --- a/obj/Debug/Cyberpipe.exe +++ b/obj/Debug/Cyberpipe.exe Binary files differ diff --git a/obj/Debug/Cyberpipe.pdb b/obj/Debug/Cyberpipe.pdb index 8b090ec..25774f9 100644 --- a/obj/Debug/Cyberpipe.pdb +++ b/obj/Debug/Cyberpipe.pdb Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index d4938ec..926c46f 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ