diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 100644 --- a/bin/x64/Debug/LSPipeline.exe +++ b/bin/x64/Debug/LSPipeline.exe Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 01b91d5..b0cf5f9 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 01b91d5..b0cf5f9 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index 56298cb..b4c2526 100644 --- a/obj/Debug/GenerateResource.read.1.tlog +++ b/obj/Debug/GenerateResource.read.1.tlog Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 01b91d5..b0cf5f9 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index 56298cb..b4c2526 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 3b57d49..e913668 100644 --- a/obj/Debug/LSPipeline.exe +++ b/obj/Debug/LSPipeline.exe Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 01b91d5..b0cf5f9 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index 56298cb..b4c2526 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 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/obj/Debug/LSPipeline.pdb +++ b/obj/Debug/LSPipeline.pdb Binary files differ diff --git a/HTForms/FrmPipelineModelDataBase.cs b/HTForms/FrmPipelineModelDataBase.cs index 3076bdd..3a5fd70 100644 --- a/HTForms/FrmPipelineModelDataBase.cs +++ b/HTForms/FrmPipelineModelDataBase.cs @@ -132,7 +132,8 @@ if (!getValidateResult(layer)) return; } - + //reSetComboboxRansparency(); + LineParam lineParam = new LineParam(); lineParam.layerName = txtModelLayer.Text; lineParam.uniqueIdFieldName = cmbID.Text; @@ -153,9 +154,11 @@ else gxLineBuilder(layer, lineParam); + MessageBox.Show("入库完成!", "提示"); addLayerToGlobeControl(lineParam.layerName); //this.DialogResult = DialogResult.OK; - MessageBox.Show("入库完成!", "提示"); + + } catch (Exception ex) { @@ -217,6 +220,15 @@ } } + private void reSetComboboxRansparency() + { + if (comboBoxExWidth.SelectedText != "") + ComboboxRansparency.Value = 255; + else + ComboboxRansparency.Value = 125; + + } + private void clearComboboxParam() { cmbID.Items.Clear(); diff --git a/HTForms/FrmValiData.cs b/HTForms/FrmValiData.cs index af230c1..7c52861 100644 --- a/HTForms/FrmValiData.cs +++ b/HTForms/FrmValiData.cs @@ -99,7 +99,7 @@ private void btnCancel_Click(object sender, EventArgs e) { Close(); - } + } } } diff --git a/LSPipeline.suo b/LSPipeline.suo index 54f4eb9..90dd21e 100644 --- a/LSPipeline.suo +++ b/LSPipeline.suo Binary files differ diff --git a/MainFrm.cs b/MainFrm.cs index de240d9..69e4715 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -120,7 +120,6 @@ GSOHudButton move = null; GSOHudButton rotate = null; GSOHudButton elevate = null; - private void MainFrm_Load(object sender, EventArgs e) { this.KeyPreview = true; diff --git a/bin/x64/Debug/FieldValidate.xml b/bin/x64/Debug/FieldValidate.xml index 3cb8452..c6112d0 100644 --- a/bin/x64/Debug/FieldValidate.xml +++ b/bin/x64/Debug/FieldValidate.xml @@ -43,7 +43,8 @@ - + + diff --git a/bin/x64/Debug/LSPipeline.exe b/bin/x64/Debug/LSPipeline.exe index 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/bin/x64/Debug/LSPipeline.pdb +++ b/bin/x64/Debug/LSPipeline.pdb Binary files differ diff --git a/bin/x64/Debug/MyPlace.kml b/bin/x64/Debug/MyPlace.kml index 896bce9..6036f64 100644 --- a/bin/x64/Debug/MyPlace.kml +++ b/bin/x64/Debug/MyPlace.kml @@ -1,5 +1,3 @@ - - - + diff --git a/bin/x64/Debug/config/log4net.config b/bin/x64/Debug/config/log4net.config new file mode 100644 index 0000000..6fbcfa7 --- /dev/null +++ b/bin/x64/Debug/config/log4net.config @@ -0,0 +1,120 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bin/x64/Debug/databaseConfigOracle.xml b/bin/x64/Debug/databaseConfigOracle.xml index 94be70c..c1fe085 100644 --- a/bin/x64/Debug/databaseConfigOracle.xml +++ b/bin/x64/Debug/databaseConfigOracle.xml @@ -1,8 +1,8 @@  True - 192.168.0.203 - eydb2 + 127.0.0.1 + szdb scott - scott + SZDB \ No newline at end of file diff --git a/bin/x64/Debug/glVersion.txt b/bin/x64/Debug/glVersion.txt index 6a37ce0..bf6579a 100644 --- a/bin/x64/Debug/glVersion.txt +++ b/bin/x64/Debug/glVersion.txt Binary files differ diff --git a/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/debug/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/error/2017/201703/2017-03-27.log b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log new file mode 100644 index 0000000..b71707c --- /dev/null +++ b/bin/x64/Debug/log/error/2017/201703/2017-03-27.log @@ -0,0 +1,3 @@ +[2017-03-27 16:05:04,327 -- ERROR] WorldGIS.FieldUniqueValidate.Execute:GD测试:字段唯一性检查失败 +字段编号重复 09464501GD544次数:3 + diff --git a/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/fatal/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/info/2017/201703/2017-03-27.log b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/info/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log new file mode 100644 index 0000000..5f28270 --- /dev/null +++ b/bin/x64/Debug/log/warn/2017/201703/2017-03-27.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 01b91d5..b0cf5f9 100644 --- a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache +++ b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache Binary files differ diff --git a/obj/Debug/GenerateResource.read.1.tlog b/obj/Debug/GenerateResource.read.1.tlog index 56298cb..b4c2526 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 3b57d49..e913668 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 82a2ac6..19fcca9 100644 --- a/obj/Debug/LSPipeline.pdb +++ b/obj/Debug/LSPipeline.pdb Binary files differ diff --git a/obj/Debug/ResolveAssemblyReference.cache b/obj/Debug/ResolveAssemblyReference.cache new file mode 100644 index 0000000..25ca3e7 --- /dev/null +++ b/obj/Debug/ResolveAssemblyReference.cache Binary files differ