diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" new file mode 100644 index 0000000..062fffb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" new file mode 100644 index 0000000..062fffb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0e7a192..b753066 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" new file mode 100644 index 0000000..062fffb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0e7a192..b753066 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index b4c2526..f3ec32b 100644 --- a/obj/Debug/GenerateResource.read.1.tlog +++ b/obj/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" new file mode 100644 index 0000000..062fffb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0e7a192..b753066 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index b4c2526..f3ec32b 100644 --- a/obj/Debug/GenerateResource.read.1.tlog +++ b/obj/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/Debug/LSPipeline.exe b/obj/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/obj/Debug/LSPipeline.exe +++ b/obj/Debug/LSPipeline.exe Binary files differ diff --git a/BaseParam.cs b/BaseParam.cs index 78b73bc..ce12dca 100644 --- a/BaseParam.cs +++ b/BaseParam.cs @@ -32,4 +32,6 @@ public string attachNameFieldName;//附属物名称 public string z; } + + } diff --git a/HTForms/FrmAddWellShp.cs b/HTForms/FrmAddWellShp.cs index f85e4c8..a4b378e 100644 --- a/HTForms/FrmAddWellShp.cs +++ b/HTForms/FrmAddWellShp.cs @@ -16,6 +16,7 @@ GSODataSource datasource; public GSOLayer rukuLayer; private EnumValidateType enumValidateType; + bool isCamera = false; public FrmAddWellShp(GSOGlobeControl _globeControl1) { @@ -64,17 +65,20 @@ { GSOLayer layer = globeControl1.Globe.Layers.GetLayerByCaption( Path.GetFileNameWithoutExtension(comboBoxLayer.Text)); - - FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), - enumValidateType); - if (!fieldValidate.Validate(layer)) + if (isCamera == false) { - DateTime dt = DateTime.Now; - string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + - dt.Month + dt.Day + ".txt"; - MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); - return; + FieldValidate fieldValidate = FieldValidateFactory.Create(ValidateConfig.LoadConfig(), + enumValidateType); + + if (!fieldValidate.Validate(layer)) + { + DateTime dt = DateTime.Now; + string logFilePath = Application.StartupPath + "\\log\\" + dt.Year + "\\" + dt.Year + dt.Month + "\\" + dt.Year + + dt.Month + dt.Day + ".txt"; + MessageBox.Show("选择的数据不符合数据规范，详情见日志" + logFilePath, "提示"); + return; + } } ModelBuilder pointBuilder = new PointBuilder(datasource); @@ -93,6 +97,7 @@ addLayerToGlobeControl(pointParam.layerName); DialogResult = DialogResult.OK; + //if(isCamera==true) MessageBox.Show("入库完成！", "提示"); } @@ -102,7 +107,21 @@ LogHelper.Error(ex.Message); } } + /* + insertDevice(GSOLayer layer) + { + string sql=""; + GSOFeatures features = layer.GetAllFeatures(true); + for (int i = 0; i < features.Length; i++) + { + GSOFeature f = features[i]; + string code = f.GetValue(pointParam.uniqueIdFieldName).ToString(); + string + + } + } + * */ private void addLayerToGlobeControl(string layerName) { GSOLayer layer = globeControl1.Globe.Layers.Add(datasource.GetDatasetByName(layerName)); @@ -172,6 +191,7 @@ { if (ExitFiled(feature, "管点编码")) //特征管点 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "管点特征"; combCode.SelectedItem = "管点编码"; @@ -182,6 +202,7 @@ } else if (ExitFiled(feature, "附属物编码")) //附属物 { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.SelectedItem = "附属物名称"; combCode.SelectedItem = "附属物编码"; @@ -190,8 +211,21 @@ comboBoxZ.Enabled = false; enumValidateType = EnumValidateType.Attach; } + else if (ExitFiled(feature, "DEVICE")) + { + isCamera = true; + txtLayerName.Text = "工地设备图层"; + comboBoxCode.SelectedItem = "CODE"; + combModelName.Enabled = false; + combCode.Enabled = false; + combDeep.Enabled = false; + comboBoxGC.Enabled = false; + comboBoxZ.Enabled = false; + enumValidateType = EnumValidateType.Attach; + } else { + isCamera = false; comboBoxCode.SelectedItem = "编号"; combModelName.Enabled = false; combCode.SelectedItem = "图层编号"; @@ -256,6 +290,7 @@ { checkBoxDeep.Checked = !checkBoxH.Checked; } + /* private void buttonOpen_Click(object sender, EventArgs e) { diff --git a/HTForms/FrmAddWellShp.designer.cs b/HTForms/FrmAddWellShp.designer.cs index 4d6156e..fd2319b 100644 --- a/HTForms/FrmAddWellShp.designer.cs +++ b/HTForms/FrmAddWellShp.designer.cs @@ -66,7 +66,7 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(24, 50); + this.label2.Location = new System.Drawing.Point(22, 56); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(65, 12); this.label2.TabIndex = 1; @@ -74,7 +74,7 @@ // // txtUpGround // - this.txtUpGround.Location = new System.Drawing.Point(104, 176); + this.txtUpGround.Location = new System.Drawing.Point(102, 182); this.txtUpGround.Name = "txtUpGround"; this.txtUpGround.Size = new System.Drawing.Size(150, 21); this.txtUpGround.TabIndex = 4; @@ -83,7 +83,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(24, 179); + this.label3.Location = new System.Drawing.Point(22, 185); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(65, 12); this.label3.TabIndex = 3; @@ -92,7 +92,7 @@ // label5 // this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(33, 119); + this.label5.Location = new System.Drawing.Point(31, 125); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(65, 12); this.label5.TabIndex = 3; @@ -100,7 +100,7 @@ // // txtLayerName // - this.txtLayerName.Location = new System.Drawing.Point(104, 116); + this.txtLayerName.Location = new System.Drawing.Point(102, 122); this.txtLayerName.Name = "txtLayerName"; this.txtLayerName.Size = new System.Drawing.Size(150, 21); this.txtLayerName.TabIndex = 4; @@ -108,7 +108,7 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(280, 119); + this.label7.Location = new System.Drawing.Point(278, 125); this.label7.Name = "label7"; this.label7.Size = new System.Drawing.Size(65, 12); this.label7.TabIndex = 3; @@ -117,7 +117,7 @@ // label8 // this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(280, 150); + this.label8.Location = new System.Drawing.Point(278, 156); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(65, 12); this.label8.TabIndex = 3; @@ -130,7 +130,7 @@ this.combCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combCode.FormattingEnabled = true; this.combCode.ItemHeight = 15; - this.combCode.Location = new System.Drawing.Point(355, 116); + this.combCode.Location = new System.Drawing.Point(353, 122); this.combCode.Name = "combCode"; this.combCode.Size = new System.Drawing.Size(154, 21); this.combCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -143,7 +143,7 @@ this.combDeep.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combDeep.FormattingEnabled = true; this.combDeep.ItemHeight = 15; - this.combDeep.Location = new System.Drawing.Point(355, 145); + this.combDeep.Location = new System.Drawing.Point(353, 151); this.combDeep.Name = "combDeep"; this.combDeep.Size = new System.Drawing.Size(154, 21); this.combDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -153,7 +153,7 @@ // this.button3.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.button3.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.button3.Location = new System.Drawing.Point(430, 244); + this.button3.Location = new System.Drawing.Point(428, 250); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(75, 23); this.button3.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -176,7 +176,7 @@ this.comboBoxLayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxLayer.FormattingEnabled = true; this.comboBoxLayer.ItemHeight = 15; - this.comboBoxLayer.Location = new System.Drawing.Point(104, 45); + this.comboBoxLayer.Location = new System.Drawing.Point(102, 51); this.comboBoxLayer.Name = "comboBoxLayer"; this.comboBoxLayer.Size = new System.Drawing.Size(401, 21); this.comboBoxLayer.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -186,7 +186,7 @@ // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(24, 212); + this.label6.Location = new System.Drawing.Point(22, 218); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(65, 12); this.label6.TabIndex = 3; @@ -199,7 +199,7 @@ this.combModelName.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.combModelName.FormattingEnabled = true; this.combModelName.ItemHeight = 15; - this.combModelName.Location = new System.Drawing.Point(104, 208); + this.combModelName.Location = new System.Drawing.Point(102, 214); this.combModelName.Name = "combModelName"; this.combModelName.Size = new System.Drawing.Size(150, 21); this.combModelName.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -208,7 +208,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(295, 212); + this.label1.Location = new System.Drawing.Point(293, 218); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(47, 12); this.label1.TabIndex = 91; @@ -220,7 +220,7 @@ this.comboBoxGC.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; this.comboBoxGC.FormattingEnabled = true; this.comboBoxGC.ItemHeight = 15; - this.comboBoxGC.Location = new System.Drawing.Point(355, 176); + this.comboBoxGC.Location = new System.Drawing.Point(353, 182); this.comboBoxGC.Name = "comboBoxGC"; this.comboBoxGC.Size = new System.Drawing.Size(154, 21); this.comboBoxGC.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -232,7 +232,7 @@ // // this.checkBoxReset.BackgroundStyle.Class = ""; - this.checkBoxReset.Location = new System.Drawing.Point(194, 80); + this.checkBoxReset.Location = new System.Drawing.Point(192, 86); this.checkBoxReset.Name = "checkBoxReset"; this.checkBoxReset.Size = new System.Drawing.Size(60, 23); this.checkBoxReset.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -249,7 +249,7 @@ this.checkBoxAdd.Checked = true; this.checkBoxAdd.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxAdd.CheckValue = "Y"; - this.checkBoxAdd.Location = new System.Drawing.Point(111, 80); + this.checkBoxAdd.Location = new System.Drawing.Point(109, 86); this.checkBoxAdd.Name = "checkBoxAdd"; this.checkBoxAdd.Size = new System.Drawing.Size(60, 23); this.checkBoxAdd.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -260,7 +260,7 @@ // label15 // this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(22, 85); + this.label15.Location = new System.Drawing.Point(20, 91); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(89, 12); this.label15.TabIndex = 139; @@ -269,7 +269,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(271, 85); + this.label16.Location = new System.Drawing.Point(269, 91); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(65, 12); this.label16.TabIndex = 138; @@ -281,7 +281,7 @@ // // this.checkBoxH.BackgroundStyle.Class = ""; - this.checkBoxH.Location = new System.Drawing.Point(437, 80); + this.checkBoxH.Location = new System.Drawing.Point(435, 86); this.checkBoxH.Name = "checkBoxH"; this.checkBoxH.Size = new System.Drawing.Size(58, 23); this.checkBoxH.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -298,7 +298,7 @@ this.checkBoxDeep.Checked = true; this.checkBoxDeep.CheckState = System.Windows.Forms.CheckState.Checked; this.checkBoxDeep.CheckValue = "Y"; - this.checkBoxDeep.Location = new System.Drawing.Point(351, 80); + this.checkBoxDeep.Location = new System.Drawing.Point(349, 86); this.checkBoxDeep.Name = "checkBoxDeep"; this.checkBoxDeep.Size = new System.Drawing.Size(60, 23); this.checkBoxDeep.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -309,7 +309,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(48, 150); + this.label4.Location = new System.Drawing.Point(46, 156); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(41, 12); this.label4.TabIndex = 142; @@ -322,7 +322,7 @@ this.comboBoxCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxCode.FormattingEnabled = true; this.comboBoxCode.ItemHeight = 15; - this.comboBoxCode.Location = new System.Drawing.Point(104, 145); + this.comboBoxCode.Location = new System.Drawing.Point(102, 151); this.comboBoxCode.Name = "comboBoxCode"; this.comboBoxCode.Size = new System.Drawing.Size(150, 21); this.comboBoxCode.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -331,7 +331,7 @@ // label9 // this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(280, 179); + this.label9.Location = new System.Drawing.Point(278, 185); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(65, 12); this.label9.TabIndex = 145; @@ -344,7 +344,7 @@ this.comboBoxZ.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxZ.FormattingEnabled = true; this.comboBoxZ.ItemHeight = 15; - this.comboBoxZ.Location = new System.Drawing.Point(355, 208); + this.comboBoxZ.Location = new System.Drawing.Point(353, 214); this.comboBoxZ.Name = "comboBoxZ"; this.comboBoxZ.Size = new System.Drawing.Size(154, 21); this.comboBoxZ.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -353,7 +353,7 @@ // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(13, 15); + this.label19.Location = new System.Drawing.Point(11, 21); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(77, 12); this.label19.TabIndex = 148; @@ -366,7 +366,7 @@ this.comboBoxDataSourceList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboBoxDataSourceList.FormattingEnabled = true; this.comboBoxDataSourceList.ItemHeight = 15; - this.comboBoxDataSourceList.Location = new System.Drawing.Point(104, 12); + this.comboBoxDataSourceList.Location = new System.Drawing.Point(102, 18); this.comboBoxDataSourceList.Name = "comboBoxDataSourceList"; this.comboBoxDataSourceList.Size = new System.Drawing.Size(401, 21); this.comboBoxDataSourceList.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -376,7 +376,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(523, 297); + this.ClientSize = new System.Drawing.Size(517, 285); this.Controls.Add(this.label19); this.Controls.Add(this.comboBoxDataSourceList); this.Controls.Add(this.comboBoxZ); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3a5fd70..5134263 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -226,7 +226,6 @@ ComboboxRansparency.Value = 255; else ComboboxRansparency.Value = 125; - } private void clearComboboxParam() @@ -258,9 +257,18 @@ cmbID.SelectedItem = "编号"; cmbFrom.SelectedItem = "起始埋深"; cmbTo.SelectedItem = "终止埋深"; - cmbRadius.SelectedItem = "管径_毫米"; + //cmbRadius.SelectedItem = "管径_毫米"; comboBoxExHeight.SelectedItem = "沟道高"; comboBoxExWidth.SelectedItem = "沟道宽"; + + if (cmbRadius.Items.Contains("管径_毫米")) + { + cmbRadius.SelectedItem = "管径_毫米"; + } + else + { + cmbRadius.SelectedItem = "沟道高"; + } } private void comboBoxExLayer_SelectedIndexChanged(object sender, EventArgs e) diff --git a/LSPipeline.suo b/LSPipeline.suo index 1b8bb41..5cd5510 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/LineBuilder.cs b/LineBuilder.cs index 86b6392..08cfdc6 100644 --- a/LineBuilder.cs +++ b/LineBuilder.cs @@ -104,8 +104,8 @@ style0.Radius = radius; return style0; } - double width = f.GetFieldAsDouble(lineParam.channelWidth);//管沟宽、高单位转换成米 - double height = f.GetFieldAsDouble(lineParam.channelHeight); + double width = f.GetFieldAsDouble(lineParam.channelWidth)/1000;//管沟宽、高单位转换成米 + double height = f.GetFieldAsDouble(lineParam.channelHeight)/1000; GSOExtendSectionLineStyle3D style1 = new GSOExtendSectionLineStyle3D(); diff --git a/PointBuilder.cs b/PointBuilder.cs index aae9f22..c8af165 100644 --- a/PointBuilder.cs +++ b/PointBuilder.cs @@ -87,6 +87,10 @@ pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName).ToString()) + pointParam.upGround : pointParam.upGround; } + if (ExitFiled(f, "DEVICE")) //视频摄像机 + { + pt.Z = 4; + } else { pt.Z = (buildMode.Equals(EnumBuildMode.Alititude)) ? Convert.ToDouble(f.GetValue(pointParam.altitudeFieldName)) @@ -114,6 +118,10 @@ { return filedPathG + feName + "\\" + feName + ".gcm"; } + if (ExitFiled(f, "DEVICE"))//视频摄像机 + { + return filedPathG + "\\camera\\摄像机.gcm"; + } if (ExitFiled(f, "附属物编码")) //附属物 { deep = Math.Round(deep, 0); diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index c6112d0..60050f2 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -5,7 +5,7 @@ - + @@ -24,7 +24,7 @@ - + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/bin/x64/Debug/LSPipeline.pdb b/bin/x64/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/log.txt b/bin/x64/Debug/log.txt index 73bcf38..7261fb6 100644 --- a/bin/x64/Debug/log.txt +++ b/bin/x64/Debug/log.txt @@ -27776,3 +27776,75 @@ exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:07:36--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 113 + + + + exception over ------------------------------------------------------------ + + exception begin -----------------2017/4/7 17:08:13--------------------- + + + + e.Message:输入字符串的格式不正确。 + + e.Source:mscorlib + + e.TargetSite:Double ParseDouble(System.String, System.Globalization.NumberStyles, System.Globalization.NumberFormatInfo) + + e.StackTrace: 在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt) + 在 System.Double.Parse(String s, IFormatProvider provider) + 在 WorldGIS.CtrlEntitySpaceInfo.positionChanged() 位置 D:\LSPipeline\UserControls\CtrlEntitySpaceInfo.cs:行号 115 + + + + exception over ------------------------------------------------------------ diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log index ac3e20e..3ab1510 100644 --- a/bin/x64/Debug/log/error/2017/201703/2017-03-31.log +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-31.log @@ -1,3 +1,13 @@ [2017-03-31 16:30:05,187 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 未找到字段或其类型匹配:管径_毫米:double +[2017-03-31 16:38:47,935 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double +未找到字段或其类型匹配:起始管顶高:double +未找到字段或其类型匹配:终止管顶高:double + +[2017-03-31 16:38:50,992 -- ERROR] WorldGIS.FieldCountValidate.Execute:雨水管线：字段完整性检查失败 +未找到字段或其类型匹配:管径_毫米:double + +[2017-03-31 17:59:34,933 -- ERROR] WorldGIS.GXBuilder.doBuild:光纤数据保存Alarm_Device失败: + diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-01.log b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log new file mode 100644 index 0000000..462daae --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-01.log @@ -0,0 +1,3 @@ +[2017-04-01 15:55:34,490 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 15:55:42,884 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 +[2017-04-01 16:17:28,954 -- ERROR] WorldGIS.HTForms.FrmPipelineModelDB.btnCreateModel_Click:未将对象引用设置到对象的实例。 diff --git a/bin/x64/Debug/log/error/2017/201704/2017-04-07.log b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log new file mode 100644 index 0000000..7055074 --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201704/2017-04-07.log @@ -0,0 +1,13 @@ +[2017-04-07 17:03:03,160 -- ERROR] WorldGIS.FieldCountValidate.Execute:camera20151119：字段完整性检查失败 +未找到字段或其类型匹配:编号:string +未找到字段或其类型匹配:附属物编码:int +未找到字段或其类型匹配:地面高程:double +未找到字段或其类型匹配:X坐标:double +未找到字段或其类型匹配:Y坐标:double +未找到字段或其类型匹配:井深:double +未找到字段或其类型匹配:附属物名称:string +未找到字段或其类型匹配:所属道路:string +未找到字段或其类型匹配:建设年代:string +未找到字段或其类型匹配:权属单位:string +未找到字段或其类型匹配:备注:string + diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-01.log b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201704/2017-04-07.log b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201704/2017-04-07.log diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-01.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201704/2017-04-07.log diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" new file mode 100644 index 0000000..7d6f0aa --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/1_03_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" new file mode 100644 index 0000000..fabc8a5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/A80g81h7_jpg.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" new file mode 100644 index 0000000..e7d7aea --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/Texture/\347\272\242\347\202\271_png.lli" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" new file mode 100644 index 0000000..591fa66 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272.gcm" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" new file mode 100644 index 0000000..fa1fa53 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL011.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" new file mode 100644 index 0000000..c882cc1 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL061.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" new file mode 100644 index 0000000..3fa5935 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/BL062.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" new file mode 100644 index 0000000..e9134fb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CCBL.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" new file mode 100644 index 0000000..8e19ea5 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQD.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" new file mode 100644 index 0000000..497410a --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQDA.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" new file mode 100644 index 0000000..6ce8702 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CQXG.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" new file mode 100644 index 0000000..92a475d --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG1.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" new file mode 100644 index 0000000..524b411 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/CTS-LIG3.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" new file mode 100644 index 0000000..4b65087 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MBS.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" new file mode 100644 index 0000000..3f33765 --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/MZA07.JPG" Binary files differ diff --git "a/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" new file mode 100644 index 0000000..062fffb --- /dev/null +++ "b/bin/x64/Debug/\347\256\241\351\201\223\351\205\215\344\273\266gcm/camera/\346\221\204\345\203\217\346\234\272/RED.JPG" Binary files differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0e7a192..b753066 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferences.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferences.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index b4c2526..f3ec32b 100644 --- a/obj/Debug/GenerateResource.read.1.tlog +++ b/obj/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/obj/Debug/LSPipeline.exe b/obj/Debug/LSPipeline.exe index a869b92..0e3c2db 100644 --- a/obj/Debug/LSPipeline.exe +++ b/obj/Debug/LSPipeline.exe Binary files differ diff --git a/obj/Debug/LSPipeline.pdb b/obj/Debug/LSPipeline.pdb index b20a6cc..bf53125 100644 --- a/obj/Debug/LSPipeline.pdb +++ b/obj/Debug/LSPipeline.pdb Binary files differ