diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LayerChild.cs b/LayerChild.cs deleted file mode 100644 index 67b51b5..0000000 --- a/LayerChild.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Cyberpipe -{ - public class LayerChild - { - public string attriLabel; - public string attriLayer; - public string attriType; - - public LayerChild() - { } - public LayerChild(string label, string layerName, string type) - { - attriLabel = label; - attriLayer = layerName; - attriType = type; - } - } -} diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LayerChild.cs b/LayerChild.cs deleted file mode 100644 index 67b51b5..0000000 --- a/LayerChild.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Cyberpipe -{ - public class LayerChild - { - public string attriLabel; - public string attriLayer; - public string attriType; - - public LayerChild() - { } - public LayerChild(string label, string layerName, string type) - { - attriLabel = label; - attriLayer = layerName; - attriType = type; - } - } -} diff --git a/LineBuilder.cs b/LineBuilder.cs index 611ed4b..33a216c 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,6 +43,7 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { + LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LayerChild.cs b/LayerChild.cs deleted file mode 100644 index 67b51b5..0000000 --- a/LayerChild.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Cyberpipe -{ - public class LayerChild - { - public string attriLabel; - public string attriLayer; - public string attriType; - - public LayerChild() - { } - public LayerChild(string label, string layerName, string type) - { - attriLabel = label; - attriLayer = layerName; - attriType = type; - } - } -} diff --git a/LineBuilder.cs b/LineBuilder.cs index 611ed4b..33a216c 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,6 +43,7 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { + LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/MainFrm.cs b/MainFrm.cs index b908e40..e097e98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2372,7 +2372,7 @@ j++; } if (count == 1) - {//不够两行 + {//不够两列 tmpStr += ""; } tmpStr += ""; @@ -5059,8 +5059,6 @@ node.Nodes.Clear(); globeControl1.Refresh(); } - //定时检查传感器的状态 待完善 - public Timer timerOfSensor = null; /// /// 一键审核---导入数据 /// @@ -5167,7 +5165,6 @@ void doWork() { - FrmShResult frmShResult; if (frmSh.rukuLayer != null) { try @@ -5186,7 +5183,7 @@ globeControl1.Refresh(); } - frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); + FrmShResult frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50); frmShResult.Owner = this; frmShResult.analysis(); @@ -5201,9 +5198,9 @@ } catch (Exception ex) { + boolfrmShResult = false; MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } -// boolfrmShResult = true; } void returnShTap() diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LayerChild.cs b/LayerChild.cs deleted file mode 100644 index 67b51b5..0000000 --- a/LayerChild.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Cyberpipe -{ - public class LayerChild - { - public string attriLabel; - public string attriLayer; - public string attriType; - - public LayerChild() - { } - public LayerChild(string label, string layerName, string type) - { - attriLabel = label; - attriLayer = layerName; - attriType = type; - } - } -} diff --git a/LineBuilder.cs b/LineBuilder.cs index 611ed4b..33a216c 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,6 +43,7 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { + LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/MainFrm.cs b/MainFrm.cs index b908e40..e097e98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2372,7 +2372,7 @@ j++; } if (count == 1) - {//不够两行 + {//不够两列 tmpStr += ""; } tmpStr += ""; @@ -5059,8 +5059,6 @@ node.Nodes.Clear(); globeControl1.Refresh(); } - //定时检查传感器的状态 待完善 - public Timer timerOfSensor = null; /// /// 一键审核---导入数据 /// @@ -5167,7 +5165,6 @@ void doWork() { - FrmShResult frmShResult; if (frmSh.rukuLayer != null) { try @@ -5186,7 +5183,7 @@ globeControl1.Refresh(); } - frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); + FrmShResult frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50); frmShResult.Owner = this; frmShResult.analysis(); @@ -5201,9 +5198,9 @@ } catch (Exception ex) { + boolfrmShResult = false; MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } -// boolfrmShResult = true; } void returnShTap() diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index dc576e6..2c095e5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -244,6 +244,23 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); @@ -318,17 +335,6 @@ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -339,12 +345,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -539,13 +539,13 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -2218,6 +2218,277 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonPanel6 // this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3010,175 +3281,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133, - this.buttonItem132}); - this.ribbonBar18.Location = new System.Drawing.Point(508, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // buttonItem132 - // - this.buttonItem132.Name = "buttonItem132"; - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -3325,108 +3427,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -4475,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(28111, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(28408, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4569,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(28110, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(28407, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5786,13 +5786,13 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj index d0c333c..b364578 100644 --- a/Cyberpipe.csproj +++ b/Cyberpipe.csproj @@ -857,12 +857,6 @@ FrmQueryMessage.cs - - Form - - - FrmQuerySensorAlarm.cs - Form @@ -1531,10 +1525,6 @@ FrmQueryMessage.cs Designer - - FrmQuerySensorAlarm.cs - Designer - FrmRegion.cs Designer @@ -1757,7 +1747,6 @@ - Form diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 33eec7b..e2571a6 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmAddInstrument.cs b/FrmAddInstrument.cs index 82ed140..8d1c49d 100644 --- a/FrmAddInstrument.cs +++ b/FrmAddInstrument.cs @@ -54,10 +54,10 @@ model.FilePath = modelPath; model.Position = pt; model.AltitudeMode = EnumAltitudeMode.Absolute; - feature = new GSOFeature(); -// GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; -// if (featDataSet == null) return; -// feature = featDataSet.CreateFeature(); +// feature = new GSOFeature(); + GSOFeatureDataset featDataSet = modelLayer.Dataset as GSOFeatureDataset; + if (featDataSet == null) return; + feature = featDataSet.CreateFeature(); string bianhao = "FSW" + Guid.NewGuid() + "TMP"; feature.SetValue("编号", bianhao); feature.Geometry = model; diff --git a/FrmQuerySensorAlarm.cs b/FrmQuerySensorAlarm.cs deleted file mode 100644 index 12adaa2..0000000 --- a/FrmQuerySensorAlarm.cs +++ /dev/null @@ -1,148 +0,0 @@ -using System; -using System.Windows.Forms; -using DevComponents.DotNetBar; - -namespace Cyberpipe -{ - public partial class FrmQuerySensorAlarm : Office2007Form - { - MainFrm mainFrm; - - static FrmQuerySensorAlarm frm; - public static void ShowForm(MainFrm mF) - { - if (frm == null) - { - frm = new FrmQuerySensorAlarm(mF); - frm.Show(mF); - } - else - { - if (frm.WindowState == FormWindowState.Minimized) - { - frm.WindowState = FormWindowState.Normal; - } - } - } - - public FrmQuerySensorAlarm(MainFrm mF) - { - InitializeComponent(); - - mainFrm = mF; - } - /// - /// 窗体初始化事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_Load(object sender, EventArgs e) - { - if (Utility.sensorMarkerLayers != null) - { - dataGridViewXSensorList.Columns.Add("sensorType", "传感器类型"); - dataGridViewXSensorList.Columns.Add("sensorAlarmValue", "在线报警阀值"); - dataGridViewXSensorList.Columns["sensorType"].ReadOnly = true; - - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - - int rowIndex = dataGridViewXSensorList.Rows.Add(); - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorType"].Value = mLayer.layerName; - dataGridViewXSensorList.Rows[rowIndex].Cells["sensorAlarmValue"].Value = mLayer.alarmValue; - } - } - } - - /// - /// 启动按钮事件处理 - /// - /// - /// - private void buttonXStartTimer_Click(object sender, EventArgs e) - { - bool isStartTimer = false; - for (int i = 0; i < dataGridViewXSensorList.Rows.Count; i++) - { - string strAlarmValue = dataGridViewXSensorList.Rows[i].Cells["sensorAlarmValue"].Value.ToString(); - int alarmValue = 0; - if (int.TryParse(strAlarmValue, out alarmValue)) - { - if (alarmValue > 0) - { - isStartTimer = true; - break; - } - } - } - if (isStartTimer) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - mainFrm.timerOfSensor.Start(); - MessageBox.Show("报警启动成功！", "提示"); - Close(); - } - } - else - { - MessageBox.Show("请先设置传感器阀值，并且传感器阀值必须大于0！", "提示"); - } - } - /// - /// 停止按钮事件处理 - /// - /// - /// - private void buttonXStopTimer_Click(object sender, EventArgs e) - { - if (mainFrm != null && mainFrm.timerOfSensor != null) - { - mainFrm.timerOfSensor.Stop(); - MessageBox.Show("报警已经停止！", "提示"); - } - } - /// - /// 窗体关闭事件处理 - /// - /// - /// - private void FrmQuerySensorAlarm_FormClosing(object sender, FormClosingEventArgs e) - { - frm = null; - } - /// - /// 表格的单元格编辑结束事件处理 - /// - /// - /// - private void dataGridViewXSensorList_CellEndEdit(object sender, DataGridViewCellEventArgs e) - { - if (e.RowIndex > -1) - { - string strValue = dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value.ToString().Trim(); - int iValue = 0; - if (!int.TryParse(strValue, out iValue)) - { - MessageBox.Show("输入的数值不符合要求！", "提示"); - dataGridViewXSensorList.Rows[e.RowIndex].Cells[e.ColumnIndex].Value = 0; - } - else - { - for (int i = 0; i < Utility.sensorMarkerLayers.Count; i++) - { - MarkerLayer mLayer = Utility.sensorMarkerLayers[i]; - if (mLayer.layerName == dataGridViewXSensorList.Rows[e.RowIndex].Cells["sensorType"].Value.ToString().Trim()) - { - mLayer.alarmValue = iValue; - } - } - } - } - } - - - } -} diff --git a/FrmQuerySensorAlarm.designer.cs b/FrmQuerySensorAlarm.designer.cs deleted file mode 100644 index da6c671..0000000 --- a/FrmQuerySensorAlarm.designer.cs +++ /dev/null @@ -1,116 +0,0 @@ -using System.ComponentModel; -using DevComponents.DotNetBar; -using DevComponents.DotNetBar.Controls; - -namespace Cyberpipe -{ - partial class FrmQuerySensorAlarm - { - /// - /// Required designer variable. - /// - private IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - this.buttonXStartTimer = new DevComponents.DotNetBar.ButtonX(); - this.buttonXStopTimer = new DevComponents.DotNetBar.ButtonX(); - this.dataGridViewXSensorList = new DevComponents.DotNetBar.Controls.DataGridViewX(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).BeginInit(); - this.SuspendLayout(); - // - // buttonXStartTimer - // - this.buttonXStartTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStartTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStartTimer.Location = new System.Drawing.Point(50, 214); - this.buttonXStartTimer.Name = "buttonXStartTimer"; - this.buttonXStartTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStartTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStartTimer.TabIndex = 0; - this.buttonXStartTimer.Text = "启动"; - this.buttonXStartTimer.Click += new System.EventHandler(this.buttonXStartTimer_Click); - // - // buttonXStopTimer - // - this.buttonXStopTimer.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.buttonXStopTimer.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.buttonXStopTimer.Location = new System.Drawing.Point(144, 214); - this.buttonXStopTimer.Name = "buttonXStopTimer"; - this.buttonXStopTimer.Size = new System.Drawing.Size(75, 23); - this.buttonXStopTimer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.buttonXStopTimer.TabIndex = 3; - this.buttonXStopTimer.Text = "停止"; - this.buttonXStopTimer.Click += new System.EventHandler(this.buttonXStopTimer_Click); - // - // dataGridViewXSensorList - // - this.dataGridViewXSensorList.AllowUserToAddRows = false; - this.dataGridViewXSensorList.AllowUserToDeleteRows = false; - this.dataGridViewXSensorList.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewXSensorList.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewXSensorList.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(170)))), ((int)(((byte)(170)))), ((int)(((byte)(170))))); - this.dataGridViewXSensorList.Location = new System.Drawing.Point(10, 10); - this.dataGridViewXSensorList.MultiSelect = false; - this.dataGridViewXSensorList.Name = "dataGridViewXSensorList"; - this.dataGridViewXSensorList.RowHeadersVisible = false; - this.dataGridViewXSensorList.RowTemplate.Height = 23; - this.dataGridViewXSensorList.Size = new System.Drawing.Size(240, 193); - this.dataGridViewXSensorList.TabIndex = 4; - this.dataGridViewXSensorList.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridViewXSensorList_CellEndEdit); - // - // FrmQuerySensorAlarm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(258, 244); - this.Controls.Add(this.dataGridViewXSensorList); - this.Controls.Add(this.buttonXStopTimer); - this.Controls.Add(this.buttonXStartTimer); - this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow; - this.MaximizeBox = false; - this.Name = "FrmQuerySensorAlarm"; - this.ShowIcon = false; - this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "传感器在线报警"; - this.Load += new System.EventHandler(this.FrmQuerySensorAlarm_Load); - this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmQuerySensorAlarm_FormClosing); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewXSensorList)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private ButtonX buttonXStartTimer; - private ButtonX buttonXStopTimer; - private DataGridViewX dataGridViewXSensorList; - } -} \ No newline at end of file diff --git a/FrmQuerySensorAlarm.resx b/FrmQuerySensorAlarm.resx deleted file mode 100644 index 19dc0dd..0000000 --- a/FrmQuerySensorAlarm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/LayerChild.cs b/LayerChild.cs deleted file mode 100644 index 67b51b5..0000000 --- a/LayerChild.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace Cyberpipe -{ - public class LayerChild - { - public string attriLabel; - public string attriLayer; - public string attriType; - - public LayerChild() - { } - public LayerChild(string label, string layerName, string type) - { - attriLabel = label; - attriLayer = layerName; - attriType = type; - } - } -} diff --git a/LineBuilder.cs b/LineBuilder.cs index 611ed4b..33a216c 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -43,6 +43,7 @@ GSOGeoPolyline3D lineeee = f.Geometry as GSOGeoPolyline3D; if (lineeee == null || lineeee.GetSpaceLength(true, 6378137) == 0) { + LogHelper.WriteLog(typeof(LineBuilder), "出现数据无法入库:"+f.ID); continue; //TODO LIST:判断是否会出现部署数据无法入库情况,Log2Net } diff --git a/MainFrm.cs b/MainFrm.cs index b908e40..e097e98 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -2372,7 +2372,7 @@ j++; } if (count == 1) - {//不够两行 + {//不够两列 tmpStr += ""; } tmpStr += ""; @@ -5059,8 +5059,6 @@ node.Nodes.Clear(); globeControl1.Refresh(); } - //定时检查传感器的状态 待完善 - public Timer timerOfSensor = null; /// /// 一键审核---导入数据 /// @@ -5167,7 +5165,6 @@ void doWork() { - FrmShResult frmShResult; if (frmSh.rukuLayer != null) { try @@ -5186,7 +5183,7 @@ globeControl1.Refresh(); } - frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); + FrmShResult frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames); frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50); frmShResult.Owner = this; frmShResult.analysis(); @@ -5201,9 +5198,9 @@ } catch (Exception ex) { + boolfrmShResult = false; MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error); } -// boolfrmShResult = true; } void returnShTap() diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index dc576e6..2c095e5 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -244,6 +244,23 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem(); @@ -318,17 +335,6 @@ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem(); @@ -339,12 +345,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemHX2 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItemDCTP = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem3 = new DevComponents.DotNetBar.SliderItem(); this.ribbonTabItem1 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem11 = new DevComponents.DotNetBar.RibbonTabItem(); this.ribbonTabItem6 = new DevComponents.DotNetBar.RibbonTabItem(); @@ -539,13 +539,13 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel5.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.panelOfTable.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); @@ -729,7 +729,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -2218,6 +2218,277 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel12.Controls.Add(this.ribbonBar18); + this.ribbonPanel12.Controls.Add(this.ribbonBar13); + this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Name = "ribbonPanel12"; + this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel12.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + this.buttonItem132}); + this.ribbonBar18.Location = new System.Drawing.Point(508, 0); + this.ribbonBar18.Name = "ribbonBar18"; + this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + this.btn_check_history}); + this.ribbonBar13.Location = new System.Drawing.Point(3, 0); + this.ribbonBar13.Name = "ribbonBar13"; + this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel5 + // + this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel5.Controls.Add(this.ribbonBar2); + this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Name = "ribbonPanel5"; + this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel5.Style.Class = ""; + this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseDown.Class = ""; + this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel5.StyleMouseOver.Class = ""; + this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel5.TabIndex = 37; + this.ribbonPanel5.Visible = false; + // + // ribbonBar2 + // + this.ribbonBar2.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.BackgroundStyle.Class = ""; + this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.ContainerControlProcessDialogKey = true; + this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItemHX1, + this.buttonItemHX2, + this.buttonItemDCTP, + this.sliderItem3}); + this.ribbonBar2.Location = new System.Drawing.Point(3, 0); + this.ribbonBar2.Name = "ribbonBar2"; + this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar2.TabIndex = 0; + // + // + // + this.ribbonBar2.TitleStyle.Class = ""; + this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar2.TitleStyleMouseOver.Class = ""; + this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar2.TitleVisible = false; + // + // buttonItemHX1 + // + this.buttonItemHX1.AutoExpandOnClick = true; + this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); + this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX1.Name = "buttonItemHX1"; + this.buttonItemHX1.SubItemsExpandWidth = 14; + this.buttonItemHX1.Text = "导入红线"; + this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); + // + // buttonItemHX2 + // + this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); + this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemHX2.Name = "buttonItemHX2"; + this.buttonItemHX2.SubItemsExpandWidth = 14; + this.buttonItemHX2.Text = "红线审核"; + this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); + // + // buttonItemDCTP + // + this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); + this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItemDCTP.Name = "buttonItemDCTP"; + this.buttonItemDCTP.SubItemsExpandWidth = 14; + this.buttonItemDCTP.Text = "导出图片"; + this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); + // + // sliderItem3 + // + this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem3.LabelWidth = 50; + this.sliderItem3.Name = "sliderItem3"; + this.sliderItem3.Text = "地面透明度"; + this.sliderItem3.TextColor = System.Drawing.Color.Black; + this.sliderItem3.Value = 0; + this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); + // // ribbonPanel6 // this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3010,175 +3281,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel12.Controls.Add(this.ribbonBar18); - this.ribbonPanel12.Controls.Add(this.ribbonBar13); - this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel12.Name = "ribbonPanel12"; - this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel12.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133, - this.buttonItem132}); - this.ribbonBar18.Location = new System.Drawing.Point(508, 0); - this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); - this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // buttonItem132 - // - this.buttonItem132.Name = "buttonItem132"; - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - this.btn_check_history}); - this.ribbonBar13.Location = new System.Drawing.Point(3, 0); - this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); - this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -3325,108 +3427,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // - // ribbonPanel5 - // - this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel5.Controls.Add(this.ribbonBar2); - this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel5.Name = "ribbonPanel5"; - this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel5.Style.Class = ""; - this.ribbonPanel5.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseDown.Class = ""; - this.ribbonPanel5.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel5.StyleMouseOver.Class = ""; - this.ribbonPanel5.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel5.TabIndex = 37; - this.ribbonPanel5.Visible = false; - // - // ribbonBar2 - // - this.ribbonBar2.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar2.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar2.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.BackgroundStyle.Class = ""; - this.ribbonBar2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.ContainerControlProcessDialogKey = true; - this.ribbonBar2.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar2.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItemHX1, - this.buttonItemHX2, - this.buttonItemDCTP, - this.sliderItem3}); - this.ribbonBar2.Location = new System.Drawing.Point(3, 0); - this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); - this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar2.TabIndex = 0; - // - // - // - this.ribbonBar2.TitleStyle.Class = ""; - this.ribbonBar2.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar2.TitleStyleMouseOver.Class = ""; - this.ribbonBar2.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar2.TitleVisible = false; - // - // buttonItemHX1 - // - this.buttonItemHX1.AutoExpandOnClick = true; - this.buttonItemHX1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX1.Image"))); - this.buttonItemHX1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX1.Name = "buttonItemHX1"; - this.buttonItemHX1.SubItemsExpandWidth = 14; - this.buttonItemHX1.Text = "导入红线"; - this.buttonItemHX1.Click += new System.EventHandler(this.buttonItemHX1_Click); - // - // buttonItemHX2 - // - this.buttonItemHX2.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemHX2.Image"))); - this.buttonItemHX2.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemHX2.Name = "buttonItemHX2"; - this.buttonItemHX2.SubItemsExpandWidth = 14; - this.buttonItemHX2.Text = "红线审核"; - this.buttonItemHX2.Click += new System.EventHandler(this.buttonItemHX2_Click); - // - // buttonItemDCTP - // - this.buttonItemDCTP.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemDCTP.Image"))); - this.buttonItemDCTP.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItemDCTP.Name = "buttonItemDCTP"; - this.buttonItemDCTP.SubItemsExpandWidth = 14; - this.buttonItemDCTP.Text = "导出图片"; - this.buttonItemDCTP.Click += new System.EventHandler(this.buttonItemDCTP_Click); - // - // sliderItem3 - // - this.sliderItem3.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem3.LabelWidth = 50; - this.sliderItem3.Name = "sliderItem3"; - this.sliderItem3.Text = "地面透明度"; - this.sliderItem3.TextColor = System.Drawing.Color.Black; - this.sliderItem3.Value = 0; - this.sliderItem3.ValueChanged += new System.EventHandler(this.sliderItem3_ValueChanged); - // // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; @@ -4475,7 +4475,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(28111, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(28408, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4569,7 +4569,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(28110, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(28407, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5786,13 +5786,13 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel5.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.panelOfTable.ResumeLayout(false); this.panelOfTable.PerformLayout(); diff --git a/Utility.cs b/Utility.cs index d4382dc..781c0ce 100644 --- a/Utility.cs +++ b/Utility.cs @@ -30,12 +30,12 @@ //public static string localicenseserverip; //public static int localicenseserverport; public static GSODataSource dataSource; - public static List LayerChilds; - public static ArrayList LayerLabels; - public static ArrayList LayerNames; +// public static List LayerChilds; +// public static ArrayList LayerLabels; +// public static ArrayList LayerNames; public static ArrayList TerrainsName; public static ArrayList LayerNamesList; - public static Hashtable LayerLabel_LayerIDs; +// public static Hashtable LayerLabel_LayerIDs; public static Hashtable Query_Fields = new Hashtable(); public static Hashtable Query_Roads = new Hashtable(); public static Hashtable Pipe_Code = new Hashtable(); @@ -220,12 +220,8 @@ public static void SetParams() { #region 读取 filename "Config.xml" - LayerChilds = new List(); - LayerLabels = new ArrayList(); TerrainsName = new ArrayList(); - LayerNames = new ArrayList(); LayerNamesList = new ArrayList(); - LayerLabel_LayerIDs = new Hashtable(); if (File.Exists(filename)) { XmlTextReader xmlReader = new XmlTextReader(filename);